gentoo resync : 14.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-14 01:05:40 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-14 01:05:40 +0100
commit: 76cba73c47c8694e74377004634daca18f2d9c08 (patch)
tree: 468603ebdc189bcfae77696162761b3be936baea /dev-python
parent: 6957f5c65b02bba533954eabc0b62f5de36be206 (diff)
98 files changed, 1063 insertions, 329 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 36572eacabf6..6d5dc6cd33e8 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/WSME/Manifest b/dev-python/WSME/Manifest
index 53dfbe616db7..6445fd1e7bf3 100644
--- a/dev-python/WSME/Manifest
+++ b/dev-python/WSME/Manifest
@@ -1,7 +1,7 @@
 DIST WSME-0.8.0.tar.gz 121619 BLAKE2B 8d6f05820457f556a14aff2e28cbd4d489832a2c2b0644e213861811e70590c1b88378cb2fc8803cfd85da79c4cacc9b95021d83506795f276652095f27815aa SHA512 a0fb92a16bf3a3df75c71ad8756a18e97ee6ab381ad954898970a5eec93cae5469a8fa07a8724cfc64e53d3ad3c3d7d7feaaa55b92176bfb24fc566bd7f415a7
 DIST WSME-0.9.1.tar.gz 123187 BLAKE2B 1c4d750dcac4fa28002931286b7390d4e30d7903bef74a7a16746f9fb60c83f368675d1c91050854372575100cb5db7ed80bce6253643239d544c3c4343aac46 SHA512 795cd780f54e4b4b25d7ae5bee75f3b8d1513b315dbd8f056051452181be4f2067b06db9e695585c0d2b00474c2e2d7c75bbf4ec57519f9343c8cc184389ca4f
 DIST WSME-0.9.2.tar.gz 122620 BLAKE2B 1731654cc33581d39cefbf825edc925ac06ab653da68438b22e36b3f9c582f833b603cba6c372c68594664eb082f3b60f1455204a0c77e20bbfe82844e86d8dc SHA512 7817e5c90a18223a317b6d1e437796fd87ba4b70f4f4ea4873c305b796fae00bc8bad20f30d736ac50317eb45e2aec0e4e819f7fb9b22b1b116983837af58cc8
-EBUILD WSME-0.8.0.ebuild 781 BLAKE2B f7af116d884197c4fa766c9c23f3296c635fbef222a789cbee5a400f12772ee4c5c5f6bbebf7e00cfb7ab80ea270346e914a7f8b648db4575afe64d2876c7edc SHA512 dc2ce577d5f38b437a08d161648886adadde934663e175cbde743163fc7b6f2160a7d91995beca345fe8c29d096593c91d37297d031261e099140ba98d3bc327
-EBUILD WSME-0.9.1.ebuild 781 BLAKE2B b47a85bf180105fc89ee205e8ce7f5975b24c897c47fb7685e47364657d619d4c044f3244479d8eb3bd0bd7b7538b307dcdec281f3b05aaa4c7fd77896b33224 SHA512 0e5812a3840cdf8fef4a27aca378858c94401d092727111d34c0b60671403533530fdd7742e8abef578d15b8ce89b1acf76f296d178984a7d41c34a176ce7442
-EBUILD WSME-0.9.2.ebuild 791 BLAKE2B 07cb168fc94b523d141daced857113256270d638214b869bbf32c44b5298dbf9a720ec930c3c4dc69ab7df9ba18feafdf0840d605e63f50fe3a48628635bf7cf SHA512 295ede199c22065240378856d0d284d4ee424e901857862e6f7e771cc1fd90535cb766a24081d0dae13b21fc2d3d610c2f2a294df4dc71506184c2b3013a0de7
+EBUILD WSME-0.8.0.ebuild 781 BLAKE2B a4d26203c37db7a200e7efa1fb139bccfc9de6091f1d26ae32e75301ec30fa6d73420ca745f482c2c40c31d008b2d561be91989db27447c34bf10da09d15a4a1 SHA512 eecd737ffbc6650104c5276077c5de45b2408c6b3edc8ecb005f993a44de3d66c01562536e62acb9c09d68fe9a5d5c8207143c7bd00b304e888919915fa4c59f
+EBUILD WSME-0.9.1.ebuild 781 BLAKE2B 45f5fa2661652b1510f08bd4ae0d0f51e0a64bb6439be07aecd122bea735dece2e407a4d5083a1e827fcd8a2ff2cfd6b4ba8d38e939fa3e1f4a53e8583c65775 SHA512 a94bda18d3ecf935d76a254d891eb5524fb5a7034aa17608274c4222c482817d4f2228e948192b410c236482b794366acc112ed94d7ea93661d3c7ed89f2ceb8
+EBUILD WSME-0.9.2.ebuild 791 BLAKE2B 68ba6b5ee34bfbdfa556fb9033713516609ef54d30ff63b00bb79a3c58f0d69ba448b74e33000cdfdaf830873b4064a18aa3ca3ee37e99b7875a5101809765d6 SHA512 283ef2151e43c20e20434e666d96c2ec0e7958dbce4f50cb292988a0c1e6ef309fac3d8026db99f10a2efe68de83476679f188fa2602bf41ad5d8b3cd97a9c3a
 MISC metadata.xml 575 BLAKE2B 124788df9210c22a2bd71eae838d413f3faf231eb31dafef6f6c4cc15a65cc23098e052d18353470f23c8874bd752503cb7d44f629dc1faef562309479315162 SHA512 d57f5520e1f102f496ac66c0f9b2842ee4511ce96e9fca3d4e166ee81307d8033d36ed1d0d90fd91a8285d9516a268691dd3502beefb398e7b1303b0af0111af
diff --git a/dev-python/WSME/WSME-0.8.0.ebuild b/dev-python/WSME/WSME-0.8.0.ebuild
index a554239a35bd..f619a21f3532 100644
--- a/dev-python/WSME/WSME-0.8.0.ebuild
+++ b/dev-python/WSME/WSME-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ 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"
+HOMEPAGE="https://pythonhosted.org/WSME"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/WSME/WSME-0.9.1.ebuild b/dev-python/WSME/WSME-0.9.1.ebuild
index 12bed14e2b99..dd2ca03acd66 100644
--- a/dev-python/WSME/WSME-0.9.1.ebuild
+++ b/dev-python/WSME/WSME-0.9.1.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
@@ -7,7 +7,7 @@ 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"
+HOMEPAGE="https://pythonhosted.org/WSME"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/WSME/WSME-0.9.2.ebuild b/dev-python/WSME/WSME-0.9.2.ebuild
index 5adb61776601..cd3f3aadaf45 100644
--- a/dev-python/WSME/WSME-0.9.2.ebuild
+++ b/dev-python/WSME/WSME-0.9.2.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
@@ -7,7 +7,7 @@ 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"
+HOMEPAGE="https://pythonhosted.org/WSME"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
new file mode 100644
index 000000000000..67d94e788ebf
--- /dev/null
+++ b/dev-python/apispec/Manifest
@@ -0,0 +1,3 @@
+DIST apispec-0.35.0.tar.gz 47684 BLAKE2B 3067a0d50a6f53378f46a9a07596da53679f399732619f5bd3d1bedd85d088c6901560dc46be22b42d77537c437d9d97840a55f0b1513e39c87760e9e6c8ea0c SHA512 45a3034c49169ca7998480a8b8e0ac6415d49b6235885fba31eaaccb1c008b4ea845a6743f10cc3492215affe20b690d73a9a06e0e0c3942e0327f381415fa57
+EBUILD apispec-0.35.0.ebuild 801 BLAKE2B 33dc3efbf752dd1109fb4960ac5d0f67c438463f72e6fdf4e2fb401a5dfdff44b6c5292b663d40673279fd5650c8be4cd42327f864d6dd3aeb10029d42cad353 SHA512 d0248652192246f3feb1e5612dc175ef1e8418a3702385242735478a0b35d13a365440e4bc72dade70d20bb7461b8f6d016de626365833d5c6446e1c085c1f27
+MISC metadata.xml 352 BLAKE2B e072e5a12d891408ee029e0f51b9c2a232e8a31e941352d43695e0bec949c4f0d1d709707c052971a3bac490763d3f79a264bf85cf97e6f6b2bd62064f1fbcc7 SHA512 ba1e41f1977b0afa34de52bbd96bba0c4e517e5f6b0094356d37c36b4365cd7ffaa055caef08888a4e1da912e1d3616e8545cb6f8de20538ea15f338a5dfb0f6
diff --git a/dev-python/apispec/apispec-0.35.0.ebuild b/dev-python/apispec/apispec-0.35.0.ebuild
new file mode 100644
index 000000000000..30197f93095d
--- /dev/null
+++ b/dev-python/apispec/apispec-0.35.0.ebuild
@@ -0,0 +1,36 @@
+# 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 pluggable API specification generator."
+HOMEPAGE="https://github.com/marshmallow-code/apispec/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/marshmallow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	rm tests/test_swagger.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/apispec/metadata.xml b/dev-python/apispec/metadata.xml
new file mode 100644
index 000000000000..aa45742ccc80
--- /dev/null
+++ b/dev-python/apispec/metadata.xml
@@ -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">apispec</remote-id>
+		<remote-id type="github">marshmallow-code/apispec</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
index b091545e65b7..c661dadfd0ec 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -1,3 +1,3 @@
 DIST Arpeggio-1.5.tar.gz 18856 BLAKE2B 5ceb26d034622c448ea29adc70f6934dc2de8335c526f02d91bc4bccaf435d462516830fa6b124638fdcb0b4aadc859d602e1ec59469077d796b7534fa28f7aa SHA512 533c59635556a3446c04c8b14f53e8ad6a7a39869f39d958bdd52b5a55ad43c533bc42a41999cc149015b34470d8ff0eca295ff1942c75b33a58a403a604c449
-EBUILD arpeggio-1.5.ebuild 720 BLAKE2B 7f749ba557c914d1bc3d9f8288d7e4743cda6663b11a9b2650718022226265848da419d768acb991e666b4632b92be7380b1b2283dde1d29cc1e75882c5e6f75 SHA512 84f5671daf74424a9e5feead08693ca960ff9eec43f9367ab84cd0d7cd54c06d451c07d8c023e600da4b9f20601d783a59932fbc234af2f84c0d9d4399f870f6
+EBUILD arpeggio-1.5.ebuild 720 BLAKE2B 65e8545ab7a9e12c10a9d9d416afd6cd953df01466dc87188ae7ee04c675c6f8a5d377c6c0718174c50b13ac96cc772c8cc434eaec47706cae5878871bea5e19 SHA512 cf68fb29ac4c484b26eeecc5de979bbd5e06666093c7b7cbb159d82daf22bdc215065b446710dfdc228c100b31a3a98dff0e0d9c3ef960021cf7204bb6ea211a
 MISC metadata.xml 351 BLAKE2B dac9aebd47c197ac00e60de049d4bfc62b3fc4082e1566475ca0a9fba0435385dc475cb6c2e7eaa6e4b91ea0ccb097ebe55da23f5f3e00325c7c1fc74e66d278 SHA512 cad3a1cb94dacf951a07d5a98a35bd723b00ba6745f52f1ff2f5d20c5c63fa9c1e875617a0833f822a1177cba0805b07964eb6ca0abbfa74f93dcd42f601a935
diff --git a/dev-python/arpeggio/arpeggio-1.5.ebuild b/dev-python/arpeggio/arpeggio-1.5.ebuild
index ca6482ac4d18..997a6ce25fff 100644
--- a/dev-python/arpeggio/arpeggio-1.5.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.5.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
@@ -10,7 +10,7 @@ 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}"
+HOMEPAGE="https://pypi.python.org/pypi/Arpeggio https://github.com/igordejanovic/Arpeggio"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 # pypi tarball omits tests
 RESTRICT="test"
diff --git a/dev-python/beagle/Manifest b/dev-python/beagle/Manifest
new file mode 100644
index 000000000000..d638912013bc
--- /dev/null
+++ b/dev-python/beagle/Manifest
@@ -0,0 +1,3 @@
+DIST beagle-0.2.1.tar.gz 12628 BLAKE2B f1d68134065a5d71f6662770b0a6a7c201a3019b57c12c3200cb59db00e664b5bba27b8a4029c0515e8095ac3c7153058b22d43e3245c3012e52e2ca734ce2bd SHA512 4cd58c05764dcca8959b2137f5bcfe627d83b576878eb77ae28ae38cd5d2cef16d045ed5d186fdf7eda6be821abe4d2eeee106fc505a5e59f027f59ab82ce653
+EBUILD beagle-0.2.1.ebuild 690 BLAKE2B 794c5d4f51878278e070b51d6bea20c81c289def1480342177b1ec42417049a64ead8b5a68b7239f604d1800071b6075aa191bdebbd5e06b7c91ed9fc6a89e6d SHA512 243c5402e9bc089231a0b38d48a76e22206d2e86ab30995256c2f8c7b20d46aa47ba5947640758ec01a79b5048b0d0496072fe878c348cbbf7be59f71c27c6fe
+MISC metadata.xml 574 BLAKE2B fdf6ea50667c20fd2eb8a0f7d1810b4828b99b482bafb5a0fa013818ebdddbdaaa1fbc0c3582d8b95403c305e2605a7b9737de50a02d0b2665217f525cfb4c0a SHA512 0698273824072d90953026383d2e1fff8cb1631104097cafdb4e4d853c25cb4c4db54f7870a8dab15026d8faa06399983220e93da846202a4885a876b94635ca
diff --git a/dev-python/beagle/beagle-0.2.1.ebuild b/dev-python/beagle/beagle-0.2.1.ebuild
new file mode 100644
index 000000000000..b74d95088cb9
--- /dev/null
+++ b/dev-python/beagle/beagle-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Beagle is a command line client for Hound, the code search tool."
+HOMEPAGE="http://beagle-hound.readthedocs.io/en/latest/
+	https://github.com/dhellmann/beagle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/cliff-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/beagle/metadata.xml b/dev-python/beagle/metadata.xml
new file mode 100644
index 000000000000..21e97c0a0755
--- /dev/null
+++ b/dev-python/beagle/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Beagle is a command line client for Hound, the code search tool.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">beagle</remote-id>
+		<remote-id type="github">dhellmann/beagle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/case/Manifest b/dev-python/case/Manifest
index 12ab18211c3f..2e67851e95e9 100644
--- a/dev-python/case/Manifest
+++ b/dev-python/case/Manifest
@@ -1,5 +1,5 @@
 DIST case-1.5.2.tar.gz 58382 BLAKE2B f5924a7bf276087e469ec43780791e7eb223daf9649eadb79060066ea0125931e5534762b148b0b3b65805bd05c7111bdb0b598df12d056535c01662260eeb5f SHA512 82c0ed9a788fb57c4109cdbe24822fdaeb59fdfd5d7ebe0c93a39e8e2a2745e911d6dc1b679ac46e263eb6041bbc0ab46b20f3850c12f8f63324cabe145ebdd6
 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.2-r1.ebuild 599 BLAKE2B 6feb472c602ba7cff1db1ee5c23e2d37a1800f1df60cbfc9adbd6b2c9584a0ac4015d03f31ec2031f17504be261cbf32d60a6f4a32dbe147a8fecb7bb93c4282 SHA512 e995b5701903bc1f135e7cf09cab68e9ec466a37fc6d8baca4738b719ba38eea821ce2d18b74eb2aab9ed1a97e02beb5b9c3b63deb1d5c2434c1da1c70952892
 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-r1.ebuild b/dev-python/case/case-1.5.2-r1.ebuild
index 2a0e878cf66d..e17d63becb5a 100644
--- a/dev-python/case/case-1.5.2-r1.ebuild
+++ b/dev-python/case/case-1.5.2-r1.ebuild
@@ -8,7 +8,7 @@ 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}"
+HOMEPAGE="https://pypi.python.org/pypi/case https://github.com/celery/case"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 8406a5488fd5..53f95aeea2c9 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,5 @@
 DIST cliff-2.11.0.tar.gz 77037 BLAKE2B a38f37574f1802a2724143f35cc1d1159d8165f75f4c9e582e726cfdc9090814635d99b073a5d8df3a3e3b3d57b79e4e383c0569bd6769325d81af69384e9946 SHA512 0f29431b30610f0c781c9eddac57724043b6d7c05bc82f0ec3027a68230222f18f78ffc1d82dbd8ff4b5408b255b27879bbc1266e8641b4bc1c871f029f6cba2
 DIST cliff-2.8.0.tar.gz 71815 BLAKE2B d73d467a1e2e06e5f45e7fce766d6c8daf79d9a882692c0e77049427bb6de629409a282c8c554ba92c62a9c8fd44e0b19cd3cd93b9b3f1f2b8091a1e917a25b8 SHA512 a371916945ee71ec519aeb923ca44b0a0e10fe6e460d236434c5c2946ad2b517050bf9d0430bdde506bdf2d28ba60bd45941d9ce21d77a83e2d5541b088d04b3
-EBUILD cliff-2.11.0.ebuild 1792 BLAKE2B bb7681de97dca176d57102544bc1fa0dcc2071a34c012ced494cc1443f7cea3feb19abc816c0da47894076ed87dea6b0bb7828a95d3428d9086051419ad009b5 SHA512 9ba5a9c5bcf077dee7e2b2fa8782d5fad6a4da4589933f9cca28d7848faacf3e5333029e5ec52f53160a5ce01db411cedf86e17d97549171509d50af30c033a5
+EBUILD cliff-2.11.0.ebuild 1796 BLAKE2B 45b373a825128f6cbfdb751a068907609c1b87712843049329c1ccc2fe60f9e760ace69037c5c3e493d20fdcbc8aae93120c55237f4b9cfc7d98cfa8034d059a SHA512 9dde86186646b99511a1f3378f1d63d9a6f580cccd91a72ea81a15adea5285310aa6a4728849fda8eabc1fca2ee302d01131ebad4946313f2b98e4f97830cdb5
 EBUILD cliff-2.8.0.ebuild 1803 BLAKE2B 1c356b186cd61f0b64ec018b9b798832541d967bc78335e6ac8c1bb80b20656bcc7d05c4c6bc62d4262ecd2efce17e1ca0db2329fd748919b78d33ad72edeb86 SHA512 714dcf939b7044a111e7e40fd8efa141907ea852d4f763ebc4b39fd4bb792445d078f85132ede9171d237af386025c5743236fdb0d19daa3a59a70a17fc15001
 MISC metadata.xml 709 BLAKE2B 05e69832a5cff97a52caebc4c113a39342e62803fd523a753a8ba119f4326a9814c7c382e88906514e539922c1f22683a09dd46b2c11e3d60b8f885072a08e72 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892
