gentoo resync : 21.01.2018

30 files changed, 612 insertions, 75 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 242972f6141f..ebec65781a7a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/apse/Manifest b/dev-python/apse/Manifest
deleted file mode 100644
index cec31e3e1712..000000000000
--- a/dev-python/apse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Apse-0.2.tar.gz 18005 BLAKE2B 00eeccb74bfb909cd1856f24f6a6b000a7de9d1157c79d0c9042694f262f8872a8fcdca9cad5e67ecb7a3259c425bbca432adb7a2d1f11e5a59aa45e59fd556b SHA512 accad6d4fa4056e5dd0ac1036b47b6e258ceea9b458ca91065b0a8411d5e3a3461cd8e87bebbf884982d02bc0f6cc996a3df800fe74a0567a336ee79e05a9837
-EBUILD apse-0.2-r3.ebuild 881 BLAKE2B e198b243600b81bad1acb3813b25fe82dc466292a04154fbdc49c343ccff5be0d21500de4f7296a2133d550eece640d62f29b9f45b844776e7c5d235159018d5 SHA512 3f4c4795f6ebe0e102e7e6cb3bb276f502e63989fb14bcea077ec20dc9ccf8908671eccfcb6931e50bc72792b7f9496f2de73e6b5a5e0303fdfe4284d3721f22
-MISC metadata.xml 1115 BLAKE2B 17b2b758107c4bdeec251ebff79552c42497d9310e7d0d356368fca4276ea8f28ad9c7ae3cd4e9f49756a8d39e433dd1137f76b562437b099444c872fa86c84b SHA512 18be72bd7a6340856103bd1a49c53966e8b25eedd551fb118929786ad5a09a558b64f598df05aede3c19a77bcc5a21f30ac990e19e70c63ecf30ec78bfb60f2b
diff --git a/dev-python/apse/apse-0.2-r3.ebuild b/dev-python/apse/apse-0.2-r3.ebuild
deleted file mode 100644
index a2843e778096..000000000000
--- a/dev-python/apse/apse-0.2-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-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
deleted file mode 100644
index e3518cf8565b..000000000000
--- a/dev-python/apse/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-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/autobahn/Manifest b/dev-python/autobahn/Manifest
index a6f731ce6411..df08670bf443 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,8 +1,10 @@
 DIST autobahn-0.9.4-2.zip 175894 BLAKE2B 6b1ffea7d77968e4e4787b321c12434821fef6c6f4c84cb2bf9bfa2fdb9ff3438080609b825f976671a2cad16203be9efc0f7fe70ce7f5bef96576c1ced02b7c SHA512 7e0d4246b8b1c552b25c2ae36f1923ed9931e3d3ca684039a422773fecd92ca04734a0b24394a9bbc787f245c72b5552522351a7c1c8e500128e7c46c740a3d5
+DIST autobahn-17.10.1.tar.gz 212093 BLAKE2B 1505097dee07025c5433645397bb52807dbd67559b628ee80735a49f8e085e9c8433fbd453a4d001996dd5aee715c9278b9932e8fbb65ecd6458b6b4bd4a804d SHA512 f26c1c88bea325136f640420ada0fc70e82397ed660056c18f68a2193f069c5fb5771ac620db1583f8c7938e804726d8885d237c925c4bd38d1a613a6aabc219
 DIST autobahn-17.5.1.tar.gz 205144 BLAKE2B a026381330d062059f23bd0fe20de12bf227fec45c816ce41a05d81951a2cb263e70ec3a5cee265ea3cc1f6910975903b493a767dce64c5bbb13be077561cabd SHA512 904f8f4c527a6c1c7840ea8634d0c0a47141458500c6d29f4aa1f05ff51f91c65a451b7c447201cbdf5e255c4c2d07509efa106790217b09398e7d50c1d85382
 DIST autobahn-17.9.1.tar.gz 209230 BLAKE2B 4e637ee22fe84c51b294faa853034b65e5bc7b230d1d80eea022a2e3809a7ff0c9ffee7c13886f154efffdcdedf5c790e5891466107670c3221a5c7b5de846ea SHA512 036508c1170f53b01be360083bbf9f569fbaf216d984b34e10ad18e5f5e156e74bd4c8979bdd977a8e23deff0332e16d3d606716d32f3987ff37c7707eac0f86
 DIST autobahn-17.9.2.tar.gz 209442 BLAKE2B 66d31a575d980d81ecd50d9511ed49b947a568ce5457db2de7fd67a85ae06016bacff10f65b74f43c2b72b21543ddb8c0d527f6b9ece706c67adb96860435232 SHA512 de73a4cc99616802d280887ef8a9971c532f974dd43cda933da953d7bcc45da3fd9d0c91763c6a80371f582f0acc9741134b1ba1b98035ef0f63e4971aaff79f
 EBUILD autobahn-0.9.4.2.ebuild 2928 BLAKE2B 26e0e26b7aba71c25bedced1bb63ad8425ed86384ac08e6f9b8ad96a75bd1c6845da68b41dc26690853fe09d2af212c97925596f1704abe974712db25b866767 SHA512 2b0d5897dbb3e659e2c02a9267cfc8847c636d5898ba59ea33786d1ead74b2a0d62a51e869c08e913c00c08694dc15ec4ce0b9a473ce1855de4da9a0a85035f6
+EBUILD autobahn-17.10.1.ebuild 1862 BLAKE2B c29491055685c54d9f836b12584455636ef1d06c3cbba5d0aa1acb7986cc445951eb8d056dea381413ae14ede8ef3a555d6de588ef7f4335fd1149d645a4c2f7 SHA512 c70fb571bd79e288f3a52b1c05f7ee79eba395bae75412b6c0bcb8617fe6f125b24dc520155a26add54942a6dad86dfde6d9d90f5950c05b8366e8029a01bd46
 EBUILD autobahn-17.5.1-r2.ebuild 1855 BLAKE2B d15732d36a5f8c7d8620a4192f301cf07f92e257b70d0ba228de8bf459ad15ee1892c1c610cd52d22c801c3192903e6708a89432c99d6248d9dc4ebd919752de SHA512 370231757473b8bca2df5598e8d741b52dc4f20268eb1497da7e96073519a6d92890aaaedd822741deffb2b562cea8e5c766a41d80d51b350e9edc5655427ccc
 EBUILD autobahn-17.9.1.ebuild 1862 BLAKE2B c80874fc962bc4a5fd7d109fef0ac589a008bc9124f3c573953be267508338f216e09bef1fcef3efff2248e3daa7a268fbf2936394da1a4645fe7fdf0d1a1331 SHA512 6fe74281a793e5ae17ca66c9ecd453fa143d82de9639cfa43525beee8953038322dde5e5ef29b9f66b885cf7a81857ce3a91ef05ee4a561fd71efadc9f066191
 EBUILD autobahn-17.9.2.ebuild 1862 BLAKE2B c80874fc962bc4a5fd7d109fef0ac589a008bc9124f3c573953be267508338f216e09bef1fcef3efff2248e3daa7a268fbf2936394da1a4645fe7fdf0d1a1331 SHA512 6fe74281a793e5ae17ca66c9ecd453fa143d82de9639cfa43525beee8953038322dde5e5ef29b9f66b885cf7a81857ce3a91ef05ee4a561fd71efadc9f066191
diff --git a/dev-python/autobahn/autobahn-17.10.1.ebuild b/dev-python/autobahn/autobahn-17.10.1.ebuild
new file mode 100644
index 000000000000..96be8246b797
--- /dev/null
+++ b/dev-python/autobahn/autobahn-17.10.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 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/case/Manifest b/dev-python/case/Manifest
index a93c899b5b96..12ab18211c3f 100644
--- a/dev-python/case/Manifest
+++ b/dev-python/case/Manifest
@@ -1,5 +1,5 @@
-DIST case-1.2.3.tar.gz 55405 BLAKE2B bfeb0547292a93035058186d44564c44816a057f2dea3fc0cd6b12af78a8228f4ecd01192edbfe4d1b9f333cb1637cdb0f11c40afae0c1cd66f4b70322507317 SHA512 7dcc2fc593e4c5382879b9f09aecc35c0937d1070d945688e641d08611ecc263531a9d87eef730685cab41ed32a0e770b06ff36060b212d288752442814700e0
 DIST case-1.5.2.tar.gz 58382 BLAKE2B f5924a7bf276087e469ec43780791e7eb223daf9649eadb79060066ea0125931e5534762b148b0b3b65805bd05c7111bdb0b598df12d056535c01662260eeb5f SHA512 82c0ed9a788fb57c4109cdbe24822fdaeb59fdfd5d7ebe0c93a39e8e2a2745e911d6dc1b679ac46e263eb6041bbc0ab46b20f3850c12f8f63324cabe145ebdd6
-EBUILD case-1.2.3.ebuild 478 BLAKE2B 8458cb17a663fbe8476d6aa6981c696b015c07f06738a2e46acdcb2de0239f063bbc95aa0bb27de048364c5e86d3f10ff7598ceb3062555d967e033bd2c546b6 SHA512 c2387dd726f0487a0126727e13a8dc882b24fb37430bd42ead6c63c6323237468cdb16875140ff5427069cbe8cfbc850ef4ba2b7ce655d43fd60540e989b85b6
-EBUILD case-1.5.2.ebuild 485 BLAKE2B 9d395dba5165143c78e4316d9e041f38da7a9f191f5b54fc68abe18ee4ca9257538b90433ac5c96b606da0639aca7006eef3fddbf700a1f15fd6290cd3c7eee4 SHA512 3cc6959bd5fddad4430327e32e0f2f0539e875827901884c30e9b9a79b9eeb8b2fe9cd477958d007e65f1771eb16f08550e9b7a4e0f2f6290148caef09b5da63
+DIST case-1.5.3.tar.gz 58469 BLAKE2B e535664cc616ac14d1b13e01abe44544fa470030895237711456eefe1aff0b79876b2225344065416149f7de444bf4dc5bef22a184b148e059a8b1f38a394619 SHA512 ae98a571c282f80c685c42ab1dc578847fe88cf8cd07faff505a8df8e3282a602908a8780ab88b36851e3ee6f3c178405e5c50776fd0f49fcc990087575f2958
+EBUILD case-1.5.2-r1.ebuild 601 BLAKE2B cd183f6ae807a7078efac1e1dd9a0d1dc36b34bccfa81feb825082e866eb1ca4d05033870135ffc9463465d09e447954e34090e2087647205759a398b4775a89 SHA512 044bb16d8807c557f3524f6396a849ca36f20c3496495bcd4aac899793e3996312bf13cc3a5c2e3b8a39e7a0fdaca007bd397732156070cf422006f173b0f314
+EBUILD case-1.5.3.ebuild 603 BLAKE2B bf23868ee37ac4d44bb9835ed6998371c2f2130fd1f8f3d1f9d192c2f9dbc2f7d9bbeccd3374c74dd156d43afe947870d8f5c7dc372f13c29126887f7e0bf047 SHA512 13daac27248b11489a2e2371ee93f6c8b933334c9d911651301d41bd01d3e787eb6dfe77f9ea53c135a0ddf1b91e3946da0b2679c041405025af8dbc033151fb
 MISC metadata.xml 336 BLAKE2B 4190ad7722be2f40f19911895aa86b9181bac364174de9b3e9016c541b0f1ddf53114533a6ccba680cebd510d411ac2a1f5d32abf04a71016dd7243143d8c7d5 SHA512 c0fdd3bfed03072c578a781b4aeb08728b17c8f9b22f4ac346cd993604fd634de8f94b7803c73f7285f87bc4f0a2245536f9a9bab8a254052bf10b8c979a3a28