diff --git a/dev-python/cliff/cliff-2.11.0.ebuild b/dev-python/cliff/cliff-2.11.0.ebuild
index 74b55bdf26dd..de7cbcd1f883 100644
--- a/dev-python/cliff/cliff-2.11.0.ebuild
+++ b/dev-python/cliff/cliff-2.11.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 8e8cb157577c..91b962d5f7ad 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,7 +1,12 @@
+AUX cryptography-1.7.1-libressl251.patch 948 BLAKE2B cfb192c89d714093f366a75245911de165a3cab7062737df7b949a928927a5b6f0000b9fa7efa416798c62c803b406b14d2888afef87f8e63759fd3ff74c8da9 SHA512 5660bd82498ec2bd17ad4dcbd8d3ffd8a2a1364dc5584736e4cff278bbeb4644138336385fa2bc16261fe4712481c6cffba227aaa09c841df3081709f8ec7187
+AUX cryptography-2.1.4-libressl-2.7-x509.patch 1005 BLAKE2B 9c01fe0f9c3c8c598388db68f68470b953b4a8e79dba8c1d3c6ce56486a93f340101a58db8771fa1adeaabe430d78acbb6723da597b8b114416d676022b989d4 SHA512 fc58993b3dc86990194e03c7cc4554d83260b243913d77b3743fe1f9fd0d21985ee849c6b7f7fc158c48b75505e8e8a9adf090b9c7ba40e12b09b3c020e50afe
+AUX cryptography-2.1.4-libressl-2.7-x509_vfy.patch 3419 BLAKE2B 89642459484d42958aec818c4196eff35991ba415c76ee1f43c0765b1a9687c6b405f31322227eb132309439aa8d7ee5ed6df7ed07f640e4eea21c6e97fde858 SHA512 e941b89924d68b1d1dfe8e64a4f7ae363ccb53fd232a3853d9ddba0a7aed1dc27fb8d699e9197bdd7ff0b1780c1f12edd2edd4133f08e2f7f13348b170985a4c
 DIST cryptography-1.7.1.tar.gz 420673 BLAKE2B 8c0257187f29173bae610f191f6ae3251e5dd2cfcbe639020d1ea8f94a09bfe4281c9f6b2c85aefc1989c5832eab4db40c226a8a2e12c4dcbf6241555dafa628 SHA512 fb88b0ee9e314526fcdbb6d35da409b7335c7408a69d2350c58379471d2b9d76021010955629cf776d26312f22d4f8aa3f135955a19dfbff9d602176c9bbfd40
 DIST cryptography-2.0.2.tar.gz 427303 BLAKE2B 53f891c02aa4b82b13a66a4c74bd6db9e8dcdb57bd0bba76648e0c1be710ce1d94c8425ead6d81b240b39c034125ce320757d4b43c56bc7410af11f171cf9a21 SHA512 a71219ff52006a7c8bf1553d0f132c747566c630281ef89aac40c65b193b1f0074fc9cda1de7057c76b452113dfb6188c83baef3ed9c05ff18adbc8b7bba646b
 DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a333b38b71828c71cb7891b489ef7af60f5e5590f67b43d5e63dc2279d9ca1ba036879f3145264f7639d65000958b50 SHA512 f749cb4384badc174a842514e5a4fee2ed01ab9c716799d8d9d5301f6d2d97b6c41deb9e425f48928b639fa34bef8c05529ed7e5b777ef5ca75c244f8fda8fd4
+EBUILD cryptography-1.7.1-r1.ebuild 1729 BLAKE2B 24e29311b4214897b071201eebca29f1c92966cd757b59003d1b1f45a3331a873d995ad9591201cd362200b5477263b1262e8ac30f2e9caf87f9624956315f2f SHA512 c4ad96db1cf986d9afdf4e6a9b2ec04aff936b6b3184b98f60614ed23f55df27735918d434be86513a15c5d84364500516590f0fbae0ef9a8c16124f8392b12c
 EBUILD cryptography-1.7.1.ebuild 1666 BLAKE2B b474878fa899bf532dc628455180463f8068d4ce90a3d0f91f6367aef1eaa5f9dc9027496bb2ccc1c9bd9451b00ae0e713c92a4e0fe156b68ae209fb5befb14a SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950
-EBUILD cryptography-2.0.2-r1.ebuild 1625 BLAKE2B 8ad8cec1c8e8d005b954afa1657cb28691f3a8718009b38834fe5eff5fd04e6827694f65ae266ef544b7ddbad2e2c4ef3d9f4cf300ca4ecd5c4eb1b479b5ec88 SHA512 5ab761262bbdae17ee75b54b5c02a295df4ee0d2b6c4a33c6371b99a20c565d0e8dd6a9cd857e474b782dec9759188b046bd354a5f65a1f9946e426fb23b4e60
+EBUILD cryptography-2.0.2-r1.ebuild 1628 BLAKE2B 03385da8ed6efb3db70150a7b0cedfb36c013f07b9bca14a8993c710bee77f97313b5d61dbc06ba1108a6b9f6804d3fb5a3bca5de26dad24a66184619b119730 SHA512 276c1f36d1e00b351717cba037cbf9803dcf92b574517c68098ff34bdf7f37ecb24bc32bbee02df43fa71afa5642b7bcce42337b27904abf77b5046528815c45
+EBUILD cryptography-2.1.4-r1.ebuild 2180 BLAKE2B 7d42c356dfbadd35b96c56e25f2424e75517c90f053b9e6ac99045bf21311f0b1d26bed2cd9f5c9d69e8b8cc3b1e823918fea30076e247069827518e1b6467e6 SHA512 982a1ce19c646206fc8c1df2776386e12464f318b25feba36d9959bce394f265ff4c271ea76c83d46499b2bc46b1283432afaffc5309ba4a68365a0969db3672
 EBUILD cryptography-2.1.4.ebuild 2054 BLAKE2B 3ed17aad90956150831f5831708a73cbce2537b1ad0ac96130c30041a513b60a0bf508ecd04fe563ad0b5cb20bddb6de8cca9870deac8b30a7ba76d7573ed046 SHA512 12ecf36d4124e39d50a602c8910f6f243e87301d2cda588a979a4f1841dcb73ce6204901ca7d42138880f4c5e99ef9f499f873ffc183beb8474393158a07787c
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-1.7.1-r1.ebuild b/dev-python/cryptography/cryptography-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..c6928ab74a34
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.7.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+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:0= )
+	$(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}-libressl251.patch )
+
+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-r1.ebuild b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
index e1a1c26f4aaf..57b42e13bd36 100644
--- a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.0.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
@@ -19,7 +19,7 @@ IUSE="libressl test"
 
 RDEPEND="
 	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl )
+	libressl? ( dev-libs/libressl:0= )
 	$(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}]