diff --git a/dev-python/case/case-1.5.2.ebuild b/dev-python/case/case-1.5.2-r1.ebuild
index 22e93c2a6318..2a0e878cf66d 100644
--- a/dev-python/case/case-1.5.2.ebuild
+++ b/dev-python/case/case-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,5 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
-RDEPEND=""
+RDEPEND=">=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/case/case-1.2.3.ebuild b/dev-python/case/case-1.5.3.ebuild
index fba062f03121..af944e8c1503 100644
--- a/dev-python/case/case-1.2.3.ebuild
+++ b/dev-python/case/case-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,8 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
-RDEPEND=""
+RDEPEND=">=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index 4415dcb5f9d9..7ec4af83e1d2 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,5 +1,7 @@
 DIST git-review-1.24.tar.gz 39106 BLAKE2B ee2361dc967db00e1444a3ef47bc82d07c5062c5717d58daad312c4f67f613dd8430f55c15bcb9c2c9ce4cd52161ffd7f63a8c097e1e7fac784e9cb509cee947 SHA512 7729358c8a99078d1e66d4682b9d886ab97fc82793838f14f7a30572e561a8e1b4c5ae11f7b347180ab34488af309dce7ee804d4a7c7873fa40b182ab6ee1ac5
 DIST git-review-1.25.0.tar.gz 51903 BLAKE2B 0d51acc467a91efa0d6350871f9ade7b4a1ea22f5fb662893801539032a21a3c3138f09ef1c21771a1c5d33d6c4718d968009abbc514d46aa5a67fa6838d0179 SHA512 4e3e23f9c016b6919377fbc44e426eba4db7dc2558dc64100fc51f5dde7c38387c092c26700bc4bb57661373e391c743098e4ffc845375b5d64de32891a81e67
+DIST git-review-1.26.0.tar.gz 56557 BLAKE2B c8af82d7cc222078c1ef470da0ffac7b698df91ed991ba43c8d34a64bbfa3996bdbe475d9965d6d1ef8cca84293613afb92ac6405c0397232e568d2ec2226202 SHA512 74b2366d7884963caaa9b4614301fad56b7997d1cb16ef333cd2dae5df5a5343e5b891fc089078856b57db0083584a8b4ceea98dd67c401651a100fc4fdf7d81
 EBUILD git-review-1.24.ebuild 553 BLAKE2B 82f2af19cccb5128f5f6f78246db70c6faaee924754bea3652f4b1703b2be3c5878b291958ee753cae4ad9cefbce7c67c34f24b326b175d57ede5e53d869a5ab SHA512 172c7814a0d04dbd64754cf910398e4a0f644c2b51bb7abd750dcb7fac87fbcf0fd407552e2cf1b657d524f3ed35a1179f4ed3661c5a59b51382131134bc9ce8
 EBUILD git-review-1.25.0.ebuild 665 BLAKE2B 31ac94d23b0c28dd3b7e975e11f22a925bc77ec3237dd6514127bcc2c701fdbfeed551f5a364d90a067eaa9bd1cabd0d2b873042bdd7af5544f81420ae3ebcab SHA512 c1c14c39c1e0ff27b95604eb3ce401f92a056568d552d4d8e9a6ab5ef261ced6bce7d576f553600aa942664702d1606f9092f21926b750808587d4b575cdc5e1
+EBUILD git-review-1.26.0.ebuild 667 BLAKE2B 17a696c2d4c6a01ec1b55363451d5e7c52bc390f31bbb64671ea15a98e9ebe828aca8d6c31fd3630ae67e068e593e2bce5f016f753d679f19b49d23d71637049 SHA512 18322f92641458b8df3269a5fc7506cb1060bf6d4986741df59856f3ea056f0b6c3a7e3f8c7829081884a8600cb80c581ca07476dad43b5f542e9906ec263cdc
 MISC metadata.xml 337 BLAKE2B abf6866cf38fbd7925eabe5d6f2a4cd5887dc263d419cad65ca4105a20ee975ad41e1a661696520fe016318ce55651dc123ba7e6a735335a70d3aaa1b10f3320 SHA512 5bb1243f031097419ceadb6935e12567d359790e5fe63c19687f1cfe4a64f5dfa23b5704232d5777c6dddc1908b0856a780129dc08b787d786d2b867dc40ff46
diff --git a/dev-python/git-review/git-review-1.26.0.ebuild b/dev-python/git-review/git-review-1.26.0.ebuild
new file mode 100644
index 000000000000..10d16800a468
--- /dev/null
+++ b/dev-python/git-review/git-review-1.26.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="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/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 6f67faaeda63..15c2bef6d2e7 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,3 +1,5 @@
 DIST hyperlink-17.1.1.tar.gz 23067 BLAKE2B 8bf1e61c6ba72c1cef4a9df62168b513004ae8ef2d4fcc13a1984bfdbf174c6175e2bcd241396c97d4e07dd06999718c217b27432fdf36d632b34c2b97bcb1b6 SHA512 13b20fd54c6bb5d7de3c9a04133fdd848413d1308d9944a2288c76d5f8b9bb0c54401ca5ed53460112209806407497526f2e68a92d119656eb58a9a618e9b708
+DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218f0ba6d4072c7448433c6bf63891fb59999358c5efa605d21e28ab6e39a87cb84b1e3c8e2e8fce24892acf2eb679 SHA512 c0c9d99a530c938b1d1e97b8344c5a0fb18f894c8b0b294cc8ae6aa6a550a5a0272cc6be7a913d371f3ce3dd8695b7ed239999f3ae5e8ce97e3693625ae761bb
 EBUILD hyperlink-17.1.1.ebuild 753 BLAKE2B efb6bc61f300f2d1ce9a690a826465812993c9ac39f067d6f02299d1ac241ec135705e5b8bcb4f0f8e880bfa1db2c19e9b57d0a81b8ae3ed3f492c95efb15653 SHA512 67815bdaeb7a7b0016fb86c93fc45cff683f9faa9d76cf3d2db946a68796d42a1e1c9a6725c8cef4c9d40e3f9380c2e93a9426b8966bf40bd9c5a437fd8da8b6
+EBUILD hyperlink-17.3.1.ebuild 753 BLAKE2B f2af7d441c54800176b865016e289a2fd2cbf495734afcbc264dc0cd5b0b5085f2d9a995c0e032c002ae0a8bd5501b6be8f70207c1e1ebc7af709f15d12f1e62 SHA512 e4d561c6fc9fbfaf6afd2565a25508d3194b070ad8a3f0865d4b68e9e0c360b3e1471b31bddcf8b889e3e8e73128cbb312188f4e77ae01d7e72d4add84234c0a
 MISC metadata.xml 799 BLAKE2B 4db92e33c11594e08b51712183cfafe039856da37461036349f61c424f917ba7b84ce9f60751ae726e5e5b37a27ef55ea486ccf9ce2dfe301057dea36e0c5d73 SHA512 be631c718eadd3957f4152a6f630f67b0b308067b1bcdf4a9c6618edddfbd6eba61f6e8ff11fe45ed90cd77fefbf360a9f30baa01e5ff1cf703fd3dc59feb734