diff --git a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..27a23caab640
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE="libressl test"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? (
+		dev-libs/openssl:0= (
+			|| (
+				dev-libs/openssl:0[-bindist(-)]
+				>=dev-libs/openssl-1.1.0g-r1:0
+			)
+		)
+	)
+	libressl? ( dev-libs/libressl:0= )
+	$(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 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509.patch
+	"${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509_vfy.patch
+)
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/files/cryptography-1.7.1-libressl251.patch b/dev-python/cryptography/files/cryptography-1.7.1-libressl251.patch
new file mode 100644
index 000000000000..a23ed7658f83
--- /dev/null
+++ b/dev-python/cryptography/files/cryptography-1.7.1-libressl251.patch
@@ -0,0 +1,17 @@
+diff -Naur cryptography-1.7.1.orig/src/_cffi_src/openssl/x509_vfy.py cryptography-1.7.1/src/_cffi_src/openssl/x509_vfy.py
+--- cryptography-1.7.1.orig/src/_cffi_src/openssl/x509_vfy.py	2017-02-01 12:29:59.080728417 -0800
++++ cryptography-1.7.1/src/_cffi_src/openssl/x509_vfy.py	2017-02-01 12:31:48.017895844 -0800
+@@ -221,10 +221,13 @@
+ 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;
++#if !CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2050100fL)
+ 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/files/cryptography-2.1.4-libressl-2.7-x509.patch b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch
new file mode 100644
index 000000000000..9a14d4606019
--- /dev/null
+++ b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509.patch
@@ -0,0 +1,23 @@
+diff -ur a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py
+--- a/src/_cffi_src/openssl/x509.py	2017-07-27 05:11:29.000000000 +0200
++++ b/src/_cffi_src/openssl/x509.py	2018-03-23 10:28:00.387774214 +0100
+@@ -254,8 +254,7 @@
+ 
+ const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *);
+ 
+-/* in 1.1.0 becomes const ASN1_BIT_STRING, const X509_ALGOR */
+-void X509_get0_signature(ASN1_BIT_STRING **, X509_ALGOR **, X509 *);
++void X509_get0_signature(const ASN1_BIT_STRING **, const X509_ALGOR **, const X509 *);
+ 
+ long X509_get_version(X509 *);
+ 
+@@ -338,7 +337,8 @@
+ CUSTOMIZATIONS = """
+ /* Added in 1.0.2 beta but we need it in all versions now due to the great
+    opaquing. */
+-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
++#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ /* from x509/x_x509.c version 1.0.2 */
+ void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
+                          const X509 *x)
diff --git a/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch
new file mode 100644
index 000000000000..a1c93cf0c66e
--- /dev/null
+++ b/dev-python/cryptography/files/cryptography-2.1.4-libressl-2.7-x509_vfy.patch
@@ -0,0 +1,73 @@
+$OpenBSD: patch-src__cffi_src_openssl_x509_vfy_py,v 1.7 2018/02/22 18:49:16 sthen Exp $
+
+--- a/src/_cffi_src/openssl/x509_vfy.py
++++ b/src/_cffi_src/openssl/x509_vfy.py
+@@ -204,7 +204,7 @@ int sk_X509_OBJECT_num(Cryptography_STACK_OF_X509_OBJE
+ X509_OBJECT *sk_X509_OBJECT_value(Cryptography_STACK_OF_X509_OBJECT *, int);
+ X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *);
+ Cryptography_STACK_OF_X509_OBJECT *X509_STORE_get0_objects(X509_STORE *);
+-X509 *X509_OBJECT_get0_X509(X509_OBJECT *);
++X509 *X509_OBJECT_get0_X509(const X509_OBJECT *);
+ int X509_OBJECT_get_type(const X509_OBJECT *);
+ 
+ /* added in 1.1.0 */
+@@ -220,14 +220,11 @@ static const long Cryptography_HAS_102_VERIFICATION_ER
+ static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
+ #else
+ static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0;
++#if LIBRESSL_VERSION_NUMBER >= 0x2070000fL
++static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
++#else
+ static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0;
+ 
+-static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0;
+-static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0;
+-static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0;
+-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;
+ /* These 3 defines are unavailable in LibreSSL 2.5.x, but may be added
+    in the future... */
+ #ifndef X509_V_ERR_HOSTNAME_MISMATCH
+@@ -240,12 +237,6 @@ static const long X509_V_ERR_EMAIL_MISMATCH = 0;
+ static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
+ #endif
+ 
+-/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately
+-   below because it shows up in some earlier 3rd party OpenSSL packages. */
+-static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0;
+-static const long X509_V_FLAG_SUITEB_192_LOS = 0;
+-static const long X509_V_FLAG_SUITEB_128_LOS = 0;
+-
+ int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const char *,
+                                    size_t) = NULL;
+ int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const char *,
+@@ -257,6 +248,19 @@ void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PA
+                                         unsigned int) = NULL;
+ #endif
+ 
++static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0;
++static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0;
++static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0;
++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;
++/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately
++   below because it shows up in some earlier 3rd party OpenSSL packages. */
++static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0;
++static const long X509_V_FLAG_SUITEB_192_LOS = 0;
++static const long X509_V_FLAG_SUITEB_128_LOS = 0;
++#endif
++
+ /* OpenSSL 1.0.2+ or Solaris's backport */
+ #ifdef X509_V_FLAG_PARTIAL_CHAIN
+ static const long Cryptography_HAS_X509_V_FLAG_PARTIAL_CHAIN = 1;
+@@ -292,7 +296,7 @@ X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx)
+     return ctx->cert;
+ }
+ 
+-X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) {
++X509 *X509_OBJECT_get0_X509(const X509_OBJECT *x) {
+     return x->data.x509;
+ }
+ #endif
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 30503b58eff6..15715ea44ad8 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,7 +1,7 @@
 DIST debtcollector-1.11.0.tar.gz 26266 BLAKE2B e94c8754d730417638542229c0c47d798efeb2f55f203c51b337f516e356f930f476881bfba7e51824e0fcdda84a2aea4cfe238fa3251a35a9bf395942de7563 SHA512 9dcbfdaec5d16714d17eca2bfce7049c0a042b2370b1be5a4a0c0057dc28bf060ba570639581ceb5e5c27f2117f9001e4b2bb350899bdab0c0c7cdc3098a9bb2
 DIST debtcollector-1.17.1.tar.gz 28805 BLAKE2B 25d965359ba815e182cddb2a8c82d7360e43ec549185380e759cb993dc44dae88bf1e6e21a67b6929862389f80450dc2f07eff7b2f7a5af58f1d8b64a2716255 SHA512 751ac56695369a36c4baa7fd60b3c0d2c027fb23f7b71cf4103acb70362af4455ebe50b73ca0ba4f946b318c38e67f3477ae937afd697d505a6f2455f932faa3
 DIST debtcollector-1.19.0.tar.gz 26176 BLAKE2B be471b8ccb8cc3df3ade1af544f6326073f65cb1a6c64a8a864ee437692508fe21d7a117f47ab9f0c8cfb74502a7cf1c68e5e9dc26d8da3cd2ac0519c93be93b SHA512 f2bd1eeb9f402853e57ef6bd31d9961acc45617c50be36192b8761454869b3b9fc7709dbd14c36be469e6dbf3532f5d75a9fb863c7ea95c276f82d06f69a2164
-EBUILD debtcollector-1.11.0.ebuild 1856 BLAKE2B a9486fc09e19b4fa0ab9b66c11bca51d03c5ef483bf82f9f79d815c157f3775009abbbc3800faff05a9782f317785281ddef17f321475e414d894bdd1170b6f2 SHA512 df6e094e314ae712d6ccf9a622f6a8141cb1aa972edc6386ce632f64e0ba368cd6477c66d24444fe71ecde640ecaa9f9fa0a79b0543e8d17e99e2c67fc0c6233
-EBUILD debtcollector-1.17.1.ebuild 1996 BLAKE2B b5c8733f2e99508878a70b62fe060c4a140961e5e75aa6124ad0e8ad036f44ff81e97b0b5d891cdff58640a5e7a5e27595498d1a3aa0256a8e07188918f8270c SHA512 f20840d293cbea4ca6c6be39d297608610776bec1f890a479fb45e651b1f2424dcf09be5a00ec03a283d275feb937b2e870e39353067e0bdf3cf5e5b3e50d8d3
-EBUILD debtcollector-1.19.0.ebuild 1868 BLAKE2B ec8f44d764d0ebbce2bf28d2a327af0c19c0fa0b760b1345514787d1d376a5b3435525458acde7569bd3de9d8eb281eacebe3d5f45c6a52d3cd18107b6a7e74d SHA512 9bd6303d0456694510b82063f5dc9311c9e22b2d82a93d1733561f4d20744fc67e2751b0dd29e9c5b90eaa920806653fb2d672e6d4f35fa24d276bcbf2c83be5
+EBUILD debtcollector-1.11.0.ebuild 1857 BLAKE2B 916843c31e6d04dc4b31091c69ee616339d92512e435deacff02045d96cb49fea70570cc738ab550a2f546d1992e2afa83a8b6994ea55935be87bf77e709aa8a SHA512 f0edbe840bb71b2f26f8e599eac5a75b983832a350fdd851706a4a91337ebd293494582d965338fe83ab3d3201e828c9f1b70dfc1e52e8136093177236834cb2
+EBUILD debtcollector-1.17.1.ebuild 1997 BLAKE2B 4535d4c860797170137e33836f3b4745b289ac1231a7d25c5fbd5f2c468a61badd25370c13624ef65ddfc8bc761001c35fab5b3b439d53c3b8baa550885bfdb9 SHA512 a26634bd66fb8f8d73579d15147cc95eb3fd6466ccdf1629454f52b451e65372917b0c86a04b6d6bef7be7d1c8d27c35a5b4c05d70edbcacf44562f0a3813e63
+EBUILD debtcollector-1.19.0.ebuild 1869 BLAKE2B 997049404631fb24a4757405ff9a23cf320a75236a3dd3025347a9cd29a54cc47617ea5ae837bc034ccb2c68ce5647bb69a3f3b7bf39d89a12b7b23861803d9a SHA512 b361e383a447d248d45d2e730e589bb830cf251f5376fffa329644cae64e3d04686e8298f3b00a7a3c8ddf0bb4b58b781e7524294a345e2f519bd6e3568f49bb
 MISC metadata.xml 330 BLAKE2B f67815c96ec5d1c50e57e80edcf471c38482eab644d201f4f1d4afa9a44941aa26cf5151d74ab2be666514454a3cb041cb1cf31ab22b4c4efe01a4a57ab5aa75 SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268
diff --git a/dev-python/debtcollector/debtcollector-1.11.0.ebuild b/dev-python/debtcollector/debtcollector-1.11.0.ebuild
index 5eb92d9dd8a3..155cd3b4f6b9 100644
--- a/dev-python/debtcollector/debtcollector-1.11.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.11.0.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
@@ -8,7 +8,7 @@ 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/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/debtcollector/debtcollector-1.17.1.ebuild b/dev-python/debtcollector/debtcollector-1.17.1.ebuild
index 406437c2b8bb..8490a275bd66 100644
--- a/dev-python/debtcollector/debtcollector-1.17.1.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.17.1.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
@@ -8,7 +8,7 @@ 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/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/debtcollector/debtcollector-1.19.0.ebuild b/dev-python/debtcollector/debtcollector-1.19.0.ebuild
index 2b35a185964b..77677acbe94b 100644
--- a/dev-python/debtcollector/debtcollector-1.19.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.19.0.ebuild
@@ -8,7 +8,7 @@ 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/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 11428993516a..3d2a08dcd93d 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -2,12 +2,15 @@ DIST elasticsearch-5.3.2.tar.gz 33704368 BLAKE2B 861ca6b37ee71b2a7d3b988287df886
 DIST elasticsearch-5.6.7.tar.gz 33789994 BLAKE2B 4e5f4e55cb3875adee7528e26187659b5bac7b2def9d22d438f888fb33ce116654b54859d8430b203c14939bd3821240f8ed209ce120388256e9389ab9acd11c SHA512 2c9fbe8d3ccdced6242b5d876cb9a25a3ef1b94f9de0720aa438458b0235082220621afffe7976664bf08b13b4aee157c28a5d519b5594e6d9d7855c24e93056
 DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2 SHA512 b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee
 DIST elasticsearch-6.1.3.tar.gz 28454781 BLAKE2B 80c42a64fb533a5b2f0a2c6ea154b129e327acc0d2addc6f1dd5fd949573459ec87118e12b98791642fdfa8e92927d749dd60119adcb398fca56e6e00b0811e2 SHA512 af10cc571ab55f52ab73a86373fa8359214a7866fbb6d2910669e6be897bae30c41c007c3be5803a7f07736041f32cf36425c182a18fab39499321ed9eb4b349
+DIST elasticsearch-6.2.3.tar.gz 29050159 BLAKE2B 32a722e3861abf024a4b82ffe97877896cf3ffc76aac34fd942eeb9ca490ac41f3bf530b6313104fdf2c4900ea377d57837c465c6de6f983afac99802586b1c7 SHA512 8103c2b817cd5e14057c28372f379bb9c2b7833698818882c649d349904163d0c69d147836d03428619535652902532f7e5abc1e23214ad735c54b1d914acabf
 DIST elasticsearch-py-5.4.0.tar.gz 81286 BLAKE2B d15ef79ee9720b4ed67c5538c66301aba2c7a4baf9a48faef0153b76dbf780749975d664c8e9d52599077738e543d6c5113bde3748e86f239f1b92a272ea934f SHA512 9d30ffa810f495662769e6d2f2627f9ef6aa3849bc2eecd09df28c05a036b8fb15ae465914c38eeb3d854683bc150a3c56425388312bcd112bd5cc7b33ad41ae
 DIST elasticsearch-py-5.5.2.tar.gz 83415 BLAKE2B 6adf9d5e05c2d097590bc78df9c9a7a948194a4106d718464c04e705380984b51d8f7e04fe9d0eaa6518d6d8767aa064c99512cf827a31e993178ee3c28a8815 SHA512 c5c9583179e87b13c7edf14baeb5a360369f37a953049c3c7e101c379cf895c8fe743d5edaaee6aa0fa4ee6cdab9364c0177097ad780ed3d85ede754088520a3
 DIST elasticsearch-py-6.0.0.tar.gz 83197 BLAKE2B 5ca16c9b881fe6f8c4944e8eec69be0532fe472564b12dbaa40225b29b8a2b88974e35ed2ab733722023da3ed877a2934bb545387ffdcf307d519950a8971880 SHA512 1d6c27654f9470837e9cb9866cb6f5305d63cac9dc6bddc06309e378a5e7b7fe3d21cae5ffd115685fe8ddcfd8cbbe1457d74799dde0fc7427f90fc870f1c444
 DIST elasticsearch-py-6.1.1.tar.gz 83575 BLAKE2B fc7cd690208a401b83fd1b86957dc49b2bd686248f2d78901551c26e67e06f4c7f6175346fd0374ff509477f571a8074ac30aa0e2cca1c73b11b6cdce67bfe33 SHA512 f593865de8879ac42cbbd35dd6bcc1da9513124556dcd3f1d8240e9d2818682136bfac09387c50797f4daada33699a7f5c1591172a7d89c3bd865595a5706c18
+DIST elasticsearch-py-6.2.0.tar.gz 89784 BLAKE2B 150668b378d50ea2d62f75a71127b524d44e5d69bc96905f70b38162598a11ab77aa34814788e4177f668a1109191bdbb4c28698da608a35c70a45026ad9c22b SHA512 f7205db8b8608ce52657a114a38f59b95ed0ea5acb0a5f18197be6baebde80fd88210a5f88fb5d2770f82f1dc7212d038d801f96c7d18cfe1e77c16ee0fa5208
 EBUILD elasticsearch-py-5.4.0.ebuild 2656 BLAKE2B ff39bd1fa8148c07781624d47b1c27765b9f8f19ced76bf6815edcc2e8be9ad4ce43d0da49e850e70d246e56f1eddd7ebff3e3e075fd0d7893c12cc9e46a4868 SHA512 5b757f21244c74c522ef2cc6533f788c031d4de915c1658645bcc87020089c196822ba6d5918ca90063f98de9d037abfcbbd737093dc436620e64ad90e4cd03f
 EBUILD elasticsearch-py-5.5.2.ebuild 2754 BLAKE2B 3e1a4b2bbb16168127f1be66014ea5282b0b58667cef11222eeed324043c503d7bb289523f482dbd019c15d4fe973a9c382aa1a07cd1eb64c9c8040494dd3f1c SHA512 bbab061e078d7ff3f75f7d722158762cee4e6912118a2499fdcb8f2be51c56802009b622f37f834f5b46a02a0d69f539d545d6d4f309a0f00a38486bab389dcf
 EBUILD elasticsearch-py-6.0.0.ebuild 2756 BLAKE2B 6dac845f2db9b7204fcbf17e70a357b0a8939d24b3fa779eb9978f1fc3edfbeafb039ed75da87d216271c161452e46780807d899403c6d3519bd30772db8290b SHA512 b8fe212ef1a44e79f4aa712118b664a80385068cb847d23970eccbacf171cd98e899da148833f434a790d55ee9dcda5ab7cb119bb581e152d79c029de2fd6a32
 EBUILD elasticsearch-py-6.1.1.ebuild 2756 BLAKE2B 4ea4b1ed0c26ac25915a281e755dc21f803b75c60798326c6e5a46b7a6277dcc32e35ff3164eaae2fd67c28ff978a7a8733fa49c5b71a099630cd180ad42b770 SHA512 37321c3206723abbeea13904bed0ce8c03524c2a404c7d6101df2b8485cc787231fb6fe67a5491dd5997f74a154a7b5fd267d873aac0e6ee7202c9b941f27b98
+EBUILD elasticsearch-py-6.2.0.ebuild 2756 BLAKE2B 147ab4eb3756cc532174e822f6aebad1e7d4824997da278e74faf02535d29a8a3323fd7c309f8ecbc1765df982865c0be7516381e774f707f7bc4ff71fdf2ddc SHA512 b7bcb4598b4b2e5f20d65bbe3cbfe0893415fd74d92cc781f6d4832da18e74cfcb7a4257459fbe4f42278fc34e2b6487fd2cf3d1047f44f34532f20e7c3a85d7
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.2.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.2.0.ebuild
new file mode 100644
index 000000000000..9d825bd56aa7
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.2.0.ebuild
@@ -0,0 +1,102 @@
+# 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 )
+ES_VERSION="6.2.3"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+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"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-2.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_prepare_all() {
+	# 643684
+	sed -i -e /urllib3/d setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# 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}" -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_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/flask-socketio/Manifest b/dev-python/flask-socketio/Manifest
index 8521de2405e5..bb69d10f0cf5 100644
--- a/dev-python/flask-socketio/Manifest
+++ b/dev-python/flask-socketio/Manifest
@@ -1,3 +1,3 @@
 DIST flask-socketio-2.9.2.tar.gz 14361 BLAKE2B 0db8ddee5fe8c7dda384a22d2880a7ebf8d25b6ee76d257012823fbe4388bcfebe01a362521fb5e5abfeca72b7b3ca2a53493081e5d42f6443d410871b6fb53e SHA512 6fc499a32f37752e6d6d62fc52787cca795f3d113315402bab8063f7b7041785a7c90aff1bd393ef12ba84f2547607920b5f3146271dc536847c07ef0ffb0617
-EBUILD flask-socketio-2.9.2.ebuild 926 BLAKE2B 6e6eca734a3a0f1bf8d54387508d7b927dbb6cfec69edc467c9852e6e20bf73fc2782fb2accbb2328766a0f2e9bb334da4b29fe14eb6c62c1a29e0b59dcc1e07 SHA512 1fc7e46195de6c22f74033ff22c23b90e6ebcfb37bbab9a088cf182bb4f2588228a959c8abfcfd8d2275208911a993a3d14087dc1e6920d77bbc0c547a2716e1
+EBUILD flask-socketio-2.9.2.ebuild 938 BLAKE2B 0b87789b3ecd80fc52d84482319d80b408f23b2cc89dd254b46c31c8fc0699f76207ff9c54b47dfe29d9bf5310e2b55ddb761e4d8af19bbf0fdfce80346828d6 SHA512 964ca26566a82b5dc701b407fa5412d87a40946fb1b6a5a4d236ee3456ea366b36dcffd7c6c09c4af3db5c76333195031c12d0ce236578b92b6c5b1a44435a53
 MISC metadata.xml 464 BLAKE2B 0e2f91635e9905f04e94fe49e33e92f5ba4b0ba58dac83c5ff6b918403060239a4af3dbbffb1a9fe1837ab5e0034caae35d5f6937b0c1bfccc73d8201fea224a SHA512 3ca7417e14ca354f6bb0ed18dcfe733704b47df3e2a958c7d2bf16b3cda2197fdbfbdaf6652ebacd04c4dd60f9cb00d455dbbb3bc01108f75047f9ae832f38cf
diff --git a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
index 60880a0c55de..195e82cc6d03 100644
--- a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
+++ b/dev-python/flask-socketio/flask-socketio-2.9.2.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
@@ -8,7 +8,7 @@ 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}"
+HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/Flask-SocketIO/ https://pypi.python.org/pypi/Flask-SocketIO"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/flower/Manifest b/dev-python/flower/Manifest
index db2d010dbdce..faa96013843b 100644
--- a/dev-python/flower/Manifest
+++ b/dev-python/flower/Manifest
@@ -4,5 +4,5 @@ AUX flower.initd 508 BLAKE2B b398accfec2ac5690ae2905fd0dbfec173dfa8475691ca2c344
 AUX flower.logrotated 85 BLAKE2B 145c99ef3e2345782f8616695bd4bf6f6fd9684df57bf2e95b22e67d5efc38afc7fd891079dce6c057ef82113b09f58332d96918e86897bc1dcff04a06d764d4 SHA512 ff230e516d0aeffe9bb7d43bd847abdf1d3bf0f0fe0a6aec087fa7f08e2157e7f15994997ba76fc57a03dc34a0271cb9051bba938138ad95fde46c9774f05ffd
 AUX flower.service 331 BLAKE2B f097ef9602998f77248da33e3edda6e2e31957653fe3d9416e6295b61e50b891a069c96da6fcdd53142b312d72894f0bea82f1363cae5a60e00e6c4749004849 SHA512 894d9e3cf4c87ba731ce8089efdce7e5d6f536425ce368825f750fe5367707a12b3b99221b7d9f3ebebf6881fa7bfbca6e13654ae878b046bfa94376c00039c7
 DIST flower-0.9.1.tar.gz 3880608 BLAKE2B 4451601285472fa61577d482ecda11b20244e8050f349ba1e81601ce9a3ec0126a13ad055545d4adb5c1201b6c457919bc5f4b8aa7aca700f3bfcbc3373c6c0c SHA512 519d92209dbdb7956fde30c604956d1cbbc8ec7180ff160ea088847b5b63310cd42dc949d02eef1197588b0353470a0f3ac96b44b2e3ebb093a254d8f94fb407
-EBUILD flower-0.9.1-r1.ebuild 1428 BLAKE2B 3ac5385b69b6882a45d0fae5d35f20037e48a97401692c86bef1c1bfb1be90862e86b1435823077c30d3549e04ac20f3b52c6d5ea466f97e763e4de6277aebce SHA512 cd2c71c8d9267ec245ef0d2edd9a1e163b63e32b839dc9d7bfb62105e55d317f5068960772176b9293496ba843ed1c8b544403bca119bb382627ac1e226e0e9b
+EBUILD flower-0.9.1-r1.ebuild 1431 BLAKE2B efbce6da1c6befdcff4d5e73388a2e92418481071ed2179321a13602d0423d3cc5781781472593852ee7c48837b7be5aa041944bde84708186ffa384c3d5b07c SHA512 127ec3b7573bcd36c0b4fa5bfd5ccd96033edf11a636b78a69b299a5a9eff29da27dc910891c73b703c4ece0285b62e39a232125008263b28c6f337168d6c8da
 MISC metadata.xml 348 BLAKE2B 912f96c87bcf9ab4cb89f34a4c84042ba7b0774e85c123e79c2dd79e04b5fda8a7d5c0a2bb8691756fc4553a80ff393db9a53fb3e370e95b184c036cc216d27b SHA512 3ebe07dea33229439c0e810bebe106316ec29481faf9c39ca3449228979d160d42a81161ed59b7109bf0731664d122b68b3ab5a6ea39aaeb35fe9feadf304a4e
diff --git a/dev-python/flower/flower-0.9.1-r1.ebuild b/dev-python/flower/flower-0.9.1-r1.ebuild
index c5b5750941fd..70e17db07d9e 100644
--- a/dev-python/flower/flower-0.9.1-r1.ebuild
+++ b/dev-python/flower/flower-0.9.1-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
@@ -7,7 +7,7 @@ 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}"
+HOMEPAGE="https://flower.readthedocs.org/ https://github.com/mher/flower/ https://pypi.python.org/pypi/flower"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 9085ea0b4df5..5425f44e86e3 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,10 +1,8 @@
 AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
-DIST llvmlite-0.16.0.tar.gz 95284 BLAKE2B 6a970e5ad8fcf23e4ed774b83144474c2b3094be875202a441781e93ecf10549542a73cb72980791a5e69f57d1a08768f06fabae921636642651f572fe945554 SHA512 97a251ef9d840fc5a25bd673c644207750f2e653ccad5850dec0a7f1bc77170c6ce85d5cd663ab5c109cb1b51ced9545493d35ef81dfe04a3696b5a0c37fa768
 DIST llvmlite-0.19.0.tar.gz 97109 BLAKE2B c4d22d130d12d7e61e9ddc177e28c6d8c3d0a1bffa0fcd672dd237260d80929c9ae0da428165f379c53276ed464b80f7cb9aec4abc4f66e105c7415db150edb0 SHA512 93551bbab519021abdc66ca099b9090b3af54b048adbce8d16f3700c066bbc4f5c24e5234a8a1ac4bfcdf8bf74d0ac52bb7023251ac948af6ef99fbd5a5324c8
 DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B ec9cfa554f44162c0d6e755628603c9afd85642998f56ed49c2ff29c3ef975ef4ce14c6555382ca282b70d71a1ff7347c0b773b339b14345e10d3b9ac96ac55e SHA512 c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764
 DIST llvmlite-0.21.0.tar.gz 96462 BLAKE2B 8458037ca49c2c7035cc65539c1dc933f26c694e07502bfb0f37adfa389c56d715b53310fa977461fa75d7f826384a9c408682bee942e7cda6a299b16192c183 SHA512 25fb0986faf558995e6405a77d675d1dfcda2f79f8e6f5183d66a16f7b1f323df7eefb54455d9a15412c4eb88cd2e160d9f45038b7d97da6fffe78d7adc0e296
 DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
-EBUILD llvmlite-0.16.0.ebuild 1198 BLAKE2B ffb0a83bb6605d3fbdee9d320007b9b7184e9dba38a423129585ebbbb71e6a205d6b2497f1733cff782df9f032392f72f3ba286ab8728c68c050a065ef5106aa SHA512 79b761d1c155eaa10b123575908b66d78797e7265c78a8bfdd81963fc53396f6e47ffdb39d57f64b781ab2d6e55a3fd628093bc68827ea2845a107f9262ef40d
 EBUILD llvmlite-0.19.0.ebuild 1288 BLAKE2B 27924c47e881063a44db3fce338e5240ad739d8e0283791a623f5ab91fa788e1ae5bf9526adf89153bbefc368166f78aecffbfeee8ba0ccc74c6f43d812b7a49 SHA512 81f241338e6d2e249b8ee7a9b9dbc184f47ed6c461259437f664400f49b2ebcd45c5434dffbd8781f0f6b34e93a8ceaf1394353df5ccb67a19158c72ff5d0db4
 EBUILD llvmlite-0.20.0.ebuild 1286 BLAKE2B ba74befabce5dbf8a93148349e230788702f1372788f99f388c827700a2209c77b7a0ff80a0c728da14f11e6170658b0d87b6ed5ce28a1500c33f8a42adc8af5 SHA512 afeeea625207aaa2ed0a60ac07fb8546e513c21bd8f864d5b0e29570016b5a7431b21d4ba4beb23822cc6be38bce5d5c34604e544b900edba1b6b1cf57f7d600
 EBUILD llvmlite-0.21.0.ebuild 1286 BLAKE2B b182d554d988f63beddc4afee57d32047ec362beab482d1f51e69722563e2608e3668ee3b87050674446fa6d6a5c4a7853b0e6410a670934fa46a76f3e957ce1 SHA512 488fad8be499311fb676ae86194f5571d22ccc97ff397f240b232e13258f6cba15b0422e1b5df5e5ae2df8482382447bbac3ddec6ddf1f0bb90d3fcf1e3dd165
diff --git a/dev-python/llvmlite/llvmlite-0.16.0.ebuild b/dev-python/llvmlite/llvmlite-0.16.0.ebuild
deleted file mode 100644
index 47ce82f48703..000000000000
--- a/dev-python/llvmlite/llvmlite-0.16.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-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/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index d9366c77b7c7..6c53b320036c 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,5 +1,7 @@
+AUX m2crypto-libressl-version-check.patch 5125 BLAKE2B 969595234bc845f5a5c31f0fbe8bfb69f9eb41dd99f4053757ddcb0fcbd3a9a6e3b725dc1eb3d73108a69c496cbfc66bd52a3eefe0763e27e2f7b82b9f8c9a38 SHA512 36fc26175591bd731de80bea08887d76d3cedd2049d17c838001eb75bea2762d5b93eaa6fe7aa45d3d156dc93ddfd73c1a58a548d6325408960e08dc54bf233a
 DIST M2Crypto-0.24.0.tar.gz 184457 BLAKE2B 15a11dc1b13359041875e8321d0159a1a393b7f85dfbd38d650721d8a2eaed2cc2199859c3e1e3c890033711e0b137f4c78b90f04681ff44a3356558b9f55aea SHA512 c23ae0f8ac790d4ef108a217a44e994341f6bbe4e12a7fef2518d8def82331246a145e19a2504b82b790a3ad4b467d2facc8a73bb7f1190b56441d8482c66aca
 DIST M2Crypto-0.27.0.tar.gz 1119288 BLAKE2B 90e227aef9a5b4c7f5ab9bd62fbe506ea0931a6c338c530adbeb1a8303a31cc7755d13003532fe0ee4005f1997db23bed2d03cd54224dc7d89a6f23882197800 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2
 EBUILD m2crypto-0.24.0.ebuild 939 BLAKE2B 88f6d7c8b04529756c31787ee56ddd7e0accfd9fec87ec85e1fe3788870f71a5598f993b16ca3745f6f1b405816ff25ed0e411c4452fc5d0d119c5ef91ac7928 SHA512 b5f7ae379e997a56934130c4b14b9357773904e19ec5357b93de6ab144ec7faeabfb19def44e5c8460d56fbc3b59287121f75b008f83b83e71aaf41e5d26823a
+EBUILD m2crypto-0.27.0-r1.ebuild 1354 BLAKE2B 588be21d33359bfe395502791031f51bfe0dc6a54edf47fa3ba5911254d0a1dbc91c49d0d9d8a543b5c5671bfdcbf51261bb152aab4d7d9e24bed08d86e0ab72 SHA512 38369a366a6392af48083aa7119e26612bc585c41b3b747c0b8805af582acc02242de24c885861204d532b133d24f13936d6f7d7ee4a03b99111e4d81f91f4da
 EBUILD m2crypto-0.27.0.ebuild 1291 BLAKE2B 03a40567917e0d011ed631e8279dfb86d90ecab4f01b0f0c9759abe387486c9452aebe98a4f4f4304f604da251c4db3757acc72cf4e779ff0c3435786b352d1f SHA512 828d54ed8f997b912e5d6776935e8e825fe5b724ab0c11fd52a3401288128ade82efd07d9404e3d540cd74cfc506895133758fc69d190c87f6d507eae259a4e9
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/files/m2crypto-libressl-version-check.patch b/dev-python/m2crypto/files/m2crypto-libressl-version-check.patch
new file mode 100644
index 000000000000..770c49f42782
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-libressl-version-check.patch
@@ -0,0 +1,154 @@
+--- a/SWIG/_bio.i
++++ b/SWIG/_bio.i
+@@ -63,14 +63,14 @@ extern BIO *BIO_pop(BIO *);
+ static PyObject *_bio_err;
+ 
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ void pyfd_init(void);
+ #endif
+ 
+ void bio_init(PyObject *bio_err) {
+     Py_INCREF(bio_err);
+     _bio_err = bio_err;
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     pyfd_init();
+ #endif
+ }
+@@ -299,7 +299,7 @@ int bio_should_write(BIO* a) {
+     return BIO_should_write(a);
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ /* implment custom BIO_s_pyfd */
+ 
+ #ifdef WIN32
+
+--- a/SWIG/_evp.i
++++ b/SWIG/_evp.i
+@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
+ #include <openssl/rsa.h>
+ #include <openssl/opensslv.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ HMAC_CTX *HMAC_CTX_new(void) {
+     HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));
+
+--- a/SWIG/_lib.i
++++ b/SWIG/_lib.i
+@@ -18,7 +18,7 @@
+ 
+ %{
+ /* OpenSSL 1.0.2 copmatbility shim */
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
+ typedef void (*OPENSSL_sk_freefunc)(void *);
+ typedef void *(*OPENSSL_sk_copyfunc)(const void *);
+ typedef struct stack_st OPENSSL_STACK;
+@@ -501,7 +501,7 @@ int passphrase_callback(char *buf, int num, int v, void *arg) {
+ %inline %{
+ 
+ void lib_init() {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     SSLeay_add_all_algorithms();
+     ERR_load_ERR_strings();
+ #endif
+
+--- a/SWIG/_lib11_compat.i
++++ b/SWIG/_lib11_compat.i
+@@ -8,7 +8,7 @@
+  */
+ 
+ %{
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #include <string.h>
+ #include <openssl/engine.h>
+
+--- a/SWIG/_ssl.i
++++ b/SWIG/_ssl.i
+@@ -268,7 +268,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) {
+ 
+ #ifndef OPENSSL_NO_SSL3
+ const SSL_METHOD *sslv3_method(void) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     PyErr_WarnEx(PyExc_DeprecationWarning,
+                  "Function SSLv3_method has been deprecated.", 1);
+ #endif
+@@ -277,7 +277,7 @@ const SSL_METHOD *sslv3_method(void) {
+ #endif
+ 
+ const SSL_METHOD *tlsv1_method(void) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     PyErr_WarnEx(PyExc_DeprecationWarning,
+                  "Function TLSv1_method has been deprecated.", 1);
+ #endif
+
+--- a/SWIG/_threads.i
++++ b/SWIG/_threads.i
+@@ -5,7 +5,7 @@
+ #include <pythread.h>
+ #include <openssl/crypto.h>
+ 
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define CRYPTO_num_locks()      (CRYPTO_NUM_LOCKS)
+ static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
+ static long lock_count[CRYPTO_num_locks()];
+@@ -13,7 +13,7 @@ static int thread_mode = 0;
+ #endif
+ 
+ void threading_locking_callback(int mode, int type, const char *file, int line) {
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+         if (mode & CRYPTO_LOCK) {
+                 PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
+                 lock_count[type]++;
+@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, const char *file, int line)
+ }
+ 
+ unsigned long threading_id_callback(void) {
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     return (unsigned long)PyThread_get_thread_ident();
+ #else
+     return (unsigned long)0;
+@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) {
+ 
+ %inline %{
+ void threading_init(void) {
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     int i;
+     if (!thread_mode) {
+         for (i=0; i<CRYPTO_num_locks(); i++) {
+@@ -50,7 +50,7 @@ void threading_init(void) {
+ }
+ 
+ void threading_cleanup(void) {
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     int i;
+     if (thread_mode) {
+         CRYPTO_set_locking_callback(NULL);
+
+--- a/SWIG/libcrypto-compat.h
++++ b/SWIG/libcrypto-compat.h
+@@ -1,7 +1,7 @@
+ #ifndef LIBCRYPTO_COMPAT_H
+ #define LIBCRYPTO_COMPAT_H
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #include <openssl/rsa.h>
+ #include <openssl/dsa.h>
diff --git a/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild b/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
new file mode 100644
index 000000000000..a1f68b64503d
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.8:0=[-bindist(-)] )
+	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
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-version-check.patch"
+)
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	# https://bugs.gentoo.org/617946
+	# TODO: Fix cross-compiles
+	local -x SWIG_FEATURES=
+	case ${ABI} in
+		x32) SWIG_FEATURES="-D__ILP32__" ;;
+	esac
+	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
new file mode 100644
index 000000000000..b4187e159f3d
--- /dev/null
+++ b/dev-python/marshmallow/Manifest
@@ -0,0 +1,3 @@
+DIST marshmallow-3.0.0b8.tar.gz 148882 BLAKE2B a83e9cb2ff7d5786e5a0d5c947e578f81d7d2ab008257df195096e06031b100cd6d31bdab3df63b6ab6704268b1915827dd89f7e5fce6a638d136686fc9ebc07 SHA512 34f7a974872d0cdad828e342788269ab19194e17f30716dc8db21bc3b86ab3f1be6bd5e31c7bcbeaad7b8c70acc39eab256eb938060eff42067f5f1b3ba51c1c
+EBUILD marshmallow-3.0.0_beta8.ebuild 826 BLAKE2B 1ef671583bf696aef8441aafd5ce82cb6db7b1487263a231c4bf47dd84b0e0c0e12c567fa865de4402c85d17870a0fdc943d810f40de226ff0460fb3c1159815 SHA512 6843b3f4e527001ac81f145c97746311ffde388967e4197d33d5e2b58e23531b4ab10a9d659365b68f18be261cc797a947e990322d75b7ee4bec17a7ef7b0c51
+MISC metadata.xml 360 BLAKE2B ed1f62630b417aaefbfc1ce52c275f16187a1fac9ee46e7172c4b703452329b64de253eed111bde2e7bcb4b85e7806d8423fd5d80899f93b23e7c3da61030a2d SHA512 51665fe5adb03e70bb1582f393b95783c9e4956c24f664c09d08017663bc8373b07080c142f714fd4c93381cbd5c55bec2b58ca412df6aa55980f9a61abebc54
diff --git a/dev-python/marshmallow/marshmallow-3.0.0_beta8.ebuild b/dev-python/marshmallow/marshmallow-3.0.0_beta8.ebuild
new file mode 100644
index 000000000000..630eff899b7f
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.0.0_beta8.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
+
+MY_P=${P/_beta/b}
+DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	rm tests/test_py3/test_utils.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/marshmallow/metadata.xml b/dev-python/marshmallow/metadata.xml
new file mode 100644
index 000000000000..36de12026687
--- /dev/null
+++ b/dev-python/marshmallow/metadata.xml
@@ -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">marshmallow</remote-id>
+		<remote-id type="github">marshmallow-code/marshmallow</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mem_top/Manifest b/dev-python/mem_top/Manifest
index 1d0bdb4ad9ba..21e10c5788df 100644
--- a/dev-python/mem_top/Manifest
+++ b/dev-python/mem_top/Manifest
@@ -1,3 +1,3 @@
 DIST mem_top-0.1.6.tar.gz 2520 BLAKE2B 427ce48da7b16e08bc6fd0943beafe9ebb42cea65ac550f5cbda1f4a1dfa9dfe10c0700a3e9f155d158dd9049944f23e24f01d4888843acef16215c6fce34799 SHA512 0feb736c154fbe5e1b81bf12ca183b1dedf4ad5037388bfde5b32d2c077724af98b81e6c069075c606eda7121ed20e8b71c4c6039e0c558698db58e2d0a7a1c6
-EBUILD mem_top-0.1.6.ebuild 438 BLAKE2B e8641702813f9230b433050b4009834655c47667c78aa50a1388f4bd5497ff4317ebcb7a4fcbe3a7bcc71d54541a7cc3d28d8ede110b6a7debb53f6b1766e31a SHA512 21db6c5910a027ddd85e60296e8b5709bfadc28fee3e8a86f25dc239ef490f24fe6804d50f67a844c7c3caf0e93816e787cbe73fa0b600b9bc54eeea498006ce
+EBUILD mem_top-0.1.6.ebuild 442 BLAKE2B bebd1a3cccf3234299a8435af54319c1ac61ab5d9cbadc251634e69d98cc7ffba3b45aefa0cccb069ba03b6716aa021806c4744446ca48d5030bbd690ab11b01 SHA512 c1aacacb650cc40909694195b76ced70dfd138d802af80712df1122884d346998c3ae00cafb4606406b1ab7cf6f4f4fcfe88facf0dd0d1865172f9600f2b6c1e
 MISC metadata.xml 349 BLAKE2B 064288e73757f45cc157a4c80e3a79a47ca0e9abbe5d8b1242b84490d03a2e7b70aa6c506f113786a49f9f2c6b5dc44bba1545b2362c891621ceef62d4bb3ffc SHA512 7695d89a8e220255089ca202257775d148d2293cf29d37045c0647536e38bd427253852c62ce8c6f5eedc9a007b0e60e78e7c309f0851593490dfbf825f0c0ef
diff --git a/dev-python/mem_top/mem_top-0.1.6.ebuild b/dev-python/mem_top/mem_top-0.1.6.ebuild
index 7ac0be346456..86128e13eb2e 100644
--- a/dev-python/mem_top/mem_top-0.1.6.ebuild
+++ b/dev-python/mem_top/mem_top-0.1.6.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
@@ -7,7 +7,7 @@ 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}"
+HOMEPAGE="https://github.com/denis-ryzhkov/mem_top https://pypi.python.org/pypi/mem_top"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index ba6b93abb5ea..7671639b3550 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -7,5 +7,5 @@ DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d
 EBUILD miniupnpc-2.0.20170509.ebuild 714 BLAKE2B c5de8d25eb9c8219ac4d124c53a8af8f62b88ace08d12084a0110571ec00b2518c3a163c54dd6b2ff3fcc215449fce8b0ffa58549c7458259ad57bf86bc6da94 SHA512 a145554f2dc93f098f6a4bf70f2505d8878de57ceb44fa74c894bbd1a6f7d27e57b2ed2f2e2d1144503444a1c25ef72a244139748db7dc5877888d785c1f330d
 EBUILD miniupnpc-2.0.20171212.ebuild 757 BLAKE2B f0b24778ea05968421c18f0da2c2e44b4fe22446fd1189a8b2b672a3939171aba0342f390561583f1ce64f79c2164bc1eab543656c1290c1795eac576aef0e5a SHA512 ef1e1fbaa80d4c26240063e73a9da5e28be195faad1816587f3f92268d6128ebf602285dc1b987db0a328748a63d3f49d59e54a4a5680c6e986c5ce970b2d73d
 EBUILD miniupnpc-2.0.20180203.ebuild 759 BLAKE2B a7eb0f7a95739c12bc7d598af88739fbb8ea89b653880f90ff93b4512270caea1beff3db54b364458ee899f533f2fd30d508bed7d1e626306735b46f48418850 SHA512 21446a2e52a00e5671cf7270d07eff3a797b14afc97573dd06caedb123d1b825e31e269f3144fb1004ea69c73fcf6cbb85d499c37420801467442b6e3577ad71
-EBUILD miniupnpc-2.0.20180222.ebuild 758 BLAKE2B eba6abe410e2782d2f44bea832af68ae655662d46b0edc9c138fc64d73d6d0c7ac8c943bab0a76244eaed2c2f59d0a59cb4bac7fb8af6d7e8b97ecb0860e7f96 SHA512 2a5017a6e58ac9a8304c5734bfd9388b01eb487d8889b16bd478a8ff998e19d87cc4930bb7a125ea925ab8861603dde715595c9425ec32273f443ec32209070a
+EBUILD miniupnpc-2.0.20180222.ebuild 757 BLAKE2B f0b24778ea05968421c18f0da2c2e44b4fe22446fd1189a8b2b672a3939171aba0342f390561583f1ce64f79c2164bc1eab543656c1290c1795eac576aef0e5a SHA512 ef1e1fbaa80d4c26240063e73a9da5e28be195faad1816587f3f92268d6128ebf602285dc1b987db0a328748a63d3f49d59e54a4a5680c6e986c5ce970b2d73d
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
index ee184e968ec3..292c63ed647a 100644
--- a/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index c27f450697f9..5edcff3ebb85 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -1,6 +1,8 @@
 AUX numba-0.19.2-docbuild.patch 601 BLAKE2B 9fa515f92346f732501dd3c01eeda331a456e06fe0a2803ea1de892c0438d898b9ede8eec9a0edc6673d5a6ab9170d54baa0be1785c1b91d87b2974f54ef9b85 SHA512 86c0ea1f45436c4ff89bed5c00da5ff9be92aa7bf445e37165d174f7e36a0809c48d0f7db665e3c171748822e7f70cdb8dd6cd0396b5f98587fc426de455f033
 DIST numba-0.27.0.tar.gz 1247144 BLAKE2B 42de6e0f7865efb597ed1dd3680eafc66906d5d9cc7a8b583847cdd12a936174af976933de5aa02859c2025b86f51da3d0148f89ecd35287caadd8da8fa8bb53 SHA512 3c84fa58bc5e84683b5e593b99f8c48cfc6e9fd0f41a2a18d8a4d9deba618cec1e764a0202bb71166cbeebf27b908044be29e3b183b01f31edc8e85c962df876
 DIST numba-0.35.0.tar.gz 1647189 BLAKE2B f0dfd6fe03e1a60b4d19f0f4d1b158d418686376f4317b7f4b5fa0734b35b6ce670661705f92994910a8b47bbd0689dca652f36cea1a2f9d5afa419ae1c8b5fd SHA512 48ee1e33e7ec1327a78c3485602e911f045df8b8dbb69da3004133e6da8cbb52388712b4aeffa1e41b83d20aaa88cc8c1202ef35aabbf3e0e04ad2875df789f0
+DIST numba-0.37.0.tar.gz 1734667 BLAKE2B 20fd765d226e6e71a0e94bbf8c6a605ef7b4cf8ba6e39667001051c642fb9b872540482e710e020c0fca6653d9ca4518ce82e48681613f28ac5b9e2346bece4f SHA512 83a4e5a28a43ed1cd6584ccd63aac38a928af48c424ed119bc86487f0a2bfb9875c34f6fe0a03446d8c8e9179be81f831200c12ff31edc22bc4741789095f861
 EBUILD numba-0.27.0.ebuild 1758 BLAKE2B dedae675dd323f345152bd8e53d14fb6b363cf8dc521de604c55467a1a76f19a89616d44fd4bfc25d5a87eb312a5cfda1c1df7e48d9f09490d213a91606755b6 SHA512 b0a95ebb91248e955d360be197ba967317b06be161bdbf01b4087095d7bd3135cb3fd3a41d947f9117167adf2a75c6e9cd11a2c5aa9b5643f01d9ce89959e5c8
 EBUILD numba-0.35.0.ebuild 1067 BLAKE2B d34869828ef23b0542cba26055d91bba8f9f9b7452b87afcbfea869585ec9d4b033ff126d63870d5c679f955f6575146cf00d1173c2dfdde9036ab4ca59400f8 SHA512 7a7dd64c87efd361f51529ac7d361fbd7eb8959764dd66ed9ccbd5296921d04b08a32adf5bd203aa4005c9cca9e0fbd87f2438e972daa8bf1596fb030e8bf196
+EBUILD numba-0.37.0.ebuild 1067 BLAKE2B d73a18fa6b62413e84aeb6619e47bfb4a1bd8c5a82f3a8255f0d6536daefe21c4bac32c0df9991b7f90d75a7f30e98152ae039f22332bcc7b4087f8a4d96559a SHA512 520feb236836be6424aeb58313aad17a5fd40fb0832d4d9025e08c133430d932585da050593edb1166796756ba2bd8988e3b1171d29d6a2820b346f96aed8144
 MISC metadata.xml 817 BLAKE2B 38ad9b5ea5c0882357115f2e0e10747e482de1f49deb0185a258172d520b4304334834ca3a78a3b2360aff8336a29cc248e7478a0bfc6e0833e3f9ea8d2865e8 SHA512 16271bf2dba4edb77e4cf05f95e9bea6c5534890c1303f6d10b9b7449a26b05ab43acc28fd5691d1433ce15ee87214c5a414dc652eb019bb1fb87acfa37150e6
diff --git a/dev-python/numba/numba-0.37.0.ebuild b/dev-python/numba/numba-0.37.0.ebuild
new file mode 100644
index 000000000000..bfd87aa9847b
--- /dev/null
+++ b/dev-python/numba/numba-0.37.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/owslib/Manifest b/dev-python/owslib/Manifest
index 706ac860d551..d34765db2bf6 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,3 +1,3 @@
 DIST owslib-0.16.0.tar.gz 658145 BLAKE2B 8e32de48192579f10515771c1682b1d1319deb8195ff9c0f9168ea82bb30bbc8bcf7c457c794a79b1121d40f3f544624f0a9789b0f6f36632c6457f396fa78c9 SHA512 a468352dfdb62bea1e6189efcc198237cb909051e51782abb15093e328ca7d3d379e88d0466e42c39ce9bc201a3be828a779193666bf9befe8d501355aaddbf4
-EBUILD owslib-0.16.0.ebuild 1059 BLAKE2B a8cd5504fa0d64e1950ee7fd8e1852e5947b1aa80940a39639c81ca1c2acb9e111620ad414f58dff1f70405e3dd1fd08b4e32421e0450c0f44b0123457b4dbf9 SHA512 1d28e58712de6bdba82f81a6d558149b0145454a2d3bdbd32c91f420ec818c6f7d39d97de1add6161690d14c7a35bcb41c754ddeef83517c6d6957636b5a9f0c
+EBUILD owslib-0.16.0.ebuild 1058 BLAKE2B 63067f83f7f20608bd06184d24f42c87738e80d2834f09ab1cbfca4e52d7d52ebc5499e0addb2a2de1bfdc2d2f266b133d82ec24c08d7a58ef2cdc390dcdb5e1 SHA512 b11b20e77ce631fd523ec6c191b210d42ab1ad53c6ff852c2e9daa8510828dcb399928d0dd5d9bf3a39aa6aa22fb111fb6523d4786592f83a5d314bcf3850a91
 MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/owslib-0.16.0.ebuild b/dev-python/owslib/owslib-0.16.0.ebuild
index 056c1a05c5b2..9da0c2f1927b 100644
--- a/dev-python/owslib/owslib-0.16.0.ebuild
+++ b/dev-python/owslib/owslib-0.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 7368311e94da..ddc4d24ff8f0 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,5 +1,8 @@
+AUX paho-mqtt-1.3.1-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
 DIST paho-mqtt-1.1.zip 159529 BLAKE2B ca3a39628c9cab8c4f3606587a5c853e79535b37a92991ecc32903967952cc00f6a9b967af0d343c4619f3e46ace1330baebc7c2e9dc231673f51775e4e1de25 SHA512 ef6d1a29480671413dbb655bd8f668b99f8587c14589d2180a37142b368e0ce058f8ed967dbfaa82f239c86e295338bc35c9f28a3ea39d21a6034cd8787a63ce
 DIST paho-mqtt-1.2.3.tar.gz 91467 BLAKE2B d2f02d6a71498107d8f7c3ef95a9b15d011e16848aa6227c3d7301e4bc474857ea3824a5d1be80bfe0a0c919746e509eaf39ff755925a833ff27f7be24067f99 SHA512 3fb15dc856cbae8885a8a379cea8ceb583ef44954cb8743602fae3e9274d4d0222a87409f048f153180be930bb6e570329768297287a2f8e8c812af03a2c012e
+DIST paho-mqtt-1.3.1.tar.gz 102133 BLAKE2B 905a51824d487cb125e06114bcba6b1ba862de4ab816db16aadb6ff761145fd4724dc6523a0c6837b8a16ced6730c5558612deb138bd95721f15054f5d6851a4 SHA512 95adeeaffbbd4b39d19fbd46feb39ec4a2ac923addd3c754a474b7a91d620bfca1678645c1a09c925e38a33995575944b873e3b2300d7bc2f3c5be3005c74d4c
 EBUILD paho-mqtt-1.1.ebuild 499 BLAKE2B 43da38aa5822daa6968d4a7b9514ddb86d0297617c59caede2453fe0d96ab29daa11c3ef6a38d9bda79c4f1133901b1eb4f2b6752b54162b684c63dca76f60f8 SHA512 b9c0957e161058d9594f7516fb31b2f45168a55fca7780b84e2ca695eb37b5acda3bee064fe2d4f3f603586565c2f806521123844f84924f325b75f9743eb928
 EBUILD paho-mqtt-1.2.3.ebuild 660 BLAKE2B e03bd58907c1e4834beb6b4fbef59108cd205bec141e2da8076d94d915afc8cfad2fff8335f68dff80981dad75afaf064a8a01dc3178d80e15633b29b9d6d90f SHA512 a62003c2687bd5aa828c4c0a61abdf80077f39bb528d6d399ffe2169f2514c7165ae836c1054d42a86437a4d44a0679d195bb15c552626fae09c4d6d86d4e486
-MISC metadata.xml 256 BLAKE2B 3d3c0a1538ada84710eccb1f0cefb4eb25ff761aacb58dbf59bf60aaf7eac3a9689630772127693cb5d41657650995240f8ec146a92d26495c159e7e4c233e84 SHA512 91f26c578fda64a9b669b9957f0c67096130bb0731f4173bf5d3118eef49e3a10f1f79880c6a2c9cf51920d2ec53f2e4a9f8d90530673c2711dc9854038fbb77
+EBUILD paho-mqtt-1.3.1.ebuild 810 BLAKE2B 48d5020dbc1d464b667af3814868cbff1b2ef799bbe8217b8a72c613beaf0f869d0ea93095c9262c9414b819e12d646aa781009a7300d172bcd5e500f7720a0e SHA512 0bb3d711b8739878f51bc61d957ad6f4e9e63ed9585e1fce2bdde6a84862107d916e86cd94a8bf05d91314a5a3382741afb0a8c2b7405ff40c2d7945cd3d4d16
+MISC metadata.xml 462 BLAKE2B bb478b5d843359050dbdb5ba67e9bca36dec28f6c65b6e89ac49cc00cf63c80abebc4525de91bd0c43f6979bc2c1a3b850243de39f3d5620a1f19d6b3c9fb8dd SHA512 bb6dabe3f0a5dcda951a9aa58ae0c883ceb7324f8538dd2962fbe216eeedf9af09829b79e35f5bbd8baa00cdfd16602411430276329554bb1908d6ca9609a9ae
diff --git a/dev-python/paho-mqtt/files/paho-mqtt-1.3.1-strip-test-dependency.patch b/dev-python/paho-mqtt/files/paho-mqtt-1.3.1-strip-test-dependency.patch
new file mode 100644
index 000000000000..0cb9750a6f54
--- /dev/null
+++ b/dev-python/paho-mqtt/files/paho-mqtt-1.3.1-strip-test-dependency.patch
@@ -0,0 +1,29 @@
+# Remove Pylama from test dependencies.
+
+diff --git a/setup.cfg b/setup.cfg
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,9 +1,6 @@
+ [aliases]
+ test=pytest
+ [tool:pytest]
+-addopts=-r xs --pylama
++addopts=-r xs
+ strict=True
+ testpaths=tests src
+-[pylama]
+-linters=pyflakes
+-skip=tests/*
+
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,7 @@ with open('README.rst', 'rb') as readme_file:
+     readme = readme_file.read().decode('utf-8')
+ 
+ requirements = []
+-test_requirements = ['pytest', 'pylama']
++test_requirements = ['pytest']
+ needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
+ setup_requirements = ['pytest-runner'] if needs_pytest else []
+ 
diff --git a/dev-python/paho-mqtt/metadata.xml b/dev-python/paho-mqtt/metadata.xml
index 62dd1dd9c8a2..c1efb3bd1df1 100644
--- a/dev-python/paho-mqtt/metadata.xml
+++ b/dev-python/paho-mqtt/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ramage.lucas@openmailbox.org</email>
+		<name>Lucas Ramage</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>
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.3.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.3.1.ebuild
new file mode 100644
index 000000000000..63403cdcae4c
--- /dev/null
+++ b/dev-python/paho-mqtt/paho-mqtt-1.3.1.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=( 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"
+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"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	) "
+
+S="${WORKDIR}/paho.mqtt.python-${PV}"
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
+	default
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 6a2168946403..f5c13dc44b5c 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,9 +1,9 @@
 DIST pbr-0.8.2.tar.gz 77790 BLAKE2B 4b2efa9a06f0e47eac8d2b591d2c10223418c5813a8de83696348d7ec7ddd20f077492e43028994f1a2d1e28856d3d6159e4105174a760211584b026a616da24 SHA512 76d7d4c97660d5a6bbe9a33498a93b32528073024520e570739c511c0138ba1af7e35139bf77ca2a94063e5979baccd6252619449d6aed546fd1331be81ab52a
 DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24b6e299284f49a7f838dcfc846daabc4e40de388848ad415a12c19813e13aab1d3f3bf147e064269e4dd725 SHA512 f7f6ce2f70324e2d287f58c3d12e0be2e33ef9ed32311ad2c56410eb67cda20732adff2058ba2fc244249a17a4c95b0d589ba913db4777e63ff1023ae888c864
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
-DIST pbr-4.0.1.tar.gz 107365 BLAKE2B 26e58558c752972726df5861c8f1c3d7b185064de97af1aade136207fc39ac2a6d994c9ef112fb748be067e84e000054f127aef3f22d48425fc23d7a2a09216e SHA512 f5795629f01dc4e7ebceb18e73eac0aaf44cf432d6c6892e8abf69e02357346da57f6671b00fd69c4e14b2b864a799a74c1f9ebd368ce9d4fd8ae4e51503d495
+DIST pbr-4.0.2.tar.gz 107720 BLAKE2B 346e74414cb77da61be08eee39148991aff7eaea7bab54407ce9dc48f422c576fd2125c11acb31cdf54cecb059281cf540c4ccfa005056c5c3b276ea2161c873 SHA512 d678c933a1d1b0319358b0d067291d29467582e6abb26e21386b9d98092f561e3b76965e0b18e12e88abab790b737606ae2a37cc11cb0a4a34ff6c1ad99cfdb1
 EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
 EBUILD pbr-3.1.1.ebuild 2823 BLAKE2B 7798e252130bb16a1ad72bd4330f2255b222c496d755f7438b30ed6ff98f5a6fe4fb6af48dd6bc345feff91276993d3fecdb995e7a20c3c4db9c0d8897f0cf37 SHA512 c890c3cdf2e68e66c6d963d6b310811b652b3d6707428650edd1d288dd7915d9874877adae7a04250279243d275219abe3909ca020333c1ab21ec2938fe2458e
-EBUILD pbr-4.0.1.ebuild 2593 BLAKE2B 04196d494aed0c87e39adbb218bec8795ebfa3cbf02139be20662d2c08b4afc1d8a424f5c21513b42171dfb68fc0cb3749aacae8792138ef0ec43a3a6e13d119 SHA512 a5cde67f259ec50090bbf7881ce333bdb7f3d7f0e450ce0ffbd1a76cdbc1fab0a9fffef1144f0bb5806a8806a396d4a4852fbfbb1d9bdab77a78921d8c7cb6bc
+EBUILD pbr-4.0.2.ebuild 2593 BLAKE2B 04196d494aed0c87e39adbb218bec8795ebfa3cbf02139be20662d2c08b4afc1d8a424f5c21513b42171dfb68fc0cb3749aacae8792138ef0ec43a3a6e13d119 SHA512 a5cde67f259ec50090bbf7881ce333bdb7f3d7f0e450ce0ffbd1a76cdbc1fab0a9fffef1144f0bb5806a8806a396d4a4852fbfbb1d9bdab77a78921d8c7cb6bc
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-4.0.1.ebuild b/dev-python/pbr/pbr-4.0.2.ebuild
index 3d26767fc84d..3d26767fc84d 100644
--- a/dev-python/pbr/pbr-4.0.1.ebuild
+++ b/dev-python/pbr/pbr-4.0.2.ebuild
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 4dce03151f4d..711a3f23e346 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,5 +2,5 @@ AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10b
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
 DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb
 EBUILD pillow-3.4.2-r1.ebuild 2501 BLAKE2B d8a28951afb94cddd6e599d6cc2f1fae6500e14743ead01b4b0e047240796a0a68069d1501be984b7180ec8af0815116e41626517ec93e43c97677543ba9a316 SHA512 73e98674e3faef57e55fd5ea3703ec5de7a6c20e1d359ea13582629c6af07cb3f051d60d3313c6661faa1a76ce194e680b1d4324313015a618813953b8e38c39
-EBUILD pillow-4.3.0.ebuild 1939 BLAKE2B 397625e55bdfd8200eb1d7c74636c5affdf6d22ae4b033998724265401d4389ee3d3951676916ff8bb2d459e85f7bca21db2ab45852229708eb09f5ef26ecb6a SHA512 dfa213a6d6d5a599b1321b194d39a427d54c98f3a69e99c0adacb7eb3e827c2833b14d906b29bda3c5371a39ff5b81cb889a1a0c8cfdf5919cc8f42008a0183c
+EBUILD pillow-4.3.0.ebuild 1976 BLAKE2B d153c38fbe2f66750b45b80e905140a3ca5556c3184b2dff242a4f22cf1f9b7e802e14a369b672066bc98fba36332865a34baf3d6f9ba23e28a7b3ba6f4fc476 SHA512 80922cedb3d334c813342c5fa70428316c59e62ec0ac9e8b637fe593bf528b589e21ede47260d1bbca7afb386afdb67521e353ab11aa33c0e7bff073b74ead0a
 MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/pillow-4.3.0.ebuild b/dev-python/pillow/pillow-4.3.0.ebuild
index d1c476ffeb24..0106f57a945b 100644
--- a/dev-python/pillow/pillow-4.3.0.ebuild
+++ b/dev-python/pillow/pillow-4.3.0.ebuild
@@ -43,10 +43,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
+src_configure(){
 	# raqm not in portage yet
-	distutils-r1_src_compile \
+	mydistutilsargs=( build_ext \
 		--disable-raqm \
+		--disable-platform-guessing \
 		$(use_enable truetype freetype) \
 		$(use_enable jpeg2k jpeg2000) \
 		$(use_enable lcms) \
@@ -54,7 +55,7 @@ src_compile() {
 		$(use_enable imagequant) \
 		$(use_enable webp) \
 		$(use_enable webp webpmux) \
-		$(use_enable zlib)
+		$(use_enable zlib))
 }
 
 python_compile_all() {
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index ec6b38063057..c674e5494ea3 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,5 +1,7 @@
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 DIST pyblake2-1.1.1.tar.gz 126441 BLAKE2B cb1f1872e1d6122419e7732114da28162af5e483db56e073d3cc4019f073813af747d56ca4f4a992cf6586d12662f3b1d4b68d04eaea91b4f90de58a9c1f4799 SHA512 a876255d0072226c4a2936a9e88297dc8c39195f423fea6624e6ffd610ffc58d07e939db942d0198d6e5a1f1afc892103c507f226787529d341ae40e9926bcac
+DIST pyblake2-1.1.2.tar.gz 126693 BLAKE2B 01690ec32a07b7ea59d7d040523ce8cb523f18927044f2d38c0a143a344fde661498e1a4b35a0f161be7b761a324677f80e88c4a0045dc324f0d588997e884f2 SHA512 26297d788208a80c8102602135332d5ee1424711d9c693828af232b5546301c5d144680367a954d8d9765998a23b82046b157b0072fdc63305ff0088feb16e55
 EBUILD pyblake2-1.1.0.ebuild 803 BLAKE2B 5bebe0ba5b5964d352aeaa003d55c34f6fdaf42d9e9ed2a760d7967a3d441d5065962c8b25dd023f38db03d75c8d78bb419bba566255af3b9b3e56030748f84d SHA512 6a514eb812db504465bca3182e853212199a07a50bfc1afe06f0402e394ed964229c96be2c904bc1a527b614bd58ef44d57810d57cb188c1aaa513533532bdf0
 EBUILD pyblake2-1.1.1.ebuild 867 BLAKE2B 853b607fe6fa7b96da0e4ae602113b6a3164fdb45fe65925bf8541d4880e31976fd4d63da333353045d8d482723f8eb165201faed2dbd585139241cf26faa03e SHA512 32847d79ee324837af8a655f4dd326d5e816c3923c7b2bc57a36960bd3f6d6dffb4a227deb13bb6c161ea0eb5d6ba584a5fced7d27becf17f44dd98c8800d4cc
+EBUILD pyblake2-1.1.2.ebuild 867 BLAKE2B 853b607fe6fa7b96da0e4ae602113b6a3164fdb45fe65925bf8541d4880e31976fd4d63da333353045d8d482723f8eb165201faed2dbd585139241cf26faa03e SHA512 32847d79ee324837af8a655f4dd326d5e816c3923c7b2bc57a36960bd3f6d6dffb4a227deb13bb6c161ea0eb5d6ba584a5fced7d27becf17f44dd98c8800d4cc
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
new file mode 100644
index 000000000000..1c7cc912307d
--- /dev/null
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="BLAKE2 hash function extension module"
+HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+# pyblake2 itself allows more licenses but blake2 allows the following three
+LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index d303531bccc3..4d34a5b0c91c 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,5 +1,5 @@
 DIST pycairo-1.15.3.tar.gz 177056 BLAKE2B cba4a212c3537d5718a73742468444b01372902d86f88558cf63ab2ec1999dac036b349d84dff0bdcae5126998c5e921f05bab54b708a29ca2381b8d1371ac44 SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8
 DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db
 EBUILD pycairo-1.15.3.ebuild 1607 BLAKE2B 0fff3a866314ff4dcf9fdfdfaa865b504859be58ddbce3e7ffc64568d744b5ef0cf7558e045aaf1d9c474c457d9ce50c19c978b27accfe2e52e94cf00a3c9879 SHA512 a61afcf8066d8b14d1b117e7952d82d1265668005f976b20a1d53fcabf3d5bd792a62cc24b765d3113016f9b1870ad7e922d05ee017868fcaed03109866a9618
-EBUILD pycairo-1.16.3-r1.ebuild 1099 BLAKE2B 61350ddd2883ee150b219cf88c507239886b3605b287748ff0c17fa09e2271302ce779cbf265c8dfff25b57a4715638dbc6ce556253915ddd1a7fad40dc5ba96 SHA512 050bce948efea26e08dd15dd0f6432c8713a7d5483d4a26faa68f2f4ae6c5f00bd71143c54c5c5a281068ecdceaca2e122558cd7cde985f1396be417fdad6f45
+EBUILD pycairo-1.16.3-r1.ebuild 1098 BLAKE2B 78f5d9e073dd64260d5654ad7df10aaee5222699d3aa853e19551e3fec6bb6f0207b20e87fbcb6f0969eef7240b8ce311dcab33c00e5b92d298b8eeb0a8c0f9c SHA512 387595118b58cc133f3928010b3ce18d94fcbb1bce86a7c58d3ae41b2399e5ed85b5981ac48150594ada6fe14271ee3460a1d5bb41c2c7b4f19f0d85d9005f80
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
index 88f444bcb2a3..14548a2ccd5f 100644
--- a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
+++ b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+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"
 
 RDEPEND="
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 449ffb0ed686..bb22b97ed275 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,3 +1,3 @@
 DIST pyproj-1.9.5.1.tar.gz 4424543 BLAKE2B cdf954ec0fe794f354b246fcd5afeac01b796f84cc2456efce3e289fcfb12074d7352c9fa7e9d74356199135dfa9814c07da9379f85771dbb7130b8b9b7ecc34 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324
-EBUILD pyproj-1.9.5.1.ebuild 709 BLAKE2B a7aee31b8c1f41572601acde0b49210e34b16db67d5ba9d0efffc4407c92bc8ce933d34ccd47276d85a4fd069e9afbec9a90c1f72907b3c49c58464a2ebeed2e SHA512 6af03a9f2c9ca1abeede14e1e07ea0f3249796a0ae14a9eecf1514f46c62eb8b272192d0870c5a13737f83eebfd1cb48f90b0f57e7807e59668d379515adb109
+EBUILD pyproj-1.9.5.1.ebuild 708 BLAKE2B fa94bdb02f4387c60093ba9f04500ca2b50741281d7ceaece5a2ea18250e45e0342a0cab84e8f848d812957177e771fd5e7b35dd568bbf2bfe3d44f49875db33 SHA512 b913c2daf211b8718d8b0a76badd37a180e3140c6dd3fc4a58eb90d921084a593f65cd84c8aa059195ff4b2f8490470c403e5c23629cafe41dd6ff51efb97d74
 MISC metadata.xml 413 BLAKE2B 8b30b06984a66d228b50b463a7149f95bfb671d60c3089e88ec11cab7b88fc7c0f044cd879d9e5fec5bc61840c6f35b17e22b93921e3716ce42b3066fe8dedd7 SHA512 84f84c14bce12374abb5014771c1663bb8877d7808e65fe60f698c60b4c7df17db703c6c1c55cb692b0c8f6a94847758e756d6f9bd7e69f59e915b09c71682ea
diff --git a/dev-python/pyproj/pyproj-1.9.5.1.ebuild b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
index bae8fd871b19..613930ed899a 100644
--- a/dev-python/pyproj/pyproj-1.9.5.1.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index eaf151bc4e34..45aae465e726 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,4 +1,4 @@
 DIST pyrqlite-2.0.tar.gz 7224 BLAKE2B f3de4d4d6f0598c6dc21e323db4c717f7f8dc85f6e592ea9dfb209ba778d1f16049d40e39b8d98c94dec61c02949ba1fabeae29e25ec8afbe4810df52b6210df SHA512 9d284161e492683955000dd3e3f0593b79e69ba5eb087bee4d3ffc1e4be9de1c362212936b10e1781538eacd838e6ed22adfc82e8cc0dd00e1d3318a4dc14720
-EBUILD pyrqlite-2.0.ebuild 901 BLAKE2B bd461fe48fdd39755a5e26fff788346c6635150fae184589f0aa82db07a5df23844e89713fb0e7e9239fea94d949c02b038c1497ba0f6d3919b00c66e3e38887 SHA512 8b64908233584ccf2991d0932992664b7d180b57f2fd738b9f88b02631a93a7db520634bd66df57297f43da52a0cdb167ff2dc97cc3ab8b660055d22a4b5918b
-EBUILD pyrqlite-9999.ebuild 821 BLAKE2B 9a5a16c6008a95a9cc355ca0aab47ecb80662090645032a32db8bfff621cbf357b7a4fd63eeaf4e95ecada9c311e61fae1b2ff756dd94fc11f66e2751565008f SHA512 18ea15e1868b8dd47e1639c9d402e8c8c414a0bbb10ba25ad539eee4824fa2be2d1df5506a24ba4649508a7e2843ee4c944b2e3099545b99430af1c13a94e399
+EBUILD pyrqlite-2.0.ebuild 913 BLAKE2B 2886457d78c7662eb8f50017ce94a618493fd750950ab12ed1a43c897cc4b63843ddbde3af22a3b6d397e039ad7b0008e50b8afb066fe2bd15b7ea3be7ebe9b5 SHA512 c6138a679a4907ca456145be6eb0a8ec405a150d1c1f370b55dfee62e1ab430f7af72dd59d171fae84b2155c1a12a1552f84b3ec574b4bcfea44cc5941325a3c
+EBUILD pyrqlite-9999.ebuild 833 BLAKE2B 84dfd9db2b49caf7f0107fce00fa4c367b112f1ff711954d6aba467662eb2a9fcfdce24719d7c3aad379acc91c2e85667c428179b441f428258b0cfd8b129f0a SHA512 80116d2da3cdf34c9367baf92350d9d89b606615fecda6b642ec4b08fc8c74e32a80f2155724b291027bfb5a50d1ea1298e9155ac6321ece0698a67c3a3bb775
 MISC metadata.xml 306 BLAKE2B 6848a797588465344547135639af1cdae67a9db23851e940a5f5aed347ad4c6e8114c2fc88159370356bb4360c926d4b44e1f4474c98a7577e3dd64403100d72 SHA512 f26c1056eb200c8b60e2d0f7ff54447465115afecd34949ba8358f812d95dea6d877928010ac81c8d36261479ff6a61982350a403546dd09e7f4bf9a082a9d7f
diff --git a/dev-python/pyrqlite/pyrqlite-2.0.ebuild b/dev-python/pyrqlite/pyrqlite-2.0.ebuild
index 93600a584e2d..a44040325ab9 100644
--- a/dev-python/pyrqlite/pyrqlite-2.0.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ fi
 
 DESCRIPTION="Python client for rqlite"
 EGIT_REPO_URI="https://github.com/rqlite/pyrqlite.git"
-HOMEPAGE="${EGIT_REPO_URI%.git}/"
+HOMEPAGE="https://github.com/rqlite/pyrqlite"
 SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pyrqlite/pyrqlite-9999.ebuild b/dev-python/pyrqlite/pyrqlite-9999.ebuild
index 5ba08115361b..f9ed2ca2f640 100644
--- a/dev-python/pyrqlite/pyrqlite-9999.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ fi
 
 DESCRIPTION="Python client for rqlite"
 EGIT_REPO_URI="https://github.com/rqlite/pyrqlite.git"
-HOMEPAGE="${EGIT_REPO_URI%.git}/"
+HOMEPAGE="https://github.com/rqlite/pyrqlite"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index d3451f7e4666..501c7a2c577c 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,3 +1,3 @@
 DIST python-engineio-1.7.0.tar.gz 22804 BLAKE2B bc807943cc24eddbc9cb25ceb55223ecf610ed37b281e5b0a59935705dc2d2c34ad5795e0bd96f1256cf91365756e43ed9c94b1082334d6f6c34f6b6e9472710 SHA512 1d184ccb9d1328d9f4e2fa22006f1d21bd17200bc893ee2588b4342da24775f98648e0e993893eb56a9159f95a114f128dfdacef9fa8ea296c7ace6c7741aea0
-EBUILD python-engineio-1.7.0.ebuild 734 BLAKE2B 83f23665001792da85dc41bc77321b281ebb3769e6eaa0a27cddd3c035a56e03336bd839614d3300977398b1d4473c8490095a1cb48e49af9c8c3c8566651742 SHA512 647d8e98dfffbf0ffc5a961d9ee3b133230d571ef046b2208eda46cf90f7c83cf55742fcbfb166b5d1c18d5d4adf67b27112a8cc5f219854148e64762779111e
+EBUILD python-engineio-1.7.0.ebuild 764 BLAKE2B 645a56928dbcae8df5b2a80a3483387cdcdfd8d7fd3d2146aae3457e05d05bfa6503b4cb08ff7fd17b261273a44a5e5a06de910fc6742f870ff8f552c6034adf SHA512 cad4bc3c0b7fe11dd093b932d7452f006781583c0d5c47ce4ea750ea9c1c7ec7a3db5003e3116779d85e12802b0d75a9a5433fa1e0069c222e77b7df1d4b13d1
 MISC metadata.xml 466 BLAKE2B 6ed10a68ef43c4462dcc0fd1ff545828cb6a38d63323da41ea1403d62c7465c08b2668319a0924b31d07719ccc0bd8587461d63362acddd9e329f9800b26bda7 SHA512 4b945547b692e81069a2ae0d70af112945aa2200b935efbddbbcfff4fea60268a9933dcf7ba2936e6c7a6655ef805f93252f157e63771e068a7ac6fb82c4de1a
diff --git a/dev-python/python-engineio/python-engineio-1.7.0.ebuild b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
index 6f3b26b71d31..d3add65a2057 100644
--- a/dev-python/python-engineio/python-engineio-1.7.0.ebuild
+++ b/dev-python/python-engineio/python-engineio-1.7.0.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
@@ -8,7 +8,7 @@ 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}"
+HOMEPAGE="https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.python.org/pypi/python-engineio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 9846d1da4ba5..95932a493685 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,7 @@
+DIST python-glanceclient-2.10.0.tar.gz 180299 BLAKE2B 0d97626361ad7fc2c688f5da6af6d49bf6e078f715560b4ac93725f8ea6df895e7eed0e44bf69399c973978af22ebaef3d371ae19026cff7fb2bd896c8be30d2 SHA512 9132493559d7a7b6de62e5ec1bdcd7a2dcf408c00bb0cfaccb6e11829975d468bfe68feabd71fdf8cc0d28a2c5c549945816aa14c9469314ffafd3d39b9c2da6
 DIST python-glanceclient-2.8.0.tar.gz 177172 BLAKE2B 0772b7e2b788b63bb590c8354dbad2c4e0bbd731f790f36916aeb154a44474f979961195d307e45149bccd2a58e1df72c48aa0593d6972c606b393f1202ee440 SHA512 257eaf1d548a3a6277b9c80e8b23b9ae4231586307c43a064754c227f3e3c872451ec0469aca931638ea0f7c9920892878c677b144dc72bad215c38d375a63d3
 DIST python-glanceclient-2.9.1.tar.gz 175836 BLAKE2B f559bff0b4ae1d1782bb06f9bb8b0188d9e78b83afb52a07245f8d9694bfe88e52718d3279f8b2b7d32acdd3cc86d507154bc9bcf716206696144345f4766249 SHA512 0dae48a5673ed779c0a4136896f5e74dcde489a5dfee55295f65d4b74dbe4680b1669570d0fe5011ca5282d0b6057ebc9261e5a06cff0b09fe41fa88529c3947
+EBUILD python-glanceclient-2.10.0.ebuild 2443 BLAKE2B 7e026fa4c173c8b9cd715e340a6550495b7a3fd155cd838006fe3c2edbf325c24390ac28aa968cb7d7e90859ace3c31cd99f6344c5f0ed83152b7e380a539118 SHA512 e497a697a28fc431a4586bc6373c71fff102f65bec5a3b0e6d07fcd83b04124079a8b5f5e0ce9d714e4fdbf52df80ae83d676cfdfe4aca401dd0e7b3b26dc93a
 EBUILD python-glanceclient-2.8.0.ebuild 2612 BLAKE2B 844e6ab91a070f9d20fd4418be7b63776eedc900c568ccf89f7c78f52f03fe6675e06249dc0eba5f56fcd70402d133192f77da1bc65ed1f71603852565b8f3b1 SHA512 ff395ab1c060e51278a7e5b6cb283827776a7a7d3e008d1fc0932412f05df0373f6d3f0bceec56e0d1e55d93d5256e59e6da6a15171b6f45bfc394a8a6f7abd0
 EBUILD python-glanceclient-2.9.1.ebuild 2441 BLAKE2B 50a79c1fce26ab8cb144944fff87afd00f8b83f63748bf01cac0ab84dc425acd9148ba0e5577fdaaf48dc430d92a9852073a9935d045b12166397100e54cedc6 SHA512 3b785c8b08d165b61ce665f3e41655afc9025c5fa8f58a297b4f7b673be82b366ab5146bb158a7bd6e412240f60584c8c66500faf9d291ef0715d9bc1befdcac
 MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild
new file mode 100644
index 000000000000..bffb4cc4e44e
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild
@@ -0,0 +1,77 @@
+# 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 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-1.1[$(python_gen_usedep 'python2_7')]
+		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-16.2.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-pam/Manifest b/dev-python/python-pam/Manifest
index 65437c3af1f1..0f8d52ab131f 100644
--- a/dev-python/python-pam/Manifest
+++ b/dev-python/python-pam/Manifest
@@ -1,3 +1,3 @@
 DIST pam-0.1.4.tar.gz 2637 BLAKE2B e5b2091f078c762ecb24e881a1df0bf8ff9c35e6538a448d79c1a6f26019babb3499d322ce79ea3d3610927ac02c88f4e3dec14acec99ec9ff048b63e068e627 SHA512 a8bce582f8ed375a5e503ec0b8e4853164125222e9cee40f6f6509def5fbeaf0eb0d2242b0ef7405024b7f8cfc0660ea7c43d266e8923a1a2ff3054135f5da63
-EBUILD python-pam-0.1.4.ebuild 501 BLAKE2B f9a354aa5c56ab782ebf4ef3633a5d5696ce89d1b7727c16b47095dfa7075a72bef3a702746ac90e324b85e83f84fd5e961b5f02101e1433da49ded1c76ac5f6 SHA512 8f70a6d9e28b29814955ca6b38ceef6f65b0a1b0e57216f1daedf7c5892b7841bf387117303c0f84229a68f2fdf293790ac8406fb89c7bac42b605f739bc2d55
+EBUILD python-pam-0.1.4.ebuild 502 BLAKE2B be5bba37f62fafb08d6fe4ee717a8792b15a606e6bde6df466251fa69554761555663c86993ed6b954abe12b4a961fa8ccbba6f1f0f6e76d294ddd979cb9ab17 SHA512 eb9434e824e71c718d99d1c5fb116a730dda622e9890ca7eb3324e1e287a50af1b02be7df4831e4f795b9713349ef6b01d5aa89750d8de2160a75567b2fc8f67
 MISC metadata.xml 446 BLAKE2B 56a55e1f91c9202eb29ecdbcdd5306123db6a38e1e508562295479ec0d08abde21e764c50248d536019f9ada29de94300996f5ecea338a1d502f9de6bd940f34 SHA512 b69b1ed0f56be4dfa7fb6fbc41bb6d07fa788f6b9a81a9d0aaf066fcaf89b1e2c05475d76f9edf2c71a749e477ab3de71ebb0a05649ea255d5446556d62bec25
diff --git a/dev-python/python-pam/python-pam-0.1.4.ebuild b/dev-python/python-pam/python-pam-0.1.4.ebuild
index 99bc3fe4b05b..fae6c1f9214e 100644
--- a/dev-python/python-pam/python-pam-0.1.4.ebuild
+++ b/dev-python/python-pam/python-pam-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,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"
+HOMEPAGE="https://atlee.ca/software/pam"
 SRC_URI="mirror://pypi/p/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-socketio/Manifest b/dev-python/python-socketio/Manifest
index 48b34216a7a8..befcda50bc19 100644
--- a/dev-python/python-socketio/Manifest
+++ b/dev-python/python-socketio/Manifest
@@ -1,5 +1,5 @@
 DIST python-socketio-1.7.4.tar.gz 23298 BLAKE2B a5337e6f124018172902fbc51935e193267a8e209e9d677fa52e72ff6b71ea27e2aa5284369082fe38013c5b4b21c8561952b9046acbfd3f02c824c0837b367c SHA512 fb31072420eca42fa0349f0a9350fe9ab6bbbac7dc32cd7ae76cffa026fdeeb4197b8c441d76bfc46af55a550c5b7e81e387b67d538c500075bc5b4e8f68d5ab
 DIST python-socketio-1.8.0.tar.gz 23557 BLAKE2B 085035d6621f2ec351b28095086c6cc5787c4466f904568d5ece0cf37261a75fb6793be1fedd9f54f7cbeccbb668eaee8463850698aa6f2a901b3454cf63f128 SHA512 2514cbad3e429c101f5e247bdf2e4a2b5a0957c19fa97e56ebe8cd78b36e81cfb9dc4500bee367e57460be3a08bbd1e70967a5c87109034ade847ff7f559711d
-EBUILD python-socketio-1.7.4.ebuild 891 BLAKE2B e5a4e9c5795cbc5bb8bbc906d25dbbe7f83c466fe945f9cfd588d628f28172f67d9baaf385ed5667cc64bbd07536a6381130077ee08b4b932a5b73a21dc99cd9 SHA512 c1d870ce333979ef24de81a833c124709e71f6fbd99b51393238fa61ee89600c0bd442713d265dc2a36e96bb88830204468e24679800d410795833475513e12e
+EBUILD python-socketio-1.7.4.ebuild 921 BLAKE2B 8553c7912df42244010cf1346b93154ab7f93026ff1426fb4746a0fb66e656cb708727457308f517db4a4c89270d8cf11faf4ab6e9307b58d8740183a5fa7499 SHA512 54cd47307b1b803660f3f4bdf2c98af60b6ec99e07b21142a1920dee9e58fa7fa58c0f4ae9f3b942402ecd26521cee7fbb210af63b3f9eba7eb6748dd895b980
 EBUILD python-socketio-1.8.0.ebuild 891 BLAKE2B e5a4e9c5795cbc5bb8bbc906d25dbbe7f83c466fe945f9cfd588d628f28172f67d9baaf385ed5667cc64bbd07536a6381130077ee08b4b932a5b73a21dc99cd9 SHA512 c1d870ce333979ef24de81a833c124709e71f6fbd99b51393238fa61ee89600c0bd442713d265dc2a36e96bb88830204468e24679800d410795833475513e12e
 MISC metadata.xml 466 BLAKE2B c1aee63cf2625278f18fa3f65ea008fbfb4aeaa6c4770fa944c853636c44b2c12defebd46ba8483d08be818e28731b3850920931a40c386c11b17416c281ee5f SHA512 8e46ce0f84adfe7f52c9a99df6338b78755d097702881515605adbfbe2c68af0afdf6e07b05d2ec915e089bd97b01ad38bc0fce43523eb542a0271788b38e79f
diff --git a/dev-python/python-socketio/python-socketio-1.7.4.ebuild b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
index 0dc7a26ee56f..9b05e5b1f5cf 100644
--- a/dev-python/python-socketio/python-socketio-1.7.4.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.7.4.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
@@ -7,7 +7,7 @@ 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}"
+HOMEPAGE="https://python-socketio.readthedocs.org/ https://github.com/miguelgrinberg/python-socketio/ https://pypi.python.org/pypi/python-socketio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index d2a824833670..5df119a2c39c 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,7 +1,3 @@
-DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
-DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
 DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
-EBUILD qscintilla-python-2.10.1-r1.ebuild 1977 BLAKE2B 06efa137a2b74ecba71b7a42ae696b0fa873a528f68ca216d404f81e73f4088bed21338e97275e20c94a2a206f00c284fda5df91f0b84eb88f14ae276753f3e5 SHA512 af165c096785ced3ffcf5c0f0332b445c0e9c75102ee880e85a12d087adface591caa19b11b25d7626527ae35e952a1e645bf24f7837d3900d8e5eb1bec82c5a
-EBUILD qscintilla-python-2.10.2.ebuild 1979 BLAKE2B de320b5b36a55ae2d38a44a85cba8188acc74714fe635ddd77fd5875281f787da70f635c518526df0b3f47ab565c9799dc043f7be5158f03fb9426bd13cde2e2 SHA512 0f71ca4bed1f084fde43e3a6b3bab93510a8d359c5239e936f2f5537d10a51a6158ec2db1d0e7c06c491f944542cd48a24b293c823997df7c67c0941fc860d43
-EBUILD qscintilla-python-2.10.3.ebuild 1529 BLAKE2B 2d9f2f49f270fa85db001841a045471d6e3ceb6b00e663727b0f81ae780e918ac07dbe69ae87b9e5c1438e9c2ca97afb6d7896a0bf0179e3fc42c8f8e1359984 SHA512 f915fc244b2af8288f451cc45dc23a42533f4c66c8f9efe42bc9c4a37e66d07fb5b52598086aaaae807a7fc13928f38ae2fb403851cc9fa1ef31e93d30e30dfe
+EBUILD qscintilla-python-2.10.3.ebuild 1528 BLAKE2B 29f01e825027fb0c7e7a130ae9b2474c920a69bbeb7662a0a08cdedd308ec8eba446762a4a7dd9508417338feee6f798f33a50a2ccdfb76fe217a3b51a6d2202 SHA512 4822e5bd19abcd917e6bda804f08318ccd60bbc55f7b191865d24590c73768ea059aa91f985f14ba72dd2e436c01e11e22342948b010e102f785c1b3142f1e94
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.1-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.1-r1.ebuild
deleted file mode 100644
index 5700b8401f01..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-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
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	configuration() {
-		# Fix out-of-source build and installation of .sip files
-		ln -s "${S}"/sip || die
-
-		local my_qt_ver=4
-		if [[ ${MULTIBUILD_ID} == *qt5* ]]; then
-			my_qt_ver=5
-		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.10.2.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild
deleted file mode 100644
index ddaeac5786b7..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-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
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-	configuration() {
-		# Fix out-of-source build and installation of .sip files
-		ln -s "${S}"/sip || die
-
-		local my_qt_ver=4
-		if [[ ${MULTIBUILD_ID} == *qt5* ]]; then
-			my_qt_ver=5
-		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.10.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
index aeec457cb344..f683ef80e872 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 7eeccd863224..5137e04b860e 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,7 +1,7 @@
 DIST rfc3986-0.3.1.tar.gz 21591 BLAKE2B b24500baf27e4f17d22dbeb839262edb11b1c8c54ddd29782c2f4d83b5322e30f8800122349c9da0787f07c94e212616bbaace3b1d3bb1b2a5205aeba55355b3 SHA512 47c0cff5b67de5cc54ce3a24eb6d192a8b1414f5bb25e54056561fc0394058ec94853e62b9495dd72e15074921b66153279d4dffd1c199e252d569646a34aaed
 DIST rfc3986-0.4.1.tar.gz 22354 BLAKE2B db2a7edefa89fd3780721904c5e1b623d34dea5e8913c606336771d22f03c258f0a3cd3b71f42db6a6f2065bb055cf6938c10f166730953fe78cdc50dd0f148a SHA512 a4731206a4179d3970fcf9c21405f7e9686268ef3610ab5ca2413a867d83b83188c0efd5958b0b4ba8fc4076da9bc0cf18aef774213a1b58fc42bfc8a6d5dd92
 DIST rfc3986-1.1.0.tar.gz 39381 BLAKE2B cb890ae46c1428ddca1aed4a49660e2620659e7af64dbdb22c2514323ede374c28bbbd8401a5b4db257ba47e617ad7e8ae486f751fd4a7580808c68ff289ec13 SHA512 5e43ca7df586011900d2f01edfb20388598f77218e5a63904557bec0f1d0cb0a35f4980014de9c943ecc43a5a7ab3f7b815fbcfc9318e494c24a14fed2d1fac6
-EBUILD rfc3986-0.3.1.ebuild 688 BLAKE2B e5a7a209b18693906ddc731d7ecfea60fd7de584424f8cf41cf8190d2ade99710e12b5112cb9b97ef94ed95fe35a6a55844f0cd11d7e59730224b08cc1e86558 SHA512 1921f69298a8e1140320acc7d09638fab31fe16ae81070e5b1ddabe5f94d1a88c02ddc7ea3ae64ce3a926694c3403d2789d9813015c6bdd9694aae57d9ef64fc
-EBUILD rfc3986-0.4.1.ebuild 692 BLAKE2B bca5f44879ff618efc0f812e2814761872d40ad3334ea9a0e7736d2107e8c31d844954bff1fbc1bd3d5246e63fb411ef86633c51c80c817f16a688015a606e60 SHA512 39c30060b4eb0f1c9cab32b9a080062be3b14e85b7513b0d6504a90a28e611aeb659fcfc3a9401a568067303c45c6e670bf5a144d4243d14601b0b97032297e5
-EBUILD rfc3986-1.1.0.ebuild 688 BLAKE2B 4874d625eeb399cb0efbb055e3492eaaf49ed65242df5d6cb16f1e905351b7fff8c242257267b8300f8097267cad2b7ec298f799bc99d160baf79a541d039562 SHA512 072d91824c329826215ee49253e75abc79ffa51ed81ef39db71d410e5698eafbe2ca92e1c86aa717370f19189e94850aefe0034bede2c24b6c92654accbad329
+EBUILD rfc3986-0.3.1.ebuild 691 BLAKE2B 8a16ab5c1b02a0936b3575de56cf9eec9f042886a7b436c6869a8ba621f4948d184b8ce2d61e861893e3397326f0b62567aac122571d30d02cfc6e63edadd321 SHA512 f8e7eab867f5dc53c636c86f71716a8ab34b4a80caab292d170ac7f022bc6352a611311e299415e6f07483d869c88fb66ddd6313b28605677d5cbd67ce9cea50
+EBUILD rfc3986-0.4.1.ebuild 695 BLAKE2B 47703d2f0ce1f12c65ab92849d204276352069fd180e00ff7d8e98091eb8cad0b780af7ea6ee24768104773e71020e97845b53ecaa3397c4f235ec956fb26c95 SHA512 48fce5247a98bc8531007e16b2fa882eed7bed53328e6f2d191ad1f36b1249f7442ec752596587133a91e6c19156a466671ba5311ef9785e9318b26c8c6d1dd6
+EBUILD rfc3986-1.1.0.ebuild 691 BLAKE2B 454fec2ba95ec14cabbe7aacde784477733ce3fb964fe35faea6b8839bc5be93324dd6a83fbfadb40e1410b03eab0ab2674d09af264f5b1db5c2ad761deaee59 SHA512 b1dba414a5a78acb41bbc4a7d61f55b5f55e01e4ab9d1207cb67fe0afe4a75dbc819f47ae28d772fdb10ae424bf2abe8acb4ce9c5d22667b061009445c97e468
 MISC metadata.xml 601 BLAKE2B 0cd1efd0eab6850689b22d3012463b24fe77156d81ab4cef046f2bedf7c8d1bc9b82707bb8e493243fe6d1b0958f8e7936f749c1e90a66c3b7052d13d7655b4d SHA512 2a535235ea1111e30083c9e7799fa584e624aa39fbbb715b49aefb0ddb8b96135da1533f8bad3e4190b6eada990da906f1bbba66fa9b5a29baf4963161c52426
diff --git a/dev-python/rfc3986/rfc3986-0.3.1.ebuild b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
index 20ab7bcecba5..878d5d608233 100644
--- a/dev-python/rfc3986/rfc3986-0.3.1.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.3.1.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=5
@@ -8,7 +8,9 @@ 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"
+HOMEPAGE="https://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"
diff --git a/dev-python/rfc3986/rfc3986-0.4.1.ebuild b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
index 66dfa30d57f3..0b0b08a2442b 100644
--- a/dev-python/rfc3986/rfc3986-0.4.1.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.4.1.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
@@ -8,7 +8,9 @@ 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"
+HOMEPAGE="https://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"
diff --git a/dev-python/rfc3986/rfc3986-1.1.0.ebuild b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
index c87afb023b49..636645481adb 100644
--- a/dev-python/rfc3986/rfc3986-1.1.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.1.0.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
@@ -8,7 +8,9 @@ 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"
+HOMEPAGE="https://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"
diff --git a/dev-python/socketio-client/Manifest b/dev-python/socketio-client/Manifest
index e4f7d31b6d0b..2b99bae269a5 100644
--- a/dev-python/socketio-client/Manifest
+++ b/dev-python/socketio-client/Manifest
@@ -1,3 +1,3 @@
 DIST socketio-client-0.6.6.tar.gz 21829 BLAKE2B 72e47f9aa4bae06767aa1860fc7d57f7f2ae78dd037e46aa50a8672f4e168982d6e602ed8f80f203081e5747cacb0f6fa2959311271bc578c1b8b5bf70ec506a SHA512 aa21d31bf9e9062578fc6892a7624ea41ef3437eff132ff3ef2829a589c0fd19953fc514ab05161a32d06578708fb7f41b2f636d3d60a2700094e676d72cee47
-EBUILD socketio-client-0.6.6.ebuild 1437 BLAKE2B 3580f901425c0fe6e568f9271cf8a9dc007e584488a85b128b19590901eaba9a7528a78bfaea9ae4d7a5448ebbaa2818c6264dbdf14fb169c135418ad0234d9d SHA512 a17df64719cc84314b3aaba03e05e5760db126c055aea5eff280d155c13b5755fe95ad2a611b169726e07f648aaa29c04fcea3f7a796919f328cec30b47787bd
+EBUILD socketio-client-0.6.6.ebuild 1451 BLAKE2B 596218f7ee6b26d3123cbb0b75a2158af622b27111fba17bcf3e7d7c9909fa5fb1e4b4bee8c3084f024b3bde63538025de4966456abec8a46209b72cbffc2a1d SHA512 9c6dc1859ae3563ac0df694118f065aaa9a8cb79150246f7be1a769ebfab5681b6d7826ada92ca0d98e4ec4c9400600aacc6ddb33d97a35f508f738109718d90
 MISC metadata.xml 466 BLAKE2B aeae4a6f57347d31b7eed388cc7beeb819174f5f07b438a418f99532eb01ae092e6fa9a5758512de10f96f9e8aecef0e234d6e893ba39a353ddb1e42f1574b41 SHA512 a5d48ac121de3b0334d12ff4e472aa04be849f87f8ef39222a5a112674d36390d1ca69936d675cb7a42d11e73cdc5019540091ac64b727842d515b2c96b68c09
diff --git a/dev-python/socketio-client/socketio-client-0.6.6.ebuild b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
index 8907a3192734..ea4969e34673 100644
--- a/dev-python/socketio-client/socketio-client-0.6.6.ebuild
+++ b/dev-python/socketio-client/socketio-client-0.6.6.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=5
@@ -9,7 +9,7 @@ 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}"
+HOMEPAGE="https://github.com/invisibleroads/socketIO-client/ https://pypi.python.org/pypi/socketIO-client"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${REPO_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sphinx_celery/Manifest b/dev-python/sphinx_celery/Manifest
index 94df0f1a6202..24fdb53f53bb 100644
--- a/dev-python/sphinx_celery/Manifest
+++ b/dev-python/sphinx_celery/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx_celery-1.3.1.tar.gz 15334 BLAKE2B 1e6d34e35327fee921c884c47b948b624f900eb3b98cb86b1e45d4054bee596d5525c2be2ddb4605d03d27167183844221e3789e27ae1f5834983e9fcaa5e66b SHA512 b3d11204fd02f85426e1f4bcb81e61557f04440656be946a18e142087180a50f864ca4bbb53d3fff4eabd7623bf5c3682d3c1e00b9adf9184de99a27de98b2f6
-EBUILD sphinx_celery-1.3.1.ebuild 539 BLAKE2B a4d43af04aef0b59bfc5d6e901828f5eff11777c6f234415899b9b7714c0ac2831a7158b1e02b4fa2bb8a8485a2474f19254dbd48d6ff819635b1a20bafb853d SHA512 49b5a8dac91d91f087a74e36a0e0e67e8d9fa8538f0252fc307d76ea85246e1d1f44d3226323867b27410f92fd24913068a3d37317a01d5d2720d8afab206436
+EBUILD sphinx_celery-1.3.1.ebuild 555 BLAKE2B 7d97d48533a8060e478be9809a28f68c2c1fb30f1f87b2223766ddf0db8b27a8176f4d67a0a51e3043b1e8029bcb7de2c2c12ef60f7f80d348436e6d65cf1423 SHA512 e0f094c3ca46ce16bfbfbbc557f53605b6b5f1098c8f65a65080065e1c1883ba19420e9fa60b6271b4d5998fbe8a8c0e19642f78cef67b98b85e24860593dbb7
 MISC metadata.xml 354 BLAKE2B af4b7d8c61b6eb65c84f867501d50d06730f6e651e3284d7200065a72a120e50705fcf96370b26aff14f5663ee6a2caf6af5ddcd8207e2081be3d4d954705ad6 SHA512 4cf6fdfa14fca7fe26e253a25bc81221e25220f34b13e08c88496d44a3f779dd2607fe4698682b27fc66158128d5a2e5f9d61a0ee58ca59f7b744ae37f909dc7
diff --git a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
index 0589c0a2be92..13324c82ea73 100644
--- a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
+++ b/dev-python/sphinx_celery/sphinx_celery-1.3.1.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
@@ -8,7 +8,7 @@ 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}"
+HOMEPAGE="https://pypi.python.org/pypi/sphinx_celery https://github.com/celery/sphinx_celery"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/sqlalchemy-rqlite/Manifest b/dev-python/sqlalchemy-rqlite/Manifest
index aec948afd3aa..8b35bb28fbab 100644
--- a/dev-python/sqlalchemy-rqlite/Manifest
+++ b/dev-python/sqlalchemy-rqlite/Manifest
@@ -1,4 +1,4 @@
 DIST sqlalchemy-rqlite-1.0.tar.gz 3910 BLAKE2B c2a07ba91812ea2223bdea4e715b364a96b66057f2ed1c7bc0d373860880f3e0d7188ea8d513b127d8c7138695b9703b4a2ed5f6a4a001a8b2ae68020189a058 SHA512 794d0a1d80803f624af4b530efe277947d3a8fa7001df2177de6bdb34ffc9fc76e22c8b73caad7cda02429ddc251fdcbdd8e95ea286a6540054efb28ee53d2bb
-EBUILD sqlalchemy-rqlite-1.0.ebuild 1009 BLAKE2B 91f8b0bc595636343a2c6be521996bcb44e8f2bdff9546d052cae171d32b1af760cee90a65e9da22339da8770ed6b88e089d971b2a5414ac1f637d13da13c425 SHA512 fdbeec0236a147829e38d307c5c5a0aa1b8e192ec1ac62c577eab86fe5b35302db46b977a00b946711538945bf21b91cd06d7fa6b9758e4346dfe151ae7cc690
-EBUILD sqlalchemy-rqlite-9999.ebuild 929 BLAKE2B 0677a905254625e8e948573ea558cf0909df8e379def7725848356dcc52ae15480df14e2b012fe770f77b4cd595228f97f2c0ccccaf939d9c8152a83fb6534c0 SHA512 f170ce89dcb9ba47558ef4dc9643a47866e98aa3127bc2c157d6365bec18d14d8b904f19e266490cfbf311df43e784077f1a4a9ed0f0111cbabb45290ca64c7c
+EBUILD sqlalchemy-rqlite-1.0.ebuild 1030 BLAKE2B fed5da0011bb974899fffd2cdf83fb3070252a5f19d9c0028193829efadd931140e42fbb53eba920121922c304e8eada2caf13529fa97f8bbb272a49950fbc58 SHA512 258078e0b2920424fcf60183f95b699d540d96f22dfeab6e4d3eb1d51c45f06dde1cb5aadf4d508830b3b1b5ab937246a300be311a357e7d6e11b7f0b9d07789
+EBUILD sqlalchemy-rqlite-9999.ebuild 950 BLAKE2B 556044dffa41f859e651b0caaa9b1cf26d0cac7a63045c4410e5075afdf4645ade36121e3dec6258f33a09a79564dde631e583352bec845a6a0bdb316738ef71 SHA512 4738140dd30c669458a7bb16a03e7670dbfd1ad9900a78047b8fc3e1875ee0bcc0e22ec711ad395135789e7e86be2a8030c7780a4992ac31d52a591b66f65ec0
 MISC metadata.xml 307 BLAKE2B 29ea763c455895cfa0961f68cb2933a3354eb233efa9bf18398146aee9a4caf8a50d53dd4542d76e3cd5cd2c0b412ad435cb377f27559209df3e92438c5c712d SHA512 ed97acffcf63e1d7d8ec644d8e050848645f93d77b2114e11e49fc841cdc35f7e2a5be4a1fedc235b1ceb4bbf14a03db47d6aa805b48537acd164357638582d9
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
index 731a6fd8e72b..c612eec4bed0 100644
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ fi
 
 DESCRIPTION="A SQLAlchemy dialect for rqlite"
 EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
-HOMEPAGE="${EGIT_REPO_URI%.git}/"
+HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite"
 SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
index 575a0522f0ad..f0891fae7cf3 100644
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ fi
 
 DESCRIPTION="A SQLAlchemy dialect for rqlite"
 EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
-HOMEPAGE="${EGIT_REPO_URI%.git}/"
+HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/textx/Manifest b/dev-python/textx/Manifest
index cdcaae4d1c5b..45e6d998a09d 100644
--- a/dev-python/textx/Manifest
+++ b/dev-python/textx/Manifest
@@ -1,3 +1,3 @@
 DIST textX-1.4.tar.gz 21967 BLAKE2B b9e5b15715e370795470be855e0425075b1f704cab0ea2f24021345d8748f9f1a36e84618207c7684cadf86dae2ee0d613af3aaf217a881ba922385a544064ba SHA512 7783f4dd1358d8e0df126f1be893c58e32f57015fd577bd20d00a17b63111d6e48222c9b78420a307fcd0833f6d9ac3a1398d55986681251f7c378cdcd68c8a4
-EBUILD textx-1.4.ebuild 789 BLAKE2B 819d66f3c1e09a2e8e2c6f60743df95314824319c03c92ce0f45381303b313147470bcdc02a5fa13121f988a95d57fc8dca89229fee3decff6d195f420facda5 SHA512 8909d89ac9a920f4eaa472b9b0eda9ad81796e4551e0d89959433da85ffc16be565958c0d4399a5adab4f64865d76994fd72ef890c20a2126f92ea8dbb981803
+EBUILD textx-1.4.ebuild 783 BLAKE2B ff8d0a8c8b7949c1e7a9cef216efd03a1aaba0321c3ec670b0c42ff5431610f52acb7ae832e5453d49447d02e943764318f7a27227eb976ec90af8340c6d9ee7 SHA512 1ebba08f86fb905e3e9ecc9dee9c55f8e1742e337868800a00b45c0ff0a4be5e2a102527f9dd4b088e3d8b614fa6dd5e6d56c842a4f002936ff93091cd71e54a
 MISC metadata.xml 345 BLAKE2B a3db3e9008b38eccc86bc80783465edbebee22a3ffcd679911b07184cda3a3dcb6fe94eeceb22f05ca826d6fa7a00818ffd3f6e2aec3d3a114ba94192cb97b5a SHA512 6fd6e78938db784bfed2b97150513735680f015cd1c9f4701dba4ee0ad67bed79d5aaa6adbbfb21932e48aa27927abd69f532895e04a2b57d890327881dd191b
diff --git a/dev-python/textx/textx-1.4.ebuild b/dev-python/textx/textx-1.4.ebuild
index bdb75ef49484..f176c431bf4d 100644
--- a/dev-python/textx/textx-1.4.ebuild
+++ b/dev-python/textx/textx-1.4.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
@@ -10,7 +10,7 @@ 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}"
+HOMEPAGE="https://pypi.python.org/pypi/textX https://github.com/igordejanovic/textX"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 # pypi tarball omits tests
 RESTRICT="test"
diff --git a/dev-python/vine/Manifest b/dev-python/vine/Manifest
index 6a027b82e06f..0a6c961a4c4a 100644
--- a/dev-python/vine/Manifest
+++ b/dev-python/vine/Manifest
@@ -1,3 +1,3 @@
 DIST vine-1.1.3.tar.gz 52520 BLAKE2B 751fdc358aac52403ffd9c6f9f112f68b363fe0ded465ebda732744bc2dfd6e10d8bb57cef357e65fa16c1954ec2657bd8a4f80ae81f9432dd03aaafe79a2535 SHA512 7652b1527021b2f45f3a372c65a6f196c22edad60ab1e8adbafe7174b7dae912f24eaf34788672c762ea9145ebf3d48265fa4ad99f3084d85769242f4e8bd87f
-EBUILD vine-1.1.3.ebuild 614 BLAKE2B f717b8b8850f2439655afcc0cf4db92491aa3bbb6bbc83685f5162dc4d91ed601effde8c4a4c0d1e2f07f5355a17484f072ec93d6dfa84c0bdc3e9729c03a42a SHA512 e143600e095e5dd39525dc0d3b7b2d026e8f3f34c6de00864cfed767df73961aa11408010d26857e37c2dc53e1cf6ba3d6fca6549f1a778084e35d78d01dfbec
+EBUILD vine-1.1.3.ebuild 612 BLAKE2B a4e1f89246226a7cf05b47c1ad5d673db2d504ff7d707bd4773f775a01606849a4e485cf5e0c15bb64c73e59ea059ee67d8b81facf542f826e81c332ce22f146 SHA512 f6ff0b0265d6fbaed7efac7fb26b731483b11cf9fa02e4f3a5e0f1f9d3a080d82e675c501b9211793e01e5a29e8634930b78812c72b9618bb7d48ecfd32526de
 MISC metadata.xml 336 BLAKE2B c113bf51d676148154f535f077ce15d52100f3f2acd6e7cdbf715f41876e6401cf755d980d66cf61bc4b0fe0884135fa8478a7512c518253d081e3ef5b75494f SHA512 992b2b4914db3beeba877533b6ad293f6449f230e2eefd8ede373cd1f9ffaeeb79fbb92234434b38c9c392a88e52779e5b0cdc6b4f1e3f69098b7847925ec21f
diff --git a/dev-python/vine/vine-1.1.3.ebuild b/dev-python/vine/vine-1.1.3.ebuild
index f817a99b56a9..1681f5c9d99e 100644
--- a/dev-python/vine/vine-1.1.3.ebuild
+++ b/dev-python/vine/vine-1.1.3.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
@@ -8,7 +8,7 @@ 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}"
+HOMEPAGE="https://pypi.python.org/pypi/vine https://github.com/celery/vine"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index aaee8a06e4c5..f62b617927a5 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,7 @@
 DIST websocket-client-0.37.0.tar.gz 194246 BLAKE2B 805482524b603fbfeb1039bcd99d761d125504a0f8d1a69766d4f586da241efd9d07ade030152fc51228a7333c97313fb98483de95808f81cfa23e7c3b0ff1d4 SHA512 b72f18c91d9a51a1943fc798601bcd9eac8b1ce807a2abb72b7cf897da30de808160645d9c7f3eaf2430e739cd0c6c01046c452f43c61af63afe7d31d801f9f7
 DIST websocket-client-0.40.0.tar.gz 196203 BLAKE2B 303aeed5bfc84139adfbef3f3198512172220d2670e38683d660def19dcd82015bf85edd26a5aa029ba021c1f9496dca33e5ee8afc790b87eb1fa7b7b17c9aed SHA512 b57593e14087ff36ab2133fb8077aa207bcdcc04fa82d00eb8fa3b86bdf7fa949c8ca25317a7fe035ef0f36d2c996e036d2b715399813604d5593584d409a5eb
+DIST websocket-client-0.47.0.tar.gz 202611 BLAKE2B 8258ac3186eedcf7e3a791768ddadbe32aa506f27889214a6a275d6710bb7adf8d0ba8354165a0d07b7a084fe5937fc65ee85e6d84fc8ad21a7d2ece4ae8d91d SHA512 0d384e96be66877ba0c24e7194e2f3d554f818c2e2f107b054e07034fa7678946738c2b08c68cd71ebe0237fa507fade319273c492871fbd0ad7085b87cf0a54
 EBUILD websocket-client-0.37.0.ebuild 813 BLAKE2B 8d81381517db67bdda79dfe57ceba323705d919e4bb3ca261d678a76e30c628ae3ec818e6b43e31c36634c80c7b9b07c5bd9e9f4baa0d1eba442d6df3c21be74 SHA512 f3e7b1d8105ff0100dc27ff772cd08659714bd62f737e0dd9824e10e534b4bfe193acfc1970c3bb235a5a5cd7cf0a72884862a5fa043ade1ea33f8f7d7f561cb
 EBUILD websocket-client-0.40.0.ebuild 813 BLAKE2B 8d81381517db67bdda79dfe57ceba323705d919e4bb3ca261d678a76e30c628ae3ec818e6b43e31c36634c80c7b9b07c5bd9e9f4baa0d1eba442d6df3c21be74 SHA512 f3e7b1d8105ff0100dc27ff772cd08659714bd62f737e0dd9824e10e534b4bfe193acfc1970c3bb235a5a5cd7cf0a72884862a5fa043ade1ea33f8f7d7f561cb
+EBUILD websocket-client-0.47.0.ebuild 826 BLAKE2B b294aff468fe8b14a0ebfeef6eeb69731b1f4493b2303c4d4fe2352888308db86ec6e9d851d7f5ac4e8adf9ad3674d887a38838d604825060fd70ab37cf9adea SHA512 6437e9a4e54b9789fd6d3e82740c8f22d60099fcbcf8b9374ad483daecdd5962f2d2dfa0daa78ea71557b033c629845d9e7d792a930fb0322363ea341cc0957e
 MISC metadata.xml 381 BLAKE2B 38376251dfd5b2c36da7d0eaf8ba345c19fbe4d402d289a3d694f7278ec51508b1b5942c4d21f01c70243015a275dff8cb433bb45112894070d710df893e3d17 SHA512 605cf450fc8c22c4280f98fedc9c60d7764fbc9abbab6f2203428f3040a436813ab6f8d9c9ebd4b978f984e63c1de2e3c70e51fd701d4c03686236142c2cf6b8
diff --git a/dev-python/websocket-client/websocket-client-0.47.0.ebuild b/dev-python/websocket-client/websocket-client-0.47.0.ebuild
new file mode 100644
index 000000000000..ba1268c7cdf4
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-0.47.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 vcs-snapshot
+
+MY_PN=${PN//-/_}
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/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 ~arm64 ~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/xapp/Manifest b/dev-python/xapp/Manifest
index 0b843618eb93..3e42c0d86558 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,4 +1,4 @@
 DIST xapp-1.0.1.tar.gz 12327 BLAKE2B a627a833adc8ca32823d4c04fd65ef3dedc2eedd031c3030105f1f2341fa17744fc81c976f4eaa1a238653392510d416692ce804ff5bcfe9ed12d9595245e8d3 SHA512 7dc4db03476f6972f6452800d2ea58d7f78d0bd5dd6719f2b49d1c2e3315c3fa09c294b1195bebd26357c30b4c43d7e5c01d160708dd17ee488b823344895e25
 EBUILD xapp-1.0.1-r1.ebuild 535 BLAKE2B bf23bcdb498a22afa47cdfbafd61f2f6474512337e894274bfb078902b62365a17474fc36ae4b851316c9b45fea3e8e1dedc78b7ba0130b7830dbda626b2c257 SHA512 131ffa68263374b5726774799516c78c5ac3a6a61bf1447f70c7b8cc974d9b41829959438e709259502447ac63ee75730f048d96deae1bfae4f3a2bb1e2c3de6
-EBUILD xapp-1.0.1-r2.ebuild 549 BLAKE2B d5b72b43406ac436b5a44b5780372dd9871729a7940d9ed9629e14f0d892f64bbed2404c799a3082f4f71eb6d113ad22046a7b4a3ae6c95f06c818f1e30cf241 SHA512 6fc2c52095d0d7db506ebc478da62fee94c77def039f5f65ef3e6eb0a0ccd4a07c459b7cc6391b9120a385fb2b7065275b7ef63bf59d24c24d7c4b078c04f927
+EBUILD xapp-1.0.1-r2.ebuild 548 BLAKE2B 3ae06d18b4b1119b40eb52eeb596246fa602ab27edf653841a4c90d24da77e3c4c5954b0ee8e6dcc339aff3141e67ca5d0a6dbf848715eff2536ac6adea93deb SHA512 b5a7793842a2410a50c9230aed13881ede81c1615848ca44df6b7593943712bd40614a67d4f9fe27c8fb73ee11dd6640eaadf59c7645cbee8be6fdeaa74a147b
 MISC metadata.xml 220 BLAKE2B 3d3008b71006a64b0bc1899c37b1ea3c2048806badd09c02be51a29f1481475c704c5561d84f7caa1905c57e94e2ebe787839bb23b647a42543f31a9d8bf869f SHA512 1aa3933bda5909c7e7907b7c5218f4c214f5ba411fb8fc373e35ee2f490e4ab8a7813549c127b916e3c8b9527853a502fe298af1aa7139c213c2f31847120364
diff --git a/dev-python/xapp/xapp-1.0.1-r2.ebuild b/dev-python/xapp/xapp-1.0.1-r2.ebuild
index d93169660ed2..ef1b386c075a 100644
--- a/dev-python/xapp/xapp-1.0.1-r2.ebuild
+++ b/dev-python/xapp/xapp-1.0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python-xapp/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="x11-libs/xapps[introspection]"
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-14 01:05:40 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-14 01:05:40 +0100
commit	76cba73c47c8694e74377004634daca18f2d9c08 (patch)
tree	468603ebdc189bcfae77696162761b3be936baea /dev-python
parent	6957f5c65b02bba533954eabc0b62f5de36be206 (diff)