diff --git a/dev-python/hyperlink/hyperlink-17.3.1.ebuild b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
new file mode 100644
index 000000000000..5c1139e0c6d5
--- /dev/null
+++ b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{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 ~sparc ~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/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 97f858cd0558..ad21c37ea4a3 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -2,9 +2,12 @@ AUX matplotlib-1.4.3-backport-GH5291-2462.patch 4810 BLAKE2B 2eb3148d1f5d13380af
 AUX matplotlib-1.4.3-cross-compile-1.patch 1779 BLAKE2B 6d95661d0300976064cca5f21020d3642d65ecfdbc74458bcb9aa82ecef7490869be4b97110726431f52385ba967d09d28b0c7c040cc4b07997ef758c83dfc0e SHA512 6d2b57ae37df42b1d6c87501037f0dfe1ebf40dad9ea2bb35ff4b58cc1a3e580ad12add99c779966e764244d0bacf6ad922848bca568fc3329ead07c0b57826d
 AUX matplotlib-1.4.3-cross-compile-2.patch 2066 BLAKE2B edb86f5bf9c2d53a13d27fec7bfd35c9b51644662c548279c6e05f72d1c626625525d0600c89bc4e00827b3f1de777f76ac626f51bd448a4a0478cadb8bf6810 SHA512 d547b79d2a6f2dcca5105093faf9bc15208b1d28737d17a65d4ad716d74029d1a575d0c83b684e139d203f7b58a34a161a8e3968bfe1515f47c754b29117a824
 AUX matplotlib-1.4.3-cross-compile-3.patch 2202 BLAKE2B cac5953ba4d075d232f9e4514e6654fc8eefad7aab45141d6f9768a48c90020b62178a2b7754c74c4c53e4de40392e3d1c4a49c786ec5e8b735c82f627c23a58 SHA512 5c1a7579a2cd4e97f56485e0300d9dcc7c8871e99bd93e03113e68b95996960ece039a41203775afc2c627f0a2483f038e0e693c73efdacfbb85d47ae855b7b1
+AUX matplotlib-2.1.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 DIST matplotlib-1.4.3.tar.gz 49933525 BLAKE2B 40ea29ef7197d364f9caea63904b11231a4f74ca93184de8b1f8c7f78713cf887ea8a6fbee1b3f545c895eb353e0eeb5d65308657a3138986fb080ac44164427 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5
 DIST matplotlib-2.1.0.tar.bz2 33051088 BLAKE2B 6a97909a44ca37c3ec09a9e723909bb0169828e56daeec5711220a6caac632d19e77ef2fc042a61cb82760c9750d04753654761a707b6265a038af9c55b91bd7 SHA512 872ff86e989b4e9352663f4abde1768aa05b1adea3e1b234efdb301429d421718314b27950e508d92df8fc9136764b07e8a6861b66512e9695a496993076bb5f
+DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
 EBUILD matplotlib-1.4.3.ebuild 6150 BLAKE2B ab34b10ad72a013c9ccae7c6b34b2f624169c44df8a149dde10a6fb5448f928bdfb107e39cc220b54c5460be1645d3bcbf8278a37b20f3906776aa0f2094b715 SHA512 9e6e415962ad4e3699bde4b2e9701ca9141a72bb7d1c9097e3bda541c2d618524eee7a64ddc22a13f2d228c2e32296a4d88592ffb6ecdb366c590f70e01a2b46
 EBUILD matplotlib-2.1.0-r1.ebuild 6173 BLAKE2B 45bda87d10e48cb942e015b518deb5476f40c64ec79a7acca3366f49d70da8036068353a3766d094e00b8108718a8aa67c34cfaa4ab37f2151322c73d8520896 SHA512 e40659b624f307e591c32f9b9f2e9aa181e8a3bdeff45535be07141b4f2657b066ded21de0adea3cdf18903cdb86882aa425a79432a4d906982de776171561c1
+EBUILD matplotlib-2.1.2.ebuild 6229 BLAKE2B de1955eb1ee57e9a64108f4d79ee4ba4ddbee244176f94885deacf2870d0940e15528c254facdab50bb036d42eeb1dd9feeccfbdcb86f041e3db0a8ca7165ec7 SHA512 0b694d982e432f5566b2f4ae075a8723d284ce5d9e334a8a975b1641e21410f0d35a6cddcc9d2ac62effd7e2a5012c5d49d2eb80d9bbc41c76353c50b42b11f7
 EBUILD matplotlib-9999.ebuild 6396 BLAKE2B e1e7d6415cadc503db5796a8aba507aa6a94f8acb7e529caeac9d71537570293d75293b607d20a33b94a7352fdcec0e2c1de8d6302f981a1cb15d15585991951 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc
 MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/files/matplotlib-2.1.2-doc-make.patch b/dev-python/matplotlib/files/matplotlib-2.1.2-doc-make.patch
new file mode 100644
index 000000000000..7ca0c6974234
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-2.1.2-doc-make.patch
@@ -0,0 +1,10 @@
+diff -r -U2 matplotlib-2.1.2.orig/doc/conf.py matplotlib-2.1.2/doc/conf.py
+--- matplotlib-2.1.2.orig/doc/conf.py	2018-01-19 11:07:49.000000000 +0700
++++ matplotlib-2.1.2/doc/conf.py	2018-01-21 20:06:44.120901546 +0700
+@@ -136,5 +136,5 @@
+ }
+ 
+-plot_gallery = 'True'
++plot_gallery = True
+ 
+ # Add any paths that contain templates here, relative to this directory.
diff --git a/dev-python/matplotlib/matplotlib-2.1.2.ebuild b/dev-python/matplotlib/matplotlib-2.1.2.ebuild
new file mode 100644
index 000000000000..074c4285d47f
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.1.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY2_DEPEND="
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_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}]
+	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}
+	${PY2_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}
+	${PY2_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_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
+
+	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index 6f92758d8157..a6ccb2477411 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -1,5 +1,7 @@
 DIST py-ubjson-0.10.0.tar.gz 44653 BLAKE2B 91c40aab4cc66200d863fb13e4f0b64f4b1903422732f83af1f32d05a7e002723bb101b085c3d34bd33c0f2c161e24877b8fe8e8d7c09a54bac043104a58ceb1 SHA512 f4fd5dedf0212d91d8fc65b4379ccdd2576d6a3e4f5200f0f6caebd4671d582516916fc89af5d942c35624a98ac76db8fe0825a269206de4ab1ca63b54608cc2
+DIST py-ubjson-0.11.0.tar.gz 45473 BLAKE2B b74bfc20b30a2a45fb4511aa730d51245e6810fb8b00980dd61ae5bfa7cda1f60397de8c9d914195dffc48e4ec9582f839b9e133b98dd897b0a47a03abfbb67d SHA512 2c5dd111ea91fff1cebd722c62b312422e198bb8cc614e1254a3913067f72124efd1cd9879bd83ff88c2fc12ff2ef17fcf350ef7a3d6587c96a58c8b9e8ca547
 DIST py-ubjson-0.9.0.tar.gz 43338 BLAKE2B 8bcf61d1329931a2bfb7399cc27e72b14f9641fe902f0275ae190b1b256c67d78fe9b436aacf6b33912ef0e29a008e4e7b05a12b10488714ecb5b31451c1e69e SHA512 d9f061e548405d16a22d235f487740b3d4abeab8b555f9684b632cdb5e2f655ba8413a207230f90e7f3f352fa3289b16bb9a56b623c0cc5fe02f61778a8f78a2
 EBUILD py-ubjson-0.10.0.ebuild 441 BLAKE2B f5441f6af0d66bbab1eb3bb7250d4bd0e17faa12fea5410980e91f18d788465a1247f6ce7abfcdb9336d0e393b0a326ead1d163bf4aafed9432fdef7a2d3a1b9 SHA512 f46e8f8ee97b491626ebf43a9d542a2a9dbd58c987e9806464080fb87c98c9e6c62aa6d7b7fb25e0504a9c3e8a30822a5c761d00b1b316309ad5911e6d272e75
+EBUILD py-ubjson-0.11.0.ebuild 441 BLAKE2B 1ef6319cf30f3b40bf3ca0344aba8f5bf16e4bab4c2146fefeaee9b714ee7eba4a2fb2a88f8dc213515605b3ed7648a72bff4b47cc30c02f06f462522a3fb58d SHA512 706a1bcb76c3ec9206d6b3e16c8e338786f1f12d4905bce686d9a51e16310df5555c21f55754ca0c66579b20c497f71cd0d15608a8cafae5279840bedd271ea1
 EBUILD py-ubjson-0.9.0.ebuild 469 BLAKE2B 4d7c599b3f3beec646f3fdf81c9c889afadc1a6e5c68e62c43f7d15aa3b77e1ffc9c130ff686463ada9ed591dc0b7f3b7f24c3f2570882b10c881c33c07f1782 SHA512 61c3ac45c29c47a3e452d8f3ec2e2770d1c1941f9359860f23c9e4af9b58b14dec959dd37759c83eacb12783165cc45b5fab545bb867fd951bed2d2f98613641
 MISC metadata.xml 760 BLAKE2B 550335bd5de35db3a782e8a24318cd92cb2510139675cacbb13f952b7467a1b83ee6bd7291271373088ae2c2fde2dfc1d6bf45512b3df62bd6aa4146edffffd4 SHA512 53dc7185cfb216ccc3327a7253408205f66266455f473f2157cff39de91065f07e832df1c32892682940c12f7ac93cabc83da8f27d36066cdffc16076b0e991c
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
new file mode 100644
index 000000000000..08ce652499c7
--- /dev/null
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit distutils-r1
+
+DESCRIPTION="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=""
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 6de06d7a338b..b47419f4da86 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,3 +1,3 @@
 DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5
-EBUILD pyinotify-0.9.6.ebuild 781 BLAKE2B d873597ab79de266f2f0f1b7a4ea313605972d4bd2b4451666187da2f3c2b8e74b2017495e458e1c8504fd061bda6ebfb57cf7c6a425b340b0521fa31e193afe SHA512 d475340e3da7b5e93a955d5c0c1d56aa08b5f1ae22d3621795843df35d26ee112e9236b214e146f5dc2b2897f4b7ad9334a4c37613d8efec7efe16cae8364937
+EBUILD pyinotify-0.9.6.ebuild 780 BLAKE2B 9d479c687ac8e4c460cd535e047c880e06a91b1964cc437230e7e19128773de31cae1859cbfb4bcafea96dd672a4ab840f831fb356ef7aaad7827ca72be99ee1 SHA512 54df6ab90a841511376fde1ec73c42deac1af23508a786a5218953991413ae6c0ca7811263d15be5296620076fcacdb0e39a77ae92002f743eb219ddb104a09e
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 55e2807e993d..a7cf24f04df9 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index c1b44cb39ed9..af14fefbdd55 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,5 +1,7 @@
 DIST pynacl-1.1.2.tar.gz 3149804 BLAKE2B 2ddf6728bfc5a8d5984ecf3fe054a7f36acf15b64d9ba42df93bb21940b9646997d59500825cdf04deeba9afbf4d227a016ad631211d18cba2ab1a38bdd89541 SHA512 ce9c720699fc3b808bb569ad9916f5f5ea97fbc49643117b014374ffaf77ce7972a530e9c4cfaca14dcffc8d676b5bce2facf6da99bf2fda4e319b772075e52e
 DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd41119e68115452a8c51317005d10eebfa7017f0a182f07bd20ef36f7b395c9461e3e7929cb1102b24afcb937b SHA512 ffc3b91766aad9d0d21c88c198ebb7520d204e58ffbcac815a382af7eaf9b489f85ae6c2fc4cfe4dd5e04576062bfe248bdcc08fb42bf184a73e41f4352c7bd1
+DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 EBUILD pynacl-1.1.2.ebuild 864 BLAKE2B f396cd993f65d060caf79a87b44c37102d49856c3df88442383709ca1bee4fc18671cf62e1a7119d1c3a8cdc60dad81b44c00eec8eef1350c74516f149ada3e6 SHA512 729a3fa3e03a952b8211b7e32cc2ecd6795f16dceafa148aca128974f0f2eb123a3c5654df09b5b53057dcafdafc9197dfb6c821d1c97a2bd868ea8c848473f4
 EBUILD pynacl-1.2.0.ebuild 859 BLAKE2B 1383c479db400fea43eb3026f14605827674a48691c667627b648e51e8e736874c791bb9441b821e5e9865fc4ae2a3b8c03c57230d00220a35dced9ecf31b594 SHA512 07b6d39acc8564d43472aa21e0d974b926b023e937792740b1b32218d12a97166e4b3ecb6f3e3ed0c35c061d11a26cb8fa86e9a1432337f26fcee8c65ffc4b0d
+EBUILD pynacl-1.2.1.ebuild 929 BLAKE2B 607997781f65a96d0927e683e91aff4cf211542a02ea84351c1bbd984091639f87e02cf07d9a451fb4becbccd4d244a9a84827bfa61767dd9358d5908f0d8c94 SHA512 630fbbec7617d4f82a4255a123d706e592ac2bb6baa4cf80b67431a05d50692d05959054aa5351a06e651e5e080d132ebb653bf76e03fc57b84ed6d15dbed149
 MISC metadata.xml 927 BLAKE2B a9f7c9b74daed0905451be50c45ce9761fd7e9794f4a1f3c33a34d36ed56ec7c67f6486075220a0125a87cc573efd7ea593dbadf6f4572fb4e164fea4f3b007e SHA512 d277f860e8aa745cdd1211546cc726d814adb37594c2fdc16d56212b4bf886e7eb7333cbff4ecba0ba66db35ec468665f904345f6a6136669790f70f9bf9f536
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
new file mode 100644
index 000000000000..bf8ceeff5c8f
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/"
+SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
+	dev-libs/libsodium:0/23
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	# For not using the bundled libsodium
+	export SODIUM_INSTALL=system
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/spark-parser/Manifest b/dev-python/spark-parser/Manifest
index 4758824470c7..fb2304cc4149 100644
--- a/dev-python/spark-parser/Manifest
+++ b/dev-python/spark-parser/Manifest
@@ -1,7 +1,9 @@
 DIST spark_parser-1.5.1.tar.gz 111933 BLAKE2B 2ad1045f17ddc2f8fc025ca7b1567db56ce519714b59374b4653d5bfc504d12192d9c6696fc7ff8fee8ef9fc4328fb629b6cd72d8d235f8187780dadef3c9039 SHA512 d46e4bf27b867e7e20e5d9d226d606428cc2173afdca27d5f8d26db2515a7ecb89b7a27cb091ff3d7d7c9cde748cc0e027b1f9212a2fc7b75144e156d16c8916
 DIST spark_parser-1.6.0.tar.gz 133871 BLAKE2B a7c57d77aa81430365c7e1156f35535b923e5f326adbffc4a7ddd2c270ce70749615ff94723825ffc0195c8d266ccf26e9e75c68b7bfdbe31e27210ab528c826 SHA512 56a89114b35449f0bcd34e2d8c6363d249b839395827fde791c0ec2e425f75a5e5e48d960a5a3c115ca4c7088ea720aba1be03c8b55611d14b18d07f9873a91c
 DIST spark_parser-1.6.1.tar.gz 134114 BLAKE2B ec59af20c84e488a3211cc2d8ece8e89a70bacf52c0b3a28c78cd535fe33d5bcae45e86ee6da7e7b68c95782d1b79577a186a140f76b2255720f7bd7337dc161 SHA512 290069ebe37aa4d5dddacefe3a4d48607076990fe1f27f914d154fa48a5249cddd0c9d238b7e4c7a9a52ddfc054a3cd5639e52b618b5f4bc5b833c4e38b21c2b
+DIST spark_parser-1.8.5.tar.gz 123974 BLAKE2B 29efbeb35592bdd95108b5289448a6530f3211b31afa32dbb66721d1d473c1a30abc8f4700a6dee6f9dfc47cdfb1de036fa9fdb4c783d7bed7274d29b69a2038 SHA512 12ca0ae14c39edb825067574931b005f85eb46ac2cfc8e2573169da1fb54b4247181b9d2cc8449ab9a0dbd45742d68e415fd766764ce708df620bd7288b18130
 EBUILD spark-parser-1.5.1-r1.ebuild 699 BLAKE2B 9c329d2a9d5f4f271c6c87bb655fa8e84b439b3df824579bb99a8171d1f4415bb438e3587f475e51844086ca85888639ef6925dba94ae0df6268fa9b88dddbd0 SHA512 4442cb5d9701bf0c0c49bbe135e9f57dc36979b8529ae2b1fb7780470b8aa280b712abef8bc884be2ff32ae174c32b8d7e02271228b59015d1fe7ee870ce81c0
 EBUILD spark-parser-1.6.0.ebuild 701 BLAKE2B fe94f7356088ac76514df58f5b360a3e02874fc1179628efcfb939f224ac071d7e91a7ed2f6812b57d8f4adca704bca4965324344c71d08e5024d0fb44b33f4f SHA512 5f5ac355734935b021a15ab4bfc4d5ef47cd20c192d16236433b5defed394bfa96fc1b3fd212877a542a06871430dcb8a7190284b2014cb574e77008d951f066
 EBUILD spark-parser-1.6.1.ebuild 701 BLAKE2B fe94f7356088ac76514df58f5b360a3e02874fc1179628efcfb939f224ac071d7e91a7ed2f6812b57d8f4adca704bca4965324344c71d08e5024d0fb44b33f4f SHA512 5f5ac355734935b021a15ab4bfc4d5ef47cd20c192d16236433b5defed394bfa96fc1b3fd212877a542a06871430dcb8a7190284b2014cb574e77008d951f066
+EBUILD spark-parser-1.8.5.ebuild 701 BLAKE2B ecbecd490e290d5c0e487fe3d5b8e24fb9c9a88bbd02799dec3c123a08a80248870ae4f050bb5f2379baa1c45b98c920121e22d0d20b476f3762e97f0f7ae8de SHA512 7d2741d0b261e95791aa806bee99fa600f57bc0ab42c9d1460166edd3326516cc11d3ceb29ead9ca1af078172fac8b1ba620ad9de03fb068ac924f3d25d4a8b4
 MISC metadata.xml 918 BLAKE2B 00ab25436f0a5d04533ca9599f7b0dcb73f0ad36cfc4a7a328d0d0a28ac78e2b766fce6a4bdb0a0cabe323d400459b60c0fa02e5cc327dde8a12f269642e0631 SHA512 922a9467a1a162e331316b6d92305c88cf6074d7e713be5f21fc3af59fc4b2c958038b939476545820cdffa1b91d7a16911e0a45205bfa2f426c1eb9f516d17d
diff --git a/dev-python/spark-parser/spark-parser-1.8.5.ebuild b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
new file mode 100644
index 000000000000..fc4444683ff2
--- /dev/null
+++ b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+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/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
index 6c3ee594550d..be38eb7f474a 100644
--- a/dev-python/sphinx-jinja/Manifest
+++ b/dev-python/sphinx-jinja/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-jinja-0.2.1.tar.gz 6676 BLAKE2B e009731381dff9aebbfd9ddddc3ce128a6dd172b64ef2610847296b30d2cc4ad5fc71f71d2e1ff5fcf2d0e717b92822bffedc25fbcb6215e072bfe285038a9df SHA512 4b5239c76493f8eabc2a079d82d52b8bb34e884e308aa7e1205cfa40690854ddd1e4c1aee9f7ff0624eee2588a3af9196a83a79f0f49359df315cb0886f09c94
+DIST sphinx-jinja-0.3.0.tar.gz 7035 BLAKE2B a43c2ab6c1f0178987ccf9f69acbf0b50974573b83d0503e7888a56bf024e519ad69e3ac6ec9b8d27d7e01e9482008b6579c6892ce114124c0ef12ef456c887c SHA512 b39211a0013db020112c865335811317699e7ade734bfd9bb24f51934df4652f0560b81f5e253fc663fbd8a269fd962ef2bfd6dc96eab12a397a538e758cddfd
 EBUILD sphinx-jinja-0.2.1.ebuild 849 BLAKE2B 6d86ed30c28478224edc2c4047b498c1d78bc0b3266255cea84d104a328697c4a2de4b637453055f5ea7d1d869c7f868f139be122cf012a0bbfa9c3a2e46acaa SHA512 d2c3b858f9f9128b4c814918dd4dc61caa86958be895b6b14a4d6f32951ee719e1198e9f58c252ea2e218ff848ab25ac9578a32f9a5a786d29798f0e0f0d7961
+EBUILD sphinx-jinja-0.3.0.ebuild 849 BLAKE2B 219af5892af7f2aa09b65c199dae8929fc86c9e822691c387602da83d1d084b9c93014de86b4adc7f6b588b3a03b7440adbe3e6a82f5f039a676e57ec9d3f150 SHA512 9e1e5f63dbd57494b2c3c0537c62423b1ec981e5a154df17fb16e08d6f9605bfdbdc36ebddaa6073fd8e3ecaefb080fc98b8ad787bc492dd8b7a4a88fed3c085
 MISC metadata.xml 575 BLAKE2B dc5634c194e0b35aebe4fe686fbb1fbd2ceb6e2aa3bf0b3cf476a3f67fe04c2ebba4711a51e248ba234dff8d4f94a583d36966ff21be0b17d3eba21d32b48ee0 SHA512 f9a56f712f16ee55b60e005a92f893a8a97de67a52d615537e10cee4ce9435388200ae832edf080ef1c78731974b42d415f597b04ab934d785d60bbbd93fd865
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
new file mode 100644
index 000000000000..df6366a639de
--- /dev/null
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="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/treq/Manifest b/dev-python/treq/Manifest
index f57144d7a6fe..b9e40c4be7f7 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,7 +1,9 @@
 DIST treq-0.2.1.tar.gz 30954 BLAKE2B e7f97fea21c18821db2eba6c26f717cbd83297822e3e607c0a451bd5fc9be1d96200c9780857ac2aa2ce297a5bec681c54c4d3dc18ae3d8f391454e19e744e7e SHA512 d9236c395dca66d358fc9bb1b752e02a7d6335195235808452542de33145057c1c2e959658015b3c89c9a20c35b1a8edb752e151230e72edd313dde6cd6a4cac
 DIST treq-16.12.0.tar.gz 43685 BLAKE2B 3d05c41eb0a471e912959546f7e7abf0d8986dcb28b0c36cf1cccfeefd600c3a7141f93650a1b6947665c2ee24cda02ecc8e4ed927b1fb3c36309e23edaea33a SHA512 9385ada8cdf88e608937c118c29506372d8d3a8e7dcdc54998461652f106e4ccca4d6fa0a3f14ff5d9312da7ea1e531a9e4b0772b694b8dbe03f456101d63cca
 DIST treq-17.3.1.tar.gz 47380 BLAKE2B 61b51c46252629358c0ffaef7f4e7e2010e2d58c307461caf42982f8b6ad2714af57c37065bdd87a94d2b9e2fde150473b45116f2d8d270f783f20e1a8291020 SHA512 e52cccbfa663314e968b33c58a5be5782063b2d6313a4ee5a03df912146c6ca25abca82915f30791f865afd2c08bb04c9993d9204d876c7ec2b308c6e51cb821
+DIST treq-17.8.0.tar.gz 56439 BLAKE2B 3e39c84453793baf3107c38b656c8968e593845fc0d41035b558326ff947a9e17903ce33dee3157d2cb2f79ab3aa884ddebcd52e743cd6e1ad08a0de324cd6bc SHA512 62933a512fcc8b0e77333eb9268846ad17f4b44cf6ea317ada2565054100be3caf03bda0a1becd775ec85528fc2f5ddec33d23d3579cf484a3c6ba7c71c50a7f
 EBUILD treq-0.2.1.ebuild 1035 BLAKE2B d7500eb9eceed48f7371482920a71246eab25bbf788be4f25fec1535b8ce88746b7b4edcfa742638206f3e24897bb1805993c4a897a90c7efa240f8475c75461 SHA512 cc3fba0a27c6823ed4552d8495af667a92eb9b10466689bc512066f564bd64334fb296009f2a9bb8b605145dbd97ac89d23d77be9febd0bc4373664657725955
 EBUILD treq-16.12.0.ebuild 1237 BLAKE2B e51e6df6efdd9b8222e3b81d87528ef2f7c917ce393df64fcbb710ad97f8595c0b8ea4c3f2508c3a3f51f0945913499356eaa5e17b7a80d27750da5bff7a0d54 SHA512 141a2c1f842dc350bdd03529a14975794b397c2cc5ddf7aa33870fb8d3f77c6b2f68273ff6f2c746ebcaa2d34a7d4656328522a8ac56fe310a9e5d3a8a98490a
 EBUILD treq-17.3.1.ebuild 1538 BLAKE2B 3edec93ed68e3c082517abab5a45a723feb853cbe4fd857bccd23d22e2e70e752306d3ff6e8eee7a35dae18480b7ee378b68adfb6d3ce406dcd0439ece1d0dee SHA512 ae623af527dce77ac380b4c74e29a43d308844196d63a8b040fca1d27f2a083ef3aa60010725026fa391d27d2e27f826eb2532dc99096cb67b0b18ee51899035
+EBUILD treq-17.8.0.ebuild 1649 BLAKE2B 40905821837481db6cbde2ee1e1a64741abbedc376d680911e7669a85bae49e08a052156432da2269d923c0fba044c8a3b6c680c1849b28aa03562ad11006671 SHA512 3bd281094d935f5ee9992e3d740c1793e0021f025e5075065ad5d05b1d977c8abd22f4c312fbfa92a6c4c0c09d2c109e8d1102a0c183c84a67ba47cfbf71eaa5
 MISC metadata.xml 794 BLAKE2B 3a022380fccced1c0cb6029e38924e45020b76274897a25985c094d3b6a5e30e79143ebecf5c109b324079c8065629ee4987748180800980220f25e4c2a6ba48 SHA512 091cfb4023e79ca37bc11714468f913b807090ecb0e0e009fab348ac9864b4906ae57c32eeade3ce8732bd472176553221e86d9fcc92db45e75b34f33778c83d
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
new file mode 100644
index 000000000000..00ad59180b50
--- /dev/null
+++ b/dev-python/treq/treq-17.8.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="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}
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	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}]
+		dev-python/httpbin[${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/txtorcon/Manifest b/dev-python/txtorcon/Manifest
index 3b04047428e8..0af2397f3209 100644
--- a/dev-python/txtorcon/Manifest
+++ b/dev-python/txtorcon/Manifest
@@ -3,5 +3,5 @@ AUX txtorcon-0.19.3-Removeinstalldocs.patch 1755 BLAKE2B db819619ede7aec946226cb
 AUX txtorcon-0.19.3-Removeunconditionalexamples.patch 964 BLAKE2B cde8fdc85b3809917fefc21603a4de86119ab54dabad0e1258c8a387c632bd034decf1ea0d6a0a829246cacefd8651b84d1aaf10b55d2e5423d6ded58b92bfbd SHA512 3131dce9b4f3bf15d09ebc87b323c06bdc30a833ab7c6a964f31599d0b21fd5baa0c696af1356db58677c58d803033e786a80db1d46444d92b91a9fee2736cf6
 AUX txtorcon-0.19.3-setup.py-Dontinstallthetests.patch 680 BLAKE2B b26bd4e41d8f3b8b9e795e77475c93bb8f8a1ce138c1fbf83af9d3ece46f031e94e90db35e0aa057594004e80d4413c4853d7b3cd7c41b784ac5a40f6a843d8f SHA512 95894caa6c9e6f3f3a2744a1388397b0ff7298bd508579411ce2cb93ea6f990e6068806ef8d4a9fe959b235ed68402925c731beb9ff9b638a8d6ef2c10709eb8
 DIST txtorcon-0.19.3.tar.gz 265716 BLAKE2B c0778c918689906c1066f714f4c6621f176cc413b0ebbe628201727cb7ae24c8f1b5a8a5a030b5cb48b2cea96e29f2f7bb5a54744e36324a938841b11f44474b SHA512 748e23c25c0b287467e0fa7db6ad69a8af7010957a846141b9360b71af0d279153ff401b85d135e7e66171e81117ebc56406e64e660aeda7dde8cd430d0a7254
-EBUILD txtorcon-0.19.3.ebuild 1822 BLAKE2B c58530837b72a932911aed2f5114f466c0be502db5aad9389f861a1005401cfdee78f688bcadaa3bccdf944f27bea3d9fdfcc9f21c09cdbdef2be51ed13ef45d SHA512 fad9006116522780cd72f70863b77a42af7081a7f8862ceb649f0b811b218a2da4e19f2113851d7ea86938794cd431f7fe3de7d58bd1dff9dcb25e70263c2f81
+EBUILD txtorcon-0.19.3-r1.ebuild 1935 BLAKE2B 8bdd2fb6c7c6f74632f7e492a00aa823de06ed3fa53655c75e4d08d2a6d8df97510012b5a2abbf74ed5455f24911020e9608fc681c4a71a3068e81bfaeaed81c SHA512 4fb4d30b6d03130dade476a7892392b092feb47a690ab9a40cdb34e6dd52d9317c04ffb060602f0983ca6292b0154bd591f714fb4acac762c2ff012a2d044936
 MISC metadata.xml 622 BLAKE2B e1041c442c5c9195cbb959acdb107d75fee9d1cd2af9aedb6f7173ce6b5f2c9b34249789c390e4fffcb0e269d5052ab587a14846c3fd5cd1d843da8eefc41918 SHA512 de6b370265df64461f6f1cc69b7e07344a51ab46f0cb9b4cbef293dd0f2a998aeaa4cc373d8e92f8321c00e24effddd30032114c70a935399a08dfaa41591d7a
diff --git a/dev-python/txtorcon/txtorcon-0.19.3.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
index 5155d74c9df7..7a947665ebdf 100644
--- a/dev-python/txtorcon/txtorcon-0.19.3.ebuild
+++ b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,6 +42,11 @@ PATCHES=(
 	"${FILESDIR}/txtorcon-0.19.3-Removeinstalldocs.patch"
 )
 
+python_prepare_all() {
+	sed -e "s/^ipaddress.*//" -i requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
 python_test() {
 	pushd "${TEST_DIR}" > /dev/null || die
 	/usr/bin/trial txtorcon || die "Tests failed with ${EPYTHON}"