gentoo resync : 04.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
commit: e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree: 9cb29a544215119b5c5538e37211b994ce1c87ae /dev-python
parent: 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)
331 files changed, 2778 insertions, 1769 deletions
diff --git a/dev-python/Coffin/Manifest b/dev-python/Coffin/Manifest
index 0800f3358c0c..2309565b8b48 100644
--- a/dev-python/Coffin/Manifest
+++ b/dev-python/Coffin/Manifest
@@ -1,3 +1,3 @@
 DIST Coffin-2.0.1.tar.gz 9858 BLAKE2B 9ea2e80cff1edfb4b40d69831184c116bb83c710bdf9234ae1df56d7a4255d8d8c57013f8e97ea4a5b8f4fb4ea02ecbe32f30e0b3bb4164ea56904c6e96fdbab SHA512 e618c74a91f84e7f41411c8e34b2c97fad1a59bc5124f0f5b3439abf1b0c2972d5f59d4b71f49393e843cd588ec143c08d659e90d2cfd006d55b5244b5727ccc
 EBUILD Coffin-2.0.1.ebuild 656 BLAKE2B 64475ff4c8c83554f1049702e9c7e8cc5642dea86d0937d7af6854f9be66f5984bdeb571d3abb7c0842eb1afdf41e7ab2abdd588d721346d29af2cb383101d60 SHA512 09c0bbc77995df6be5d60be5c109afecd16fec1a23df577d6a62e936cb583a06592723cf64631addade5ab60ba87e2835a6ba1374c443e8288c5206d6f4d94d8
-MISC metadata.xml 374 BLAKE2B f33b37be06918dcc90acaec88ec0d37f30d12598a7b0b2cd8a1ada383ad4f07b0f58bf259d7e6a6a725d33fb23b52970e617dadcf1e7a0a0496b0fc8e0e3c03c SHA512 647ea636d9b5338cf85abe493dc107eb0845024a0af8b99df071bd960e8662308ab1e5c45f655ff68c58acb9a6b8ea51405040eb73e16c263be42bab7ce531d1
+MISC metadata.xml 296 BLAKE2B bb77d605cef8690d9b4d475936505bd726bc6f7951d63c957a1797e08440b0c3425d76d744532dfb51eb71185701ad440097fbfb65885369592b6ac133240043 SHA512 ab05e8766f5f2611b81b77790a526a842dc3b985867dc6fc0af25d65651974b94370cd31630fd6b62189ab70de34ed50f5a939684eba095b72c2294aeaf88b08
diff --git a/dev-python/Coffin/metadata.xml b/dev-python/Coffin/metadata.xml
index 4573224f605f..24ceccaaf4d5 100644
--- a/dev-python/Coffin/metadata.xml
+++ b/dev-python/Coffin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">Coffin</remote-id>
     <remote-id type="github">coffin/coffin</remote-id>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index eed4339ee5a0..ec9e00c8f543 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansi/Manifest b/dev-python/ansi/Manifest
new file mode 100644
index 000000000000..a1fc1cebfb65
--- /dev/null
+++ b/dev-python/ansi/Manifest
@@ -0,0 +1,3 @@
+DIST ansi-0.1.3.tar.gz 4561 BLAKE2B 33f1bb49dac19879a1e98dc75706e1963a11665a31c80161a6ff9580b5e2c0ec50de7e168860cde647488c67d2bb5bfd1418b9f4637c9db2f3d68d1b49bcfb47 SHA512 824ba1a9125af8fc23f402ab4de26c82250dad7be0080e0050585ad955337801393792c01ed3affa8a25551fa07b3caaedecde1889401293d415249e70a72705
+EBUILD ansi-0.1.3.ebuild 459 BLAKE2B e861e3a7f46e163615fefe41ccaf9a6bfa94fd3bad91176b2995598e19924e0e49c5a0c48deb3cbbeeb644bc06f22ec506e64746fff7e39b26814b4d817bfd00 SHA512 9a305ab520ba8ee3e76d0ae25f22e4bd08278d9edf3965a23839514f3575103bee045e5aed888268d885dc028bf0ac395e426f49c7696a821e565f060b329e0e
+MISC metadata.xml 366 BLAKE2B bb092fb0749c188b5367ff6c352e7614fcd4761d81063f7ed4c07958e6fe2752e88e0dcdb93f48cc58a0e35b8aa2f5ba280ca082767c303118f956d7c5ed5c46 SHA512 4fdd976a6c082c245474c4c5d4809b9b17ad90fc237b2ea08cd3fd3022ae3e3a0a92b8f27b53429ae8f1a1bf964ea1af65523f9f43128a40e296d6714b1b4711
diff --git a/dev-python/ansi/ansi-0.1.3.ebuild b/dev-python/ansi/ansi-0.1.3.ebuild
new file mode 100644
index 000000000000..e1e76f207625
--- /dev/null
+++ b/dev-python/ansi/ansi-0.1.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI cursor movement and graphics in Python"
+HOMEPAGE="https://github.com/tehmaze/ansi"
+SRC_URI="https://github.com/tehmaze/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}-${P}"
diff --git a/dev-python/ansi/metadata.xml b/dev-python/ansi/metadata.xml
new file mode 100644
index 000000000000..7a7fc220ebbe
--- /dev/null
+++ b/dev-python/ansi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tehmaze/ansi</remote-id>
+		<remote-id type="pypi">ansi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index 9ae4d9ed76f7..a2f3e4b811c0 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
 EBUILD asn1crypto-0.22.0.ebuild 606 BLAKE2B 78d5be009491f3a3f7112237e258231d48cc0e0203276c20fea8f82a84ccdc01fab3beb4a1065a77c59560614a2639fa949211cb0c4a26e301d3a46c81636001 SHA512 8ed3fc7e6615d33588ca1962aecbc0fa8c6b76081f7b8868cc9c834eb01782b9650ded7898b229daed1e989e546df88be9ca68722e5d2353a269cedc789deaae
-EBUILD asn1crypto-0.24.0.ebuild 761 BLAKE2B eba0f0960cf374ba17884e0234d0b2d80b9d261416e894603cd80a1e3c540f812663f4a42ac9d27076512a0eb1be82885437a16df3f9a23f774bbce18d169276 SHA512 82632364cc7e20566e8d0c7ae5101a19961c27839c3b879d84064561f3704c7e425e1d12faec0046d3185bb1e7f232a48e247e8c55ca317d64c1f162b04c736b
+EBUILD asn1crypto-0.24.0.ebuild 766 BLAKE2B 712c7a1a5ae76b9dbcaeb4d5b6bcd032917cf57b41c68df1c4e277612fc864c61ee85b8f5bb94082128f190068cf5f49b077d62aa5f291476e7ab5ba88d26d4a SHA512 f9ebd3afdb3ff860004bf8fac34cf36253ea834a11f244dc0bc11e6881fa20fa0c53cf363a83cabf0959a64a0d94dbda04e7fa63348ef6cad3ed5053787a495e
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index d56c1190aab3..a6636497c1fe 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index 35eb3efa230f..8055a49e6d7c 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,5 +1,5 @@
 DIST cached-property-1.3.1.tar.gz 9648 BLAKE2B 154208108cfbec914519f2a08ecc6ad025c284726d65a001eae84701b1eb8479e127473c124b08d3b0d969f59798f9dcef473cd8209c248b1d5b016a0bc8dac6 SHA512 3349751d442ca6e7d4e792c8b076735d5308d68244af9c03044f3d72d619a5c3d7d5dbef434caa954db4b983245bfe646d4a25c99aec39f32d99751edd9e233f
-DIST cached-property-1.4.2.tar.gz 11201 BLAKE2B 1fba572e8e4e06744b230994e19a93f9004c0e2584549af2b001cf780222cbd2196b09432301f1ef8b4c4ccc93f8dedf53113c541b1189bc005c79fa9d7dadc0 SHA512 27ce49c8b71f0337e34c36ef5a45cae273a62b42c8f1b690c2c4d32d9bdf7f532a12787c99257c956ac7ff15d2e7f16868e4cebdf1417ebca493e1037c1a612f
+DIST cached-property-1.4.3.tar.gz 11252 BLAKE2B 53df63f94a730a59adec6b2960c93cbd73f7e3880c060dc55f981d16fe6082e8b796c77c8052ca8765b6738a3429de2daea322d7644465b1c6fedaddbce6ab8c SHA512 e36e61af8f68a253573efbac666abd4e897142b3cec2499c50ba932924f8dad786979e1a297df7f0898310ae1aec1116615dff6e39c0b203e262628b450ad91f
 EBUILD cached-property-1.3.1.ebuild 625 BLAKE2B d05f358db313bb62e8e6af7733fbeb9bb378db4ebe34be8d2c44da08147aed09567c8dea352c93ee3a94ca6ac52733b19c5ddfaa119795d9f515c1b9a0972093 SHA512 8b408e180af71d702e053ee0e56327eeae8843ca3b75e15b71d41997a428ce63c59f04e74e59edd93f4898e99280f39dd5f37ef1c64ae8e30d33404a22802547
-EBUILD cached-property-1.4.2.ebuild 911 BLAKE2B 252e6b963254b1e48cd328adc04bf344f2916145ff9138f15d780e8196215feabbd3ed524a2d26922fdeae5d20c1011633c11087f0096ad81c0afc45e7946361 SHA512 442dcfa206d8f8b06bdef561723ec280692f7e6cfd35dca8d36335687a7b9668b84acaa9a034d5c24cd2d2c4f7836fb64197d6ab8faad80c04fbdec8daca2416
+EBUILD cached-property-1.4.3.ebuild 911 BLAKE2B 252e6b963254b1e48cd328adc04bf344f2916145ff9138f15d780e8196215feabbd3ed524a2d26922fdeae5d20c1011633c11087f0096ad81c0afc45e7946361 SHA512 442dcfa206d8f8b06bdef561723ec280692f7e6cfd35dca8d36335687a7b9668b84acaa9a034d5c24cd2d2c4f7836fb64197d6ab8faad80c04fbdec8daca2416
 MISC metadata.xml 489 BLAKE2B 36f59b8764462acd2920868cc5b5c84e27cf2e86b1356a76a816ec60a5f69bda780a62a811aefe06639827bdc3257128cded2d6c2e53e8c4516af9d1b9769879 SHA512 cecc6d43fcd54d1a949a60380d91a313d0464e0858be0fd544a76232f04961eca2530ebddaf6daabc5f050bdfe12092c99028c4a9cd33a14f23c0b43befe7def
diff --git a/dev-python/cached-property/cached-property-1.4.2.ebuild b/dev-python/cached-property/cached-property-1.4.3.ebuild
index 3b54319a6d39..3b54319a6d39 100644
--- a/dev-python/cached-property/cached-property-1.4.2.ebuild
+++ b/dev-python/cached-property/cached-property-1.4.3.ebuild
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index 4fbf29a675c1..61ac0e19567f 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -12,5 +12,5 @@ EBUILD carbon-0.9.13-r1.ebuild 1850 BLAKE2B 9bb0919ed111c51709c87cc1a67e83c7f622
 EBUILD carbon-0.9.13.ebuild 1845 BLAKE2B 3c63c6659740da27a9bb63137122503b1c54692afa994c8fd87369fdd5f96e9d9298f6aacdc26504b85467228331cc8a6ea0637b3fbc92adbcd1732c9f26ba66 SHA512 19be871a4fb56b058990eedce3bcb70eae0b913c0b6bdb4c46236aa9e65bcd8b9bce3b2790ee591fc9494ea36e008ea98f904a5c6dd99fe7e55cc6d63c3d5182
 EBUILD carbon-0.9.14-r1.ebuild 2039 BLAKE2B e00c9b09ebd02f8f8bab63381d9ba26c0831c617de35442fa747efaad693adea3d9a7aa3312648e76e2f14deeab662e81606605a213901922528a2f445394023 SHA512 0370b1b716adca976ca799f3968d52491eeb02a3ea0e5dbd384efc6360ef8d0f0fe708d24aaf53a1dc8923eb83dbfea6c7a40dfecaa15aed5f53877d48dd6163
 EBUILD carbon-0.9.15-r1.ebuild 2047 BLAKE2B da7ca2742cb7156ad4b94e996e582b8ce1fdbb37add1b9b6c0fba8a874aeb84db63804cf3b6768d9fffb1c69d9168c5f0f56ffbca62180f4a475b03e8a8441ad SHA512 64f1250fbcf3bfe024e3a6b9be3abcace36cd2ddf4b933ef6c132d7e78d1edfefa8b68d658a52f9139e6c35486ab59f4510d07ab4ebd13e217c118b9bb8969fc
-EBUILD carbon-1.1.3.ebuild 2011 BLAKE2B 641f3c2afbf5f43a58ccaa88d840af4a99fe2a3d4eedf415649de668172a109beb8a94b83a82c7592754fb9775c94d2004bc86bafa1265f89ba034f3e4e05a3b SHA512 999310990bd9aa495c81f4f40a61e2a5efe9085d8bc6779a5b4c6368b18295f88eef49beeae4d347bc02875594c08cdf1b7fb196fb7e0d6b7d71004db0097a12
+EBUILD carbon-1.1.3-r1.ebuild 2131 BLAKE2B 5cc8aa9e09019e2f53c1650a4082ec62654716fb9adb398afd06341ae8ff30bb0be464e8aba6ed628db74efbda20bcab2ad17f02eedfef0230a993956177944c SHA512 0ec927e875b4884ee13282c4aac212d5487a304dbf8b0c471dc14e046fab3bbee96a90f4611ca01bc23d14f129e60890036d83af80d86d164cd2b6716db8352f
 MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
diff --git a/dev-python/carbon/carbon-1.1.3.ebuild b/dev-python/carbon/carbon-1.1.3-r1.ebuild
index 91d82b54c360..43c4daded363 100644
--- a/dev-python/carbon/carbon-1.1.3.ebuild
+++ b/dev-python/carbon/carbon-1.1.3-r1.ebuild
@@ -24,6 +24,9 @@ RDEPEND="
 	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
+	# bug #661340, excerpt from upstream, next release should have it
+	sed -i -e "s/'r+'/'rb+'/" lib/carbon/log.py || die
+
 	# Do not install the configuration and data files. We install them
 	# somewhere sensible by hand.
 	sed -i -e '/data_files=install_files,/d' setup.py || die
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 6f71b3e6d589..c87610792a17 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -6,7 +6,9 @@ AUX infinite_loop3.patch 1236 BLAKE2B f236f05623b5ee4414fe3da7efebf61d62ed8617d4
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
 DIST catkin_pkg-0.4.2-gh.tar.gz 52930 BLAKE2B 2b8589441d241197c661975c07c60856c614c4c328e441e6fbb1cb41ea2919f57864f67198b684eba7183004671df0980ddcf0070a53099074433166b5d7db20 SHA512 cb47771172d88792bc7039f072175a6f410aa046e2611ccc75e46bda388d620ac0059e0fa9e087fbb7f2833600a7233d714c1aeeab65e264606d8ae2e64d76bb
 DIST catkin_pkg-0.4.6-gh.tar.gz 60713 BLAKE2B 88442adafcedd90a53a37c5aa3632d06dd88c1c685427708e7801d2a6702b229dfc3f81ac3dfb0ac6ad7c932865b9a61b8c6da28165acef8fa45859cd3a8aaf6 SHA512 d95362a56680f3ca1eb33299e041d6a0a8bbe35bb4a20f411c3b846a2b6fe91f583ffa7a1ed1884604a420dcc1b5e88fe3336ebfebe9a51a7a9f2c8a80f79f8f
+DIST catkin_pkg-0.4.7-gh.tar.gz 60765 BLAKE2B 905de7f4f013f8e7d6472b5159cb0e9ac82bb06dfca0308a7a5f8881402a721d987a016f7980f7a435a7122c4771311f82f56f460949370ecd93057ef8a8bb25 SHA512 1e947c09aa4789d414de74bed7b1aa3d5f5d16d22a8a4609f656b47e51b7318fdd21e003f8bf65355728abaf54a016ce2d78b79cc4ab8bd7c3e048b66c0c0f6e
 EBUILD catkin_pkg-0.4.2.ebuild 1146 BLAKE2B e413fe7ab6984bee5bad8208d10442586d8acaa5f81a229ef0f77d670d92aae16a6429d06d6e978efbfb15deecf4b1eda726afdae94db5dfb8c491749cba398d SHA512 2c32267fead6de9e05cf74519fb87d5d846d6ad993e2bc737e48e5131590f840b515d78bfd1dda9971b50607b65b46f5c6f9bf2deead373da3fcd94ab6fa40f9
 EBUILD catkin_pkg-0.4.6.ebuild 1194 BLAKE2B b26f615622719b87a320a21a3157acff920bc9841145783fa28dfa1d4d1290795de651b87e5b618648f277e627a2b19c063b237713e0836b6030ef33ae508371 SHA512 962e46ead9bd6358a97131ad67da3de86dfb562acb29b9cdfa972da708cccb188603b825d2ec048c5bb052a65501556067f76f8354bc615558605360b5ece778
-EBUILD catkin_pkg-9999.ebuild 1194 BLAKE2B b26f615622719b87a320a21a3157acff920bc9841145783fa28dfa1d4d1290795de651b87e5b618648f277e627a2b19c063b237713e0836b6030ef33ae508371 SHA512 962e46ead9bd6358a97131ad67da3de86dfb562acb29b9cdfa972da708cccb188603b825d2ec048c5bb052a65501556067f76f8354bc615558605360b5ece778
+EBUILD catkin_pkg-0.4.7.ebuild 1237 BLAKE2B 062a0893ed878654c8add72f78814916e33e4e63cc8e78e17b1b30a6869d228f89d55e654294f0668ba4bc4b485c08987108bdeb4ff99b1a86e413512075e771 SHA512 0a4ad10184b23eb326a78fe8b411cda68ed65aade565832f0ec30d0d1fbfe37e2841430bf71eafab99db059903685fa3876998be7cb98172f62572a9abee552e
+EBUILD catkin_pkg-9999.ebuild 1237 BLAKE2B 062a0893ed878654c8add72f78814916e33e4e63cc8e78e17b1b30a6869d228f89d55e654294f0668ba4bc4b485c08987108bdeb4ff99b1a86e413512075e771 SHA512 0a4ad10184b23eb326a78fe8b411cda68ed65aade565832f0ec30d0d1fbfe37e2841430bf71eafab99db059903685fa3876998be7cb98172f62572a9abee552e
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.7.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.7.ebuild
new file mode 100644
index 000000000000..46f2913d41f1
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${RDEPEND}
+	!<dev-util/catkin-0.7.14"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix2.patch"
+	"${FILESDIR}/argparse.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop3.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 263dc13362e4..46f2913d41f1 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -33,7 +33,11 @@ RDEPEND="
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
 "
 RDEPEND="${RDEPEND}
 	!<dev-util/catkin-0.7.14"
diff --git a/dev-python/cgkit/Manifest b/dev-python/cgkit/Manifest
index b4fa1e4b26b4..a5130666af28 100644
--- a/dev-python/cgkit/Manifest
+++ b/dev-python/cgkit/Manifest
@@ -5,5 +5,5 @@ AUX cgkit-py3k-pillow.patch 2025 BLAKE2B aa036db10e22b6c92c56a4e0e356d9fa8d14acc
 DIST cgkit-2.0.0-py2k.tar.gz 885682 BLAKE2B f32eb8f05197ae44b3a1d5bf734d779c6e7f53af526f1686348e977f55bc584f565eea9e3831f562dae6aa6715d732465e0d37b07746065e965f945ee1152d18 SHA512 44e57cafc3ba3aa824c44fe4ad04f350dfe053cafa09523acab220e8a5db45dde042b4fcc3e444dc3c248a43ddd94faac6875f579c2063e6c8feba7841472f7c
 DIST cgkit-2.0.0-py3k.tar.gz 885012 BLAKE2B fe48d57ec01ee286c0974b53e088f74db73a19d6cdf9ebde43f3190a46994c803f870f2546583cf6d4bce984895469f61a82e99e6bf98da77443b3857b70b60e SHA512 0c721d728e2cacb3a5518bfdf49810793a7e4a7efdec54a95d9b8b64099996452a08193c90e1b76f57852c3593bf07e4361ba20c17ea3565413d4997e9cf6c2e
 EBUILD cgkit-2.0.0-r1.ebuild 2124 BLAKE2B a60a0485180c1d47e87bb9622089b7ae7983b5ee585fbd986e53e067b9c0bbf1f0fbd3cfb6a73ef5ef7a393f482df4b3d3891d234aa96bdc5ebabf6ade9b4678 SHA512 0c65a4469d9324c1e6574b3511969b251601982b3b94364d929c24b37640302c3e9af86df6f90e151a2b31da6ceed7e4b716535e1e6c9d9a3eefcef88eb7286a
-EBUILD cgkit-2.0.0-r2.ebuild 2129 BLAKE2B b14eb62c5dfd14ee4debae0d05de64675ed0de355f2c9ee010e8d09a2f81c367898a368488e208bd845449f50598c0a50cfbcf6a50ce68fa273357e239338166 SHA512 ef6ccf0ca0feb6f0734333c94b9cbac00981c60b5d954c7c495527a6af4a6e0e0522f364823189f04fc3a8cd89396655e1f7e8492b9ea7ceddc6a7a715bb8dff
+EBUILD cgkit-2.0.0-r2.ebuild 2128 BLAKE2B a8d16ad970d756797aadd6ab1a42cae6705f8b9ee35d1ae8d9d752d8bc6a69b449258f4b6954e267434800f0532e6da0f52bad215136e0fe5949b01436e91a1b SHA512 9f1bcc506644ae8fa2e3e8a5be2268e5775a3dd708de8a0c39d100ebf6ee670bb36fe2ba5431f57848ff89b826f96a39978c9dba9f35156cdfb1b5fa0a3e4c35
 MISC metadata.xml 613 BLAKE2B 1ab7e4e1a5527090988592c49fdabfa5cb34527ac802efe6f4b144980a88346f6f2bfba8dabd94b63675e811852e3aa6c4dfe12d1ff65562a9c1ef74f8a96fc8 SHA512 276fc1ce3f5ef82f91499436866d31a2807c1d753eabc5bf5494af756086327320f671cd30e4628b4fd4740774a3d7bc83e14175157375abcf01b496589fc85b
diff --git a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
index 38c4d52f34d5..86ba0935d201 100644
--- a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="3ds"
 
 RDEPEND="
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index f1218851df3b..a0b0bc97ea02 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,3 +1,3 @@
 DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
-EBUILD chardet-3.0.4.ebuild 1013 BLAKE2B 3ea7b8a5cd7ca4d081821b3b04283af038e2f190b6266b756ec0e2dc7e36ef5ea31ca39d627267953aa56db0850e05bfe12e59b4f06dfd263d776b32f3de446b SHA512 88f6cfa5cdb71ba64c06291b5a05ace6f311a12639d8b45ee8515e6c53779c102134cef19b1d91b4404139cc4a140c1af433d20fa7ca2118642863f29fee4347
+EBUILD chardet-3.0.4.ebuild 1012 BLAKE2B 64ec5642129a3aaad7bbb1a97d6eacf2008d694b09b460d254572ddb41e59adb376367ee669517b3c5659759ab951cfe2261639fb69fa16e437ca3482b855248 SHA512 5c6378500242a0c0f6eb9bbc14e1effa06eba482a5aa8e50e3c66bec3df54a15f8bdc51ea821d221ef5eee455c178853d360097e335bf5c6360f5ad95e561d9e
 MISC metadata.xml 377 BLAKE2B 8aa19a889e96303024d469c969a9e47613cabd1456b0e21888a02a091049e09a53c6faa3d0e128b5ea21b68f521cede9cf09b570f2fba7a4299187a44e40b018 SHA512 c48c3874a248049fc2845d0a64ee5b94c705ef58158f882f30bbdc561f311a7203cd8979e067a5b0f3f034c95cc4b6da373cea6efc9616f3dabc574772874650
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index 34471e6d3049..a4348443c342 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 21f01c457a6e..06ac56f3ce01 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,13 +1,10 @@
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
-DIST cfe-5.0.1.src.tar.xz 11483036 BLAKE2B c4eb54cd8271b62cf7a2219db0b599b68c00b6e574d1946220efbd1633e841796e6717d6eeb35e84a6db32a731a3285b59cedeb3b1a8f3c3c502b799fdd0a720 SHA512 6619177a2ff9934fe8b15d6aa229abb8e34d0b1a75228d9efba9393daf71d6419a7256de57b31e2f9f829f71f842118556f996e86ee076f1e0a7cd394dfd31a2
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
-DIST cfe-6.0.0.src.tar.xz 11959224 BLAKE2B 257edbaedf72bd941b67b4aa2f152a96a37bbea72d21d22d4445152685efe40d75b9a7a39955545643e841ad6693ef12e52b207b9119098774f39e858b64bc09 SHA512 e886dd27448503bbfc7fd4f68eb089c19b2f2be4f0e5b26d3df253833f60b91d70b472a6b530063386e2252075b110ce9f5942800feddf6c34b94a75cf7bd5c6
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
-EBUILD clang-python-5.0.1.ebuild 1018 BLAKE2B 84acc3e37c530b17f6d4b21bd6ef519cb8cf960efaab0d3241736f3bc6d8c28d0e5764e76b2d7e4becd024b3ae6662c3fa125e0a2baa9a28c05b157460839e22 SHA512 adc39f63cb3b8edebd2344e35b325cc006b29f524d7e20b2cc6a44476595bc873733bc776fab50584c1b30700e2a51cbeaed13531b6032e5ff244d856a06f1ba
 EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
-EBUILD clang-python-6.0.0.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
 EBUILD clang-python-6.0.9999.ebuild 1055 BLAKE2B db471ac4f051b76629a69cebda0144090697cca1c1ddc28d9119c7f3c5e6fe11f6333c3c34f314d5c4007637b809dbf1d7414fd179b7219757f01b4c613c24d5 SHA512 47158aa7588bb0e923e1984be9ab32006f22b260e8ceba58972bf4c40b1c203c04e93507f06b174585bd5cc2a62f8bbd9c7ced9eeb8c7b1d3c7f46427d48507c
+EBUILD clang-python-7.0.9999.ebuild 1055 BLAKE2B 8ec9fca2212d73599c2f53e3bdd64da4f92829e07d6e382de98b7acb0b49414d6df86a620291bd2cd4ea3c106c45920e4103a06ff4a97c1754e032b5724ad418 SHA512 6191b1ba3f2fb318a03149d7e909fb0e55017b917fdb6f9009d8fcf05678babb64835077a680d77c756c2f5c1afe4639ad70c07939e84cadd49582a03f0f0f20
 EBUILD clang-python-9999.ebuild 1030 BLAKE2B 4152729630f6822b4a22e1ec754bf99833951c49e94eb55583ea8d3b2dedd957b435dfc3e24bd8adbd9f12a02161fcd5a16962165f9ec592469a4716820332af SHA512 5889e98300f26a540c93017e72b76232b2c9c871be3bb39c248d30a88316d44114fd1d7545acc0963ccdb4d15dc55f70fa8f30825cccfba69b33ef90e3d73401
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-5.0.1.ebuild b/dev-python/clang-python/clang-python-5.0.1.ebuild
deleted file mode 100644
index f60acf5217fa..000000000000
--- a/dev-python/clang-python/clang-python-5.0.1.ebuild
+++ /dev/null
@@ -1,43 +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,3_6} )
-inherit python-r1
-
-MY_P=cfe-${PV/_/}.src
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}/bindings/python
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
-}
-
-src_test() {
-	python_foreach_impl nosetests -v || die
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-6.0.0.ebuild b/dev-python/clang-python/clang-python-7.0.9999.ebuild
index 5d6eaf45c6cd..d0d8cf54084d 100644
--- a/dev-python/clang-python/clang-python-6.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.9999.ebuild
@@ -4,16 +4,18 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit python-r1
+inherit git-r3 python-r1
 
-MY_P=cfe-${PV/_/}.src
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+EGIT_BRANCH="release_70"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -27,11 +29,11 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}/bindings/python
+S=${WORKDIR}/${P}/bindings/python
 
 src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
+	git-r3_fetch
+	git-r3_checkout '' '' '' bindings/python
 }
 
 python_test() {
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 514f309da65a..dfb59b4961d8 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,9 +1,5 @@
-DIST cliff-2.11.0.tar.gz 77037 BLAKE2B a38f37574f1802a2724143f35cc1d1159d8165f75f4c9e582e726cfdc9090814635d99b073a5d8df3a3e3b3d57b79e4e383c0569bd6769325d81af69384e9946 SHA512 0f29431b30610f0c781c9eddac57724043b6d7c05bc82f0ec3027a68230222f18f78ffc1d82dbd8ff4b5408b255b27879bbc1266e8641b4bc1c871f029f6cba2
 DIST cliff-2.11.1.tar.gz 76570 BLAKE2B dc0b4a702c6807077f830941516e8c5f2dc6b732e7a7788eb2c2e5fc5c3fa8d893e7156d6ad76904deb2d1cf31d1ef50d08b73b750422b84bb053a09e4930bb2 SHA512 ba494cc26e103c6043de49a59b3e9c0c9bb1658416095f02c6bccd3536f24615239a66941fb971c289926c88e85eeb29eb10065379e4f21645828f6aa4a2755e
 DIST cliff-2.12.0.tar.gz 77405 BLAKE2B 70b3865837bdba1396fd76b4937c594dfc9f50db24f684c6676c4ac1125ab34f6cdca29fe63a490d41abd49a268d6246afc873a5805446d06b07cd754aebb727 SHA512 5802cdd17b6aa81dbb344efb8ef53212de999ab33eaec1eb06e1d002ab513758d3634ae5013ece6375b1bb98c9fed99aa74cf92752c34e1132fa5ac20a969f4f
-DIST cliff-2.8.0.tar.gz 71815 BLAKE2B d73d467a1e2e06e5f45e7fce766d6c8daf79d9a882692c0e77049427bb6de629409a282c8c554ba92c62a9c8fd44e0b19cd3cd93b9b3f1f2b8091a1e917a25b8 SHA512 a371916945ee71ec519aeb923ca44b0a0e10fe6e460d236434c5c2946ad2b517050bf9d0430bdde506bdf2d28ba60bd45941d9ce21d77a83e2d5541b088d04b3
-EBUILD cliff-2.11.0.ebuild 1796 BLAKE2B 45b373a825128f6cbfdb751a068907609c1b87712843049329c1ccc2fe60f9e760ace69037c5c3e493d20fdcbc8aae93120c55237f4b9cfc7d98cfa8034d059a SHA512 9dde86186646b99511a1f3378f1d63d9a6f580cccd91a72ea81a15adea5285310aa6a4728849fda8eabc1fca2ee302d01131ebad4946313f2b98e4f97830cdb5
-EBUILD cliff-2.11.1.ebuild 1798 BLAKE2B 88010d5f16f658aaf0f8e02ee0455d321a898cad08d671e157f25bb37d0567a8edf6120dc51ed1731d7f1b98390e95b3d2aaebe2c322b9a26311a8b82f7b5973 SHA512 e11ed282dc82c2a1bc6bede4d5752c258519d62d5024b1feee1aa8cf123312721d8f6ae4e011d4ed87cb269da5020d38878af847c01a432ee7fa022eed086708
-EBUILD cliff-2.12.0.ebuild 1798 BLAKE2B 88010d5f16f658aaf0f8e02ee0455d321a898cad08d671e157f25bb37d0567a8edf6120dc51ed1731d7f1b98390e95b3d2aaebe2c322b9a26311a8b82f7b5973 SHA512 e11ed282dc82c2a1bc6bede4d5752c258519d62d5024b1feee1aa8cf123312721d8f6ae4e011d4ed87cb269da5020d38878af847c01a432ee7fa022eed086708
-EBUILD cliff-2.8.0.ebuild 1803 BLAKE2B 1c356b186cd61f0b64ec018b9b798832541d967bc78335e6ac8c1bb80b20656bcc7d05c4c6bc62d4262ecd2efce17e1ca0db2329fd748919b78d33ad72edeb86 SHA512 714dcf939b7044a111e7e40fd8efa141907ea852d4f763ebc4b39fd4bb792445d078f85132ede9171d237af386025c5743236fdb0d19daa3a59a70a17fc15001
+EBUILD cliff-2.11.1.ebuild 1796 BLAKE2B 45b373a825128f6cbfdb751a068907609c1b87712843049329c1ccc2fe60f9e760ace69037c5c3e493d20fdcbc8aae93120c55237f4b9cfc7d98cfa8034d059a SHA512 9dde86186646b99511a1f3378f1d63d9a6f580cccd91a72ea81a15adea5285310aa6a4728849fda8eabc1fca2ee302d01131ebad4946313f2b98e4f97830cdb5
+EBUILD cliff-2.12.0.ebuild 1816 BLAKE2B 116dad4f946510b3e3d2305754a982ff7013f38e7969ffc22de1c61c313a9b426b9b1e0ea21410265c16629885a3e1c401bdd4ebe08003ef2815eccffb434b18 SHA512 609252565bcc6134db8b3752d0d0fdc7e2eff3e8208ae25aa2708a7b014c4c6d3e4872aeec757581ca1c7610caa6c8a66f182abb864dfcde6c00d80edea3d6e2
 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
deleted file mode 100644
index de7cbcd1f883..000000000000
--- a/dev-python/cliff/cliff-2.11.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/dreamhost/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)
-"
-# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	"
-
-python_compile() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cliff/cliff-2.11.1.ebuild b/dev-python/cliff/cliff-2.11.1.ebuild
index 7a33576474fa..de7cbcd1f883 100644
--- a/dev-python/cliff/cliff-2.11.1.ebuild
+++ b/dev-python/cliff/cliff-2.11.1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/cliff-2.12.0.ebuild b/dev-python/cliff/cliff-2.12.0.ebuild
index 7a33576474fa..c341567e56f8 100644
--- a/dev-python/cliff/cliff-2.12.0.ebuild
+++ b/dev-python/cliff/cliff-2.12.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/cliff-2.8.0.ebuild b/dev-python/cliff/cliff-2.8.0.ebuild
deleted file mode 100644
index 2e42d79a7e28..000000000000
--- a/dev-python/cliff/cliff-2.8.0.ebuild
+++ /dev/null
@@ -1,62 +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="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/dreamhost/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-	)
-"
-# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	"
-
-python_compile() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 038f741c40c6..e533acaeacef 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,7 +1,5 @@
-DIST cryptography_vectors-1.7.1.tar.gz 26652514 BLAKE2B 5aa670b4d52b010964465091660205fea4b7de1099701e25a6e31da9a7ea4a312a81a488ed369ac6b032e8232514361f87f1b0946cb55e0e0a18955874d2f09b SHA512 2edaa91198adcf5e2523ea8d3d25a8cd7df85e6f6c06618301f87af6f0133f5d4672721082205a9a3c0c648390ee772e6107eb6ba76e96649bc2832676df8283
-DIST cryptography_vectors-2.0.2.tar.gz 27011827 BLAKE2B eda02ca72a4a6a608050c531fc649a9843a9b7083a0a7a726ac89201f37016e258538671b15d4197deaffdb6902c345ff40e1da604e2b6034148d9c204b0ab1d SHA512 ab14bdf664e6df08c8436eb24c4465d3080aacd4e6cb47a0113b0877f869cd91d4184ad9122a428b323e91316b686eeb167c4e932773cac1e7b2adbc9309ca36
-DIST cryptography_vectors-2.1.4.tar.gz 27255711 BLAKE2B 6c842b6366d794e9986110479e2175996b344aa191345c85a5cec8c0640b7a67b157f310eca31ac8e6487739357b11a2b86b9832fc680318e754c4751414c754 SHA512 74c2c1e3924f848488a3b5abdabda1a0089ae7d070b94e65f9fa2bf2da057ad27a37e46f90de4f2c3e9f1cc96c1c179cb5dbf0f50d5166a02846923e3bceb165
-EBUILD cryptography-vectors-1.7.1.ebuild 628 BLAKE2B c292005fad6d1a5988e2eac2722d8b4e975f66c825577ea6e02416dd06c8fe4cc6a7f014859ed26f095af2246eff54cc2dc9160f1c977973f26d7adb8104d049 SHA512 179b0c257607ee2565bf79519848d3b2de49d38a0c0ac28e0055605579015b6c61b42c47c519792b4db68106da761a24dc3ed286aa715c0ae13465a2a15a3723
-EBUILD cryptography-vectors-2.0.2.ebuild 630 BLAKE2B 2f2c2cfcae55ab4f707c891797c0c31f516183fc34406d3a3a2ae906a8623fb8f28b2ad51ad9a5ad678c08980f8c352baa68ba83d3c862a19e98ccbd520c3d09 SHA512 ee88ce6d7ccf24e8b74763e52d745b71cca53b24ff351df20a120a3e67848d082061ebd6f5d0da70c437c4acf1f484e06f45e99567412496692b2874f7ea1fbc
-EBUILD cryptography-vectors-2.1.4.ebuild 666 BLAKE2B d00059c6f5951592ba2305d587cac23d0b3c80585ccdaa913807150a33bc7dbee628208f045985f7b62e4c2fbb2e190bf832e3c4ca6ae16776e6872e867d682e SHA512 1963fb659fc8a7d1689947c4ce02f47d8bdcd6810afac4a26215042059caf508d94678f541056dacd2e31dfcba7d692e96502feee8163cdb28c99d0728c2911b
+DIST cryptography_vectors-2.2.2.tar.gz 27270814 BLAKE2B b57cfd402e85e34a1e52d034ef51699ba9ab7381e5baa28f0f062ecc8d6b7b5849ac4d5426c41768e1a4fb9462f84d7e22476ec64dc0bd0142a799caaf95eafb SHA512 bdaf53c8087d6c44fcd3ab54069d1d45b60ee80d98fd813fe180b9e88272203b5dd2abd5fa6dcd3b4ce9ec3215997fd8e99e63309e2f0ac619a6f72d552afff9
+DIST cryptography_vectors-2.3.tar.gz 35303908 BLAKE2B 694f5a741ddedce2101632dcf165961d4706feaa5c8482235f5afb69f4257bfb4f8a9b8423213661de0da2d56ebf43cc7ba138a4bbf9462f367ebd5adf2620f7 SHA512 7c51b0c29c182c4da3265824a1b6e44c943bd41dfa89199cded963d0182a8ade678a560ec9ea13f6e8918119fcacf1c90d804cc90368e51cc5d430228448231c
+EBUILD cryptography-vectors-2.2.2.ebuild 688 BLAKE2B f541d6ae0657e44a47fb274943ee32ff63e56b26eb45fbf37fd725e5166fac8e895f0a07e7519262204f48bbf2f62d2ed282d2269cd9dc26368dc794080d37e5 SHA512 a4fdb4a05c6976fd990715eba29b3bd799645ecd72e73b546ebe57ecf2488e2c62daff9c7ee45774a415e6ce63382b42c4d94973543a993cf188eba1973c0fcd
+EBUILD cryptography-vectors-2.3.ebuild 711 BLAKE2B 3882a384c11fd2cf36f4fa4b69ff7bcecbc3ea91451e5f4ec9f6f2b7d0af99829ec2e566301dbd4ac6f9aefd883cd473e35fa9f1bbfcdbe91e045a32265f8b45 SHA512 f1a5b96e1664c4011237e8466a5ba03e7adda8839973a6314ea6274bcccc86ff0da42f58c11eccacd1a49510f9ca68ceef04526ba0abe27b9252ebe29e9a18c0
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
deleted file mode 100644
index 522a34ffd311..000000000000
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
+++ /dev/null
@@ -1,25 +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} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.org/project/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild
index 4c323e7d6ba5..257fe8aef645 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild
index d116dec7d496..dcefb0e150ea 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.7.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index a30d41472cfc..24f3214a4a54 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,13 +1,9 @@
+AUX CVE-2018-10903.patch 3641 BLAKE2B a426705cfcbc9ba4e3ffd662610b7a27c7afe52dff71d1c7248c03524369faa763196eb018b7ea94b8ac87cc5cb5dd5bf172f5cdedadb54be62dbe4e0819ed82 SHA512 94c56586ae1649b29959d855235af8e84bc9dd927b412e0e0a62cb47bb52580a919bacefe4be6d0b75318be05afccb950dbff3d7f6ec1cb44c111a4bbc2e6a99
 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 1725 BLAKE2B 3327c2607caa9f5fe09f617091dcb21ec637cc5621aa10dcfdb07c82af71a7663a603ae2b7a1597ede0895221c2cf57fb5eacb8883ceb10f89fc36e9c1ef2900 SHA512 9e31689524057c73cf174c8ec4621b57777f20e75295748c91c58eeec8a058ac5067d996aaeb5508d87b07b58c3484e8a5a09c9f4585cadd10009cdc7899e79d
-EBUILD cryptography-1.7.1.ebuild 1662 BLAKE2B e93ee9089ba409dcc50f7a09aed35fe63706c0c08feda1413c1127fccdbedbe5de857b9f4980d2348125bfab11879b71b48e12c2d187f0ed8db6f5b083466e90 SHA512 33688e944e9b4a46f8a49b643fb5f8203716aca424ae6fb84d0b9351310efe4f7941eb2c329a8b4f11c159511aca7e8ee94bcbd25d89d3da919f943a591eda34
-EBUILD cryptography-2.0.2-r1.ebuild 1624 BLAKE2B 7bc96039e6e97bb471124fbc1d1a669a94b6b95a1066fc3a06e5adf84514efcb5651fb9a8c837942ed649e910fdb86ea86b4d92c4dca2177d81bc41ebc6800de SHA512 a65cda871f652ff1e903226396c238185e01a666b84bf1fd15a41707989b5848e4b442bce23c3bbc78a49bd64bfd27eb4d75274b2cb99be6c6ec5710d82df896
-EBUILD cryptography-2.1.4-r1.ebuild 2163 BLAKE2B c58897dd5f2f67b32238d71b15c1b9b080258fcf2d99b614f54205b2a1c356d425f2139d0ce9d8ec97a59873af0ede38e8bbdecabc530bbaa3787ce44cb126af SHA512 4e97f44751883fa5caa341e142df7ffbb4fdd800440b7b35268b8ada0181d8ecf1fdb718bedf41ac4cb44c92ac5c7a83ff4cd9fda4e195cf4c4c29a30330da08
-EBUILD cryptography-2.1.4-r2.ebuild 2182 BLAKE2B ed5ebbd230128b1d6f8a55a3c14d1e8094e37658a2dde1c4e495c9c8a655d36437c3f2246126d67df836a4fb51713e7a66d4873f1a78b3f56b7a7ddf59cbe66c SHA512 bf66f656fb468ca265688c4c883329454018bfc2fde4558ce2786db6c9b08a0df25c8d95a46310a2686fec840c731e5521ad0f41ec997c59237ae1bcb9f8e5ba
-EBUILD cryptography-2.1.4.ebuild 2044 BLAKE2B 2dd3ba08232364b585e92ed6fd83a204f9d1192ca016a796275a200b995c9e3244c687c042600be62a7245f327813ac6d95f6fb8fd1682c0b861cd106a5d2e72 SHA512 43cb90a1de0f0501cbff6385bff0e80eb1fe412479dbfca2bf8ac3d15e93b2c4621b80ca45c7482852620de97eab249cca0e7d2a050856cf4147c22d0523b2bb
+DIST cryptography-2.2.2.tar.gz 443822 BLAKE2B d0fbaad78d172f1ba1bfa6edd64d2d5a0eac0853a564fdbb9830dfedc5c53fe1b28d8c1878be85ce38b8cd90a0c2e40e6a209158693a88a7053a80f0481e6302 SHA512 6c1b19cdb870d65abad42523697e9a0bebc7a0025b34f10c4bdd30c313333efd7c41bcb4237a29b3a1b270e3fbade75ccb35df172b055b7c075d619f4d9424c9
+DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52
+EBUILD cryptography-2.2.2-r1.ebuild 2212 BLAKE2B ea9b70fe4d8e10b7e812a98a82665fc663a90939f04615f9ceb17baf14f4b8c3df327052151662ed5ae2f7bfeddb7caa7839108c36c57be780596baff8cb5985 SHA512 1c819531e989645d64c8742fa1b331bcc0bb733c6deee2a81ffa02dd92a074faf000f29e35db947f8014d3a7425a0f0e1ad722c0e28b9a90df049b482e82532a
+EBUILD cryptography-2.3.ebuild 2162 BLAKE2B 68fefc766e1b98af7623b5c7e6f3ed96a38ba8b23895b24d0d0a4a6d299f5a2180b9707652b084ba67040fc30b03ba781e91d4b3b07a2224aaf006c35c6b88b4 SHA512 44b7b60fd5f41caa0a299069e9bc761725a539cefa6d7b71db031d9d18fffb78f5468ac0da848387616e3f0cce7c78de1544b646bf6e0b1b939925a902ee9a37
 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
deleted file mode 100644
index 11cff7b6191c..000000000000
--- a/dev-python/cryptography/cryptography-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/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-1.7.1.ebuild b/dev-python/cryptography/cryptography-1.7.1.ebuild
deleted file mode 100644
index 2646ca4511b3..000000000000
--- a/dev-python/cryptography/cryptography-1.7.1.ebuild
+++ /dev/null
@@ -1,50 +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} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	distutils_install_for_testing
-
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
deleted file mode 100644
index c69917dc3a69..000000000000
--- a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-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.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl: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 )
-
-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/cryptography-2.1.4.ebuild b/dev-python/cryptography/cryptography-2.1.4.ebuild
deleted file mode 100644
index f5fc4dd530db..000000000000
--- a/dev-python/cryptography/cryptography-2.1.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-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.org/project/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 )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_configure_all() {
-	append-cflags $(test-flags-CC -pthread)
-}
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-2.1.4-r2.ebuild b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
index d24836330f64..ffaf2cd166a9 100644
--- a/dev-python/cryptography/cryptography-2.1.4-r2.ebuild
+++ b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
@@ -14,7 +14,7 @@ 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 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
@@ -57,6 +57,7 @@ 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
+	"${FILESDIR}"/CVE-2018-10903.patch
 )
 
 python_configure_all() {
diff --git a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild b/dev-python/cryptography/cryptography-2.3.ebuild
index 00035b90760b..958c0527b8c2 100644
--- a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
@@ -27,12 +27,11 @@ RDEPEND="
 		dev-libs/openssl:0= (
 			|| (
 				dev-libs/openssl:0[-bindist(-)]
-				>=dev-libs/openssl-1.1.0g-r1:0
+				>=dev-libs/openssl-1.0.2o-r2: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}]
@@ -42,6 +41,8 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
 	test? (
 		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
@@ -55,8 +56,6 @@ DEPEND="${RDEPEND}
 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() {
diff --git a/dev-python/cryptography/files/CVE-2018-10903.patch b/dev-python/cryptography/files/CVE-2018-10903.patch
new file mode 100644
index 000000000000..1133405fb93d
--- /dev/null
+++ b/dev-python/cryptography/files/CVE-2018-10903.patch
@@ -0,0 +1,76 @@
+From 688e0f673bfbf43fa898994326c6877f00ab19ef Mon Sep 17 00:00:00 2001
+From: Paul Kehrer <paul.l.kehrer@gmail.com>
+Date: Tue, 17 Jul 2018 10:47:57 +0800
+Subject: [PATCH] disallow implicit tag truncation with finalize_with_tag
+
+---
+ docs/hazmat/primitives/symmetric-encryption.rst     |  1 +
+ src/cryptography/hazmat/backends/openssl/ciphers.py |  5 +++++
+ src/cryptography/hazmat/primitives/ciphers/modes.py |  1 +
+ tests/hazmat/primitives/test_aes.py                 | 16 ++++++++++++++++
+ 5 files changed, 28 insertions(+)
+
+diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
+index 5ebcca754..5b6000902 100644
+--- a/docs/hazmat/primitives/symmetric-encryption.rst
++++ b/docs/hazmat/primitives/symmetric-encryption.rst
+@@ -670,6 +670,7 @@ Interfaces
+         :raises ValueError: This is raised when the data provided isn't
+             a multiple of the algorithm's block size, if ``min_tag_length`` is
+             less than 4, or if ``len(tag) < min_tag_length``.
++            ``min_tag_length`` is an argument to the ``GCM`` constructor.
+         :raises NotImplementedError: This is raised if the version of the
+             OpenSSL backend used is 1.0.1 or earlier.
+ 
+diff --git a/src/cryptography/hazmat/backends/openssl/ciphers.py b/src/cryptography/hazmat/backends/openssl/ciphers.py
+index 462ffea25..e0ee06ee2 100644
+--- a/src/cryptography/hazmat/backends/openssl/ciphers.py
++++ b/src/cryptography/hazmat/backends/openssl/ciphers.py
+@@ -199,6 +199,11 @@ def finalize_with_tag(self, tag):
+                 "finalize_with_tag requires OpenSSL >= 1.0.2. To use this "
+                 "method please update OpenSSL"
+             )
++        if len(tag) < self._mode._min_tag_length:
++            raise ValueError(
++                "Authentication tag must be {0} bytes or longer.".format(
++                    self._mode._min_tag_length)
++            )
+         res = self._backend._lib.EVP_CIPHER_CTX_ctrl(
+             self._ctx, self._backend._lib.EVP_CTRL_AEAD_SET_TAG,
+             len(tag), tag
+diff --git a/src/cryptography/hazmat/primitives/ciphers/modes.py b/src/cryptography/hazmat/primitives/ciphers/modes.py
+index 598dfaa4a..543015fef 100644
+--- a/src/cryptography/hazmat/primitives/ciphers/modes.py
++++ b/src/cryptography/hazmat/primitives/ciphers/modes.py
+@@ -220,6 +220,7 @@ def __init__(self, initialization_vector, tag=None, min_tag_length=16):
+                         min_tag_length)
+                 )
+         self._tag = tag
++        self._min_tag_length = min_tag_length
+ 
+     tag = utils.read_only_property("_tag")
+     initialization_vector = utils.read_only_property("_initialization_vector")
+diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
+index d6f83ebc2..4ceccf155 100644
+--- a/tests/hazmat/primitives/test_aes.py
++++ b/tests/hazmat/primitives/test_aes.py
+@@ -439,3 +439,19 @@ def test_gcm_tag_decrypt_finalize(self, backend):
+             decryptor.finalize()
+         else:
+             decryptor.finalize_with_tag(tag)
++
++    @pytest.mark.supported(
++        only_if=lambda backend: (
++            not backend._lib.CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 or
++            backend._lib.CRYPTOGRAPHY_IS_LIBRESSL
++        ),
++        skip_message="Not supported on OpenSSL 1.0.1",
++    )
++    def test_gcm_tag_decrypt_finalize_tag_length(self, backend):
++        decryptor = base.Cipher(
++            algorithms.AES(b"0" * 16),
++            modes.GCM(b"0" * 12),
++            backend=backend
++        ).decryptor()
++        with pytest.raises(ValueError):
++            decryptor.finalize_with_tag(b"tagtooshort")
diff --git a/dev-python/daemonize/Manifest b/dev-python/daemonize/Manifest
new file mode 100644
index 000000000000..e8e590f582b1
--- /dev/null
+++ b/dev-python/daemonize/Manifest
@@ -0,0 +1,3 @@
+DIST daemonize-2.4.7.tar.gz 10096 BLAKE2B aeac5b0c0ac3dc0a1a069f3b1bdcc81bc8cc6703c4650ee6b569f6ce9caf6255551655e41a94406b1ff22817ef2f64d7826ad9491cbe1b0591e357141f34f06f SHA512 33c32893916b9bc45949bb4115bc8aee2eacd809535783eb7b07d3d3ee162ea969da5a739078f8b061e89da52e8da468f9d7fe916dd4f9d7dbea7012c2955e9d
+EBUILD daemonize-2.4.7.ebuild 457 BLAKE2B 06d131875c27ca68fa0c8cba2154577748fca2f21b28e8e59ba0543943ab5cc8f8b9c9aa978d20d3045f7bfba0dea4e34dcf8aa608c8d038629c790a5b10b610 SHA512 7a3d533a6965809eb1518482da18e432b5912c99bfdafc4f0d58e49d2aa4abfb1e8121610fd98ed87aaea7e59ba6a75f697b0b72b1cf91f44e65b12ea1f8f8e2
+MISC metadata.xml 377 BLAKE2B c8bc7c4e33e27cb2f208673e213460e02fa448f41226b08324f44d700d856be8b1bd408dce6f24dbdc1ffe8d2b15d99f56160fb93727066d887362fee7a532db SHA512 7d2e4141f084e93515957fb82473b1504b53c5082063b3f4c97fc1d326bc03b589405df8b3f19f8f926656fd52d7972b1b95a479c045d8a691cec255bb95d4c0
diff --git a/dev-python/daemonize/daemonize-2.4.7.ebuild b/dev-python/daemonize/daemonize-2.4.7.ebuild
new file mode 100644
index 000000000000..e186dc2bcd22
--- /dev/null
+++ b/dev-python/daemonize/daemonize-2.4.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for writing system daemons in Python"
+HOMEPAGE="https://github.com/thesharp/daemonize"
+SRC_URI="https://github.com/thesharp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/daemonize/metadata.xml b/dev-python/daemonize/metadata.xml
new file mode 100644
index 000000000000..0f169dd51718
--- /dev/null
+++ b/dev-python/daemonize/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">thesharp/daemonize</remote-id>
+		<remote-id type="pypi">daemonize</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 891831a9bc7c..85daf985dd43 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,7 +1,10 @@
 DIST dbus-python-1.2.0.tar.gz 602426 BLAKE2B 86f5ba9283256b83d268ff7c27368e587896d58f87b15aefe9d29a90530ced591a2c6814dd37b91274910ed131fe031846071311bc6cc07c11d1f9cdda9e4602 SHA512 013b23e08fa1ed43f53a756587fefbc9770f7c51e93510e555acbd77230b7200693419bba9a69680d790bbaf123f4a195afa38b3eee1143da950fee0b5130bce
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
 DIST dbus-python-1.2.6.tar.gz 778893 BLAKE2B 1587bc9b1795e5c416397468b2061c869d923aea0983e604862342b27d37b946b1fcdd3bf07a612dba30087bdc6a5fa734906188c55756edf38d50eb67b7eef6 SHA512 6f2aec81defd2528d9876ec9a83843f8767275a5d6cf1b2b7b7a094f892f552f9a7b3d7b5006465254d410e503108e10138d7dd4cb3f1a4035d7f8d58c4d0684
+DIST dbus-python-1.2.8.tar.gz 787426 BLAKE2B 186cb8b1b25b2d2d12ab24ed304819ef18f953232d321bd425e7fda632c79a5a94f7b4118cc09f1bb13a0621980af67b4b55599fbbbcaf0e95f7912f4afd0a2e SHA512 6e486fd560944fc1461a27e6798e2c348c7fdf351602c082a0614c0a6822ff147875212bdcb1f818c0ab12470cffc613c0ffbd292cd9d445d3429bee65765905
 EBUILD dbus-python-1.2.0-r1.ebuild 2210 BLAKE2B 0f475f5ebe65b9880a5a9807f01914f3dc366597b21d528c1642d251400710a9dcd45f0bac1cd7e1faafa4506b358bc4d723d5c87d1db05dddec74eede59fa3a SHA512 a7bd731d00b142fdd0dcc90c8c2b3e87ad4766ca4725cf10d2418b13de82e87df1931cb76fa40e1808fe0a8d1be3012e855e126f0b398f5aaa308118a67a9c0a
 EBUILD dbus-python-1.2.4.ebuild 2228 BLAKE2B 16447af268331e0666b0cb10bf0f9137e466f5bcc53cdeebbcc5cf3ac2f7e80996f124ca724cc775482a98ade16e5b85177233402897cbb4f21116e31faeb702 SHA512 ff39e5618cc8a6704c7e393949370a6fef2d6aacc22172410db6976ab76071220a5b16ebeb901be66f604cdc0440bc9ea1982126ae66730853464b46d8bb1f85
 EBUILD dbus-python-1.2.6-r1.ebuild 2354 BLAKE2B a84ae880849eacd33ac774d3aa9f0b99a1a4a827304e806da5d0508f0850abf0eb79e61a8dff2d36a561a3bf09061d660d24ec45aa8e6a3196482a7019bcb765 SHA512 ca739a3a0a63ef25a260eb62adc4efec39181dadaac3a5feb1cb4887f3620ef45bc7175ac3677f3502e7b2ca695bcf2861694acba94784205e2521a751f6d477
+EBUILD dbus-python-1.2.6-r2.ebuild 1895 BLAKE2B b868d0892812a869f10461bc4317af6d32fe910b304b6cb04e1162f167570819224b6fe70de33b238f9c6780f0048016c06a16de8b27602078981f8bb545068c SHA512 fd4e509aeee20ad804bedc0db431acd8db7402ee57afe53d532a55362113258c57f000710478be9aa3205c30c7e53b6fd1596b7c9dffd092a90f3888b0988baa
+EBUILD dbus-python-1.2.8.ebuild 1638 BLAKE2B 39eda40eddf1f7100de143031d2f272db9375633657fcd89bd7de9997bad3329f8c838d0cb54cdbdf6663f086735ac591dbe1bedb5f3d9a95cc51329440881ef SHA512 5d3377cc756460686412bb40e54794f50b12042e3f51cc6c94795144873bdc1a81f8b00dca3cdd74568a72d6a3ef69aa7155346a7358151d8a101e9b3b1f4e8d
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.6-r2.ebuild b/dev-python/dbus-python/dbus-python-1.2.6-r2.ebuild
new file mode 100644
index 000000000000..b2f40c7851c9
--- /dev/null
+++ b/dev-python/dbus-python/dbus-python-1.2.6-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit autotools python-r1
+
+DESCRIPTION="Python bindings for the D-Bus messagebus"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+# API docs generated with epydoc, which is python2-only
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	doc? ( python_targets_python2_7 )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sys-apps/dbus-1.8:=
+	>=dev-libs/glib-2.40
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		dev-python/docutils[python_targets_python2_7?]
+		=dev-python/epydoc-3*[python_targets_python2_7?] )
+	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/tappy[${PYTHON_USEDEP}] )"
+# TODO: Half the tests require tap.py from PyPI now, which we didn't have packaged; those tests just get skipped then though
+
+src_prepare() {
+	default
+	# Update py-compile, bug 529502.
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	configuring() {
+		# epydoc is python2-only, bug #447642
+		local apidocs=--disable-api-docs
+		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
+
+		econf \
+			--disable-html-docs \
+			${apidocs}
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installing() {
+		default
+		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dodoc -r api
+	}
+	python_foreach_impl run_in_build_dir installing
+	find "${D}" -name "*.la" -delete || die
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/dbus-python/dbus-python-1.2.8.ebuild b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
new file mode 100644
index 000000000000..f976f4eb972b
--- /dev/null
+++ b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit autotools python-r1
+
+DESCRIPTION="Python bindings for the D-Bus messagebus"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="doc examples test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sys-apps/dbus-1.8:=
+	>=dev-libs/glib-2.40
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
+	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/tappy[${PYTHON_USEDEP}] )"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	# Update py-compile, bug 529502.
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	use doc && python_setup
+	local SPHINX_IMPL=${EPYTHON}
+
+	configuring() {
+		local myconf=(
+			--disable-documentation
+		)
+		[[ ${EPYTHON} == ${SPHINX_IMPL} ]] &&
+			myconf+=( --enable-documentation )
+
+		econf "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name "*.la" -delete || die
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 7443e7b741fe..d051a90d6fab 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
 DIST denonavr-0.7.3.tar.gz 61735 BLAKE2B 5a6a8fab2f416cb34ac3078cc65fa92342de81a21f1710f6460fb00c1d255d7a5e208d3d9f9904c063004456e6e3447a08c677b95fc216bab1153060bafa8dd2 SHA512 51d559bf0db1ca9fcd6239046d2c2a149ac22e99aec331f10c7c6d59b2c9290aa66477093f4e707caf24f9ff78572659c3ffe2c9d508a28b344a1838e8cdee5d
 DIST denonavr-0.7.4.tar.gz 61901 BLAKE2B 70e4ba2b261d2007f80e52c43bf3fca4b41d2e53067e82aa46010334450b2a81723045f377956340d7b7d4388e829b8648a267a89c7ba69fd1ce28ca1f42ca10 SHA512 7ac9a25ecb46f0556acf48c1427154d3282a59185640aa85f2ae5d638d4b7fffea5b53a1964c621751e42d1d45fd6a6d5c273e1c850e2e473159bd099394e24e
 EBUILD denonavr-0.7.3.ebuild 735 BLAKE2B 4f4356586b107f67da9bf30ad343baffb45d1aee00a71bc080d6277308775e8b0326ba1f86d8de47184fba8f9915903fe90e7b4aed7c5e9e2cb889478b08ad35 SHA512 fd6fec7ad258fad0149ae210abc6aa00662ee305a8990c4ed8a4f934f7ea985cfb821af0f92197aa1abc0629effe2282a9692a029f3d9eb76c2ffa457f7a0ef9
-EBUILD denonavr-0.7.4.ebuild 734 BLAKE2B c038e3ddf24d3d4948e530055f3ef013e8813fcdc8244002c67daa5913f5663effa3a49b295878818f61b078efffd3f835848dd550bee76bd8eaaea340ab2bad SHA512 075681f71446a1cbb0c2162696dc39b032789cf6ff8a2d203080da00c6f1e4165c35586e92b358ca31f7bb4c2b0a08326ac9fc756b809871871a11e37284b99e
+EBUILD denonavr-0.7.4.ebuild 739 BLAKE2B b17948d21ece30d16b9d1b06d8798e148b72f3ed28d7d9e384efcdb9341af44bb4d9af4c89e989b024e54275a100bcdc1345e1b13597fc5aeeaeaa1c045986be SHA512 281143ed79912e720b465d2b7709b47c3d3eae7187f3da4c9a8dad0739d5bad78f2a624667c60d67a2d4d557c4bc74f2c5ab3fa88e41d91c50bbb4bd0b23b269
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.4.ebuild b/dev-python/denonavr/denonavr-0.7.4.ebuild
index 4a3aab119639..6f32967db35f 100644
--- a/dev-python/denonavr/denonavr-0.7.4.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -29,5 +29,5 @@ DEPEND="
 "
 
 python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
+	pytest -vv || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/django-compressor/Manifest b/dev-python/django-compressor/Manifest
index 7f15b1557e27..5c6a76b1c2df 100644
--- a/dev-python/django-compressor/Manifest
+++ b/dev-python/django-compressor/Manifest
@@ -1,3 +1,3 @@
 DIST django-compressor-1.5.tar.gz 105855 BLAKE2B 18cd7d664a683c44674d89f714e36dc4c7c8f9412567c12b31bc563a16340a11ffc3c4e686fa8d360a40553989ed41aa208e71aa31d0bb2c5fe31f5d7c3261e7 SHA512 d6c7a04263895a4195754a49bd4831053186c99d6fdd07977c26059eb931c982bd3b60848311e8469ad0e0298204a5fc3f0e63697a5af5608abf0b76e521c797
-EBUILD django-compressor-1.5.ebuild 1744 BLAKE2B a984c067edea8858402e4ad70edb7a3c7a52cd5d695258e75d73e2c29abbc563776e7a05aab83fc0a82d59b213746214b259855bed5d75f3de8e137ba4e73706 SHA512 b29320e332292c3822dce6536cd66f623c4d9f1ea10afc6b9e1835a96b9b31c7bf055422e6f636694fd1fc08b1714a59c5f1e1b14b5cba620cae664ddd8f91b3
-MISC metadata.xml 339 BLAKE2B f8fd408c82c6c7f9416a7bf9092555ddcf18c962ac83a379e95ef264d8e9a09837dc6527b0bb659dfb5565887348313d5fa4ef7a28e7e91e51d3f28a1afa2bed SHA512 41051f6aacf5ae785a36c1606b2df505fd6120b9d2d9a9864ec15a5c8e72a5350b81510b5aeac28267f62310e8c192b3338001ada21c4b8fbe183f80f1043bb2
+EBUILD django-compressor-1.5.ebuild 1747 BLAKE2B bfc9aa7f97930dc5254ad2c6fc01de1dc26c7d4255ecc0efc164f9cfb2c0f073104a61ceb1cb78f52a9264ab264a224bc5e5038aad0998bb917c02dc1c065434 SHA512 c7755772aca445990f4912d3d61d4d517e0622fedcc72deffc2649ed91b39303bd4aa769671fb441ff329564134b2d3dbe6e124390963be204b21b184f4f5011
+MISC metadata.xml 261 BLAKE2B f00ac4dfae4593cea0aa77a0eb78d2233375424892a35c68158c2375ba361c586bc7787f1a505cc1f9b905f3c789af265250356b650b1f621d98fd9df933ca2e SHA512 ee79f9fd96b3de69d2f761c08df6c09258cdd9509d6a65bde8e759a4889fc264d81b774324fe19082b1ffb689b9b5b2f42d40592b415030be47c70241bc51eff
diff --git a/dev-python/django-compressor/django-compressor-1.5.ebuild b/dev-python/django-compressor/django-compressor-1.5.ebuild
index 97c17be2b6d9..df8a9a524ca4 100644
--- a/dev-python/django-compressor/django-compressor-1.5.ebuild
+++ b/dev-python/django-compressor/django-compressor-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
+	<dev-python/django-1.9[${PYTHON_USEDEP}]
 	>=dev-python/django-appconf-0.4[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/django-compressor/metadata.xml b/dev-python/django-compressor/metadata.xml
index 6e566e0fb330..52740466c040 100644
--- a/dev-python/django-compressor/metadata.xml
+++ b/dev-python/django-compressor/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">jezdez/django_compressor</remote-id>
   </upstream>
diff --git a/dev-python/django-openstack-auth/Manifest b/dev-python/django-openstack-auth/Manifest
index 83d3fbb34321..080c58a380fe 100644
--- a/dev-python/django-openstack-auth/Manifest
+++ b/dev-python/django-openstack-auth/Manifest
@@ -1,3 +1,3 @@
 DIST django_openstack_auth-3.2.0.tar.gz 69837 BLAKE2B 4ff5fdf15731668d91a5d0693f57c41ac3c373e45a1fcecc619d621bcbfda53a11e48a3de6afeae276d7320daf8e7eb9fc05e63f60f2b7c79d536b8f9c358f99 SHA512 43e8d19d73c934935f73b6dcb5a5ffbb0ca49c2c7dc892cadd9a04af94091e39bf35f1833d33474f7aeee9a94040424f6ee43c5fd355d8ad971c0b4ff971d4de
-EBUILD django-openstack-auth-3.2.0.ebuild 2128 BLAKE2B 15802dc0c99c1275b3b6e68a2e86f42d683bca254ccc0b0873805894a1cf5a7f35a23bdb3c3b84e143d081f09765ccbe6db6940309e259ea3d302f0f5098cf71 SHA512 80555209154b1021d161e8f82c61a5e042560181e137c35ab1928a935635a40a8f020a4e7c3c3ade23870dc3330e940799f2483b584cc4416f708b8a95dd5f87
+EBUILD django-openstack-auth-3.2.0-r1.ebuild 2126 BLAKE2B dae0c770e2260e3c20647a1eeaad41c7ed7e861f6e493f718eb5f9c6b9ad07e5b5e1c993003a4c4233c0f59c5e601254e394b023ba87075263720641c823548f SHA512 4adfac22c36a5e6f2452335aa518d84c13d4fe460eebbfb5d31ceb60f75cc880693a62a79d7963f4bc9e36620087a8fc5a57a13ce1b6e4fbd400f263acd91fa1
 MISC metadata.xml 596 BLAKE2B f6aaee22ca4f6da9461dd4d83b100c319dde54d64c8bc951b5ea84dcd4749b5922b05ef828d570d7d953a095fe17bb24389892a177ad8181d24f5b21a6e4612f SHA512 84101c91533c60103627252f9392897cde375c39c26a66f72568b34feb1da4684f5ae63c6e83324b56bc5ea3efca97b4b22165bd0b93b5c9536e10916e695330
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-3.2.0.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-3.2.0-r1.ebuild
index 7a83cbeb560e..5f7292f8f799 100644
--- a/dev-python/django-openstack-auth/django-openstack-auth-3.2.0.ebuild
+++ b/dev-python/django-openstack-auth/django-openstack-auth-3.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-otp-yubikey/Manifest b/dev-python/django-otp-yubikey/Manifest
index 98405461ecc4..cb7bbb74c6eb 100644
--- a/dev-python/django-otp-yubikey/Manifest
+++ b/dev-python/django-otp-yubikey/Manifest
@@ -1,3 +1,5 @@
 DIST django-otp-yubikey-0.3.3.tar.gz 14233 BLAKE2B a85eba8bf9c590d4747627baaaa6c038afea7d766203974508ee1ccb6bf807642720fae78a64584230f013daefd87475c5c9f94f1584ed4ddbdcfbdb31aee57d SHA512 80c9ffb42a7109a04eca4fabca33294b3a65abeb12f408cb6d7c6c06644896629df43d32833d514e0a60ddd6352af073fb5b2f1174a07b370214a76ccc093c3e
+DIST django-otp-yubikey-0.4.2.tar.gz 12670 BLAKE2B faf060cdc242378ba762ee6af4cfa124da60388ed23fbb33016e47dfe22542075573d9792924f72701aa09d1dde37a79f56674b26d83c2936223602f4ab1eea4 SHA512 bc6fca539e28b52086768c2874d333c7f42b69de4cbd99e57c3cbbb4d0aeae31335a54d6d7f03a9252c0524e75ca20263106d1aabe30a21f5b4046fb2fc2effd
 EBUILD django-otp-yubikey-0.3.3.ebuild 572 BLAKE2B 2f9dfe15e30dd4cc43e27bd4c265e018db2f140499b07bb5edd48c4e1475972da4b922bd6feb1adff3e423ffa1eb3f39f23b7e6e5885ea2eec249d34a03cfbc6 SHA512 4a8800b24cabba93de68ccd8416bb8aa77ef29db4bb2ae00a6e1402f23c8d2883a1fcbf176e094a044ba1016c9f03c57bb3b5aed8f08c93d00eff15e0e459d6f
+EBUILD django-otp-yubikey-0.4.2.ebuild 572 BLAKE2B a7ca9c9cfceb41699822d907334bc784adeb23ee9eec7f48e5acf9706567b95579c5d79e417d97d4cdf21131d6d5e8bfe10b6979033f58311649f38f5dff769e SHA512 41f435d81701d3cc43ca36ada647f14ad2b8d686fd1351a57dfc953bd5cdeb367444a56075f807f572a20447676ff943601b8ac846cf1651fba4b2e3df610fda
 MISC metadata.xml 316 BLAKE2B 07e00fa2de594708826250b71745951204e35e8ab7c74257eca61057a7bea5b2d9fb5f18724b0048da782f415751ceea4dbf4e79bcbb2135c77421a71a8937a8 SHA512 0a65b77aa7db9ea74f8643b05534fcaffaaedce5e7edbfc35c0f86e831c942b4464d9e4c225e3373d18b1b3a61e58976ffbd222843efcede3eacbb0d4177e597
diff --git a/dev-python/django-otp-yubikey/django-otp-yubikey-0.4.2.ebuild b/dev-python/django-otp-yubikey/django-otp-yubikey-0.4.2.ebuild
new file mode 100644
index 000000000000..21e25622065a
--- /dev/null
+++ b/dev-python/django-otp-yubikey/django-otp-yubikey-0.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="django-otp plugin that verifies YubiKey OTP tokens"
+HOMEPAGE="https://bitbucket.org/psagers/django-otp"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/django-otp-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/yubiotp-0.2.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index bee88e08d5f6..5c7e34087bac 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,3 +1,5 @@
 DIST django-otp-0.3.4.tar.gz 39992 BLAKE2B e85cee8d868038aa936a8a3bd7dfd326a28a7609f3a6273637e075fb971dba27060b39f18773628c6a963525a0aa83328d72de937957f430629b8ad6fa77e127 SHA512 62b6683050a9dbd0bcfc9a63bd965f19e5d088c3e53c5e45067f8a785aa7b2a7b540d0331742bf8b979ad95d308f944bfef250989d1f782849a71bbc79a7d53c
+DIST django-otp-0.4.3.tar.gz 42480 BLAKE2B 09398e4e06425fefdda45a3a200576efda9409a42fb8f1c640a996e066e1ad2cf47e6ee0879e4a61cdc64808fe8f030aba19dfd99fa4da7d3e86597bda881d09 SHA512 3f3ec761dc12ed40e8c757dfbe1fd951c7c6aed3abc311c823acdeca08d5864b54c8442a49807228be17b30c20093b1ba7fb8b2c0f86f00dc1cc215ccd7c28de
 EBUILD django-otp-0.3.4.ebuild 541 BLAKE2B cfd56608c112f605107630452694b00395e30fb4c5852e7c5ba99b449e6059fb2ebd979a5d6ecf045714773cef98f3dfb9ad4e9fbad127b4c0f6ee54b44e0868 SHA512 3f66855843e29cec6873333a0cd2c247e28edeab90bd776ecc3097710d60413cf90bf64b36e3839535825149d550b75f25d84e8cb7ff80c7f93ad9db3940245e
+EBUILD django-otp-0.4.3.ebuild 539 BLAKE2B dec8d59c9c7a0481465d857666fccac9e143159b88ece94225039fe5d52f4fb81a6db4843e76926788d8e383ae33832efb4e3b7796041b497f4ceca07f188f8f SHA512 ff41c34c765d3e884d6320266d3411e6224fcb8a02ea67ea35b7cf6a37dc1cf10e2339e67dde186e6bf822f075f6cb9148edaf2c2ba23045d62537b7939c8cc3
 MISC metadata.xml 308 BLAKE2B 4ab31e91721855334918e7c51072069b20202977309fe1e9509952351500a59b7daea3adafff99e44bb4ffdef76e900716e7718fefe3f4bb3f790a80955baf6c SHA512 06e2750aa7131626332ae0b473edb21ebba3ab26aeba63fde2dea4520c38a8e3d94e18e5f4aa5c759493059aa127858e1595975503f6a723611774d7fcd2550b
diff --git a/dev-python/django-otp/django-otp-0.4.3.ebuild b/dev-python/django-otp/django-otp-0.4.3.ebuild
new file mode 100644
index 000000000000..2f62c4dcbb8b
--- /dev/null
+++ b/dev-python/django-otp/django-otp-0.4.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://bitbucket.org/psagers/django-otp"
+SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/django-1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-tastypie/Manifest b/dev-python/django-tastypie/Manifest
index 419631de045c..77ae0813c78a 100644
--- a/dev-python/django-tastypie/Manifest
+++ b/dev-python/django-tastypie/Manifest
@@ -1,3 +1,3 @@
 DIST django-tastypie-0.13.3.tar.gz 231373 BLAKE2B a966e7d9f36b3399799afd00f92b4d0bc4041226d7aa3d55fc204c60eb7fd757d1c56ed985f79017754b16b4af92281004b968c75fce69862da8584a78e058bf SHA512 a4497c2212e1ca6614d69c8c847aedd9b9bb88c7c9083c3eae8bd163e9f61f4402c6adc0a3b2a5632e9d2d7e14b2158bce66d8e62257493edfbd9ca9be9355fb
-EBUILD django-tastypie-0.13.3.ebuild 3287 BLAKE2B 8b1b199944cad0c6fede63971408c527bf4bee6f88f9c8e0ac3e6640ef9c738af0abf676fd02de6a5a4ce4bbfc15bef30850c8874a338187c00f37f2139310f2 SHA512 ee0daec0920cb4d8fa5c89a04a6397f2adb8d78f2433405d90005bc64d924398ddede8108b3c689fbcfdf743d2d99e78de368b13c47e5e093c17c3b5f5f5e1e1
+EBUILD django-tastypie-0.13.3-r1.ebuild 3198 BLAKE2B 7f80807ed1e39d69fc3ebb80d671db7e8f098893e025bee6cf4ec6788db21d7ea4f52ef971b523bac5bfa48ddbf98bceb4901f9e99f94656874f9f4132c243e6 SHA512 cab453b1c0452c8c3b2c134e100f184656b69ee90339d7d0b58a13ca7196b647c17ef4ada82952ca006650a05abdcd536833583d547afc621b0ed47d411b55f8
 MISC metadata.xml 454 BLAKE2B 36ec2e6bfcbdffab95e3decfb7644d2f0f9c7f4456f3e3674e50b5eb4d3f35791e2bb45a18ce0ed7b9eaffee613f1d3e7e17ca011d0e392846bae5b55f8542e5 SHA512 d2d016093c899313785e87d85dbf1a218db654f028dc694e7161e152ec871e429738c80a61609be155062dd6a1044aa9e3d27c5702050189ff000a792e0759f3
diff --git a/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild b/dev-python/django-tastypie/django-tastypie-0.13.3-r1.ebuild
index 30df05b94e5a..901a7ba4a769 100644
--- a/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild
+++ b/dev-python/django-tastypie/django-tastypie-0.13.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1
 
@@ -17,9 +17,9 @@ LICENSE="BSD"
 SLOT="0"
 
 COMMON_DEPEND=">=dev-python/mimeparse-0.1.4[${PYTHON_USEDEP}]
-		!=dev-python/mimeparse-1.5[${PYTHON_USEDEP}]
+		!~dev-python/mimeparse-1.5[${PYTHON_USEDEP}]
 		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-		!=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+		!~dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
 		>=dev-python/django-1.7[${PYTHON_USEDEP}]
 		<dev-python/django-1.10[${PYTHON_USEDEP}]"
 
@@ -28,8 +28,10 @@ RDEPEND="${COMMON_DEPEND}
 
 # test: django fails at current version of sci-libs/geos, making tests
 # explode immediately
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
 		dev-python/biplist[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -38,8 +40,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pytz-2013b[${PYTHON_USEDEP}]
 		!!sci-libs/geos[python] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/django-1.9[${PYTHON_USEDEP}]
-		<dev-python/django-1.10[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '>=dev-python/mock-1.1.0[${PYTHON_USEDEP}]' python2_7)
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/django-two-factor-auth/Manifest b/dev-python/django-two-factor-auth/Manifest
deleted file mode 100644
index 0d11c6c5bc72..000000000000
--- a/dev-python/django-two-factor-auth/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-two-factor-auth-1.3.0.tar.gz 98955 BLAKE2B 9c9053a0b1f7c8dcd67b1f82ad5f0db5e790d6e589bab0489960fce8bcb3bdceb51e43bb2b42507c4a3ddd100722d83dc88f71521d3a9fd6513ce3e41aa0247c SHA512 5876e82897b7b86663f12701652d266c20a9d4ea16da8722e96050ecf3a3997fb0bf3e08cbcc1ae12763f68e52d66d2749343f8b7757d4286da14e8ceb98c85b
-EBUILD django-two-factor-auth-1.3.0.ebuild 1041 BLAKE2B 3674cb2d3e53c66468b3be2d79077f719ec78268fe5864b9c0e3efa7af0b8220f00ab645a41493ffb3a9a7dc5cb489c5962c80953cd6fff0d42953d34f6777ae SHA512 e336545ecb1e6562559101f3005955cab138fac0549b0157dd4614895e0227f2f88a2994d7ea6bf3c0633b39c7dc0f51aae9f0ce5ec99894e681b1597d776b9d
-MISC metadata.xml 363 BLAKE2B fb99985f957786bb9730d9c5934ee7b3b0a6a00f801c07451bb22d0bacf3a21bcbccf21b0c05bd792e6bc21e90351a6d519c7a2eeff6db348f7b2abc139ac9fd SHA512 720fb046376f3b49c628b5aaf140fa6965170c771e506a2a1c9adf47202e27d821a2850c1f1e41cc1e81d3035acae5e825bbf7dff31816d5b130964e02248ad4
diff --git a/dev-python/django-two-factor-auth/django-two-factor-auth-1.3.0.ebuild b/dev-python/django-two-factor-auth/django-two-factor-auth-1.3.0.ebuild
deleted file mode 100644
index e2b29f2b94d0..000000000000
--- a/dev-python/django-two-factor-auth/django-two-factor-auth-1.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# would support 3_5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="User-friendly Two-Factor Authentication for Django"
-HOMEPAGE="https://github.com/Bouke/django-two-factor-auth"
-SRC_URI="https://github.com/Bouke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test yubikey"
-
-CDEPEND=">=dev-python/django-1.8[${PYTHON_USEDEP}]
-		>=dev-python/django-otp-0.3.3[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		dev-python/twilio[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-7.0.9[${PYTHON_USEDEP}]
-		=dev-python/django-phonenumber-field-0.7.2[${PYTHON_USEDEP}]
-		dev-python/django-formtools[${PYTHON_USEDEP}]
-		yubikey? ( dev-python/django-otp-yubikey[${PYTHON_USEDEP}] )
-		"
-
-RDEPEND="${CDEPEND}"
-DEPEND="test? (
-			dev-python/flake8[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			${CDEPEND}
-		)"
-
-python_test() {
-	emake test
-}
diff --git a/dev-python/django-two-factor-auth/metadata.xml b/dev-python/django-two-factor-auth/metadata.xml
deleted file mode 100644
index f1167dc31e6f..000000000000
--- a/dev-python/django-two-factor-auth/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="yubikey">Adds support for Yubikeys via django-otp-yubikey</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">Bouke/django-two-factor-auth</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index a2cde230efdb..384da0e8e5e4 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,11 +2,13 @@ AUX django-1.7.6-bashcomp.patch 1090 BLAKE2B 7c3a960ade3b450da853175a7ea4afaab26
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 DIST Django-1.11.14.tar.gz 7850578 BLAKE2B b858ab51d40812979ec04cffc459ce137a5f5604d105e73c2fdf9e36b07fd5cf12a7f31d6f89607716220328313663f4e99dabfdf40f93b5c829efe533efbc51 SHA512 71dbbad22bf0675a5c9aa36bcf69d6de561cf041b744fa37b407cb021ef342c3245b8001025c0492ce20df664e37ed2d7a5ffdc397761065d088ddb0d9fbe6c8
-DIST Django-1.8.18.tar.gz 7297986 BLAKE2B 3cf777d98bfc278a3b6458cbb1bbd273e6b77e35bdae24e73cd1af6b6ab7e71ef12d36df73d90a3971ac3b6fe6edbb4a2d14a95a6f2200c99419a049eb95cdda SHA512 41959c1012feec579dc991129976a655bc2f1ff7298bd05951c925b3d0a86a67cc32bf8a78273236b3db05cc1eb841a7aba5091bd06a072dd73c55eb0f7ecee8
+DIST Django-1.11.15.tar.gz 7843843 BLAKE2B b7713de8136302d8d95929ed449ab01173e28c0d5d20529eaae9d6bd6d323f53b674a4fb6e8398da4b57a223f10ef63e7961accc8fd777313f18b4e2b0f225ed SHA512 4ea18c59f7c74d0b6deb9d292d5de068c6dcc53d9596f321f5a7e823ff5fe423cc8d69c88bf53e3acd9c36c4ecc4447148243a127d5114a4894b0fd4d449f37e
 DIST Django-1.8.19.tar.gz 7359244 BLAKE2B 1c7b857f864527cf5b9cac8e08599e1f4f3306a828bcc253e0e59755da6d464592e627eb3743687b0410d308b3d089359dd79af0146b02e6db7f5eca43f04401 SHA512 cec71f4a1aaa3fcfc43a035e9fcd8d6fabde7aade43491f9205942cbeb251ae394e49ec6b5b2403b74c24b069064d44ae6070b151c0c949b940f2d46aa87774e
-DIST Django-2.0.7.tar.gz 7988568 BLAKE2B afc3fb9cd3f37b7488ad8eb46eb9ebb540c54b04661a44620951930a352537ee3a3072a604fd2cbbc95ea3fe112ebab25f45f971bc30ad48161eb8cda26db6d3 SHA512 ef42d9046ce3e7b5067c5b85114c0cb5854b0ebb1d3bae526484f11da8abbf04864c83f176e9c6e498c9140b134c9a517968c7bb0bc087c49bf105b2aae8644c
+DIST Django-2.0.8.tar.gz 7987343 BLAKE2B ab35f50ce1911cb9603c7ac85e7ab01e6019ce9a2dac4cd733b11f35722368946ff3a130c3c791da4d49cf609b5747b4c5de64e29e27a8e12abb7f9e29cd363b SHA512 ac3cc3f58cb977518c6f549834beb35677c2d5541cfb5723045b98165926e826178cb33737c52a0f999be24bc38b84dde489a5f91d1c8d51b8338aa611acb518
+DIST Django-2.1.tar.gz 8583964 BLAKE2B 92a48bbdd45fa94c7b43961bf22bd5521019bf0c9f37f6685c8916d9d1886b77522fb58d7db27989a713445b51e15858161e5b99e636cdadc23860d2d0a8ef56 SHA512 1c75f0ad8ef353fb38d245034f108df5554cc27073f44ef920576b5dba3d2dd685d8905c0bde1701d43cb01b4c9dbb2bfa7c38c57fae3208af5be616d26d39cb
 EBUILD django-1.11.14.ebuild 3226 BLAKE2B 4fe569a5302e8a35933a4a5059930b2a644657599374db2a693a15e1df41b60d54a0a689e63777e2669bb2abbb2c034ae0eeef7b497b35925fce11513262a9e3 SHA512 549d9198a51d786a028d3defde21a66ab45819127c68422517f82a537ccdde36dfdda34999b228b46dbbd84adb0af3fffb353bca147bf148e0a3f071ceae88c0
-EBUILD django-1.8.18.ebuild 3037 BLAKE2B fbb57541c06ce4233a1f179c4280ad35c1193ce35a5069d8067554d0a72d1101699f6ac2e7316551412ae07e14f87fc8cfe22181e400b2976c1042346da5f66b SHA512 1600a406796e229dcf10c7172467494a38481a707ebf7d5087a69582b8e38c7eb495f774efe72ffd8daddfcedb01e7e1cab178205467842dcf7e0deb16b67fc2
-EBUILD django-1.8.19.ebuild 3015 BLAKE2B 031a0bd274e2588473d5e4856224ac9b7f1e98c22b6c52adddfacbde2b26074d3bb83e69a9a09f9f29ac833dda45151eb0bf0dd9eca1d634f4eb337e9ab889f4 SHA512 f7c368a5875b0a0c3c9f1ec4a7c28ff2f5e8ddd048c42c57c4f2ccfba79d21806f20ca0602d615b1a974b3b06cb53f29198159f2fe15aebfbe322e4e6bb6ed9b
-EBUILD django-2.0.7.ebuild 3059 BLAKE2B afe8fad8175ee2abda5be42069a68ea1f15c258551e639395248730175a7a37bf69d958bef7fcc8bb8ca75db772390b364b03f0af87dacd3da8833cd0bf0789c SHA512 25c4497797a4049baf998499af58208cccfa47dc32fd279cbb12c2e4339c46f5a38467c994e7f3ac20667da457c4f6dbe163e8b5e2587fdba398ddc77ab9ddac
+EBUILD django-1.11.15.ebuild 3228 BLAKE2B 4aab321bce708bd0f7054754874783c0d52056ab1bfb54172a3f190fbfce911b7dd1357978e0cdc7f630d42f1e386113d2d6f3e93e3e3030b57ec53376878d63 SHA512 79bb04e301c5a7c114e5df2b5dab43ae4daae9fc36574313779302578602341668cc27a1d29890a2ab6d40a79ef23be50dfd061516e40741327bbcc99e07353c
+EBUILD django-1.8.19.ebuild 3013 BLAKE2B 41cf956f18ab2bee939c1e31dae3b00a41ab1dcf75d8d8cda1f30d1161f0e9a150594600c2441c7ac4c7ab163666dcc19e09b3f6873380ad88a535286b0fffca SHA512 dcbb4508720fd0a7efda8114b775922b08ca65ae9183870c81870dba644084f8d04a729c99b7efb809dd69f9c0e77ea6b2c9e50142b1a9327ba0457e4f3692d9
+EBUILD django-2.0.8.ebuild 3059 BLAKE2B afe8fad8175ee2abda5be42069a68ea1f15c258551e639395248730175a7a37bf69d958bef7fcc8bb8ca75db772390b364b03f0af87dacd3da8833cd0bf0789c SHA512 25c4497797a4049baf998499af58208cccfa47dc32fd279cbb12c2e4339c46f5a38467c994e7f3ac20667da457c4f6dbe163e8b5e2587fdba398ddc77ab9ddac
+EBUILD django-2.1.ebuild 2494 BLAKE2B 59ebaa530f06a0837f84864b47e1e1ec7dc35422da3dbab3c7988e24469eb9c8a0f7a50e6bec1f0cdf22c0dd73fa80289714c63d57dcd953e316639256da27e2 SHA512 0a56f6dcb2315515c075885ef1cb3697581abb9ec8667e296b82d6fbf62d59e9051203d233d5ad0a34d4bfac5464b77f5670afdf80298fc4243230fa58a99651
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.8.18.ebuild b/dev-python/django/django-1.11.15.ebuild
index 413258c4600e..0d97bbcdfd43 100644
--- a/dev-python/django/django-1.8.18.ebuild
+++ b/dev-python/django/django-1.11.15.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
@@ -15,17 +15,22 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="High-level Python web framework"
 HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
 SRC_URI="
-	https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
 	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 	"
 
 LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
 	test? (
@@ -33,8 +38,9 @@ DEPEND="${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/numpy[$(python_gen_usedep 'python*')]
 		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
 		)"
 
 S="${WORKDIR}/${MY_P}"
@@ -42,7 +48,7 @@ S="${WORKDIR}/${MY_P}"
 WEBAPP_MANUAL_SLOT="yes"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
+	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
 )
 
 pkg_setup() {
@@ -63,7 +69,7 @@ python_compile_all() {
 python_test() {
 	# Tests have non-standard assumptions about PYTHONPATH,
 	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
 		|| die "Tests fail with ${EPYTHON}"
 }
 
diff --git a/dev-python/django/django-1.8.19.ebuild b/dev-python/django/django-1.8.19.ebuild
index 1f2e2d012e0a..1dda1fe2a773 100644
--- a/dev-python/django/django-1.8.19.ebuild
+++ b/dev-python/django/django-1.8.19.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
diff --git a/dev-python/django/django-2.0.7.ebuild b/dev-python/django/django-2.0.8.ebuild
index 133d40ffb7d8..133d40ffb7d8 100644
--- a/dev-python/django/django-2.0.7.ebuild
+++ b/dev-python/django/django-2.0.8.ebuild
diff --git a/dev-python/django/django-2.1.ebuild b/dev-python/django/django-2.1.ebuild
new file mode 100644
index 000000000000..87201aa293d8
--- /dev/null
+++ b/dev-python/django/django-2.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 30575853d227..3b7882c36884 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,5 +1,5 @@
 DIST dominate-2.2.1.zip 46460 BLAKE2B b09984978755f9020e78873aec73c09ccdf0113b99f1a0c9dcf43307a5523000f04ef2e063d03e636e2e958aa5dbd69993a8c606838cceb216599b314ab24a2e SHA512 3f79fa4258f98708b1e169693e83f919179c1148f440300426f907e28c26b28c21a1098793a14f7e89e5aba0de61f93c889a4908f0eb6e3641ffe234e215e597
 DIST dominate-2.3.1.tar.gz 27887 BLAKE2B 3ac0820bd0cb79e648dc947d3cb69aa207e3c129cbae05daaca8fd3a6e22c67bd20fa350ce211986451caa7feb5b60c8ff692e568073e007c34de7cb8847b8a1 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3
 EBUILD dominate-2.2.1.ebuild 662 BLAKE2B 664c240b48ecddf85d01f1142b12bf5331d7073425bb7108f783379a02203ebc7a1ca5b1013dbd6f05238e6e267c3facc408695c0f7c426c9fa52c86e4846d94 SHA512 e35a3f04d9673cc915f2776e828c12be6654fd552537f7ed64f02106fdefada4836a3c12ce35b6227786c614ddb62b4b907e13778e34b0e347e9120ac48897dc
-EBUILD dominate-2.3.1.ebuild 601 BLAKE2B db431a40a300b625bc9b4ddcb6b02fb6d5b537f3acd60c98668210069e57605db0785647bf4a80f36327f700d9f24be8d17e2bfab8d895fc77823d8fe4d7cb16 SHA512 10ecbbab20fd33e0a9e8b87e5e480715b81431e389ca913b77d8bbafa80b19ddb712360ba561b496092ba2d99e4ff097ab49d98fa2d962922afa2928c3a6be71
+EBUILD dominate-2.3.1.ebuild 606 BLAKE2B e59982d021a5797c993d4ea58bd57c831aca4a9c17901198af5c6477221f06dfe000b69f14f6367380ef95a91ea107318119bc91b122902119e18b904d2a29df SHA512 0319d71125e32159f0672c1c167e4c53f03f2076fab285b68e62a24b78bb93bf2f03e5e3efb8b4f6f65749882508e92cfd22aaddba8032ff953e6e767b1560e4
 MISC metadata.xml 771 BLAKE2B b57440fdd8bad6140d982af019944cc740ba47183908dc2505c1436448e735cd63f537b3ef2158b6014c4dc050128b13881b368ef9ed5e840b37f7e88ac72a25 SHA512 2af8875459291f59c07ece49ac0edeab74408f54031878c1b03581bdbcfcb509caf37ee30d03e2f86f59dd67aba62c54808ca5a6c67037717113c3bfb6f9961e
diff --git a/dev-python/dominate/dominate-2.3.1.ebuild b/dev-python/dominate/dominate-2.3.1.ebuild
index 3844d909e582..87ccba2d8e1b 100644
--- a/dev-python/dominate/dominate-2.3.1.ebuild
+++ b/dev-python/dominate/dominate-2.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -21,5 +21,5 @@ DEPEND="
 "
 
 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/eliot/Manifest b/dev-python/eliot/Manifest
deleted file mode 100644
index 3c0b2f560afe..000000000000
--- a/dev-python/eliot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eliot-0.4.0.tar.gz 67581 BLAKE2B 6d453bfd9bce12cda235390a852bec479e8616bd328043c93e502f95ff967397884cb234ba735b53aad6e580390532912164d7dc5868da854e49f2c6a255dbf3 SHA512 f63b487905996bf06c2efccc66c5b9214e13d672f9c3ddcfa5f2a65dc909953b489111469251501efa2e46b3911b213ffe404c6fddfea92646e086e439fb6503
-EBUILD eliot-0.4.0.ebuild 861 BLAKE2B ff7ce3d07b66897d5d9cebe3408667596d902727f693c232bad306d02e48187e9db34722650e06452c1b1b0203f9a0f96e4eb4e85927df48856060009b30c16d SHA512 0d88adaa0ec6b3fa834ffd71688cd12bb9ab5aea74483c03e41cedc0906fd1d0f00a8f75784eb05d2113b44f462cf2bf52de2ec988a335919f5cd51c87b9b5be
-MISC metadata.xml 301 BLAKE2B 6c366005453f140573c5097c2e2386363219372ee7e54e148729ef8673e76f28a9e7f129b65f12e7abc9c21aee9448bf5c7b932072e906fb008b23abddf8840b SHA512 5764d600c99a02ccc86132c89f1f930c8ffaaea5ab2d83f8ec2ce79fed3643acd02e1ed27d26aad114d636e2f9a6c885aa8c9e321461b9fe1c237617ffd4c49e
diff --git a/dev-python/eliot/eliot-0.4.0.ebuild b/dev-python/eliot/eliot-0.4.0.ebuild
deleted file mode 100644
index f9fe661676b5..000000000000
--- a/dev-python/eliot/eliot-0.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-inherit distutils-r1
-
-DESCRIPTION="Logging as Storytelling"
-HOMEPAGE="https://github.com/ScatterHQ/eliot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	"
-
-python_compile_all() {
-	emake -C "${S}/docs" man
-	use doc && emake -C "${S}/docs" html
-}
-
-python_install_all() {
-	doman "${S}/docs/build/man/"*
-	use doc && dohtml -r "${S}/docs/build/html/"*
-}
-
-python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/eliot/metadata.xml b/dev-python/eliot/metadata.xml
deleted file mode 100644
index 9f6846ff63e7..000000000000
--- a/dev-python/eliot/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">eliot</remote-id>
-    <remote-id type="github">hybridcluster/eliot</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index 905a45a43fed..c7c2d7f9520d 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,5 +1,5 @@
 DIST extras-0.0.3.tar.gz 6231 BLAKE2B 28f60a341628f87f2fbd333de8f2d6e37d42890a186e42d262079f26beca5f9452860b9c434c6953fb8395d13903c2fe63969726d1c1cb4bcc0a469efec8fb13 SHA512 7b08d094717a27fbb522d49c0c538e98baccef6540216479d176b55b94f3f0b97c4b70ed48f3802a1bf08a58fe9a319a113d4ca04d9dadcb85e3a99bf7490a3c
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
 EBUILD extras-0.0.3.ebuild 735 BLAKE2B f4b36b7ce2b6ea5b997af9f2c50f12cd52f46df52808ea047e9fa7f1502d1bd5aae769bac6b80742eb95d5cd5ed2ad7ba429e681ed48330e34e6f49f7980e6bc SHA512 a3898dadc29011ab04ce12b18349dce1fcc225920903785c0838bf971bee7fbbfcd34b92afbc09771f7acaf700b7bc8a8bd2fca46bc0f5b9995c1ca336df93c3
-EBUILD extras-1.0.0.ebuild 759 BLAKE2B c899d660b213008d432271c9035136e24bbfbb45f172fc90b00d2fecd9d07cbb0d729e3e34ad9ce6101d4107aa76ee96e70d32b50ae1799c1f28a753f4cd8e2b SHA512 63b4889b311adc66d3d80a4b93a37a53eeb759f4d6804666ccd69d8234ddb20544a640c5d25bb95059c8b45af704ee74de604439b088c9e41e3f8ea719f3c652
+EBUILD extras-1.0.0.ebuild 758 BLAKE2B daad68da85b69167b603354f34a43c9a2bc2c49bab73b6307bd6b8adffb415650b4521aac475a473fbd6325c806ae8677ec311c8860ccf664b6768a0dfa5878c SHA512 fcd6179b8e64d7ed2002a959cc56f47b4d5d4edb61a60f9b2a75c08533019aed749a2801414a46f5ea25f1cc593a4c05fc1208d702e56b654db3efff07e618bc
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0.ebuild
index 925a6fda57eb..9e28a1ffcc2b 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
index f9c5550a751f..41104686b0cf 100644
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@@ -1,9 +1,7 @@
-DIST Fabric-1.10.0.tar.gz 208969 BLAKE2B 08ddc1a43a34436e857595415b66d9f38d769647858d93258d454673be3be3f8da84ab3e6c89e526449cb6b89e05651ccebf65d648aaa9277337d342af7c1926 SHA512 991341dfb3f71e938c2a2e30f5bc158be84cb1600ab64c4f7c5c49decd0a38bc57615f9e07edfbed70d9ca796592d7c1a4f7f3e25a40c4d31049015df928b2e3
-DIST Fabric-1.12.0.tar.gz 232840 BLAKE2B 97d27261db631c8b4f89ba3e93a0e97aead841423d036dcdb00921b15a9b598428262de49e7ae2d0e960bf16ceb1297a526c124b2f39df9b3db4251a8af8d95b SHA512 cc07e811873c296c7e33ddadb00af3b4cbd1a87b2617b82505758e6b646e20e55edafe76cd969f3b2a7931a2deb4daefe8e44a7d6fe6ec67e5d9923d6c64e95e
 DIST Fabric-1.14.0.tar.gz 219294 BLAKE2B e4f8512fd5f84dacccdafbde51ed109fd7128954635ea67ed7461f686769c107cfa6bf0181921aea5db214ffb9fb52c7f0de88c5edbbdd63258e8c280e37c70d SHA512 3bb90597356ac033e5a9bba668ec8b080ee10cac31f54b1e89b6e2e21550ba5f2341e774ed9ff52c3a4ecbc3bae3206d155c6bfe6678576caca8e439c7810ed9
-DIST fabric-1.12.0-completion.bash 4266 BLAKE2B b691b34d3a62ab8a70d184fe89150d50a0817df0619cfcb4a82dcda485b0a77bb33b5f7e548b1c50ddf8c9c9ae48721c9621e0ca6ed4396dea2f9a0e1ae61931 SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3
 DIST fabric-1.14.0-completion.bash 4266 BLAKE2B b691b34d3a62ab8a70d184fe89150d50a0817df0619cfcb4a82dcda485b0a77bb33b5f7e548b1c50ddf8c9c9ae48721c9621e0ca6ed4396dea2f9a0e1ae61931 SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3
-EBUILD fabric-1.10.0-r1.ebuild 1732 BLAKE2B 06801d66d7eb65c9e56a061eca6c9ae4e5240bceaea5cdc2b1968b82c4a1ab5d10d1949f6e3d6f35308b6abee5523495bb5a39bc0612d991bcad291b3ee59f13 SHA512 85f076e0901ef30302da8c02d3ea6c8f90040dae611705549326725be69807611cc3e8abc36c9d5444acc47da73aa362dd6d15709c060c8225bb7dbaaf95c7d7
-EBUILD fabric-1.12.0.ebuild 2121 BLAKE2B c45c472502ca43a2830d9195a7054a0f7ed9b5a0a863515502900c154ccb0d1267eeb28b5acf2eeed78eceaa12b034f8edc659a1d6b234c809cfefaa9d763723 SHA512 8864f027b6804390a820abd0d9d9fbd7df444a3a5b250cfc63b21217a706fe231ec6a6cd9b4a06820a2260b267dd7140fb85b9836e114fd739365023361fdea8
-EBUILD fabric-1.14.0.ebuild 2121 BLAKE2B c45c472502ca43a2830d9195a7054a0f7ed9b5a0a863515502900c154ccb0d1267eeb28b5acf2eeed78eceaa12b034f8edc659a1d6b234c809cfefaa9d763723 SHA512 8864f027b6804390a820abd0d9d9fbd7df444a3a5b250cfc63b21217a706fe231ec6a6cd9b4a06820a2260b267dd7140fb85b9836e114fd739365023361fdea8
-MISC metadata.xml 309 BLAKE2B cd101ae05f7daf7c54a18766f2d93c84b4eb1fa59e01bb3afc26ce495fa234756789d1ce496f11e22880653c62ebafd4f2ce509f530438ff970f711d47ae3b5c SHA512 ca05cacf9ab4eb5814b4d311902e34ba0e788c811b59c9a687b0d320b254036a688cccc45265384523b2fc460383336d334acc860b72f78d3ec9736361bf6b24
+DIST fabric-2.2.2.tar.gz 146579 BLAKE2B b3517bc95b9b15f08091b52b7f45326aa9ff85999000dbcaf8a22cf2af84e3bf4cc4094fe1627e3c5dc86cf2d98a3ac6456488b788ca1b756af301321eeb7165 SHA512 917be063ee49f6a6b06dd1e2829f47221bf2b7a591d4fcc5175766291a2d2a5026d5a92812d11592556d2945b8668d1bef3a8c43809a6c0fae4b143a68f5eb1a
+EBUILD fabric-1.14.0-r1.ebuild 2162 BLAKE2B 36a3d0a6e660e7ef850eb87d8ff4b2b858a3db08095bc69487003e8db1976d9faa95f03365786a0353b014b0b9222447ea70394568cd9580520c98581b496a73 SHA512 d2f83cbbdc340d04e3f08809616f3e5021db7f28681ff2a27e1946c4eb2b4a4e7ff6f6c5c252e909e93d572a63a2d49497873181368231ed3001fbc6a305444f
+EBUILD fabric-1.14.0.ebuild 2163 BLAKE2B 98ef182b8a84056f297ef881a07a4062b4b0fd7c601e58de9103d4383af31ef346c6ca242cfe2677c1d0fbe2492009a3921430eec3df74373565350600d99977 SHA512 dcd699a6e9ae08cea481b354a4c1327bf1738815761fb6f856a84684e99f81cf553c31d2e7f64f906456aa4b687b11435fd93dc094dc9db45459819154a56c76
+EBUILD fabric-2.2.2.ebuild 1531 BLAKE2B e9d763d3a9ae1c128b634e4ae51488feb81f5575601d7de157dbaf4548bd2ff256c01110eb8a09f39f7c2cc33462bf8133b81949c7cc1bb1bc2bdcad016f3585 SHA512 689d0552884cc8c9545f578dceadacd2522e9a84abe0494477012e06680c6ad58534c413f5898f9eb7228f964ffda7b0b0a5c077ca2dd3fd4243f0dfb4bdf653
+MISC metadata.xml 524 BLAKE2B 9df10f0b4cbe8197f27e7b5fc67fee9d46d881ab29cd29f2255aca693b3439c49edd1145ec2442cc6d49fcb173998aef3bbd2a3f2017e1cb83fcc79f1c50c59e SHA512 1a7a207ebf6d760a6f8e150806addbc9ca6c207b0f93c13bf5525ab2868d95a2b33acee846dee25eb70af0163cb2e05323de1ac2b74155046de962a44c470413
diff --git a/dev-python/fabric/fabric-1.10.0-r1.ebuild b/dev-python/fabric/fabric-1.10.0-r1.ebuild
deleted file mode 100644
index 8fc24c231424..000000000000
--- a/dev-python/fabric/fabric-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Fabric"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7
-		dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		<dev-python/fudge-1.0[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Re-set intersphinx_mapping for doc build
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed  -e "s|'http://docs.python.org/2.6', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
-			-e "s|    'www'|    #'www'|" \
-			-i sites/docs/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
-	fi
-}
-
-python_test() {
-	nosetests tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( sites/docs/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/fabric/fabric-1.12.0.ebuild b/dev-python/fabric/fabric-1.14.0-r1.ebuild
index 4b345890112a..f3da6f17450b 100644
--- a/dev-python/fabric/fabric-1.12.0.ebuild
+++ b/dev-python/fabric/fabric-1.14.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -24,7 +24,8 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
+	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]
+	<dev-python/paramiko-3.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
@@ -70,5 +71,5 @@ python_test() {
 python_install_all() {
 	use doc && local HTML_DOCS=( sites/docs/html/. )
 	distutils-r1_python_install_all
-	newbashcomp "${DISTDIR}"/${P}-completion.bash  ${PN}
+	newbashcomp "${DISTDIR}"/${P}-completion.bash fab
 }
diff --git a/dev-python/fabric/fabric-1.14.0.ebuild b/dev-python/fabric/fabric-1.14.0.ebuild
index 4b345890112a..460458e98acb 100644
--- a/dev-python/fabric/fabric-1.14.0.ebuild
+++ b/dev-python/fabric/fabric-1.14.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
@@ -20,11 +20,12 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 RDEPEND="
-	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
+	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]
+	<dev-python/paramiko-3.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
diff --git a/dev-python/fabric/fabric-2.2.2.ebuild b/dev-python/fabric/fabric-2.2.2.ebuild
new file mode 100644
index 000000000000..2ee141e59f00
--- /dev/null
+++ b/dev-python/fabric/fabric-2.2.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple pythonic tool for remote execution and deployment"
+HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fab2 test"
+
+RDEPEND="
+	!fab2? ( !dev-python/fabric:0 )
+	>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
+	>=dev-python/invoke-1.0[${PYTHON_USEDEP}]
+	<dev-python/invoke-2.0
+	>=dev-python/paramiko-2.4[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.7[${PYTHON_USEDEP}]
+		<dev-python/alabaster-2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pytest-relaxed-1.1.4[${PYTHON_USEDEP}]
+	)"
+
+python_compile() {
+	if use fab2; then
+		export PACKAGE_AS_FABRIC2=1
+		ln -s fabric fabric2 || die
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
+	fi
+}
+
+python_test() {
+	# -p pytest_relaxed: this plugin has to be loaded explicitly
+	pytest -s -v -p pytest_relaxed.plugin || die "Tests failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( sites/docs/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fabric/metadata.xml b/dev-python/fabric/metadata.xml
index 0ed9470ac422..38953b499500 100644
--- a/dev-python/fabric/metadata.xml
+++ b/dev-python/fabric/metadata.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<use>
+		<flag name="fab2">Install as "fab2", allowing side-by-side install with fabric 1.x</flag>
+	</use>
 	<upstream>
 		<remote-id type="pypi">Fabric</remote-id>
 	</upstream>
diff --git a/dev-python/functools32/Manifest b/dev-python/functools32/Manifest
index dd0b59e85d6c..307f8817451f 100644
--- a/dev-python/functools32/Manifest
+++ b/dev-python/functools32/Manifest
@@ -1,3 +1,3 @@
 DIST functools32-3.2.3-2.tar.gz 31171 BLAKE2B 6f228a7ae4977f333a4979b583e636394691036670f8ab330450153e77262929d981dd0988dc00ab245df6dd0667f5ae12d296bc72513a4ed5b031159e332a7f SHA512 ad944019f4aefde292b6872bfe06862d01920a2f44adf8740c36ed51d16d879be7638591aaddf9dac4ec83b6f05bbf81972d5f32854abedcce3dde080459f7f7
-EBUILD functools32-3.2.3.ebuild 621 BLAKE2B a8de58b1421c9df0ed3a8962c593ff7c214e3d5eb11c7e7445a64dc45765ed2cf021c1ccc130751cdda65d89ce7e72dca27161bea8cde04eeb0f79b0b003f797 SHA512 a32dc8411a59c9befa976c98b638bb8266e6dfc449fa5a9606e404e70400adf03fdc47ae058b1c42968204a738a34130d257145d4cac4d110d93e8fca67fc1d5
+EBUILD functools32-3.2.3.ebuild 620 BLAKE2B c1aeb0e11c8776a5e8d7474cbf60ca8649bd1068a910c9f0d4725e726d8b2c97e4776d1a19693731573d6f115015b8594ba01052bca0757db7b4fd9a9495c244 SHA512 ee89c4211a0ac8a20ebf2a834fc30b7ff3fee85d4f01d02a85885db51a6ba44105cabf49a3b2b8b21506ac66401a614490ac98755f627341c70c3006488376a8
 MISC metadata.xml 380 BLAKE2B 112a93cd4165bae11a99c2668c01427f7deaf5d2d780c0a7a2d5d8a5f6d6d9e1e3609b1ca7bd96f1f37e718121d6284a3094fa87d376348cae1176b2a92b425c SHA512 665568fc9ce82f570e4601ea9574856c6e1d3db18e79a04ea46888b61ddc6da5aa0f73950346a8940a32ccf1c832981e6ed18ad547fb2f37edbea9b123b0fcce
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index 3708a8e950eb..654c411860de 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2.4"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/${P}-2
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 1459fa9cd4c6..97e41f92710f 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -2,5 +2,5 @@ AUX future-0.15.2-fix-py35-test-failures.patch 2339 BLAKE2B 737ba57bc09a141ee2fb
 DIST future-0.15.2.tar.gz 1583441 BLAKE2B 9c552a5f3598922f8910480d054015020112aae4f7e14d2c139dda13a0b26e878b75eaf5068d66f20823ac4659d85edd4087a95d9474dc27bf15767cf6e9d921 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee
 DIST future-0.16.0.tar.gz 824484 BLAKE2B b098366cc7a7866c4aa4a35f1a6a5cf113698307de8f4cce6c77e4ce72a8433dd102111f991e35ffa920c09a0d31cc048b9502dacd0aba1b701c11eaaeab8392 SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f
 EBUILD future-0.15.2.ebuild 495 BLAKE2B 6796334fd8cb1a1e2c90a4a55c4262bbfba55eab6defad0deb788466ed93790887b38f1e3d63f41baa0b586d7cab5e5731c08cbc4f958ae9799ef7c085ed4b8d SHA512 39de67be4877db5f248267e72642090763473ea15935e69ec069a726a5d4836c1de9efc46626e422d4bb18299b5ddcb5e42514781020417fdfdd6038350ea2b3
-EBUILD future-0.16.0.ebuild 562 BLAKE2B bf613f9be558778ff0803a843ccfd7e7347ecf5cf499418f05b4935ffffccd4cf36eb8c9678b890211d8113205e628866543d57c2e6b0dfa6bcca44b1df4146e SHA512 e0b8a7576d97640ca6944be41837eec60841977d41de41f4a3f92bbcde39fd60a911082c25609523797a2acf0f9bc93a20379616ab2d948bff239ec0047f029c
+EBUILD future-0.16.0.ebuild 616 BLAKE2B e97f5a31c707ef172cc572f0beacde74cfdbf5fb8653b5cb0999cc55f46ffbaca07357c076921e90f8f172ad00cb2484e24abe69b1a81f3c957e7011806fa598 SHA512 52b2288073dea8d3d8dc5ed1504aa1b88c19d74d10e8c0c1156b9fc17013eabd5a2b1d44600fb0b91de209e52ea07f5a7a4d96648e2d97b415eebcfe11f5fcf8
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
index 937ee9f1cad6..70d94772f015 100644
--- a/dev-python/future/future-0.16.0.ebuild
+++ b/dev-python/future/future-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 317bd0d934bd..223bc49ac8a2 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,4 +1,4 @@
 DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
-EBUILD geventhttpclient-1.3.1-r1.ebuild 1167 BLAKE2B 5a4776fb0cd83ecdc48d73718611ebdb74e3e251a42286e19f365b15e7c43e33d3b086e4c301a40d9cf8190d2d6a45f408a65fe75c827bc5641842d2b0d86161 SHA512 c0f25e9adae96580b3220a2702160ed746d88bad2dcca29df6d06b7bef2da161bc14b5ef90967262540d10225ab5a7a3b02436ef0e6bf9790c1a1bbf2bdb9f31
+EBUILD geventhttpclient-1.3.1-r1.ebuild 1169 BLAKE2B 28daa115267542dd3add11048ae93cf7d945655ccc00d9f3f809694786ec570622c5b1b76a6dfba50af63afee34174a92eb2dc5f1be780491bf4edfab9337063 SHA512 415325308fec15a32407527986120cff084359c92616689f660f8b790ae4a2b8dd205358cb5894c85c6d705141c07e8db3eee6d06c18ed40b4edfc05312707e8
 EBUILD geventhttpclient-1.3.1.ebuild 1207 BLAKE2B 9f06db42ea4b6061e9df9bc9ee549ce1c04a589f7d78093ba620e2d551fb20db4a6c31d5efeebc643562242e22eb0930fdcd731f48da98d4788b1c792fd96b4d SHA512 8a7f9daff2f9493af829403ec3974612a57112f1968532ab869c7f7af27b3f73412f40955a13c6e908288536ecc692181f6b540cbc53b9d215d4f4a8b0067f62
 MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
index 9b10793dfb5a..bbedb9e89a28 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/globre/Manifest b/dev-python/globre/Manifest
index 7e3a525b9127..557f5d3b6810 100644
--- a/dev-python/globre/Manifest
+++ b/dev-python/globre/Manifest
@@ -1,3 +1,5 @@
 DIST globre-0.1.4.tar.gz 19274 BLAKE2B 6b05f531e9a3819f9916d16679a39c2a281056446afc8f395ba16dcccd25878355c749820c8b1fcfdd1e855ec7a8d0f10cc5a23e3a4e77c877e0e7180e9c24dd SHA512 288b2a6e9e1b7e646f7b06db73b255f9710007c0305466a8d4e26245ab73efb14e5b543291937edb3f0d1dd9205391a08a073d106f4ed687e2a21d181a83840b
+DIST globre-0.1.5.tar.gz 20388 BLAKE2B cc3dce578d4c30d0309a60a054dfea11b53d5039adcc3251fedccc1ee8a8ceb70e844799e8a7fffb398d0f8022a51ff2460a74102d1c39f1e49d5fa2eb8fe07b SHA512 8b102150acd17a77c8c3ce1f01e36f0c9258a051b44348b6d9494ea9d2f8247bb534de250c5d506641d889042107f3b93c05a313ed46ae54f6fb47ae997ffdfa
 EBUILD globre-0.1.4.ebuild 682 BLAKE2B b31b69bf2d4998a0bc090c576de8e892cb87e7fe1fcb9dda3472ffe66b12a52027ddc7db2484fe1c123ec81909a05336ed57290653db3451d80e87ba384f8a94 SHA512 794ed67e00b9e18a9f667df9d5304f6a5ead40f43627cc9f6b1dca22bcd49c380bd86e8d98d165ad549294a9c52b2b87c04985a77ce275467642491deec8a379
+EBUILD globre-0.1.5.ebuild 661 BLAKE2B 5eaf5789efcd398c90c082b23a80111aff1ac6a0f4fe11e2661ba7b23dafb9e3aefd586204b2d94ee0b0389e3c9bacd3076b7109ffe192a4d5afe1659145d8a2 SHA512 7357dfd5a5fa3213748072c8baf710c73f5e13132b3381a7fd0628a7ce6ecd30fb6ae4bcfe4966dae3422e674087e3e315e998d78445a942ae11c446a605f914
 MISC metadata.xml 367 BLAKE2B fe876ca7eacf8c0c26d7d7198a43457c2e07749a9eae4e48c844a3daa998938768068893eeacadffff1dfffe1b68d17f937effca43714790a5d6e78d9ac4ea9e SHA512 d6d5ed219d18649e5c54e8a8b7aec3119f1af0dbaeab04953e88ee825aba9ec309374ea32249f8f3e36bf80b6fcd91a345f9562ec757efcd691ba8dc5a684257
diff --git a/dev-python/globre/globre-0.1.5.ebuild b/dev-python/globre/globre-0.1.5.ebuild
new file mode 100644
index 000000000000..310157cb58a4
--- /dev/null
+++ b/dev-python/globre/globre-0.1.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A glob matching library, providing an interface similar to the 're' module"
+HOMEPAGE="https://pypi.org/project/globre/ https://github.com/metagriffin/globre"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 574c38e29083..3aac58847b3b 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -4,5 +4,5 @@ DIST gst-python-1.12.3.tar.xz 388220 BLAKE2B ce9cecab7e65c66b43f7363be18299be0e8
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
 EBUILD gst-python-0.10.22-r1.ebuild 2148 BLAKE2B 5a99c81cd728afc601e7b8b3f54bd9d8ab8e5c215a6cdf568cf6aa01eba484c1fc16b701bb5d8bf9dc97b0f44b69688e1c8fb7d4a5c9781dd3f4d7c8d6a67071 SHA512 ebc646247140167dff59b882007d1919cfcc03cbc872d2d0db1dba3887287b3f9110a523df844da4b59ac70f764a8cb1f9de570ac660458a29d0802b7791639f
 EBUILD gst-python-1.12.3.ebuild 1126 BLAKE2B b380d585e607b91123da87fff21af321e1dd167465693f539f881d1968104d2635b348f81d40d81c1dc2c8c63797fe4d20bdff6b1125823ce4eaa46324a9e2b5 SHA512 e68bfa562cf78dc2da2b7edf570122e9052b12015fbed8948db9c5e2e5ec29a2ca7daf35fb96ea72a4d44fd5dbe6d13c75330f6734d1d4368ff525b6e4858622
-EBUILD gst-python-1.14.1.ebuild 2075 BLAKE2B cdff6abd60ae7bd5bcd1b1c44d67e6a3375484cd40a4b808965f09819e2242ec0ec59e86b774d3397822691d2a454fcaacf650ecd482ec3fe7bd19b778a3ad85 SHA512 fb7ed50de548f414dcd4dccaa47070241779a13fe1f33d2840758a798591e93b7577daeeb1128b7a9640295fff5b77a9da8ac57f99120e56919236b4cd104e9c
+EBUILD gst-python-1.14.1-r1.ebuild 1989 BLAKE2B 90196cffd70b5ffbfc4afa6713e5cb8811c8086f418e588306c5a4eefb78074873a41b092d2fc272fca6d7ba7d812faf074ecf853d61029494574e66b96dff0d SHA512 389ce69a04a14ef07540ba2a7ffe2f3ad69e0c5e960cf9408a909599a780a2c6b63dc48c55b5cf1ade2b0c93b55fd95a8ea6de7e53698563d521d01c2cd703e5
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.14.1.ebuild b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
index 26e8c6c9be61..0a4576fbcc3b 100644
--- a/dev-python/gst-python/gst-python-1.14.1.ebuild
+++ b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -28,14 +28,11 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	default
 	xdg_environment_reset
-	prepare_gst() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_gst
+	python_copy_sources
 }
 
 src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf
+	python_foreach_impl run_in_build_dir econf
 }
 
 src_compile() {
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index 214019978e3f..e850753c0b46 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,5 +1,5 @@
 DIST h11-0.7.0.zip 105979 BLAKE2B 46922a67a8496254845562e46432596cbc400e788adddc5df1b84583d16a090fbc1ac6a4dab1af9d05263abb33d2505627be1325ca9c3f6dd27dd3676ca99027 SHA512 abf9b8f7f12870804539049c3bfebbbe476e394636aed9967aa725d501fff983f28c7f14b4b882c17914d00fe3e74417ff8922128d0e4e07bf042a7db6d0b100
 DIST h11-0.8.1.tar.gz 94009 BLAKE2B 34c43874ba8d1e59f89d9d71a5eb8033583aefc6659f6cf645067267a68769f01864b997623ad175e263d4918e2e572e2af49f4ddf743608fc259ab7b4a51022 SHA512 3310dcd8552de4440ed9669fd37b3fc4d76073a9801decb705bceee3c1e98ff83470bd124ecf36e1ec3457ff2fb4da6f4fbf077daa810c28ab73044dfab709d4
-EBUILD h11-0.7.0.ebuild 605 BLAKE2B 5a90845ba25feda71c0225854968a947af84848bfd9089aec7a7580d7d1b9a504f949d5b74f5726447aaf79527f0cab9a8df72c4dc59177b923ae39a18f3758a SHA512 9cf2d6c9c3a51fd79e9e7ee70493f69cf6e72178b5e5b0def933baa48560150461b19a75dbebab7fdeaa5b9fb4b64f5abf83dd833c6abbbd25f6d57990ed4fe0
-EBUILD h11-0.8.1.ebuild 611 BLAKE2B f3610706b9b9acdd469a2bf38058572694eeeb3f88ace22db5d95a3a4d27c332d121008b2330a7678c89fb6a970d83840ff7047bf05db9e587bc18846c78aa58 SHA512 70d0ecf6e3b2bb851c11fbcdfa3d40c34cdcd165906f8efd5b47d2ee95c303a6e5715fc1c1f3336226fe0207ee349fe6b6ece5c6b1f2c929584a113066033815
+EBUILD h11-0.7.0.ebuild 607 BLAKE2B beb7f78251450ccd32221efbc6beed43029c079b4f0ecbf45b22c94097263e8f326d819a0d3b7fb3c293769af94ddaa572f00e33e170739331f9b61a1337e99a SHA512 730ede4755f6d2ee302502da5bb753ae1c119cb0e9b2fa149ea289d6b454943e3ecadf53c62712654b0c743a6f280deae0962ece6938864034bdb11184ed75bf
+EBUILD h11-0.8.1.ebuild 610 BLAKE2B 0800ac54f219a8a9c9c72f34802ddc3f9f42d448168558d8eba71c245036e6fdcb16326cd395a7b1986f3ac2bfab423351dd48222de5b1907f454aecb9b518eb SHA512 caf4e3641a5bdaff56cae275a462e562829e013834275a64d88ffb4991e678f6718b753e86ee7320968a6c1063a3aaaff54ab6ece7053446503bd164221a1de3
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/h11/h11-0.7.0.ebuild b/dev-python/h11/h11-0.7.0.ebuild
index 6c6a5b9ba4ec..cffbe228322f 100644
--- a/dev-python/h11/h11-0.7.0.ebuild
+++ b/dev-python/h11/h11-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/h11/h11-0.8.1.ebuild b/dev-python/h11/h11-0.8.1.ebuild
index 42f5ff8794e1..e3c685dbd663 100644
--- a/dev-python/h11/h11-0.8.1.ebuild
+++ b/dev-python/h11/h11-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index e735de3397ba..89086c80bf89 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -3,5 +3,5 @@ DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
 EBUILD html5lib-0.9999999.ebuild 1095 BLAKE2B ad1f21c5f04ed8c270fe1fc721a608e76f286029ee088fa5f30b037a06b9bd4f96487d5e1101a4df7e0871725113d4d6c129c9554b56e39efd4923c1bb2be4be SHA512 a556b56261fda05dce6005e0e8fc9fb58fcc3de79ceef34db2ef4209ca1b8294b7dd4aeb8dc055831de9635e452467d0ed27ebccdfc938f83835d4230ef5e0f0
 EBUILD html5lib-0.999999999.ebuild 902 BLAKE2B 0a4eee9541b3e256195d15bd3fb9d39191fd9f8ee755da586e2438f1affa014d1ff9bfa352f90a634f809de038993127917b6b599ddc3e7ca6f96082e321a911 SHA512 4480b232359af5c515bb6e2dc78101438d3cc1595be883fad2b62fd9d94d6ca94fd1d3f465f45a50ea7cf485095d66a02badbf6b47adb28f40186cf2ece916ff
-EBUILD html5lib-1.0.1.ebuild 904 BLAKE2B ad5257da8b3a72454ea27509cd614d858966542f0991d6e61f7635a21b8e43728b3e53d7d4037e4d07979dbf70783d46fd5d7fcad7b5ba66dbc09bd39cd85dd7 SHA512 f3795b2939477f40af8b59e9e151de435fea314efdf9ea9857e5ea4416fd96fde2aa6c19bad7b244f19cceea5e75140c4538ed15c7e23eb527d898570fc7a1ea
+EBUILD html5lib-1.0.1.ebuild 903 BLAKE2B 81e56811754d872f611a899790317dabe1deaaebb192c61f5771acc4108b7c02281fa9502c8d6176537074a0ea479ca36ddbee201edb4e4194e0e340f41da73f SHA512 63d2ba4d4a6649034c4874ea8c3979203ebfd943b054d5b8bff9a46d6570a460a47a5be7a019461a4c4b08df7d48188bda775efd772e98746806455cb465ba4d
 MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a
diff --git a/dev-python/html5lib/html5lib-1.0.1.ebuild b/dev-python/html5lib/html5lib-1.0.1.ebuild
index 9b2968887cd4..ae97b2a43075 100644
--- a/dev-python/html5lib/html5lib-1.0.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/httpauth/Manifest b/dev-python/httpauth/Manifest
index da2343517e37..de2d0c2b85d6 100644
--- a/dev-python/httpauth/Manifest
+++ b/dev-python/httpauth/Manifest
@@ -1,3 +1,3 @@
 DIST httpauth-0.3.tar.gz 4440 BLAKE2B 41c9ba9ee50b7fcc4ed409f4b34897b5243df4065fd081cd5c0951ebe2719a34a424e59c21adbcd9be133c8fe4fa4ad9dc7bec561285b873987f982f684b3682 SHA512 aa35148322a1c5ffc22a132d3062d300118aa23181a0008018d0aacfd473758d86d50ff1236d88126858a53e2f45aeea938988b2d1a8f62f80a97d8c2cc69822
-EBUILD httpauth-0.3.ebuild 609 BLAKE2B 03a1ea563ddbaba80b11724a097148c52ebb4ee092acd04d425cd2ad4d6e009f734646263257bf1fcb8d8d7ecedc8350a4fd62dfa6d151a4662f9214c8ec456c SHA512 1fe43a4db2054a5bb944ed57259f3e0804ab2df091d08432fe7485c8e5c5a2a95b06f99e9b1ffa4413a16d1856ee154955d27d69b376db0f8ab5e5c4d56531c0
+EBUILD httpauth-0.3.ebuild 615 BLAKE2B e4f1203306f8087a3da5df61d2463a93ff0c22c029e8a0ec3f289c14c4c02a5b29e00bc41b9e294fb6de5e804d77cfafb1adfabd3b0795d707f160aa34f46c28 SHA512 285cf7de472c7768a86848cbcb4c71df5d453e2d4a05b141f6586eb331e77371c90de42bd31b612c87ef0cc5d6aaaf3321f03944ff9a6ca11b10f652be02b9c4
 MISC metadata.xml 440 BLAKE2B 440d03c6243a6b43d9b8d033ad41383a2f3a1c375ad085e7c9241fc85a301ca4bdf2d1831e76dc55e6f17975e560fb90d6cd88bc1df57f31a8880068afbea80c SHA512 572f2e592e08ea0316f9df8fad23e77dc78644adb664e975631944d06d8ddb3a560724d3d241f33fd323fc83877b75506527960c4f3790fc650c88b461770a82
diff --git a/dev-python/httpauth/httpauth-0.3.ebuild b/dev-python/httpauth/httpauth-0.3.ebuild
index 49c87f86fbe0..5d6c2a75af22 100644
--- a/dev-python/httpauth/httpauth-0.3.ebuild
+++ b/dev-python/httpauth/httpauth-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -16,11 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
 
 python_test() {
-	nosetests tests.py || die "tests failed with ${EPYTHON}"
+	nosetests -v tests.py || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/httpstat/Manifest b/dev-python/httpstat/Manifest
index 37d6aafc0a37..2baa6224f637 100644
--- a/dev-python/httpstat/Manifest
+++ b/dev-python/httpstat/Manifest
@@ -1,4 +1,4 @@
 AUX httpstat-1.2.1-gentoo-tests.patch 838 BLAKE2B 6185274643fc1e67d5cb099f747bd595ddb38fb0ce2f335b3472952298dcb47dac63009d48fe328d22465e777e80b23af1668a6c1da1c62b5208648cb439e9d4 SHA512 a38e8984b9e06b47fb076f449ebc651646b68be448481ce9f197bf995a81c0b81c4ce3070508f597e4dd4bd9e7b5f17f8ae602c4d9978ff3e05b11f7ad7a048b
 DIST httpstat-1.2.1.tar.gz 97012 BLAKE2B 2c2ae97fe7c5f6563b3b29e8f40ec18ca62ab0efecd81bda404a57f594574d1647b9f72bea644a3e934670c0d142e4e1f9b866ed6cf215cd4183d6f574b252a5 SHA512 58636eacc7ad57fc6ab5fe477117547c515828e1dd50980d7c1d7c70d2fd04a8539339331bbf4e8a9ac9fea199626a45e7c3e2e458e11b78fb848027ff7c6a76
-EBUILD httpstat-1.2.1.ebuild 655 BLAKE2B 034a466a4b35156907acb386955eb2b0fad6d43ef1c11458cda0190b462ebe87fd043876f1112e565ab982a81c39024c6e955a41f41c71035565a28d44188fe6 SHA512 12f06a0abeff4a316740d301d5ef84c793c921d0469f4a832372139defbf091d16b76c32d19a58216abdd63e9a7d8ceb79e6e61efd3f44c416d01f1a2bfd4e18
+EBUILD httpstat-1.2.1-r1.ebuild 696 BLAKE2B a7d2cde3f1f49970f9d738ea89c0d6c7be8bacbf1e9e1dede007aca1ac057e6fc6d1bfa1bc8b25825d1ec20e70ce25be037f5d2c577cb352024ac9936913bfed SHA512 7eb463dc638d9cfa280d3d5b6079c00a9f1f1cc05e88a4a96f91c5c71c9f5b1e32eec5d28747321be123aea03a2160da965b86e178bd52b581e94b40bc8305cb
 MISC metadata.xml 392 BLAKE2B 31931fd92505a57b10e74968337224c5bc19b3377e622ee8711ee56797e101797a4697f59a0ce38228472490072593b4b44042c8f904d432d502d88ad5297b19 SHA512 46e595a4b6ba41d5353316332d273c063103f39ca04659b56b95fe935603b5441ef5e317ece03de6469240091beb5e12e419fb7e7c57ebfcae7629f74004d7d7
diff --git a/dev-python/httpstat/httpstat-1.2.1.ebuild b/dev-python/httpstat/httpstat-1.2.1-r1.ebuild
index 2b9302f689b2..814383b60ecf 100644
--- a/dev-python/httpstat/httpstat-1.2.1.ebuild
+++ b/dev-python/httpstat/httpstat-1.2.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="net-misc/curl:*"
 
 # Requires access to google.com and http2.akamai.com
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index a6dda7ba688a..15ce14261430 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,3 @@
 DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
-EBUILD humanize-0.5.1.ebuild 867 BLAKE2B 99079dc11347c81d989c88ad56d5cc642ab6f1267fa7b6ddf09805fb3844901c84950a6169c81934b59129ff6a37bd3196fd0213a0b9921431eb005db7959dd1 SHA512 a57f2e4ab378f9de3a60e0b89b8c73a98188082f06077c583c862e441a41b83a0d092ce33afd3ea6c0838d54203f0c855f6f6e4cf166ab7a978368654c964768
+EBUILD humanize-0.5.1.ebuild 868 BLAKE2B 95a694b404260c62b65ca62921fd7bf3a4641ec690a30d630f14677bb1954e66307c07c372c42f850224b5e6da97dc181f357ccd301f4b51bcf7548b458c9986 SHA512 9032dcb3d64ce02322a0b0f4810cd5c392e2aa386099ceb391435b0750275c072987104b1ecaccb032d17f3b8eddfa87d1117b4db645d14526dabb33d8b0275e
 MISC metadata.xml 436 BLAKE2B 79f8554b22e171509667145d3270ea7068ff215fc9d999f2cf654cf42948ba49f850efcdb19cb2a3fb41347612a4d3f178c529410b42238555b20b652b40900f SHA512 871a75a8295b80f9884f191f2264329be5a2975429e35b1ded2e085771284cfa76e230d2e7784a05524ec51cb809fde24e34d6caea45904f5fed3b388fe855a2
diff --git a/dev-python/humanize/humanize-0.5.1.ebuild b/dev-python/humanize/humanize-0.5.1.ebuild
index cddd0815cf3a..a476335fd67a 100644
--- a/dev-python/humanize/humanize-0.5.1.ebuild
+++ b/dev-python/humanize/humanize-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 8946a23f02fd..6e348329ea82 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,5 +1,7 @@
 DIST inflect-0.2.5.tar.gz 109756 BLAKE2B ecb64b0fea04602f112dfba11ade6828eae7a7f3f44d4c4fb15c2300ac18025ea4c51f9c36aae5e7e92bd09e24d08091ce096b888a520fd2d4c40374356333d5 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616
 DIST inflect-0.3.1.tar.gz 109456 BLAKE2B b57009a933f49762da315c55950ca20ad04a53559b1bd1fb7d8395bf4bfbb74b618eb1a0d0a0ca0f2b64adde93665fdf1f643f56299820ffe0c56a20f57237dc SHA512 c832f0f36b56f5f59d8c3a7c0b128c0ae00f7a90c57f303e79a2118657ee7b62ed3db7cd4c3297e41a07c4d2bdbc18d6c754c319a43004af6d35cab3701169a6
+DIST inflect-1.0.0.tar.gz 110186 BLAKE2B c9a47237e7fabfbbf512c3c88632e910e1bdc2f6b370f0224f1ae775a63de75c0c5ab25385b44786e349fb7243ef5d22f22d9001dec3c1a6adde3112551bdcb5 SHA512 7a82789ebd3db279589844752ab4e6c99a664ad5058778a9049d484c63a391c7e6623e80c07ca6a4845971062a496cb3062e7fc94607c5843b99a92860708b90
 EBUILD inflect-0.2.5.ebuild 559 BLAKE2B 7a4e165bc85aa92047d6e3560e9afb29749a75148ed254797f146405c43c8a408a5c5c01535092b04edeb313bb0ed4dd53312258651a9f88a3fc63ada7843c29 SHA512 6cd5a2a1ebe78a6449262017643e61b6353d08a9b20a582f20e92405a7d457bfb4916f0b2920925be985f0cc83d2b0472db1fbbe637b102088f6e28f7e4e282c
-EBUILD inflect-0.3.1.ebuild 576 BLAKE2B d016693a41167457c3465615d5f58e6316e96ff11fb959cbd6c09771e3e347f3dd13e638ea523e4e7768afe6618c0125967053f3732da55825bff9b5ece7056c SHA512 ad54e23d194a273482bef10f23f2ba0c563dd42982ee79def453d41f47a470113eb8d93f13a2f71ba504013d403ca1d8ab97f8146f8b49784a5456016db325f7
+EBUILD inflect-0.3.1.ebuild 577 BLAKE2B fdd5fa7dee0cb8983768dafee648be45c56b78cdfed3124827ca344318ec616f72aa9f795bd27b8a6c051e101f9f246f155cda2003af3d6e19524a3599768471 SHA512 9b34f400717735bfcd8466f4182dcd0c8cb87670770b364e70655dd1599b3a30dbabdfb0114a76daf019ef45015143366f3fbdd13c265b510afd47ed84f37033
+EBUILD inflect-1.0.0.ebuild 660 BLAKE2B bdff3a54d5ee33ed564201704c79a24fbf4d66c9c417a54b208852537fc808f37a8c9aec7601f2741b0e0b5abf602255e99150adfa5cdae719e97727011290c4 SHA512 739039a1416ad9386c6d0ccc0479dd32218cea1841e6543968642695c98f74322f9f078f03eea88ccdcd41b28450a12354f225f921b1bc7b35c3356fa815cf78
 MISC metadata.xml 371 BLAKE2B 0c72b1b5bfd404e494c2a6e2f48cf56634981d6ac86026dcd43f9c81804099b0a4693d4971f50db501e1f9421b5952ee6ab65805fbb17213cd0af75f4cc5aa1b SHA512 266d5f9dd95fc339a8653f0f8342996d194565a23e8e024523e1e8880f900301ca796a2abe5f550c51281be0df59d1704e44bb1bfed000d5a880f1a915b8af07
diff --git a/dev-python/inflect/inflect-0.3.1.ebuild b/dev-python/inflect/inflect-0.3.1.ebuild
index b9f89e067ea4..dfcf9546974c 100644
--- a/dev-python/inflect/inflect-0.3.1.ebuild
+++ b/dev-python/inflect/inflect-0.3.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/inflect/inflect-1.0.0.ebuild b/dev-python/inflect/inflect-1.0.0.ebuild
new file mode 100644
index 000000000000..bf150255a033
--- /dev/null
+++ b/dev-python/inflect/inflect-1.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jazzband/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests -v tests || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/inflection/Manifest b/dev-python/inflection/Manifest
index 574baba40a11..f8413ac8ffad 100644
--- a/dev-python/inflection/Manifest
+++ b/dev-python/inflection/Manifest
@@ -1,3 +1,3 @@
 DIST inflection-0.3.1.tar.gz 12943 BLAKE2B cffaba9dc22444abda6cef04bc7dbd420abcdc0edca5c13bb734edd72aab631a2b50d3c37f9bd914cc8956f8afe951734db764bcced9e0837bfe75a90c527f73 SHA512 2a69a6228f2d44a5afecbd3ef51a51b4d5f63f69ddc844f4abfd6f326cb25c518403e8c5b9f98589885777d41d8fea31bacab3a5a3ab80db411960238d2f49ad
-EBUILD inflection-0.3.1.ebuild 875 BLAKE2B 974b235a9206a246c6010c965aaaf78461b124a38c66b9451abd5d915a89851e666fed3fc90bfb36866f9a6b145e194c370506a6f60aaef2b1db39f3816df295 SHA512 5ea377a59db55488dfe09107cc4dc9fbd7f42a96d9230143192747e4cc6284ff6932da7aa64e132fd850ff0c58204beda2285dc3ee2f4fcc01af3b306d1b7f19
+EBUILD inflection-0.3.1.ebuild 867 BLAKE2B bc8e93cace37515e9a5e7f20f6e2535b30b52b1b5a8e8159443ca68311ef1d82efe2aa783a5a0dab1325a177facbe93025f25902ce33deaeb5f6b9f64a42a177 SHA512 01ab631dbcc1063e9b577b4528c65098d90a58e7a9fb8a8083e15fd662352ed4c50e06657e4641d61b8fbc04b21fca7578d3285b7eece20bc41ad9c9c3c66c8e
 MISC metadata.xml 444 BLAKE2B 8127165e52bc2ba190021733ea594cf8da0bf3f2d878fdc191cda3354d2093c239cd5bd7fffc0c2bfe3055eff103da4bcafefc215576a28cb83e852aeb43cd57 SHA512 2175dadc52b8a381bfcbcd3a390d99f8582aba44870c29f5addf25880df9336d9bd16bd2120ad283359693fef2b0e65b7cae315fe17f042c17a512ea0352c352
diff --git a/dev-python/inflection/inflection-0.3.1.ebuild b/dev-python/inflection/inflection-0.3.1.ebuild
index 16c59e49ccac..5ea6e6f3a815 100644
--- a/dev-python/inflection/inflection-0.3.1.ebuild
+++ b/dev-python/inflection/inflection-0.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -17,12 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND=""
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 
@@ -34,5 +31,5 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/invoke/Manifest b/dev-python/invoke/Manifest
index cd79344aaff5..c21f4b87e207 100644
--- a/dev-python/invoke/Manifest
+++ b/dev-python/invoke/Manifest
@@ -1,3 +1,4 @@
-DIST invoke-0.22.1.tar.gz 292418 BLAKE2B ae392d3cd84ff58a0e2f24a8beed7b0d556a45d55a11fb5522bfe11351d2b47512e7910a18bad2db1e1475410d9c15b0af4cedbae06240133d5d8b320c362669 SHA512 e1c55435923bbfae8eb8f22a7dff81ce3e127cecbc0c33c002acb94d49c6cd41b7fbaf54beea654c77873bbbc8bcc85c7a61cf5789af80758d5b3abd7d2a61b0
-EBUILD invoke-0.22.1.ebuild 416 BLAKE2B 10c5c931974e3823655e3cc9249b9a451e77e292ba7e5acd705e3f3dfa1ce55d96b5edb397f17c303729043e72220034661f5c28231c9d9af80d54468ec4c741 SHA512 70a075bcc11263fb444cf868f0f1ae29f68f265944245fa7da80aeafee4bdc7c435a620cd30739e962a315ae9613a23f781328af79b75dd0168f501618d9c978
+AUX invoke-1.1.0-skip-pty-tests.patch 959 BLAKE2B 4e23e88f3cdee0a3e7408b3fa217dafe28f36967516a7231543e8303b22c901a5c63a45dcf1332ae7a6e5d031fd535f8674388474429deec15535ad378cd02a7 SHA512 3ee402afa6f658639b56049e114b9e243be91e0a8016f0fda18d3f34c3a3e8d1be9a452d4828f072fc220b185790c820c43bb5d9a7b9060265c181fe2f63c58e
+DIST invoke-1.1.1.tar.gz 311831 BLAKE2B 2918c1a03cccbd90be6aa495206a2714f45c9690d8ce1b063adc0cacfa4c7accd36dd94863a83e9cc0c05aaf889bd746c3f528fad5af0db9f64725438866f81a SHA512 2dabf88428a53f244cab45cbc073b3a91fea5dd97a7590a58701a32bfaa14a4afe5d6a2e4ff4ed03ae38e1dfecc5a7c0f811bb18313e0af1f4e116f56c5e9ba7
+EBUILD invoke-1.1.1.ebuild 807 BLAKE2B 62bc62c294380059f7e475f05ebd03f74415bbc39c1e13a4faa79a3793979afafaa53d8989ccbf3738db9ff90e13c40fd419c1966b764cc2c1f653875c1548cf SHA512 73787e63db0d2de16716fa34dffc505ed9dc85cf659c39226eaba0d9109a8c783deb6ae817de213dd708211f6d6367e90775604f3d57a4a4755fc7088a5a5b66
 MISC metadata.xml 438 BLAKE2B fd7de2d82839646be57042d5db8b2d4a27f9e3f16bad202dc068d2eaf590e04952003d67614c98554c631668c0c31927a7e3a4f73ec15761a66631d01cf6aef3 SHA512 eb37fe7d88bec1255f2579bd9e60054b887c466984017501327a48a6a8ae6e3a3b3b473c850db94b0dda7bdeeb63b8c60e0cdae041fa034854fb68ee416fc9bd
diff --git a/dev-python/invoke/files/invoke-1.1.0-skip-pty-tests.patch b/dev-python/invoke/files/invoke-1.1.0-skip-pty-tests.patch
new file mode 100644
index 000000000000..d09eac74f91d
--- /dev/null
+++ b/dev-python/invoke/files/invoke-1.1.0-skip-pty-tests.patch
@@ -0,0 +1,29 @@
+This patch skips all tests related to PTYs: they all fail under portage
+because we don't have a valid TTY. Skip them. A bing chunk of them are
+skipped through "skipper()" under mock_pty. The rest of them are skipped
+by simulation windows (tests that don't run under windows don't run under
+portage either).
+diff --git a/tests/_util.py b/tests/_util.py
+index d954946b..27381cfd 100644
+--- a/tests/_util.py
++++ b/tests/_util.py
+@@ -24,7 +24,7 @@ support = os.path.join(os.path.dirname(__file__), "_support")
+ def skip_if_windows(fn):
+     @wraps(fn)
+     def wrapper(*args, **kwargs):
+-        if WINDOWS:
++        if True:
+             skip()
+         return fn(*args, **kwargs)
+ 
+@@ -190,6 +190,10 @@ def mock_pty(
+         return skip_if_windows
+ 
+     def decorator(f):
++        def skipper(*args, **kwargs):
++            skip()
++
++        return skipper
+         import fcntl
+ 
+         ioctl_patch = patch("invoke.runners.fcntl.ioctl", wraps=fcntl.ioctl)
diff --git a/dev-python/invoke/invoke-1.1.1.ebuild b/dev-python/invoke/invoke-1.1.1.ebuild
new file mode 100644
index 000000000000..ec7d500d93db
--- /dev/null
+++ b/dev-python/invoke/invoke-1.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Pythonic task execution"
+HOMEPAGE="https://pypi.org/project/invoke/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock
+		>=dev-python/pytest-3.0
+		>=dev-python/pytest-relaxed-1.1.4
+	)"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-skip-pty-tests.patch"
+)
+
+python_test() {
+	# -s flag is important: tests fail when pytest isn't in "no capture" mode
+	# -p pytest_relaxed: this plugin has to be loaded explicitly
+	pytest -s -v -p pytest_relaxed.plugin || die "Tests failed"
+}
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index c5bb9b9a1d50..605e7cb2df21 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,5 +1,5 @@
-DIST irc-15.0.6.tar.gz 81996 BLAKE2B b5d329b70404a92d4f69cc3fef2be374b0a1e98e04588b7f2f7f7c241dc3d72122f813b67e48522b7779dfdf90478db6ff10cda3c66b621f7c4a099142d533f0 SHA512 48240eb496a3c88310f02cf092b8e19e4aa8d8dc165a9a8a39c313490a69ecc29ac67db297436df5e86e7253e2481bd19bc0429ea9cc359089a5cd6179125c0f
 DIST irc-16.3.tar.gz 87067 BLAKE2B 61d8b9cc20390a3eb918e5593a167b28f37154ee05cb4d7a72f8901509d3345e8d6bee9c17b66aa6c71fad4608a9f98eb3848190f82eac7db6f2013227979c25 SHA512 84b5a56a441cdf22396c10b81c115cb2e297ac082785e9baf0bc73d655034be1ff3f553d44412f066ab4b74530faddb66a9cc2f511a332e87fe49af0b6e68e5b
-EBUILD irc-15.0.6.ebuild 1597 BLAKE2B 67909f9c9f586c6ed63850ceb6df56aeae9404ab65ad5702a561667c6e624c5157ee46a90a8975e27ef28bdf39ce24f78d8e15d96fb0cb3d2dd13626ea0a5a7b SHA512 df65de77ef9fdb42bfd560212e5c9e86fb1d6febb58e4691a1a8ac3392b424709e81614b22c301f775b40e7682cb938012f4d98298ffad6e1dd62c1600af9ecb
-EBUILD irc-16.3.ebuild 1673 BLAKE2B 0014550f5a8b72e1cf7782fe6b70b2e4db0af21088d58c92ce19543f1ee794f6bd9f70f9232fa52e63c38cdbfa8fb57615dc79d60b0d4d4dd8dacf3e47347da4 SHA512 7ee09f6a0300504c0c074180465101eeca8902281e23a59168062ba2b8debe85f7ff717b9458d60c532cceee4c41d05e3a0e1f2be5adf9ea38a6eff3d87a692c
+DIST irc-16.4.tar.gz 86909 BLAKE2B c1544a36cb4173fdd22514ab5c6a61d691634224f93c9a04aa08b9fc91203aa18ed2bf429221089fd2bbea45de6138e8eb480b1ac706e36c6ed2c01405397dda SHA512 9080d3dd484751ffa80b117184cd63c4728b1bc50f2493b046a1fd3779e65016f874d0e629d2ac8a3b36db39a91985b890f3a1fb35bd9638d96f2654bf6da943
+EBUILD irc-16.3.ebuild 1680 BLAKE2B 93507172331fcb0e1cc18553ba3b97212320c2e71fa74d223f03e8ea7daa8df5d72da85a8e2152a240aa2a07493f14e8c8acd4cf1e95da4cef26194ead5368f2 SHA512 1bdc0ac3df0942435588f233d5edcbb58758e8b6e7346220da2c982500b63c3cf61f73ededbcf6175b1a79962224d1b7390c9444aa14c8f0b0348120c16f3265
+EBUILD irc-16.4.ebuild 1683 BLAKE2B 03a597644b910da9aa5a8be18c8cfa1082c04df2fda32dafb3677a80570d93f51163080622ab5d5f6f04d30b6199d327f42ae1ebf196c7fbc307862f9e8b4f7c SHA512 f779a74a3a336f53f06bf02eb08d5037c00f75a992795f8b62ccb47977747a52d48f6ae008df926d262416323beae250872ddb6359461544bb03607369fb969d
 MISC metadata.xml 690 BLAKE2B 5bee1fd162cf7a46ee59a40c945991887fe187d09b647907a2e05b80dbd9327d039d40986b5b5549e27f8729153880a234ea50c9601e171b5cfa13de295d6ba8 SHA512 1aadd270ebeedd1ffaea3f62bb804e48f94f822ac6f4d8502753259c098c7b18a5a94d0643f35eab2df47ef3537d513e37bbb9d04b619cf88580a4d5a463095d
diff --git a/dev-python/irc/irc-16.3.ebuild b/dev-python/irc/irc-16.3.ebuild
index 98fedd35523f..a8ee6feca92d 100644
--- a/dev-python/irc/irc-16.3.ebuild
+++ b/dev-python/irc/irc-16.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -27,18 +27,19 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
 	doc? (
 		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
 		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
+	test? (
+		${RDEPEND}
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
 "
 
 python_compile_all() {
@@ -51,7 +52,7 @@ python_compile_all() {
 
 python_test() {
 	# Override pytest options to skip flake8
-	py.test --override-ini="addopts=--doctest-modules" \
+	pytest -vv --override-ini="addopts=--doctest-modules" \
 		|| die "Tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/irc/irc-15.0.6.ebuild b/dev-python/irc/irc-16.4.ebuild
index b84a0821d677..f96d4b897827 100644
--- a/dev-python/irc/irc-15.0.6.ebuild
+++ b/dev-python/irc/irc-16.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -12,32 +12,33 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
 	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
 	dev-python/jaraco-logging[${PYTHON_USEDEP}]
 	dev-python/jaraco-stream[${PYTHON_USEDEP}]
 	dev-python/jaraco-text[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
 "
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
 	test? (
 		${RDEPEND}
 		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 "
 
@@ -50,14 +51,15 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	# Override pytest options to skip flake8
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
 	if use examples; then
-		insinto "/usr/share/doc/${PF}"
 		docompress -x "/usr/share/doc/${PF}/scripts"
-		doins -r scripts
+		dodoc -r scripts
 	fi
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index a97b34906bd2..8dfe7365c148 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.classes-1.4.tar.gz 5171 BLAKE2B 193333a9a543328b6f781888ba7a6ae3cf0b1ae7cab078c9da65a1ed26cc71164aa06a31f2495b62c7d7a388b6fc075e97c7af58f7d67bc0ecc1785f9c7056dd SHA512 d434b470424c104f91e9a4a5e3a1f2109b919a35edf45540ad1ef8600f0b10864f32aefb411d747e13b5d99ba06601ea7abe5032e24e5dc6b25254b4e68f8a89
 DIST jaraco.classes-1.5.tar.gz 6710 BLAKE2B 884e756c7bff272a0b35d9ef8cd30538eba793e6d838b7bd409a59fde9539776906aeb95a456f7095178ce0623e20634fe1a09a8f3515d4b661bf702480cd934 SHA512 8fe3d40863424547e5396fd6a2b4ef3f27a92185ca82206bb88de2716419a9c2dc917fc945c732d5dab1a1795727a12014e0bbaceee7834896351de05491f99c
 EBUILD jaraco-classes-1.4.ebuild 1073 BLAKE2B 583bbfb1f6f7f4addf8eeceb599d2cfb625d95272f8ba0f2f4c46bde2730aee33cf166d575ca6aeb8af8b69b139ca0ea5ef62bd3adbbdccac34df4f5b83da495 SHA512 382382cc08370724725ad39d54919b58e53e52b1f4ae191fe90bf07a3a77c9755dd20c4e63f6d453a979251279d124bc67c882dc9e58c2383ab1d84c35be0524
-EBUILD jaraco-classes-1.5.ebuild 1323 BLAKE2B 1d94a0fa2680dba7b578eb9eca5063be25551a9d6f28cfa2b1caeda86d0bb3e32de12841f5610da8123a77e4d68c0a10b8312afbbb75da87b2f5fd5fd192d899 SHA512 78ef8ca2904436b83d723b849ef855569f21df01fcb4a70460881de0133bf0a6c63f0c0efacab5661a2132ac6973284d49c5e223135ddb0aa327685ef178682d
+EBUILD jaraco-classes-1.5.ebuild 1361 BLAKE2B cd0aeb96986a282adeac6d6125ce9bf3c8a2a4ec178140382acbf66d9151139d2a6749111d8d6e6d538f93600d551527e3dec51b0d937fcc39733c9d4dea86af SHA512 acd6f36b538350875310073c9be48dd2a432160ac1360733d95d296e3667a55d2d999761fabc96c218d6fe9fd3a85002ae5c0a862b5c07e387ea97b1f7c8d684
 MISC metadata.xml 452 BLAKE2B 21134cdd1ed697f4c18617cf812678e3369ed58334419ce74ec5bc0956145cbd8080085d207d37d257d5ed480bd81670f98a38289c773ba7f8b905cbb49077d9 SHA512 0107c5f161fb935b84251fe078da9a6be29f4ab53fc16c8f9f4aecda8e8de3df00b396c54ae53461a76cf794f6bd0f96697ac1ecb2bc59d2cbdadc8a6fdfa2da
diff --git a/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild b/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
index d91842e9e0c0..ecf62cfb39b9 100644
--- a/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-1.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Tests fail with pypy
-PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -47,8 +47,8 @@ python_compile_all() {
 }
 
 python_test() {
-	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+	# Avoid ImportMismatchError, override pytest options to skip flake8
+	pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index fbaf44f553ee..eef53fc59f12 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
 DIST jaraco.collections-1.5.tar.gz 10615 BLAKE2B 4331a1df4a1232817e5bde97ce22b019ecb50711c0f4dfd18d050233b820a51c420719ff2a0d013e60da4710a63ab34293ee15f091b86392ec0d5e36e8262880 SHA512 7e2d3849d26422d687cfeb560f8096fb099a9c7b99b3061a06f9ad7037c3805b577754f62e5d5ead3f6f89bcd7dbf574df2844aa3c28928941ea2c99d50fc161
-EBUILD jaraco-collections-1.5.3.ebuild 1421 BLAKE2B 3acbffe1c06d6cf6234c473822e5c6c510479540105cd8beb31131959c75b9872a49647c6c7c0d0d1a789b2920afe43aa1bc978a891c5bf276a6445740d5cec8 SHA512 01f366fb92ad6b83e7aca055d74e79921ffbceef6837bf6b8f57e733923652bf0d6769ff5737ef2bcd7e9b33a9ab39e60404a71ab01defe2459d61ca628dfc23
+EBUILD jaraco-collections-1.5.3.ebuild 1426 BLAKE2B ad973ab473d0cc84679f9338fcc5f1a3d0f30a29232c67d1e68353213d8fee7ae4ddd0d5625108540f4b9cb4260e4b81a94e769765bf97917571d1969b0e39e6 SHA512 1a57784f212c32a82cc16f748ecbf35b92e2e0b04c348f5003787a5040ec509d4f7714d15811a40941be73f4a24111fef16955be7d05284b6cc078d89d6f262d
 EBUILD jaraco-collections-1.5.ebuild 1402 BLAKE2B ea6bb23d97ca077a13ef637cb68af51d165b8f8b3319fa4d35c279413793e1aa3104fbee394f35b464ff39db264e94d63966e6ef3eaff1d369f9d02baef52666 SHA512 a48e9c9a8918ce2734bf0d2ad37e9ef85353bb502a057e3f3ce63d97ef0e9871fd086c36219452788c9bbcb29e4e0c90aa4094c4cca11360bc645e81c7c30fdd
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild
index bd576051b345..916b00712698 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -49,7 +49,7 @@ python_compile_all() {
 
 python_test() {
 	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 40e5859a5e9c..bb915cbd4903 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.functools-1.19.tar.gz 10588 BLAKE2B c71eb4e0c611f6a0bd82e04cacb7933961ba5e50091439c274bd8ceeda68b69789423994fe43f44af6cdd643b7a04418bc32ce2f937d118520298a019c5c6638 SHA512 7fbf1956ff8a132021e1f7fae5e98f40199a5d0e705b08b44ad5b2588fdd7d1088db9d7457b985c1852b50285a8f03cc9795fff0c4f53f9155f7c8ec371ff307
 DIST jaraco.functools-1.20.tar.gz 11063 BLAKE2B c202c3cda86c0f32fb3299a083ebb8d584eec444d9d8f0eff536f5e663634dab03c5831aef18d683dddde7eafff311b66a724d9004ad46f5ef92e90df16a9c7d SHA512 ba17b567dfcadb0d8ff1cc7a6ed07f2a23abfd42e73f3d815a6fa19d9be97d6af0c90bff7fb5e7ef67012ea5d931e9babc963da8a7105ba6a92d5c43c7126e04
 EBUILD jaraco-functools-1.19.ebuild 1559 BLAKE2B d81c73fb79917feaee1357a5c62ef2857c338eb10831e105f458ec409a044694cbe9b74f10af90a2952840f62ea4662c11952b61a7f742606489d0e34ec5e2b0 SHA512 0084cf27eca9674b9013ccf346567da5b975bfcecaa81b5ebe8b22c70dc9c4ab43e96cb2bf45e50a872935aa7aea20ca954e61e9e8df5a0c5c574f1b76451088
-EBUILD jaraco-functools-1.20.ebuild 1561 BLAKE2B 5883fbe1af5242bf99b0b1d25c49003695ceed31dae5edd7330c56d4545b9f99324d2afcc89e37971d0070d1a3f06c172bed0dd927265905834c4056e3b2cf85 SHA512 dd3556cba92eb962c3bf84974d508a2d649d5b5c29d16be76d96f6426a9673ebe1876f1ae276703b2733fa025bbbdd56ade82e70b3d42ef9a0fd97300d88d58d
+EBUILD jaraco-functools-1.20.ebuild 1566 BLAKE2B 52a4d36c5e9e5df2cf5ed0a57acf397447a7ab69988c3a158dea74ee9fdea902c4366338ca1516090ecc41d10cce8986ce79fd7c361c93e997440ac1f9e90a84 SHA512 4fab43dbe8982b91dd64d129b23cf44593775be091661b8da8e3b992ae76b206688a8d2860089aae2cb00682a00bb407d377bf2e9f39e3577a2e724f4f26f3e5
 MISC metadata.xml 550 BLAKE2B d8c0bdc0a3d2c0c3d37638bbc8534233acb659d38e0ed9e9e757ff35b261f241e213b73a5c55aee059aa7e73e71e574e4e4e52c12f3bfd9e6c3ac0059f2ec0ee SHA512 2fccec87fe5c57aa922ea30710d802c438f86fa3a72492dd4d2fc8917cc1a1a92ecb12fa5e9160c6245cbd6ab557791ac6f575de8a7a001842618f8d00343476
diff --git a/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild b/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild
index 74eb81aba71c..f50cec31eb62 100644
--- a/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-1.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -50,7 +50,7 @@ python_compile_all() {
 
 python_test() {
 	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 	}
 
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 7448331b325a..14b7e4061c41 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.itertools-2.3.tar.gz 12857 BLAKE2B 714b123965af3ff593205aab373f3097709729377cd867ca2a7ccbb7795b1818f47b0b316d4c927c9aec4eb66fe1da63b44c1d60db310dd97b5444b01f7db04d SHA512 070a442531fd079fefcb61bbbdb0cc98bc88cbc5f23f6cb40ee1fafbc9a259c69e0a373e949ab54d22836f54b0de41e1b09d10692f92d18030825ca09345be48
 DIST jaraco.itertools-2.4.tar.gz 13026 BLAKE2B f7e73667a1aae0641cc8ef1bb901fe54ba6ff3742148840fb355677c9370bfa8a4ab2654864fb224f342552e5bd551e168fb7aa0dd3c61c6f10cd2b4b398f580 SHA512 95d687b4c7f32e2f8e712bd5ac8b82fa63a1571a9062d9182f13bf027c65d4266b87c2c450a89dd2ac01124e5ccaeb976a9cf14788778903be79db5f7dda6167
 EBUILD jaraco-itertools-2.3.ebuild 1379 BLAKE2B b39cd7ab1498d29c82fad5dcded173edd67f6558e43a2dda7c1cc08b88272c9cdc0674357b89b8ea6e660c0264550214d4bba12446bd1aeb0c8ded05c4945b62 SHA512 a6639595b6e83be1e8e8df346b47d2c365e344e7e6d6a78214e213cc2dec8b8b48c66ed294d95024a9cf541bff26967ef64b7eb707b38639af0c5d9695bb6da0
-EBUILD jaraco-itertools-2.4.ebuild 1441 BLAKE2B 5fdc742fa1804152d8f7e544b9aab4be81fd191b32ae32a2fb592bcf2a5358f68a835a59159cd953246c15f164413b19cd95fe3738b8cc19b41f759c9e469521 SHA512 4f5b1212a2244db61fb0a1783f40811c082abad93cc710ab7b622803b9fb0e968161e030d0d6bf4c5005a957f334f5b81d2f152ed8cba60be9ba63fe20ed6427
+EBUILD jaraco-itertools-2.4.ebuild 1445 BLAKE2B 27dc6f04a0e5a502d19f2b8c0c127cd30a3311c8b0a59abe091d97ddc00f365284f3648e61e5643f1b84135d13562b6db4044ec08bc65a7c206bbae38673ce33 SHA512 92876eea9059caddb3b5571404efd7a3b7568ee70af62bcc10161c77f375396c0eee6f9193f305ca5515b65ca18d66b67db860ddd7220b27df7511b14edc82ba
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.4.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.4.ebuild
index 239e74badaed..86d3ccea6157 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.4.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Tests fail with PyPy and PyPy 3
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -49,7 +49,7 @@ python_compile_all() {
 
 python_test() {
 	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+	PYTHONPATH=. pytest -v --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 028fdd829c4d..99146cd52b69 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.logging-1.5.2.tar.gz 7135 BLAKE2B 5235566df80008270f2f28101ab5df1d7fbc1446f138eb4cb851c9bb464b741c0ebb8528d3502130b5c557f30214ec27ce1ea563e09e78776e22d37811da21b5 SHA512 3299adc9c9ca6113198cddbc34147afe1bf453edee16a2d6bfcce64e63deeaff7f87beb74ff44f092435f3433a921b19167fb45778dce444512807357bce1661
 DIST jaraco.logging-1.5.tar.gz 5707 BLAKE2B 853d2747ab92754de4480871355180a33a7a6cbf69fc3d32ba489ecac27dc55ad92d94bfb84e411ee13400d82d162ea400be1027c3002f317a97e00b849484ec SHA512 18f267bd0c764f38ff5223d4fd6e08d7d9fa568691db285155d7b955c71439474fd84edd61b20d57f6eac77394d4b3ddf9b35d8e6ba08a2db5dd4b2ada6e0d68
-EBUILD jaraco-logging-1.5.2.ebuild 1360 BLAKE2B 849bb90721298a13cd3bdb8b94dcd8222e41f56477966609bb6aad9afb813554f218ace4e4a5b8c18347b33d495096431863f9b3cf40026a4478e7b89851b53b SHA512 3dc8a13e211d33adbc4a043a52e1ad6e54c31ffaca2f15e4440e7a4e43ec7044afd5be3ebecb04d0a8f49f2d46f38a28a0956d6712aafbf1aabdb77cdd42c881
+EBUILD jaraco-logging-1.5.2.ebuild 1361 BLAKE2B 36cf064b351749c40f0f78180a3e014ba620a8c444925fa428a0c2b1b6dcf1202f7d60c8bd24b0c4d3619c143d629ae06962fff9f02d49259ccca20c867af345 SHA512 65ea4737871fb64d3b732faade1bb65f75f1e00e568b799eaea0e930023a331d9df96bdaf99274a57959a9bc60f14b441a3da2e7b33a1d6fd7e8f9344e5a934a
 EBUILD jaraco-logging-1.5.ebuild 858 BLAKE2B b3570b11464d1059a6e6c58ce8a0b73a59bceb2021f6f2e3011899b19ae9beaa4de057e47fb90150d21a0d085d1334863091ca8a8b988d7e619f63e60974d375 SHA512 72c358214ae4e6938551a57b808ca2b9c4f7f5c2cb184a53715882b80b5d6721765ea5ad7d0962076e0aeb66f082f61a26498f882f00de5740f21abc97663464
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
index 0b9ca834e443..606284a9c65d 100644
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -48,7 +48,7 @@ python_compile_all() {
 
 python_test() {
 	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+	PYTHONPATH=. pytest -v --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index b6e00275f95b..da9502e0eb2f 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -3,5 +3,5 @@ DIST jaraco.packaging-5.1.1.tar.gz 11056 BLAKE2B 6dcca468be3d960674c7de73af48ef7
 DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
 EBUILD jaraco-packaging-4.1.ebuild 1197 BLAKE2B 61042c2611ad0bd9d2514468653b8bb168023c215d1ca4a19363b8b9fdb54a0fba00bf8d22ed93f791ff3c2ec45bd26f5a7aec88550ee309399dc0c315bf3b26 SHA512 d2b7932112d762cef53e6e89d91dbae5a81fb4f70f53b887082d3464eb1da86c661f774c583ebc592d306d65642e6f67019597a3a23ad7ec4031201eeb1391e5
 EBUILD jaraco-packaging-5.1.1.ebuild 1416 BLAKE2B 79f8de70973943aa46b009dff3f2751bac902da9e9f0c096b83440d565dc931394d7ea83f086c775d95397b5bcb6299272a278fb1823587ec2c3765861d62bb6 SHA512 2ca8b3bc5accca45f20c2d7efc20a304f4c6a3b3e7f59652496b5ef9313e1e3ef240f5410a345752d6a39d8ca54239314b75e9db71749d9af8de39b48c6d8404
-EBUILD jaraco-packaging-5.1.ebuild 1318 BLAKE2B 8ed7ef10e0a7d50b83f8cd436029f6390865212b6cd57fb1f9a58383429dec3bd5e46218c8ad57529fdbe473c7bf0450e88ece3cad7d65d5ccfe501c850a7195 SHA512 4afec51b661cf5435b5bd6ef0009e08263518e2fbb3b2e6f07b0977815051ab76068e6ee21ba479bc16335c7e26f5f4de78aeda4a3c41da698dc80775612b197
+EBUILD jaraco-packaging-5.1.ebuild 1323 BLAKE2B 0802a20fc6bc08e3c0ba667b615f693533f69a78941c90a157b66d5f9bd4581d2d0c2d77f5d79cc6bdaca3f8f822b6be49a6842f0d186522d1207b6cce1d6f0a SHA512 26998bd60f1b8e9ec20b51897e7b3916446f7a493fe36b5b2f8df65f7ae0077ff01e50989eef21e356282bf810c5772e56e725c14076b5040ccf95cf0cc79e47
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
index 11b189d6c24d..637bf4e49f09 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index d97eafe78a1d..8b87a8fd04a5 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -3,5 +3,5 @@ DIST jaraco.stream-1.1.tar.gz 4887 BLAKE2B 6942db399e3821b176e5c966647aa9337e31d
 DIST jaraco.stream-1.2.tar.gz 7696 BLAKE2B fcc1aa8d26da17635b9ee7c68c278ae572cbe36a108cb30f5eb98c7ebfd2255aad499bed38ea044b28e820646b92e64602db0e2cdfc430169035882f7b6abe9b SHA512 47a96c1de12eb64e250c85d97429218606dc9bb212cf7b97e579763dd901ee063711c00307b7442be400856d3fd4e5994afbe1cb91a99e233541ffd7ff4024b9
 EBUILD jaraco-stream-1.1.1.ebuild 1199 BLAKE2B d17248c08f88f74324d918e3b09533b2ea094de180d7d6fcb3b35cb8b714467bd92a88c5c3ec03ca6d55b36a36a441fc89593ae10878be1ad7d4570c054accda SHA512 3cc3a43091ee01b0ed72f510378f7de528f3ad3a4a44a8b90ad8d4cef87c8e954e2c3a7338fa132b52c5e3ca196b11c8853a9a63cc849aac3ccd0649816110d7
 EBUILD jaraco-stream-1.1.ebuild 1140 BLAKE2B b94964bb40aadf4f950395b4cb8e164810fcb2601ddb9d21cc2498a92d97fdfa1cc60a6eb4776a9c87147fc3ad2249bbdeac13283baf07bdaef831e7c8b07c1c SHA512 9d67cc8e9ec8fa2b39a421f8a87ae5b0a7561d7555b00531ad6ac1fab470d9190bd104b5bac066aad8b5e1db0db53f7da13086986c5f34b83436547a522df599
-EBUILD jaraco-stream-1.2.ebuild 1410 BLAKE2B bca85957a1bf23a45c5e92942d75d1287c93e980eacd4588d45661b2456f1d0160da4a65083bd8d055490f36f69f9ec811a9eb7cc513e3ec37fe0e3c108293a5 SHA512 c9de3da424b1cc9424d8cf468b66968235c93bc16ea5bb0239d43aad330de2b39d71d78312a30e8b5b0fe3e1859f46c7db424dc222ec22602191d95991912768
+EBUILD jaraco-stream-1.2.ebuild 1415 BLAKE2B d45bcb415bda160cd75d581892be95715b7279d6ee2e18a857dae0de7ba6c344a1f99e00b67dcf1a165277bc5fa5b0e70b76deb1d740b73938af839bc57b7a00 SHA512 ed290cdec09e74a7b9723c2f0e8999601e8d0e1f8ff2a9df6b865a2105d73da07c1d1e75c27201cc9088a909ab7a7d5460d4daffdd8556f65760d70361473f70
 MISC metadata.xml 602 BLAKE2B 3875bfb93914028b263ef5b6f7af81ee9f3fc08f1217537363a02b12e69f273ad9344c5078ea284ed5edfee1389bace975f2745379c3b4b17db4fbeee4045494 SHA512 3a6635e6f38260c76979248878ff326451273bab021f3e85c23a0ae7e29d71daa53ccfa319c8d8457faa00c6fdf5ad3dc68e0693e951ecdd419182f1861a36c0
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild
index 8aa4e6c40820..b990da9621d0 100644
--- a/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -47,7 +47,7 @@ python_compile_all() {
 python_test() {
 	# Skip one test which requires network access
 	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --ignore=jaraco/stream/test_gzip.py \
+	PYTHONPATH=. pytest -vv --ignore=jaraco/stream/test_gzip.py \
 		--override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index ef37016e1ac7..d57d1376c34d 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
 DIST jaraco.text-1.8.tar.gz 7364 BLAKE2B 60e3ce561ca5c6dca3093a51f8397e925279882ee5b1c02e5359b518f2344481f3d86a927fbd1c7fc903e3207c46cd052a6efbcfac693debce721884188ab87a SHA512 7f13eee9553d7531bf2f51af1b1c7fbb9d778cf082e6eb49948fc0943b7eb5a0268ec51b363ae9e96df854e0af5e38fbc4a679c746160e422759c044d4a33654
-EBUILD jaraco-text-1.10.1.ebuild 1376 BLAKE2B 772f40965e0d9938e817d8926bca03467a53ae796c826cebd6a3e6c97a2761d321ebb5d86350dfc03411209f7e7719a4872d2b07be16d159b16df04f5ca5c837 SHA512 2216f9f1537b6a8ec4521b5133dcc91baa2df8a1b8eb35035b5e6d181e284a44241c0b507c8ea684f977df8d2aac04ff950b11e61561a53ed500202597863044
+EBUILD jaraco-text-1.10.1.ebuild 1381 BLAKE2B 1e4fbb711c3483b43c43ffb785ad336de022c6232202e86439cddcb7256adc018b8f42416ca952799edf82ead9fd9765b4109a1b6de941a16ac8aa24d7284b3a SHA512 5faccc2da88fa7acd885504d2f82de45406f6caedc1617b86ccdc8513697dd822f59badfb2cf0aae2ceaa77c9f89b4b5c55f7924f18785572c997a997d58df71
 EBUILD jaraco-text-1.8.ebuild 1154 BLAKE2B 671c07286fe601c381e75d0dbbe9b88abd9b1f0725b07131a007486c98e16593022628d3dd7023a9d028b3736a5532bd48e53ec7b2a507cac7d4f2cfd0c6668c SHA512 401b49fd1c77829f2a8f6e3173912948b6e44a3e7f4544bb6ade500d6c7b0ccef23b350a4161069c994313804777210053240b898e907d944d34c6aa750c6498
 MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
index db6f55ce4a50..8f821be04d50 100644
--- a/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -48,7 +48,7 @@ python_compile_all() {
 
 python_test() {
 	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/jingo/Manifest b/dev-python/jingo/Manifest
index 11ea69da8012..e2c845a134cd 100644
--- a/dev-python/jingo/Manifest
+++ b/dev-python/jingo/Manifest
@@ -1,3 +1,3 @@
 DIST jingo-0.9.0.tar.gz 10536 BLAKE2B b7cf8cf544c44dc74d750f85e5abf43a0d58bbb13a814610b7dd970995ec8e2c4b94d6b46f20be7031a1755fa47e9c28aa98f17d08bacdb967373924302c7739 SHA512 ec064df61639a96dcd0f0b8383d93a650928035e8744f600bd55e42e2ca4b2436db9cff3d75780d2803e9a326fa17308c424c693e14553c9b9a3b45e4132989a
 EBUILD jingo-0.9.0.ebuild 494 BLAKE2B d15ad2d4f093c052aaa46961f3627cf0267ab3181a12ef6a78316be26f87674a34d1e86d3d6ae2ddd0b3fb5ff58ea63b7ed2415dc489a4e8b023c3c60e751bf3 SHA512 7c9e70ab9c83ac5d14658e2380e337f8c6341a5fd25e9406cb3bbb90bd46b557f7e5ed820087e91d559c603d1edf8474d6d22cc1ac2d62c2982de9ec048afdf7
-MISC metadata.xml 373 BLAKE2B 0ae09f7892cf74eeda3b0043f8e9dccf91c3a0f26d7688d4557d433fa30476970e9b556dce038c368d271268ead212cb84baed641dfd297f5f0086dc8a8e25d7 SHA512 a04d5e28ad423aa29d52e8bf57b5116523c596acc6fa1f7cbea6929736d4e969ed859b87e742e1a9ce3f2c37f15802680be129aa37595d43918a4edb3351e9c0
+MISC metadata.xml 295 BLAKE2B fdb2b9185ff9f479be742ab96696424d7003fa70a6edcbc20ddf7a9c47568fd86cb52e0c82b4118d1ec9cde3b38160efdbe3b467db352412a3e868e1a230bf8d SHA512 636335fdc409d297e43d52498039a233157d2c63d1372975cb5e903e8e4779248339b44fa7ace26776596a222eec1cc88bdaeb1b7d808b7876e2ff64838f0953
diff --git a/dev-python/jingo/metadata.xml b/dev-python/jingo/metadata.xml
index 8743f7df7de6..a798b91934e7 100644
--- a/dev-python/jingo/metadata.xml
+++ b/dev-python/jingo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">jingo</remote-id>
     <remote-id type="github">jbalogh/jingo</remote-id>
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
new file mode 100644
index 000000000000..3b871f4b7f13
--- /dev/null
+++ b/dev-python/kaitaistruct/Manifest
@@ -0,0 +1,3 @@
+DIST kaitaistruct-0.8.tar.gz 5158 BLAKE2B 802435e81c8ec2544f26109762d43d7761c8672714107861e5f981583bf38ab85b3c2f1f3be5d25429287b380b756599fb51cedd130870f2cd9cfe221fd2f509 SHA512 8361e30c5bec9a7c57c280d277232ff4123686f29f3813e61cde9bf7512ead2e2f447ea1e18b8925aefe432edbbd9682a690293dcb928a9049c4c81832b5666f
+EBUILD kaitaistruct-0.8.ebuild 414 BLAKE2B 9e799a556085a7671ce559ec671de5bc039c2e7f6572b87d9965b8cc788cf212b9dfae5ba42b2de1b20f6ac9bcb47429849fe6822109bc706d857aecdaf33cc8 SHA512 8fc13c8cf15b1694ba56ddc9a6bde3cd2df63fc22b922974d5aaebea7785b08c00877e649e6ed689c3715afc159a0b76efbd423380e76d142a40d681920341c3
+MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
new file mode 100644
index 000000000000..bc1eb4526a51
--- /dev/null
+++ b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Kaitai Struct runtime for Python"
+HOMEPAGE="https://kaitai.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/kaitaistruct/metadata.xml b/dev-python/kaitaistruct/metadata.xml
new file mode 100644
index 000000000000..e7214b7e32c5
--- /dev/null
+++ b/dev-python/kaitaistruct/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 8e7fe8338865..3de6eabb5c7a 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,13 +1,5 @@
-DIST keyring-11.0.0.tar.gz 40883 BLAKE2B 50ce8bf1265899a3054edf2fabef75694190e06e83a56b5de8e76b3d6c4ea460971d74c1a03d936765914d3b2a1812836bb56363911b706d20d59c158e8478f2 SHA512 d4937e84e6de18ed8fcba02d2d297ecc5a6434623c362f5608141041acbc7bc27fbf94e54a5a503a02b725df737fa8505d0d91e2c3e84298fa4044d7dc99f207
-DIST keyring-11.1.0.tar.gz 25518 BLAKE2B 8b23853a15217a4d51a30d2add4f2e4eaa9af788c37fbb821bde69081d120f4a81560d2165b067b3eb299903a35d0316d944c3889c312745609085bb6ce29cec SHA512 3fb099f8a72c705ad1e2387b67ca3b9bf18615f9253e589bc8996e3b31db4b295a925ff95ef52da861e94ecf10d080db93bde1a7420e8de12448220abe2e016e
 DIST keyring-12.2.1.tar.gz 42242 BLAKE2B b821f17a671e89a28bd2953456bd0406e4f7fd142f1abf2e1f752e8f74f072c8fa995b90de62ac34586dd50a4dab47dff3bbb19157d76bb2f93a61e176dc3188 SHA512 8806b4433bc9085ae133300e68bc614281beea70de547f75afafdf6de2ee1b436f3a4cd13d7684cb6e4d5aef0a2eb9119d9cebbaf239a9ee1997ece4a56a7371
-DIST keyring-13.0.0.tar.gz 42883 BLAKE2B 73d44b331de7ab15d820f9484089968b3f3c4c79d360c190963d2bb12dfa20d71768a6bae3e44bbb2b728443fd1ecce5b907036457f3f38e08692d3b4a5792f9 SHA512 d06cd64a435a08ec18eea595f2a37769e823e9095cb5585f7b6532804a4cfaae807e7ace4bd4afde7f11480d202b09878480bd7d7de37dc7e6ce2214f0d38991
-DIST keyring-13.1.0.tar.gz 42960 BLAKE2B 9d11d91d0f4261cd40761a492e96478c3545de3f867faa31ad1710799238e4c04d51420a9b2ec26e4a99175fb66d1b236208329654b8751337e02bae761da1ee SHA512 06dc9f27692b4ebaa1592d500135d4dad7358ebc53d3b1e1cc733e9aa6610136f9b7224ffd5426324ee5d405fcf0c0b836de776ab304d2395e7491655afd98ca
 DIST keyring-13.2.1.tar.gz 43140 BLAKE2B 74272b93ff80a03615879a5f416ad6be1012f22862972a7f400609ea3fb984c45ed2ccb44eca30d253d0d39e0876f1ce25ab9aa6267a06a7c67a17aac27cd31e SHA512 3c15c3415ba4b657b041d2395536fc92ba656dc71f28669235f13a630946ad1b332d1f5b031a55776ce8a2120d3d2601462708f00ee105f46a27cf043c1bd906
-EBUILD keyring-11.0.0.ebuild 932 BLAKE2B 97e2368a84d7adabaf2b96b0d0f10d8dc8f6e229ecea4d48ee15939867a5bd7ba361e3e985d0233c8b786f031adf7987e876324adb213d9d220762c1c1c6aea4 SHA512 1c5c6c490dd19c9fd92a440dacb39287ceef7907becf2ffd346025092e8c639549a0eb259b3df9dee9f381c14796770438004711c2d7787f5b0f3331fd19c188
-EBUILD keyring-11.1.0.ebuild 1021 BLAKE2B 59d8e93d9145669a23ac81792aa881daa95ebe11e87ae0c7d7b7203a79404403ae4977c7fc3f520dbb53fdfa412dd22a5c5ca45727bf5280f46dd988eae07d86 SHA512 bd8ec804960a12965fa4f5bc0689a77728b8fa1c9e851b696814d576dfb5c60d6950d0646f59470b5e8cdb956199e60d86ebe24b1c56b34aaafcd82cf9a8dc5f
 EBUILD keyring-12.2.1.ebuild 1017 BLAKE2B 568cc5619b1b2645c999d3175720469157ee2d55955b8364422a2bf72c8d4631c24e9bc71e0ed3db1ae625810e8a5cb0c33fe6ade88a4859b1e4b8447336fb4e SHA512 172ef757531fcc524676747080b0a383c11c54dfb48180aecc6d82dabed7f803766804703aa726a4755b4c5df108ce6babb56096ad4cd325d71a17a877af242e
-EBUILD keyring-13.0.0.ebuild 1019 BLAKE2B 1f4c04a88168af7141870db343ffaebb03bd4288f4447688f7adcc0a687d4a42dc3befe8208579506dd34cf705d1cf287917a51cac49856466fd6f7b192da178 SHA512 1df3130f404f84bc4e23ff3b54872fe77d318b27621f0e9b2c17c274a6e392d551c0bebff7396140997c651bcdbf60920310f26e1dbc14083ee70334a28bd3da
-EBUILD keyring-13.1.0.ebuild 1019 BLAKE2B 1f4c04a88168af7141870db343ffaebb03bd4288f4447688f7adcc0a687d4a42dc3befe8208579506dd34cf705d1cf287917a51cac49856466fd6f7b192da178 SHA512 1df3130f404f84bc4e23ff3b54872fe77d318b27621f0e9b2c17c274a6e392d551c0bebff7396140997c651bcdbf60920310f26e1dbc14083ee70334a28bd3da
-EBUILD keyring-13.2.1.ebuild 1019 BLAKE2B 1f4c04a88168af7141870db343ffaebb03bd4288f4447688f7adcc0a687d4a42dc3befe8208579506dd34cf705d1cf287917a51cac49856466fd6f7b192da178 SHA512 1df3130f404f84bc4e23ff3b54872fe77d318b27621f0e9b2c17c274a6e392d551c0bebff7396140997c651bcdbf60920310f26e1dbc14083ee70334a28bd3da
+EBUILD keyring-13.2.1.ebuild 1019 BLAKE2B bc4e761d749dbaded425683e054028ef234bcf7ed33722b0dcea89eec54f6a58dc6d065657df8af185795651ca1c5e6b01b23b2fb964aee8ae4554c771196f50 SHA512 ac5b4ce8872dcc73b36ba8429dee0af9282e3fda7ea7f33661809b033ccaff9e064562071402fa6e43bd8bffb07cb1dcbe08277eda1b15b96aa86da74b9ec8fd
 MISC metadata.xml 672 BLAKE2B dc2296acdb196c85c9cd2c2badc6ee991258e43f340576990610fb975837dd9e24c0f2aee0d24c6b8e79e17436719b17e5ef3a4d9c356b08ecc5f33881cff2bc SHA512 19e907e069f6e6092791babdd8b914791d1c52c32187747edc127ce4c80ecad2da1edcdf6e6387c15f9c2b041767b9072668197087afc3644b7713837d5f2ac9
diff --git a/dev-python/keyring/keyring-11.0.0.ebuild b/dev-python/keyring/keyring-11.0.0.ebuild
deleted file mode 100644
index 9bc979032813..000000000000
--- a/dev-python/keyring/keyring-11.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-src_unpack() {
-	unpack $A
-	# This is an interactive test.
-	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
-}
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-11.1.0.ebuild b/dev-python/keyring/keyring-11.1.0.ebuild
deleted file mode 100644
index 0dc334c090f0..000000000000
--- a/dev-python/keyring/keyring-11.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-flake8[${PYTHON_USEDEP}]
-		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-src_unpack() {
-	unpack $A
-	# This is an interactive test.
-	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
-}
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-13.0.0.ebuild b/dev-python/keyring/keyring-13.0.0.ebuild
deleted file mode 100644
index 9b35a1c4afbe..000000000000
--- a/dev-python/keyring/keyring-13.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-flake8[${PYTHON_USEDEP}]
-		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-src_unpack() {
-	unpack $A
-	# This is an interactive test.
-	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
-}
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-13.1.0.ebuild b/dev-python/keyring/keyring-13.1.0.ebuild
deleted file mode 100644
index 9b35a1c4afbe..000000000000
--- a/dev-python/keyring/keyring-13.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-flake8[${PYTHON_USEDEP}]
-		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-src_unpack() {
-	unpack $A
-	# This is an interactive test.
-	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
-}
-
-python_test() {
-	py.test -v -v || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/keyring/keyring-13.2.1.ebuild b/dev-python/keyring/keyring-13.2.1.ebuild
index 9b35a1c4afbe..458f8acd5a08 100644
--- a/dev-python/keyring/keyring-13.2.1.ebuild
+++ b/dev-python/keyring/keyring-13.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index 162674d29348..22032176b1bc 100644
--- a/dev-python/linecache2/Manifest
+++ b/dev-python/linecache2/Manifest
@@ -1,3 +1,3 @@
 DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
-EBUILD linecache2-1.0.0.ebuild 770 BLAKE2B 3e62a3ee37e59d0905a55e928119e1fd3b06f1664933c193685221c1ab0bf7b2551257870174d1e694af14d32193a1df99ec9d7ee64f5cd9c4b98c2e46bf1f0e SHA512 c2451cfc59a3c41cbbe9702982656d09f9a508e545a07129f05d51678f8b71e6b4c0fa5c9b7249dc0a717affa9d8e3f088e71fdd31ad342eac14c278ef95a823
+EBUILD linecache2-1.0.0.ebuild 769 BLAKE2B bb5599eaf2db76d120c0fbc5e2e5014eb341eb360fbc648919e6c4e1052f031e6ae492bf7b3905583728cf38d3aa4d5f257a44138fd1b1b6f3373c554f2f631b SHA512 88d1008123ca9ae1a323a4a04a046d5f7a076924f929215c0e0667948abf7195e30fa7cf90b2bf61071d22ca75d3e65a8e3c992db6bae8ae372d2d7c57749d53
 MISC metadata.xml 276 BLAKE2B ab1cb64b3a917d8eced0d55be858ef505e3f578f1b0a8beff000329ccf5b53bdedfcaddf28a2564d35525fda36cf5d2117390deef58320f500d0647a865c2f23 SHA512 4ae389040c0420f9f1900c0eb6d258c7dbaf8ba413599a2e3568b0b2bd018b45bb6f68436e0abdc4c84b1a522a9220fb9d3875ede3503e805f5f40f2c0d6c94e
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
index c5e8a0382a7a..c5d46e50c22b 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 205630c0fb29..ed8c42223ddb 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,15 +1,12 @@
 DIST llvm-3.9.0.src.tar.xz 18235716 BLAKE2B c348d36cb21e716e8656b97489a0b7223fe81599e36ebf6f88d6191b1dec9eafc2d5d5413657ef89473af193b660c4b13317bebe5ecd02ad6c761c0ffdbe7f40 SHA512 f18ae32531218ab156c3e56c11826be0fd05f0799c82eaf2e6a043b38e1277560b4d921987513b88b11d97ea2619feaf277eec72181dd2ae4f4108c2836bf7b2
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
-DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
-DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 EBUILD lit-3.9.0.ebuild 790 BLAKE2B 13015298e24920449372388bc9a0fe5b5c705b49bbc50cc6114c8b18f9861acca1d394d08de4ee87db70ee9d363309a3cf8f3ac1bbff865a0c6c6f5c14aaac6b SHA512 57854f8499794d42e9c312b006f54454bbac7679c166c603872ebffe01c47411bff083f7fce0eb817151056ecdd72562224e383de96bdd5c46487f895e33a6e2
 EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
-EBUILD lit-5.0.1.ebuild 897 BLAKE2B 982501eb196f19447490abc081eb7cb1420ce800ad2bead2c2943bed5afc1edb1789f0f38d2e25f4e56f187e4afbd24f7498cc1d527a68eeeeecf17a7f29f5be SHA512 dad181576e1c8c8899c4b5929393940fb7dcfd7f5f1c6023cea39864d42ad7a4ddccac063ed7b788e350ebbf32c7f06f6718b205f036e0157aa89dfe3effb8ce
-EBUILD lit-5.0.2.ebuild 905 BLAKE2B 601fc56cd26681f9fd0c411ffba286fc58894e71b2be5ffe6efde617b9936629838300f857bbc118cd303aa0a01aad966daa94d0aedd48b05245a6ab38bcb3b4 SHA512 a59114b9c073b9d1c6079cc91057d36a22221cc82c5027f95981ccb38486f3e279797ca759484ef51762a32a65490e1df3ac8448624613a0fdff8801bb2ed471
-EBUILD lit-6.0.0.ebuild 1018 BLAKE2B e86a9a9369db88fa6537d381a1c40ecc6dfac99127e097df1921329e1d4d5fab0b97f80077ad2699cfff4cf44178998128174f991b40291ff4f32e3fb0f97032 SHA512 6aa8853254a1db5a3d191869672c9748ac7f8bd0345bc545a73e1df6c14d5ed9c89442ce648393c527efaa75568b7eccc97ba3c959988e6cd3902a1df1d27954
-EBUILD lit-6.0.1.ebuild 1018 BLAKE2B e86a9a9369db88fa6537d381a1c40ecc6dfac99127e097df1921329e1d4d5fab0b97f80077ad2699cfff4cf44178998128174f991b40291ff4f32e3fb0f97032 SHA512 6aa8853254a1db5a3d191869672c9748ac7f8bd0345bc545a73e1df6c14d5ed9c89442ce648393c527efaa75568b7eccc97ba3c959988e6cd3902a1df1d27954
+EBUILD lit-5.0.2.ebuild 904 BLAKE2B 74ccf4ce59c6aba63fec1f0dfed1e49bf751abf8cf61626f95534f46ecaece80b793481d7cf8115193007c9c13139018f28b6e4c86566d8481614229a84be5c6 SHA512 13a3ea3609045b3cba077e931b5ae52837c4510640bd5b6df7df6819166e069f3d4eef85ecd5dc1043868d7889539383f64c9f0655de0d88129e6b0d7a4f8986
+EBUILD lit-6.0.1.ebuild 1014 BLAKE2B 549c00ba1da9265ef26ea04d574d139f1fbab99f79ed60f270ff960f940df4507376fe31d48776241ecf4a4cb84f134abec61c000a27756ba057083527cd6607 SHA512 729a2b96a49758b18e59ec9df38ddff9890953283185cbae0abeef1cf4f11c2680485f26ffa70a85b326a389a3230e459700366b06f6bcee5a4be9854afeef62
 EBUILD lit-6.0.9999.ebuild 961 BLAKE2B cb1a25ddf6915b528d16dbb4cc200a708f0e4906659b280d2a87f7e02a536665ad592378ad446b9149373dbd643e683200e8169703628fcfa8db9b08536a777b SHA512 44fbdfa703aa94f2f4621490321bdcc092226c842b2f41d6223fb23a703686fcd004ec843b5bbf810a358179dd3e7b86997e4dfdd6ee7e32550301478ccdc4ae
+EBUILD lit-7.0.9999.ebuild 945 BLAKE2B 23e293c056263d0dc4c5c1ae7a8eee94a581110d93bb31287aa823f2e2d5ff39e485d0e0608c177ac24babd375cf1bf40df3500758ab86cdcdc4a72d9c3e4680 SHA512 5ec3c6c5bbda9b31c82641d841d00ed411f06aa52ab403d30890bc935c1f6322f0822c14d19e5c4826e7a5e38f236c77c21e097e795b87496c80c40b6f93407e
 EBUILD lit-9999.ebuild 920 BLAKE2B 3327119d4508e44c9f3a7658a38e6d6b15ec021761584764c8fb32af8469490d428fab66f20de3f75f2e72cb2f8682f0145805059b3723d8d7361b0aae18966d SHA512 95606df1e8ca840e0512b6dc6c9b06d161646fc71f41bc2e1c459cc2dc4fc1ed3883265c43f575d493f89477616b530b8e7a62414da82bb315ee175bb0dfb80a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-5.0.1.ebuild b/dev-python/lit/lit-5.0.1.ebuild
deleted file mode 100644
index eb53b1cdc0a2..000000000000
--- a/dev-python/lit/lit-5.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-MY_P=llvm-${PV/_/}.src
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-fbsd"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}/utils/lit
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
-}
-
-python_test() {
-	./lit.py -sv tests || die
-}
diff --git a/dev-python/lit/lit-5.0.2.ebuild b/dev-python/lit/lit-5.0.2.ebuild
index 18cafea48190..54ad36389f27 100644
--- a/dev-python/lit/lit-5.0.2.ebuild
+++ b/dev-python/lit/lit-5.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd"
 IUSE="test"
 
 S=${WORKDIR}/${MY_P}/utils/lit
diff --git a/dev-python/lit/lit-6.0.1.ebuild b/dev-python/lit/lit-6.0.1.ebuild
index 59bae5b9a36e..e9fe57536c8c 100644
--- a/dev-python/lit/lit-6.0.1.ebuild
+++ b/dev-python/lit/lit-6.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-6.0.0.ebuild b/dev-python/lit/lit-7.0.9999.ebuild
index 59bae5b9a36e..470c4cf4dbe9 100644
--- a/dev-python/lit/lit-6.0.0.ebuild
+++ b/dev-python/lit/lit-7.0.9999.ebuild
@@ -3,21 +3,23 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1 multiprocessing
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 git-r3 multiprocessing
 
-MY_P=llvm-${PV/_/}.src
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_70"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-S=${WORKDIR}/${MY_P}/utils/lit
+S=${WORKDIR}/${P}/utils/lit
 
 # Tests require 'FileCheck' and 'not' utilities (from llvm)
 DEPEND="
@@ -29,8 +31,8 @@ DEPEND="
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
 src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
+	git-r3_fetch
+	git-r3_checkout '' '' '' utils/lit
 }
 
 python_test() {
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 02dd3f6d9e7b..eaff6d26c20c 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,5 @@
 DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 EBUILD more-itertools-3.0.0.ebuild 940 BLAKE2B ecdb27a57e7ee9ee08e84e64fb8ac37f873c41e4dd38a1dd73679bb6eabafbc2e27e20e343228e29b2d695b9de865c42f99be874842bac32ec4464f444179587 SHA512 370654b68c809bb5745c0ac0329aca6eb4e9ff620079082af53c4c85f43c8d9bd1a4f6a0fb11d5913d7c0c20a35acf57127be0e704df8295066a63875aca12d3
-EBUILD more-itertools-4.2.0.ebuild 1039 BLAKE2B 5981d50ea36df00dbefec87c7843aa018d367372c0360c4f817200b9d220ec1668fd379e82b41251f479459d6e6889aae92e6079e139c0f2446a8f6d3dc39a9a SHA512 87162055d2ca7300038147ac40f6ca89088635fb1a225b22a8643718b757b4b3a48de65f62c4fe9230a197be672da324796c288f17b41205f49637ba05dc9cbd
+EBUILD more-itertools-4.2.0-r1.ebuild 1031 BLAKE2B db6f012867773f945210a41ef5a2a292993869d935a2ae5bc77671e577aaf43f61614af457d622e27f6f0605a912eeae3ba46bd445a9525061489b84422164c3 SHA512 973805b51ef5ac9e3d1c3912e6b0de5196a57926db9e863c8c58117120ee2f38c69fa78d0b9016c757e6ea7468d45725b5c3a0c1cbf06651ddc77659142c7463
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-4.2.0.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
index fc733c79dd01..9f03c2aae583 100644
--- a/dev-python/more-itertools/more-itertools-4.2.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
@@ -37,7 +37,6 @@ python_compile_all() {
 
 python_test() {
 	# Avoid ImportMismatchError, see https://bugs.gentoo.org/661412
-	cd "${BUILD_DIR}/lib" || die
-	py.test --doctest-modules more_itertools \
+	pytest -vv --doctest-modules "${BUILD_DIR}"/lib/more_itertools \
 		|| die "tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index cca747f7cdd2..6ac8a4f5a0f8 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,5 +1,5 @@
 DIST mysqlclient-1.3.12.tar.gz 89793 BLAKE2B 7dbd582b72b27a71a4fa7a6fd9f051eee7f1d820d447cd5463d4060725f3f779e5bb91500aeaf9d11460f0d72c76732fc610dbd1555c6eb5a0ba55ca3e870c03 SHA512 fa267ad14ee98cd994c0c80b8a84b592e71f80008348d67a9c970c84930504a02034e4cd2903f0acc7dce416c485d5629be6e6e9dc52de1774dec7345d5d64ee
 DIST mysqlclient-1.3.13.tar.gz 90368 BLAKE2B 34e6aad0d53f93017120334b09b901530a84cc5a5dd806381dcc3f12742764bda6f42699fef226b22274efd8f61304af0d1366abdf44607cd9827e9718ecc285 SHA512 e8e385490bfb2d926a94695089c9532981d1e3fcf1fb89a4dbabe98f0bbb25beed1cce8004b71a11fdf0161824e86826565cdb1ba5f2162450847b6b467f362e
 EBUILD mysqlclient-1.3.12.ebuild 833 BLAKE2B ee12396fa34929fca62f8fe1d02529290e92e7e5c0ab7b9e78ced3880c5c60a159a2c2e758b57939acc1b20f9b7c08e817892fbd325d5a3eb2ec78e26fec46e4 SHA512 3356f451c6da3cbea73616333ee40756068f9d5eb310f152ee4f17f5939d24c0f30ab6ef1042744204b51ee4be5b2cab0a3485eaf1b50bc4589ca8eae0bb84bf
-EBUILD mysqlclient-1.3.13.ebuild 835 BLAKE2B 1c186e50686432ec6b39c8391ec185f997be3ff18b3fd25b1d095c8d579286fc9418a2bdb34fc2ccf509642cd57b8ff7beb95d0cd621329e53d1b279b387d70c SHA512 97081d1f570ce159e0e50ba00d70a4d65978c6409c9eb63c065a98f7cb4d1ea805a7d3b2e80f55c42bf04d60af52100ac411bbf345da5dd833eec6c7cf013535
+EBUILD mysqlclient-1.3.13.ebuild 833 BLAKE2B 716f89739bad288c8de4b78ed49b69fc42750d8a9cbfabad5717f3bd1d5b505b4ce3a73cf3e9723569d5068bcabe540d1b3120028865cfcc7cd77882834594fb SHA512 f9db9a939f447353599af8b74f3af4d0a60b59b05ad3e5cd0065a20c4df73cdd4719dd6be53b51bc567073d77ca489464a01a8998ecbeeb8bafbd2acb829983b
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild
index c3993497eeee..26745c6218ac 100644
--- a/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index f26c6577a07f..a9c286f3bde9 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 935 BLAKE2B 18a83d574c23f2df917df6ef33ad4b423822080e1d717d9c98bb894bfe96ea1228277b7fec0a75dc8387108c8f67da0236524701f8aec62e23ca586ee8fd1dd0 SHA512 bedbd85002adcb99946fa0d5f46faa43c20fe7c494fb407c4054ba18881635fa80b6169a945600d81aaf122c404c5795203dc468cd608649e4771e21b6810ae6
+EBUILD namespace-zope-1.ebuild 934 BLAKE2B eb64633a44c30f3358d13582cbb755812e488e7975d5b1475efe65ef86c029620dc5be3d662088a7f491e4a3d56321a5c9ed7c0febd10c72b4093e4f0de31a6d SHA512 a64a45a39fbca11d397445585d7463808d8bc036a79e447535678b37e4e10feaff66c5f4da1c3f85d8e723d303f7619e89ad4c0bfef584847875f1de4473d3f1
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index af97e2ae2e9f..4544d424b89d 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index 7f21ce4e5a31..32b36a2a1770 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,5 +1,5 @@
-DIST ntlm-auth-1.0.6.tar.gz 48282 BLAKE2B 988634d78d6c30a92791baaf4dff865fe2bba8318ce1bcd9739c267d11fb29ae90e7b0348b05b4ef3754cf20675aa690973cca03fa35c195ae0c73c6ac6120e8 SHA512 e6abafd52affebfe0f60ed1fd77543dbfe675a82774bffc44d2e034226806ce6781adc5ca8ac29c35c6fe75440f94a1763e01b0987669cb44a6fe01e102a1489
 DIST ntlm-auth-1.1.0.tar.gz 38624 BLAKE2B 22c6fbe7ef95b7ee88b803b7ccc5f63f1a27ec9285a4527dac20c3d774abef9765f8a7aa7265effd70869f02e09e6d3b8012c50b703c3b0979e41c0134843be2 SHA512 0c41cfab957c48d5fabf391422323556289cc6d8ba5a50c82bb179f6cdbf68528f005c3987e0b47fb47aff2fbcf00deebb0ac4220df6bd08d335879344f8470a
-EBUILD ntlm-auth-1.0.6.ebuild 565 BLAKE2B 285d06d921e3cb8fe5c91a1b9782e0d5e22c87ddd14140832dc1e1e70eb871f1222ddf89f27910a5845273840147f51dd2c760b9f4d6be4c5d513bc2a5d8422e SHA512 9d35c2f83b1c5ae9e0b07fd8552eb74af4096371ffb10da32e16407b33652e2ce176439229c1329bd2840148730be10a7c7e679aa085f2a721465526d60223e7
-EBUILD ntlm-auth-1.1.0.ebuild 565 BLAKE2B 285d06d921e3cb8fe5c91a1b9782e0d5e22c87ddd14140832dc1e1e70eb871f1222ddf89f27910a5845273840147f51dd2c760b9f4d6be4c5d513bc2a5d8422e SHA512 9d35c2f83b1c5ae9e0b07fd8552eb74af4096371ffb10da32e16407b33652e2ce176439229c1329bd2840148730be10a7c7e679aa085f2a721465526d60223e7
+DIST ntlm-auth-1.2.0.tar.gz 40006 BLAKE2B 2fbe7533411dde27938412b3e5e1292ce0fa197abb048c0e52f521ff351bd7e51bdb83b5fd8c1f05e0bb3ce206a4442b8b7059c859eea7333ee2d20ed2e7f7dd SHA512 4fa537c5a6a7f3493df2fdf49261f9588b7aac876f72b7a7ef5b8a7a1dd971d9426dacdc8bbf520cecdbe5b7adb916ddcad9e9cf4df725b69793299304601912
+EBUILD ntlm-auth-1.1.0.ebuild 562 BLAKE2B 7c6b1569c173558250bbb29c11e5021683434d1e712f33ab0c3a01101bbed71bbf664a09c84346d85a17bb0ef215e3ac15b36112209ba7cfcb8c5d32435bcb04 SHA512 cf5eb6316e0733394d4b45dbd08608d2cc17dc563ceaadc771637f8d4e2d14169bdb131ac5ead33a30bb3723eb362976c752375e54764e6c902329c05b615cca
+EBUILD ntlm-auth-1.2.0.ebuild 562 BLAKE2B 7c6b1569c173558250bbb29c11e5021683434d1e712f33ab0c3a01101bbed71bbf664a09c84346d85a17bb0ef215e3ac15b36112209ba7cfcb8c5d32435bcb04 SHA512 cf5eb6316e0733394d4b45dbd08608d2cc17dc563ceaadc771637f8d4e2d14169bdb131ac5ead33a30bb3723eb362976c752375e54764e6c902329c05b615cca
 MISC metadata.xml 425 BLAKE2B 791b65f110ff47908b2ada3e140cbd1fb262f0cce02e5ac083cb4fecbfba686a44aece6a3d44a69b6876c4603dd74d343fd9a61638f908836250bf3badeb9524 SHA512 a38de76267e3e44d11a8e3571809031b94697d270e3c752629764300893e95ccb1e8daf8a9bf897a442fb3b097fd6da4f3d4d34fbaead847474335a53ab91768
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
index 54b600d8ff15..94bde6851a89 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/jborean93/ntlm-auth"
 SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-LICENSE="LGPL-3"
+LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.0.6.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
index 54b600d8ff15..94bde6851a89 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.0.6.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/jborean93/ntlm-auth"
 SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-LICENSE="LGPL-3"
+LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 5b8a76623f26..058a58a998dd 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
+DIST olefile-0.45.1.tar.gz 97969 BLAKE2B 246198e69cde316f24a183fdf07872edf9b1db2a168571eedb7efdb91166d4ad2658acaaa90e733950e437ef5c6ab8d1bb275cd1b24283b95497e254a39c9b26 SHA512 72d40056cac1d9566aa8e32b7b5484f61958a689130e71fa86bc0b9fed98f27a8cf34b824971357d42ec3dfd2d5bfa86d0f212727ff91d8daa3967969ff576e9
 EBUILD olefile-0.44.ebuild 656 BLAKE2B a007182e3bea9a28a280b96febdb4fcad524f230c1ae96894cd93c181c2556b9259f60f026fa2aa99ac6ac2f75c1a83ba9bab58dfe3a813809da73c40e1859da SHA512 d3345f66d82734d7537cb02f5ebfdcf78a90239d13aa11468a853e029cfc43751cb729ce2387a475b2f48c5d7b1e7a2e62431c55923164f85d111284d67ac01f
+EBUILD olefile-0.45.1.ebuild 648 BLAKE2B 120fd92de6aa614af987790b59a75ca97945911105edaf4c30f4a76a05567da0335310b4f374421b2abae97180bd9bbd564df49a724c4f92ea5bcecb68cea94b SHA512 905a537a5f57cd2558bc4341876de83efea83e73ba6be3b4ad94390ba88929d6c910b5a778c26f1368629ab1b65a94e9608029193cb48cd70695a559d7727b1f
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.45.1.ebuild b/dev-python/olefile/olefile-0.45.1.ebuild
new file mode 100644
index 000000000000..243f264d315f
--- /dev/null
+++ b/dev-python/olefile/olefile-0.45.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package to parse, read and write Microsoft OLE2 files"
+HOMEPAGE="https://www.decalage.info/olefile"
+SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=""
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc; then
+	   emake -C doc html
+	   HTML_DOCS=( doc/_build/html/. )
+	fi
+
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 01e4339782b3..aa1a64be951f 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,15 +1,11 @@
 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.2.tar.gz 107720 BLAKE2B 346e74414cb77da61be08eee39148991aff7eaea7bab54407ce9dc48f422c576fd2125c11acb31cdf54cecb059281cf540c4ccfa005056c5c3b276ea2161c873 SHA512 d678c933a1d1b0319358b0d067291d29467582e6abb26e21386b9d98092f561e3b76965e0b18e12e88abab790b737606ae2a37cc11cb0a4a34ff6c1ad99cfdb1
-DIST pbr-4.0.3.tar.gz 108684 BLAKE2B e3a9a695b04333a9523c8e749628773cd12f38e87cd6cc670b8ba40b800871004a5cd9d038913e5f483291d180afbeb524535c6c68833ee48adde6ff276783f4 SHA512 9e5c915bd661e3356ad1b92b3d01df3a592a6120c9dc58d3e4bfbc3040f2d69f896244ea8f6c9cffad3e774747d330cd03e928cfc160e5df980c134fe2dee801
-DIST pbr-4.0.4.tar.gz 109077 BLAKE2B efe901b074cd6747fe123b6a325cb45e010d774834a875e86647b6a9c3afbaff9e435087e757ae4276c0b18558faeea57c8dec6b2039ab7b0f70424f64d94f57 SHA512 fc849a27c3b5deb89545dd05eb102a14f2c42a0d617f474df46b3292c14ab7e0a4343cd6e1a38eef77815cca49374d58698cb0c2fdd2aa5f2f47e890939adbb3
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
+DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
 EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
 EBUILD pbr-3.1.1.ebuild 2828 BLAKE2B 7fc677aa10ce15627e6e6f6857f0d5b1fc336fe139e42b3ff1aa62d2d898eeb6a92a8e7c22e06e5f597025a4ad16e60dfdec60758b6b5f36569bdd67a39566c1 SHA512 58894ca83de7006ee6486d75ee1673c970ccb207d50c84332b215086468e3288b10a38245a92c8a6330f2a26fddd001b70a9d89b8144009459180474774c1cc1
-EBUILD pbr-4.0.2.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
-EBUILD pbr-4.0.3.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
-EBUILD pbr-4.0.4.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
 EBUILD pbr-4.1.1.ebuild 2601 BLAKE2B a2945d95e1ba37c28d86fdd0bff32f0a880c801eeddb2f3f70f6b21fbac7c0bb869021ccb389888c146f5920b7350af1d0c53d34784f9dd0e0934eb937ff1f55 SHA512 c71925bd2db17d18a625ea6510f589c8bf7df9f10031659f7a6c4a63432826639ba6a93c99be229b5f62933051fc00532d53bb0660f89e0d0c804b8bc7af44dc
+EBUILD pbr-4.2.0-r1.ebuild 2752 BLAKE2B 00b6503f19bdab76fa00451bcb0253eca38b407f8d75cd6b1bc8a3f1ffea6086c7aad0abd999dbb0514f77b2a244f6039c07a70290c03a0f6b162ae401fff197 SHA512 27cf34e621f474af7f668b88ad0d70ab39714826248186a34c54a68452435fa08f2afdb2904374dbd464aab8ee00bd0a6ebd9cdd51317f33e91d21917ec787d7
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-4.0.3.ebuild b/dev-python/pbr/pbr-4.0.3.ebuild
deleted file mode 100644
index 229da21adf65..000000000000
--- a/dev-python/pbr/pbr-4.0.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-4.0.4.ebuild b/dev-python/pbr/pbr-4.0.4.ebuild
deleted file mode 100644
index 229da21adf65..000000000000
--- a/dev-python/pbr/pbr-4.0.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-4.0.2.ebuild b/dev-python/pbr/pbr-4.2.0-r1.ebuild
index 229da21adf65..b000008290fc 100644
--- a/dev-python/pbr/pbr-4.0.2.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,7 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
@@ -34,6 +35,7 @@ DEPEND="
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})]
 		dev-python/wheel[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
@@ -65,6 +67,6 @@ python_test() {
 
 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
 
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
+	stestr init || die "stestr init failed under ${EPYTHON}"
+	stestr run || die "stestr run failed under ${EPYTHON}"
 }
diff --git a/dev-python/pew/Manifest b/dev-python/pew/Manifest
index c11dbfd91476..f184d9a86462 100644
--- a/dev-python/pew/Manifest
+++ b/dev-python/pew/Manifest
@@ -1,3 +1,3 @@
 DIST pew-1.1.1.tar.gz 19629 BLAKE2B 9db83eeee873c1a9a542372562cbadda37d6d5d52ed220c7018390291a96ae1adf7e168c4213cbcadad04a6cadb7115aed53eb7a8561a0ee0e58dc9137ac5257 SHA512 9b59ab51d4685b6203a944338d8fc5ab0ac65b442adb7861fb3f2ed7437ef8a02f1f87e234fc70124245625ac7992500c11e51902a98511015e90f1ac5e56b46
-EBUILD pew-1.1.1.ebuild 693 BLAKE2B ab867d60ff2aded71f4295e404c47cd5de884aa17db1c63211a6cfebfe6589308b72f57ac67cbf2b4d0123f77b85b68ff5aa9e657a344f0686e6ead9c547e9da SHA512 4c0136c32cfc22dd2ddaff229bc9e83f41e6bc031758b8e15325663c83281813e2b84243274d16b747e6dc95926431178109bf0e846f42742ff2065ac4d34478
+EBUILD pew-1.1.1.ebuild 743 BLAKE2B 3ea45d63e72b2478057133b85cab386e9bc84c79d51077b7266af6de7aff08b080a51fdae085e1e9f18b98092248c36cde9d15d615404401937812c4195abda2 SHA512 5acbcf2ddb35c9d8ec9ae0244b9cc82715e244ac583038a6c3626f7c96b886b9d767466f4872e25218c0e10092ae3aff3d7b709424cb4a141175fb4beca8e5c6
 MISC metadata.xml 446 BLAKE2B d4be59a9c95d607bc67b12d4fe5a5310dfcfa5a251e022fb9fb0ffb0a57aaf51c47331d735b76eb651718adfd627d72ae9afa315c9703fe639dbf67ddfe411b7 SHA512 81ea90c5b887670e5a5d1f6933c503fdbcbfe1b59034bc8656a5ecdd5aa954a35edf3aa46b3c5d591194d2f964d4fdf30ede9270d9dc06ca7676b0f864bae20b
diff --git a/dev-python/pew/pew-1.1.1.ebuild b/dev-python/pew/pew-1.1.1.ebuild
index 6522126be14a..5c0c4ea55839 100644
--- a/dev-python/pew/pew-1.1.1.ebuild
+++ b/dev-python/pew/pew-1.1.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
@@ -20,7 +20,8 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	>=dev-python/pythonz-bd-1.11.2[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	>=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-1.11.6[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
-	>=dev-python/pythonz-bd-1.11.2[${PYTHON_USEDEP}]"
+	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 37e0fbef0d59..f59334fe4025 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,10 +1,11 @@
 AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70
 AUX pillow-4.3.0-freetype2.9-test-metrics.patch 553 BLAKE2B a5bfdf7789237b583c464f2cbb7cfdf645a272587337da227eeea98e41312bd2a7b3a7f22c182856577350489a849f52271a395f9799410a7a07f77654629197 SHA512 291ced301ee1938dfa19afc7b57285c57e6722e28f3adca492e390b1ac7a0cda43c58fa19b97cac81d2ed6ef928ccfb51de87e60b035e35f923c1a006e80be64
 AUX pillow-4.3.0-no-scripts.patch 392 BLAKE2B 1443119f49b0c76c75d17414851e7f54d673b804d8d268fea79fe9fcc4f6361d6d2e70cfc6d855c8c374bcc28b67672778f310f38442502bf5c7096e26bf0bc7 SHA512 500706b3736e17bbfdcf18d2e3038a96ab16a5ba1015fd2ee9332ae11d8f98594ac4c50dd0f7cfd5288703970d20d0a4f3174a8071442893903888d828a2d2da
+AUX pillow-5.2.0-no-usr-lib.patch 446 BLAKE2B 98a026f1fdf2e44fa20043aaa92ea1866b77abb244974f9c827dcafcab20c3f7f4a33a6582f3fea11416413576e4befeb0e79d57ff529dbf34937ae798ab3f59 SHA512 1bef741f5d1b12109dbe27afd360ee2d8c5d7c8a1d4a177e017bb9a789358bb0c7936e354f357cfa3817077eab21c831ebcbaf2730f63ef68541a380ca655598
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
 DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb
 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
 EBUILD pillow-4.3.0-r2.ebuild 2335 BLAKE2B 927d5247c0146ab1a304bdd2985f2606e336b766ec6bcd5718508f0f51b583c27cd8256ce836e7f6100625b36c53ffe11c63cde624d682bff96c45eaa49fa5cd SHA512 4e387bf4d17babe9b33856391a7f66d0849e6d652685faeb8e6afb8770514502ebd5dd10dafd98855891ae1802583b0f8cc51b9a012cc9288146c281eac60d4f
-EBUILD pillow-5.2.0.ebuild 2159 BLAKE2B 28f748713a20336e7146254ecdb0b18f58dcba5e77a30cd5753ed28997a2d7d6d98bce011716c3bb38368b551a957c12dbf9a6c6ddfdda31962fb14a640f088f SHA512 1509c48e17f5161bad19b2063af9ca38207a14f38e3ede8ee8d48f4dc0e86b81fdac4bbfa38756acf761d6bc54ab9cd4801e83932cc8556b5991e92b52cfd1ca
-MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
+EBUILD pillow-5.2.0.ebuild 2701 BLAKE2B 69e75f027ab441da6b8843322ceef55edb999da8b6dfc854998026aedb59b919ac661c3bfc6525b3673a534441b4fc9e830de2997df56df961adb234cd469a44 SHA512 f2e7ea59baa9383756acdccf9f4153b4f589356795945bb5b4895f285c20a4e8e0c8d5a57909d05e113f65780fe974d49f2e51dad793238cdcaaa849cc0dd205
+MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch b/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch
new file mode 100644
index 000000000000..4b6cc50eaf5e
--- /dev/null
+++ b/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch
@@ -0,0 +1,12 @@
+--- a/setup.py	2018-07-22 22:09:23.840195059 +0300
++++ a/setup.py	2018-07-22 22:11:43.400626135 +0300
+@@ -258,9 +258,8 @@ 
+                     _add_directory(library_dirs, d)
+ 
+         prefix = sysconfig.get_config_var("prefix")
+         if prefix:
+-            _add_directory(library_dirs, os.path.join(prefix, "lib"))
+             _add_directory(include_dirs, os.path.join(prefix, "include"))
+ 
+         #
+         # add platform directories
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index c3f74b982665..270281456096 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>vdupras@gentoo.org</email>
+    <name>Virgil Dupras</name>
+  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index 1476c3915c58..b4f435d0425c 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 virtualx
 
 MY_PN=Pillow
 MY_P=${MY_PN}-${PV}
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2.0-no-usr-lib.patch"
+)
+
 python_configure_all() {
 	# It's important that these flags are also passed during the install phase
 	# as well. Make sure of that if you change the lines below. See bug 661308.
@@ -64,13 +68,23 @@ python_configure_all() {
 	)
 }
 
+python_compile() {
+	# Pillow monkeypatches distutils to achieve parallel compilation. This
+	# conflicts with distutils' builtin parallel computation (since py35)
+	# and make builds hang. To avoid that, we set MAX_CONCURRENCY=1 to
+	# disable monkeypatching. Can be removed when/if
+	# https://github.com/python-pillow/Pillow/pull/3272 is merged.
+	MAX_CONCURRENCY=1 distutils-r1_python_compile
+}
+
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
 python_test() {
 	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	virtx pytest -vx Tests/test_*.py
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	virtx pytest -vx Tests/test_*.py -p no:relaxed
 }
 
 python_install() {
diff --git a/dev-python/pp/Manifest b/dev-python/pp/Manifest
index 887c1573f1d2..98d3ae72eff5 100644
--- a/dev-python/pp/Manifest
+++ b/dev-python/pp/Manifest
@@ -1,3 +1,5 @@
 DIST pp-1.6.5.tar.bz2 27185 BLAKE2B 3148b9d9c251a8f75348f4a5b4905d658054b44ef959b4e9617532f69d6d0c12379c68c86cb91a8151de50b9434844ee6746cc266e253a4417228895178c3aec SHA512 b72c3e12b770f386b213a0325748a7e99d225a608a5453929004b06aaaa8fb69b40054a3bcb1d8b30a640f7db7a945b0ae8c1b1a1d753855668553d18a18bbfe
+DIST pp-1.6.6.tar.bz2 27261 BLAKE2B 967fa8a1a65c098eb61c0f78ba3527b7d6c6aaec60adc6bec04019e3f10379ef4d5b50a6cd251fa5f9c658bdbc7fc54639afb12cd6708ffbb3519eab56ef1548 SHA512 5014a57a9c58b3032973e6511a00c710d2f781441735cdc2760d1073a4d78a0f86f02e2f6f21d2a55dac272e6ea0c0cbcaa6282efbc0c5175fcb0b6ccec1ac97
 EBUILD pp-1.6.5.ebuild 617 BLAKE2B c9cda62671a799b6db808ec5abe2fedce19e7a180365eff6193a508fd2ee94245370a1087c6fd9dfbacdca9ec72141960df51c7ea07e1bc2b7888a8caee2a1cf SHA512 c0b9e70c30df277550db1db85b53a5d02f4412f42f15c43471aa351ee4130ea6f2b26931b965b41e3af5fdcc9936103b35166522251728488e977ae71393a63a
+EBUILD pp-1.6.6.ebuild 617 BLAKE2B c9cda62671a799b6db808ec5abe2fedce19e7a180365eff6193a508fd2ee94245370a1087c6fd9dfbacdca9ec72141960df51c7ea07e1bc2b7888a8caee2a1cf SHA512 c0b9e70c30df277550db1db85b53a5d02f4412f42f15c43471aa351ee4130ea6f2b26931b965b41e3af5fdcc9936103b35166522251728488e977ae71393a63a
 MISC metadata.xml 485 BLAKE2B b45925828641bb14a94fc2aef987654643219b4a58d57a1551b675bb10700d077a69d8cb8783a92aa8273971476ed22eb9b9216ea4e29d28a8fcddcffa9aa1ae SHA512 68f07655eb89478f3fd4bd5f2312706ae48ffb23ae5da7c120dbcfed34fb3476bd9aa8b82de033db604bf04a8056b7765d46b83b72c5df4187dbd1d37a907a51
diff --git a/dev-python/pp/pp-1.6.6.ebuild b/dev-python/pp/pp-1.6.6.ebuild
new file mode 100644
index 000000000000..467a8f15bfab
--- /dev/null
+++ b/dev-python/pp/pp-1.6.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parallel and distributed programming for Python"
+HOMEPAGE="https://www.parallelpython.com/"
+SRC_URI="https://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+python_install_all() {
+	doman doc/ppserver.1
+	use doc && HTML_DOCS=( doc/ppdoc.html )
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/examples"
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
new file mode 100644
index 000000000000..878eedf6d6ea
--- /dev/null
+++ b/dev-python/precis-i18n/Manifest
@@ -0,0 +1,3 @@
+DIST precis_i18n-1.0.0.tar.gz 61251 BLAKE2B 3f49f77ae4e6eea6ac1429a8de9b4ebe217d4d901edc223ee487d8a11bb45dc9e21a1e9fef9bd4478273ae721b5c02e4e2a7d2a3f28da281fcbdc17a12a1094e SHA512 9017852fdd2a066b8e31521bd39843f3b1f87259ce87e1567cfaa2b932b52b745ad84eb89b77a4c3ea0a04e513573655266b2cc73997e951268646da7a000e5d
+EBUILD precis-i18n-1.0.0.ebuild 546 BLAKE2B 19a3c5e30811608d7ae61d0c5f9446e2ff77343379bc8beb9b92ba49829e058940bffc6334621c8478cea4f7f18475a7e2f1336b99a6f64b2aa11dca470bdac5 SHA512 018bce20111d3963c23cf2792b779e54928e1e4581f858a09ecf19d287b25052e9f95e3a1056a43b6ffd519e7aa8478cf0594cbfcd5581123517e4854ced5a0f
+MISC metadata.xml 945 BLAKE2B e05fc6a6170827749badef2aa323c05a7c57ceaf89c21d11d64d9b7e43623a1486c5a90ae4fa6a6d40557a19fc4a3b06eb1575a7981bfb98c46826de8297dd1c SHA512 d45d169badda2117215c9145a80e95bb03f13018631e813b61c09b84e6e860e56e48054aa874639d3111aa79383a690179d415cdba015452b21546f0970756c4
diff --git a/dev-python/precis-i18n/metadata.xml b/dev-python/precis-i18n/metadata.xml
new file mode 100644
index 000000000000..252b16c4bd62
--- /dev/null
+++ b/dev-python/precis-i18n/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		PRECIS-i18n: Internationalized Usernames and Passwords
+
+		This module implements the PRECIS Framework as described in:
+
+		PRECIS Framework: Preparation, Enforcement, and Comparison of Internationalized Strings in Application Protocols (RFC 8264)
+		Preparation, Enforcement, and Comparison of Internationalized Strings Representing Usernames and Passwords (RFC 8265)
+		Preparation, Enforcement, and Comparison of Internationalized Strings Representing Nicknames (RFC 8266)
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/byllyfish/precis_i18n/issues</bugs-to>
+		<remote-id type="github">byllyfish/precis_i18n</remote-id>
+		<remote-id type="pypi">precis-i18n</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild
new file mode 100644
index 000000000000..64ef7198e16e
--- /dev/null
+++ b/dev-python/precis-i18n/precis-i18n-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Internationalized Usernames and Passwords"
+HOMEPAGE="https://pypi.python.org/pypi/precis-i18n"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/promise/Manifest b/dev-python/promise/Manifest
index 1806d4991418..0063f0f4bca7 100644
--- a/dev-python/promise/Manifest
+++ b/dev-python/promise/Manifest
@@ -1,3 +1,5 @@
 DIST promise-0.4.2.tar.gz 7309 BLAKE2B 8d08c3985c6410d2b684bc27e300f4e5df620d3e035e127010a15ce2d774365f621eb4c3525b4422295d38cd62b5fcef2135758dd331d5769a86eca26ee378f7 SHA512 e3f0bd3dddfe3a304cb51d857418c8b8993f6e97c1a9e64622438869952174275ef4631259d5e6f090bfb39d4a2fd6bca8fe50ada5bb8ccea19ff726adcde7fd
+DIST promise-2.1.tar.gz 17974 BLAKE2B 5e1fc9bbed3af51812c43b1c13006037ada44404564a3064cb2e39657f6bb5dc0fec6d052ae9038439c60339fd4f4b5fa97330571398bf84243805b25ead94e8 SHA512 d4d5628c9b75f81fdb5d654a76e788df5296472cd73bcb8fd9a27979b8aadeb1d40a4d52cfed173341a5a97920132b00cee44d915ef640167127a249b5c0cac0
 EBUILD promise-0.4.2.ebuild 671 BLAKE2B 16df1ea6bb32e1b0cef0568e36605e28afd847d6864ae2cb0189b540a731c21303c4b3e43ced5d9faa19495f76375ecf391fc98b62661d315256f8d1eaebc861 SHA512 92fa75d27c1197addab185510d294e73abf04930fe196fb522db22de80c427093bf95bd638650b6c8bf9bc405d9fbcdae47e4c92b1b0622fa35898ca70e1c885
+EBUILD promise-2.1.ebuild 576 BLAKE2B 31a71149ea617137760975eac743c10191bc83456316e631564a57965f3ec29d755e1417024622af94da7682e8a0680efc921ce00d34dcb100b72d425bd1680a SHA512 8efea17805b86fecf6d347d5c031c9c9b689f77ddd6452c415e65366cb0b0f169beb09644bba14423fae292f699012a1c3a316e4b172e7646e8a1d975ea3e54a
 MISC metadata.xml 373 BLAKE2B cc10ed34d2ea993068f7a4d4b86a03933564fab8a8e4d037ebbaa006fb03048c3a8444c3678391681ee912a291d040d1ae5369e6aaaffd0efb8279281c6048c5 SHA512 a8e678fd1664a3adb4e5f60023acde26c317b37bd742d7e1c386e4847f19fa9c727bf366745ff5a772b8e0eb02f8515048c65c6f78b2a127213236bc7e635b9f
diff --git a/dev-python/promise/promise-2.1.ebuild b/dev-python/promise/promise-2.1.ebuild
new file mode 100644
index 000000000000..e9a2866b834f
--- /dev/null
+++ b/dev-python/promise/promise-2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Bytecode optimisation using staticness assertions"
+HOMEPAGE="https://github.com/rfk/promise/ https://pypi.org/project/promise/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}"
+
+python_test() {
+        nosetests -v || die
+}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index abdd689d80bc..64d17c770f19 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -2,6 +2,6 @@ DIST psutil-5.4.1.tar.gz 408489 BLAKE2B 867dd9b535134ff2ef5960f774891eb4743afc58
 DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b9cbef9e0f48b0379944e2aa06ed498adfddc30e8d9ba8e02a08f79d4867dc1e313a62040ad3550d69d62664f SHA512 f2a0f3089c3436df52d509576795e1de14c4127918fbe63b8f116f7c097ba4d67e3b55a8da167a88c6ffd340bb443109d4887c03371810997ced4478b295f960
 DIST psutil-5.4.6.tar.gz 418059 BLAKE2B 84141bc30c4f8b9316f3dc1cd86409272af62c8b2d9269f6b4cb406ede59ba147cd7a1b78f7d176c5f98a4544a74c375699e44be36fb862219fd97d7b3efaa15 SHA512 7aefb2c1759a62fca21d1bd07f7f3aeddc368b972ce831dc6e52cda5effaee2798c6bf0aece9732dedb7fefcd8e9e3f03760d6e715be8ea1479b282150a585f3
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
-EBUILD psutil-5.4.3.ebuild 797 BLAKE2B b9f060635f84013fadce3565305575d986b1ebe9416332a72fd4ac005e05553778c8fa14b6f4b898c601117ed5ca13b48f88955355eff76d2e8a8422e1783e03 SHA512 ada3f982c989c2ca428dbffaeb8e61054e82ace935649e27fdf9e1b160e8eec9943e097f61d4ec05ceef56e2626410ffe4ed9872a0af7cbf6e33acfdacb9627f
+EBUILD psutil-5.4.3.ebuild 796 BLAKE2B 16153d9a9658118a5fab1a6545222c64c1e5cddf259a687d8b5cf751939e8f27728dbde8d92f8985760955872157cfbec853f373eb8c3b668d64868a84f67c59 SHA512 c9397c3776f7aedfc615b4b1412a98e6dca9a2f157d0131cc1ca8d523939213ba0b8e636e4fa592d131593d368e05c004657109ada7bc739f3014eae2aae60ee
 EBUILD psutil-5.4.6.ebuild 796 BLAKE2B 8d89ec0f9df2a222b1f8b4ed782ce834c1e17f528a04be7711fc62db8f2b120201ee34908ef686f6724510b5b97bbc42da59fbce5ecf5ac0dbc0c0425121f307 SHA512 a89e412600f2f04c0aab18ef987a14f10801fa9f90d73107f29f0532920615b5adb4b187b915ea33831b7608e06394549944b5d914f558e7555d59b6e7fa914b
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.3.ebuild b/dev-python/psutil/psutil-5.4.3.ebuild
index 0087d6814837..6241bc775c7c 100644
--- a/dev-python/psutil/psutil-5.4.3.ebuild
+++ b/dev-python/psutil/psutil-5.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 3709b490879e..2ccec60e4e57 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -14,5 +14,5 @@ EBUILD psycopg-2.6.2.ebuild 1963 BLAKE2B bc808d9db5b41744a0afc87de313e1ddd8cfd70
 EBUILD psycopg-2.7.3.1.ebuild 1925 BLAKE2B 23ae799c7190d00b1f89ed0a5d56ffd6d087729aa14c9f9de5613f779e1bc1e4429caa0bcbb23c4e3916ed52201a778329c497169eef019a2c0eb9d71bf816e9 SHA512 a2aad512239cfa3c484ae4f60a8a2206581d3a4507b1c61f77c96433889b445a378bae56807ac083631fe80f5222f5e4861cb7be129033ce4ed99d6c83c5be7c
 EBUILD psycopg-2.7.3.2.ebuild 1676 BLAKE2B 7284bd0b9418c7447abb99cf8b54745e87d37216c96784159be742cb225b8221cd1339c627d355a04adfb246b6caf6bc03f5d7bda7cae3b7f7af3afc4566cd33 SHA512 cf7359219dffaf91a62eb4f367ee8060ba553dff76f59686045734b791f0bd14596175a6cd597ad027aa684f772232232506fcef5007b17118a41d09896e761a
 EBUILD psycopg-2.7.3.ebuild 1916 BLAKE2B 0aef9459837710da76e7a79c8b53bbef66273693015db9b845ec9249cba03cef3920f9f5759dc60d4d080793d2ce2b8b293efe8ae63b91073f2596541fec8b31 SHA512 5c8eae548f2435667f48fc996fe4be784ea2ab71fa86f9a91c423f15d9ad778107c70d7670de36d8cf00cc2bec1c46c9ba693feb3c10982dc17e008fd8bd6b1c
-EBUILD psycopg-2.7.4.ebuild 1562 BLAKE2B b83a09920c98a2a094751d215d095d3200cfbe3146e33568e83e2c2c693e2045ae9a00c1a13ff510ce1f8c47f2a2d7cbecd689ec568c438fd64c00d60454e741 SHA512 414c68ec903f18ea0c49f64911900494d817890ce84eab112bb86271b76320175452ab08113022f027e2dcf0834746caffc6b986608a563aa2283ea2543ad10d
+EBUILD psycopg-2.7.4.ebuild 1561 BLAKE2B f3f777c8efaeb7f31a77b025a2dafca2df253603b295af25f1193110820769e2fceabf305160bc7ffdb2deb68aa0069cef2ea1734e388cf337659a6ed3b454c7 SHA512 01afd0d38aaef299d9590f9d37b3f3bc5c2068e5a24da0cac44e417582952c93e372838f7922f01f58d6aa178d079e9036022c7ed044d66263865b22767ada5d
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.4.ebuild b/dev-python/psycopg/psycopg-2.7.4.ebuild
index 343fae0913bd..9e54fde2ad0c 100644
--- a/dev-python/psycopg/psycopg-2.7.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index c21002f86a8f..01311fd4e565 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -2,7 +2,9 @@ AUX py-amqp-1.3.3-disable_socket_tests.patch 405 BLAKE2B 9d1c75d6499ba8fdd172d02
 DIST amqp-1.4.9.tar.gz 79392 BLAKE2B 03c37db7341705c05d8a1087d8e2911f5d89676b0dd00381677f09d1541b76bf6881688a8897202534e57f7dec0d4341e76138f4eb81b9cef3653f98a7c334b5 SHA512 9c2fecb3c9e1d24333895031a9ae255a858146d498b169a89c3ca8061428c622d85dcee8d2ca45d63a3ecdda34a1efc917aabf42c7c35b579143caf81494a079
 DIST amqp-2.2.1.tar.gz 103599 BLAKE2B 2f0f5573bea19a8dcd609cbadf664ad8835b83f470d0ac24214f3cebcf174e9838fd2f1e4dde029ee9511a1e55ff4b7e2a6368902fdc22035272cc01b8c2f96b SHA512 dcb6297917d4528cfe3ebc446e97be6fed3c100ea77c68923c923cac466fa2d85ed8afaf19582b281ee6e05d699e8ed3fd6cdcbb0cb4de0451becaf16711af29
 DIST amqp-2.2.2.tar.gz 103128 BLAKE2B ee1513e12e1695ce2d16f72fc09dce713a5c9e7e630f8e8d2d39b580b15e254287ff49039db6a43f808f1d2c26239195c003648f360169abfbdcdab9aa700604 SHA512 8ebb8f2b0942e9b88b12cf35b8861da392190dd200d843bf3bba7b98e325afa53f52fe3f8250af1d2c1c14ffe8a071df5494d1eedc1bff974cd62fe88bc3e1e7
+DIST amqp-2.3.2.tar.gz 105854 BLAKE2B 8bacae52f03118e2d0fb93a6494628f18f7139d655f1c4b3e7cda9fd81eba5d92f56038bc01dd4a28a89168be0fd51013db0060e945e7f7c63e1423892feaee6 SHA512 c9c99a238cf64ab5590eaea5756e9f68d58769b4d74af3405321d5c129171f34e6a5d20f2125ef2828e843b637fbd115d1ee9391726fe6ff09d233f0e6bdd511
 EBUILD py-amqp-1.4.9.ebuild 1615 BLAKE2B 2513d1745ca8bbfaabb2310560fb1f53975fa5657c6821c9b627d6fb187b9a620762a4eeb567052460dba6f0c0968e1aa10c6fefff5d8837a3e371dbf11caf6a SHA512 9653194a6d3f666a629e0cac0c5d373cee3071c8e341d16dc44d86f999109e1a5070e43c6dd97fc38e1384c7d6bddb6ff0654ad64ad81d9b4df27912018d7129
 EBUILD py-amqp-2.2.1.ebuild 1184 BLAKE2B 66b918cd16f7629fb3d694ed89a936340538fd6a102ca6fb745f6a658c82c2a9ffec16db7cb13145913dacfb7a0b1e1744ea7e12efcbaca370884afe46fed632 SHA512 a31708b7b9c501d571c3df8670e17e233c081511e935d89737afff85bdd2da636e3fdf78324cd9c0d44832ca3124be14e897c7a73f48ccc0a3f92b351e4684b9
 EBUILD py-amqp-2.2.2.ebuild 1184 BLAKE2B b00ea1a3a4337918834af1238fc9f64f2ea2bc5abaabd6973b87d9ae42afde4582e5b99794a42ead1a609f7b3fc7f1ccc445e716e2862cb101f1fae942998b73 SHA512 b67ad99b6bd8fe75884ccf9ec17a86ad3265e07adb31289538b65b1127ef1d8d0dac702cf7414b617f69006fd0344c12c8ab8ad155262dac979e465a6951adcc
+EBUILD py-amqp-2.3.2.ebuild 1186 BLAKE2B 429dcdb253e5b0e9d9ad29d8b94e4d59d3ba5c0da7cfffbdf4b320695f9f0ce48eb93f3e37ffa33de9ee2b2b27277f31ba4aff51cae002df5dd2787953f9cbf1 SHA512 950549ffd9dcb5215f39897ea64c08c7889e4097cd147915d2235ab6b476d12abd8c89eae9e3e2206240e8e62285ec0c18035277357b75c7488ae8099ebc8451
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.3.2.ebuild b/dev-python/py-amqp/py-amqp-2.3.2.ebuild
new file mode 100644
index 000000000000..b70ca5751c12
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-2.3.2.ebuild
@@ -0,0 +1,55 @@
+# 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_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc extras test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_celery[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index 32c9173d1a5f..422351b7c0e0 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -2,6 +2,6 @@ DIST py-ubjson-0.10.0.tar.gz 44653 BLAKE2B 91c40aab4cc66200d863fb13e4f0b64f4b190
 DIST py-ubjson-0.11.0.tar.gz 45473 BLAKE2B b74bfc20b30a2a45fb4511aa730d51245e6810fb8b00980dd61ae5bfa7cda1f60397de8c9d914195dffc48e4ec9582f839b9e133b98dd897b0a47a03abfbb67d SHA512 2c5dd111ea91fff1cebd722c62b312422e198bb8cc614e1254a3913067f72124efd1cd9879bd83ff88c2fc12ff2ef17fcf350ef7a3d6587c96a58c8b9e8ca547
 DIST py-ubjson-0.9.0.tar.gz 43338 BLAKE2B 8bcf61d1329931a2bfb7399cc27e72b14f9641fe902f0275ae190b1b256c67d78fe9b436aacf6b33912ef0e29a008e4e7b05a12b10488714ecb5b31451c1e69e SHA512 d9f061e548405d16a22d235f487740b3d4abeab8b555f9684b632cdb5e2f655ba8413a207230f90e7f3f352fa3289b16bb9a56b623c0cc5fe02f61778a8f78a2
 EBUILD py-ubjson-0.10.0.ebuild 438 BLAKE2B 91b39ffca500aaacef4c789a229a8c97e6a277c5357632320f46e6be2160d8e5b4e0ca08c758ef746f4804cadb92236e4fe739022c6079d40ce85da1ed6071e2 SHA512 ae74fc9affeaa2130123ee5d50329754ca1f2954b5bd17c4a837ec821cd4ee3f6b2a5b81e2f824a792598e1ba0272e25ce867dbea68542d2a6e7862f47139618
-EBUILD py-ubjson-0.11.0.ebuild 438 BLAKE2B e9121fec58ec4c3e5765b696ea840c733afd9319195c8c6f14dac3b655bcd563364975f4c5ece2a3565b61f2f4db255a98a0e4d3a1c9758d18dfa12f30c8b727 SHA512 8606a8937ce6e29a165c465b838377cfe7ae176b0ae60513494d2f4b61add669d88c156b098376e77f4a217be8c8b1a45ed999a5f902db1b917cf201b95d4e88
+EBUILD py-ubjson-0.11.0.ebuild 508 BLAKE2B edafa4a9125efbe6c9db0497527c95ed6c0f7ea006e3d2fb180ea8a7070743d5366d7c4a4078fab55bc8b8a7bb325d641de88beee50d866ee676cdca3f227586 SHA512 e7720b558822b25acf8a1a1155bcc3e947c6e2760e350e6cfc092a1403e8fa2bd5c48bd258708f53c7df76c869da9b27ec1d3484cf5dbb11bf3c1dfe5f69b653
 EBUILD py-ubjson-0.9.0.ebuild 466 BLAKE2B 86d5bad038035ae6bf56cf7f00e187da8e00d8bf2e59d373ec3a615c1d161eca9b127e043484c5e74db869a8aff2db77d1dd163a2cc4ed8f5953b88321a6f5c5 SHA512 b5d46df307ff640f7e5d21ac7fb1ec3f4bbd4a2508782a4b7d54ce2af000b27e9aa4cde5969262d8bc2d326c5ea7b4f9dad9f2208f46d617c447fd5037c349a8
 MISC metadata.xml 712 BLAKE2B 69ca065a27809d3112fccb2a0e812fac18a216d88afca7ec654df0a181701be32365863a41f1339a42260d551a3c8aac678451ff7d9ab6c58d8b4eebb76ab33d SHA512 18ee84822f59b8a2b8172c4703d0ed93522a9997013ee0d533acfb4e23343ac2df70f719d8b161dd40604e5875d4c74f1243880ad0725726b445cfb84398a767
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
index f7ea0909f016..9e759613ae71 100644
--- a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -14,3 +14,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 3a79b9559ddb..ef4084902a52 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,5 +1,5 @@
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 DIST pyblake2-1.1.2.tar.gz 126693 BLAKE2B 01690ec32a07b7ea59d7d040523ce8cb523f18927044f2d38c0a143a344fde661498e1a4b35a0f161be7b761a324677f80e88c4a0045dc324f0d588997e884f2 SHA512 26297d788208a80c8102602135332d5ee1424711d9c693828af232b5546301c5d144680367a954d8d9765998a23b82046b157b0072fdc63305ff0088feb16e55
 EBUILD pyblake2-1.1.0.ebuild 800 BLAKE2B 5c3fa94d977b1579966283790a073aa038f26c07d420cd713cfcdd96a2da7c9c4cf3d4180f5d9bd8c51542852392c7cc7d2b3c5ea827943535c0337033119545 SHA512 b1ae954130ed64b5d9bf7ea3d97634a38d38cb1fb659a50bfd349f3d0265c65d3e0f1c3315b265a18530e912973a2b0bab5ed4993f535170579e0fc26ea3e16b
-EBUILD pyblake2-1.1.2.ebuild 864 BLAKE2B 7862b6775b353602492f92b78b5fc3fd3dd474c7c2df11896ce17203e4d1f21ff4a44f34fe7df566e7449980b7d644cc1f85f86732cb821a267befd3e33934b4 SHA512 e1f0a119b6d296cfb6d47b3fd37f4435033cf4f7f94ae4a7e3ee04c015b35fd4dc863edd22c05b6b681c2fd3b6eb0924e6f0985b6aca204fd235776f3a041be2
+EBUILD pyblake2-1.1.2.ebuild 863 BLAKE2B 1f701440d5fc9e764ec763b00e518e4c0252c6d3ebe138208ab42931c1a91dc94f47fa3f3751750dcd1bd83cb892209e71cdc7ebee38054721c527cff8553aee SHA512 8218d53eda4f615fe34a17462bf10751561f4b486d587f80c210602942f1a7f454f086c33449f206b68ab822a1dcfd6e1b205c9a757a2d1e82db19af1df68769
 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
index 490edf11796a..57925229549c 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -13,7 +13,7 @@ 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 s390 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 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}]"
 
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index 1bc0be033f2e..572535064759 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,4 +1,6 @@
 DIST pydecomp-0.2.tar.gz 9819 BLAKE2B fc2078b00f152e598599b1fc4b1239035d1d21789689fb49605a4c3afb6d9201a1b1635d6f1971edf98fef8de02caeb6ea5e6bae1fe2b21f546e8a712ca94949 SHA512 1cec8ba501cf6223740c50751508a83f474a9acbce811c82f6d8beb5536ea8ce9c1d04a218503acd13b6eec8d9a68ef4b712049a7e0ae94ff34ba05c6f50ebc9
+DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
 EBUILD pydecomp-0.2.ebuild 973 BLAKE2B a83d018c4cce344da3aebe2510497435f779ec19dea46693a87cd881d1232a20b70cae241bedf279ed9fac89332e1b7b0f6d7f8cd4c34d56060d7c452568673a SHA512 e936a0480345bcf53574250c1c6854d70a288c59f97d0d9ac136fc61d3377cf1899852db8fe2791758b50d45ea6a534a92c60befeded03a987ef7b92a2b5a6cd
-EBUILD pydecomp-9999.ebuild 1245 BLAKE2B 43296d7b9f499162f48989d2eb61f090fe94fdfeb4fa5b2ca82da9f31c406ccf681bbba9ce1d2a976a2e9bd6b68f44d3afb48d2c53c45377a600365980cf7ceb SHA512 4d7a54d420c9151150380a71b35c5995f838ff2eeebeeb7120933a6cb270d4381fa9e5af1a27d96da0f3b5a6c730312971cb9a61360c3fca4becf2ef8e6e9e9a
+EBUILD pydecomp-0.3.ebuild 973 BLAKE2B 1815cbc724a88348a74672ced223ea2c82ca031486a37a4aee0eb48907eb02a6cb2016500423c4bb3c0ced1a6332b865c52dc3033e2b2081a986d8f9d6e192ff SHA512 3dd344415e65c8c1a0003f08126e27bf41fc2e45d7d2137ebc21922d6ca6bc0c64ffc892eaf307f35c1a6ad9be5f697a31af8f700af69589d39f607249e8f404
+EBUILD pydecomp-9999.ebuild 1245 BLAKE2B 5c48b6b1fa33d057cc201b7999a979ce7f35aec58200687f517ec2da8d8deb68b12c0da261b05e85de0b1ebf71aa94604e5d231fe561639cdedc4e0186137691 SHA512 20a1c836d6ae72ac091dcc801aa9f08916a53e94cd62c19c4e0c86b3fb3d621806e7f5871158d9e363bd7806c23e12fb4cc89cbab7c025e0a8de9a82ae83ca06
 MISC metadata.xml 796 BLAKE2B e83d6be3e1700f9be8b80c72d0d30868757a53d225df068d58991f945d7089a0769efe1fc7984f1a8a218e54d4a25b81c4a9ce7d2fbe28f2d65f9419b49a0d64 SHA512 ec96d316559404d556dee6f64807d44a4b201028000d4ba527743b2f6f18fbd3354e4dd5cf811512edf9bfc7cd1ea176bdb7c6ce1e04efc154b0f8f564c675c7
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3.ebuild
new file mode 100644
index 000000000000..415930a122d4
--- /dev/null
+++ b/dev-python/pydecomp/pydecomp-0.3.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=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 python-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	S="${WORKDIR}/pyDeComp-${PV}"
+fi
+
+DESCRIPTION="A python library of common (de)compression and contents handling"
+HOMEPAGE="https://github.com/dol-sen/pyDeComp"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please file any enhancement requests, or bugs"
+	einfo "at https://github.com/dol-sen/pyDeComp/issues"
+	einfo "I am also on IRC @ #gentoo-releng of the freenode network"
+}
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index c25e7e24119c..a7c9cb463406 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 4edc7fa3099e..ee39f52e0b41 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,5 +1,7 @@
 DIST pyenchant-1.6.6.tar.gz 64010 BLAKE2B cdd0878ca58e05d955bf7d5518de71c02f663a8b00b1437bed8171fcdd08768691a9f9bc2bea0de0e942c2197bc9cbef66a88a114c47df3265c8d8034c95225a SHA512 af6aa1ac77b5718ec4b4aad3d0b88d26e697b472ec8261b23b37fdbf6b399a120ccc3e4ee6579b884c44b0eeb3f95bcdbceea189105c05088a48400a0c8cdb90
 DIST pyenchant-1.6.8.tar.gz 63693 BLAKE2B 5a8f867f3f40e81ec7d2431b678f324619b81942c8ca05a0cddc5acd2a3c645227fe6584b2236cfd440104f552d23786fff064d39762eb62e9e6a9d62ef1c670 SHA512 1a297cd279a0fbea2657bb42f2018a693b7f1d2da420f8cba436f680fb803282432f86e244a098eb7b9ef801059a3ee3c3bbaa748d30ea6357edf9f778e2f0a0
+DIST pyenchant-2.0.0.tar.gz 64022 BLAKE2B ee1200ded8e2a8f9145fece64cee1c8ea3129d540e10708d51acf6491c200a0f39927b47fce51d2e2f932e465d7acd5bb4afd31712183530f6da5e8ea899c0c7 SHA512 c985714bc8ad69b6580fa1dd546243da5f3f92e8681d846ed265b086c486ae7ed33754fba303b450be4c0cb20e975a9a10efbeb700ea5213a11ed00612a93af0
 EBUILD pyenchant-1.6.6.ebuild 751 BLAKE2B 0e79d6b7a81fb512af2700cae7e99592ab5012e6b3d6ab8ec1d480cd163b50ed0b71f9b78aa0aec2b83b0b7cdcb0bc68e8275af77ecb4037e75782c786ae8a7e SHA512 5ecd971fd492c5e039d250990abb2d7ee1d733491d4fe36af9120908a22cd2d156af8e98ac939ae8b9899955f3fe308240f0575f490930932e7991b095f9e6b7
 EBUILD pyenchant-1.6.8.ebuild 758 BLAKE2B 2945e7e92eb83a3d09bd14b22ec3cb955ecb5d2609de72aadb091fa21915f26357e678865a6f76610bcb019e384e3bd0c5bd9da00adb1fa25b6cd0740000cc20 SHA512 a3de5f9ad29b27cd32ca4bef94e20fb725bf0938eb1b2ff65a460d4480cff25c0871bd37cc24688b138c4e53c2416d781a0e53e401deeba63e1626ad131c792a
-MISC metadata.xml 817 BLAKE2B a4ea16f5a872477cbe84e1aad65d6705e68aa3226358618ad3449a0eff7de175ad6953283f7407d07fb13e9f3cde7c9c23865654ff0c859615f567e42782c7ac SHA512 3af25ba667f443ffc1c5852986b499689d16b20e82867724112cb9c0869b7c6a684e8f4dbd9354e89c721e350ca6ba3fea4f3abb110b8613779060233adc22c3
+EBUILD pyenchant-2.0.0.ebuild 907 BLAKE2B 3d0d8bdf100d3a98d4c01849443931894a5bbfca7fc368f626f44bcef87e19e7e822716f0b8edfed464fe5a7aa1ac8990cd032f0e597eda0a574b1fd46732675 SHA512 9c0de2dda565013dfc804b6f39086b502c8efdd932e5c319935ff18c809c228febc8a00816d5f7a6dee7e7e3f994b52a2665aacbde3acec6acab05314d33f529
+MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/metadata.xml b/dev-python/pyenchant/metadata.xml
index 016b0abca652..c20386bc1a12 100644
--- a/dev-python/pyenchant/metadata.xml
+++ b/dev-python/pyenchant/metadata.xml
@@ -16,5 +16,6 @@
 	<upstream>
 		<remote-id type="pypi">pyenchant</remote-id>
 		<remote-id type="sourceforge">pyenchant</remote-id>
+		<remote-id type="github">rfk/pyenchant</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyenchant/pyenchant-2.0.0.ebuild b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
new file mode 100644
index 000000000000..0ae7b34a1c04
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="app-text/enchant"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		app-dicts/myspell-en
+	)"
+
+python_prepare_all() {
+	# Avoid a test failure when there is no dictionary
+	# matching the available locales
+	# https://github.com/rfk/pyenchant/issues/134
+	sed -i 's/test_default_language/_&/' enchant/checker/tests.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index ee050b1059a6..579e30d22f98 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -2,5 +2,5 @@ AUX pygame-1.9.2_pre20120101-import-bdist.patch 1609 BLAKE2B 976556f860aa1d9be39
 DIST pygame-1.9.2_pre20120101.tar.xz 2263028 BLAKE2B 401b7cdc32cfc6b960e8a686236d0a310d840b4a41211b602f6fe137f80f3bb358daa5e25758c4e152ab41e50c3864c183a0b6f36176e3dec12db80449e126e1 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576
 DIST pygame-1.9.3.tar.gz 2974541 BLAKE2B 38ba1f85d845cf33202819705ad564168fb3bc7041731d50d8c3f6bf1c55bebf41202f8ae9e4c4ba52cabe7335a9df13d7724104015b49842dc7f7aa7b0bfd19 SHA512 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe
 EBUILD pygame-1.9.2_pre20120101-r2.ebuild 1922 BLAKE2B 600b82e63db88de273532e01263651cb11b5cae28b9f159504e8d85fb88e197ce41971cc706224eaedc0b231ff3842d8398439c3d556f0addfa86043e2fa0c5b SHA512 41d06f4e001be51355894948abc96a525920302dff2edd63a6371f9bb0631feb79beaa339c8a06c926f3f0da83dc725a3a2a47463aaf476a7ef9551154a170f3
-EBUILD pygame-1.9.3.ebuild 1778 BLAKE2B 8ebd7270f9511af61a02dbd05fef7b1ae5e83e2afbc074fc2d498a7e6f07527e5cdbb8eb12e18218345b10c3d0b67be33d33a53a2284a7fedd282d953463d702 SHA512 91b598cd68787be953cddf0e8ae6f04893e87064d48d051c4958e9db0d5e73612e526e38dc30519dc32e70bf5e64f273a9bbdfaff56b468f1b6f46ed6d7acafb
+EBUILD pygame-1.9.3.ebuild 1777 BLAKE2B c5d9d768af723d016cd3b3beb121a2db47675cb3f3a6b05c5abbd95b31d891707ed3cc1270189ad37c0da4879966a7a8bc8716ae15f3214a8d4f73866fefa619 SHA512 1b73100fd525ca1465ec666b44ec4bda05bf8cea7fad9a04150c3f3faed5f2db06ef9fd67d0646b0bab8ed721e83d7957749ce02dca9fc326397c8877cd253de
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-1.9.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild
index d7ad93fa8093..8e12c46e56aa 100644
--- a/dev-python/pygame/pygame-1.9.3.ebuild
+++ b/dev-python/pygame/pygame-1.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86"
 IUSE="doc examples midi X"
 
 DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index f2547202612e..a59277acedb5 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -6,10 +6,12 @@ AUX pygobject-2.28.6-gio-types-2.32.patch 1231 BLAKE2B 1649df8d58ee096a0746b5ca2
 AUX pygobject-2.28.6-glib-2.36-class_init.patch 11038 BLAKE2B d610454930cf4a568fc9800b3fc58440e2bbc08d91572e7263df42af9c20d2400f7c6d4f64a0cdd066be1469ff33e2ba01b452b5898fe1368add1bb947ca366f SHA512 e8acc5970ac540dc01551759591ee693ae12dd1512130b135e397e528d920159f0f8866bb8a611e2c06cd96f899ef7239153b59a2ec0318e1fd08266acf95e04
 AUX pygobject-2.28.6-set_qdata.patch 847 BLAKE2B 696aa6c48ee900db738f8a92265a625a3ab7b59afece84157bf0b9abd0aca5ae68b7ac8cc627a47a5b1a688029d592abcc38e403543a4144e055bcdac68285e4 SHA512 19025af51a8387061276ec9d6c8eb0ecadb5124bba2c4ab3755ab653df467896d19c366d80ce9313fd46e43b493b7c536f780014cf18a6ac47f4b1d2ad4bedb4
 AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519927f8837b5487847ad0d0aa25f57dbaa4b10eaed2eff79f52d6581ca29f1688ebdbe71db231aba56de06c3aa8b246fdd1799320d9a15cc3 SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4
+AUX pygobject-3.24.1-py37.patch 8573 BLAKE2B b9d836793fc31dc07d65656f66400e18f34d156aac9de639998ac909a6af2c760fce6069659aeb9707818635987c2e8f2a5a9cefbd0afb7394439b0c2865a6c9 SHA512 4236800e1df1fbb507eae98ef3e334daa0deea01e7c6e9a4540a2ab797441f7b2a39455118443a2ac77d07ca85bdd093f8a799bc5cea9765f60ec70eb298b781
 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
 DIST pygobject-3.22.0.tar.xz 756820 BLAKE2B 2030b9106c082bbec4418c97945df68e20f49005341ad1d7c6d390b894ac88e13f2619215df4c02587b5ccce606083906609d89c559b790777092e991afbf367 SHA512 1f6f0ea8014b35d7828a6bebc0fe2cf6519016ca5ad3819dc6b7879154d8e27fdd2971620955c8fc4904625814833c8bc8ec0599152720649864262d3b6e33e4
 DIST pygobject-3.24.1.tar.xz 758648 BLAKE2B 95e3bc6d022b70053549f8a780aa372d8964477e881b825299ca82a7328bbdab58b037a92d36578915ac622b7c223d47cc1c35fccd3ea70d7840841eaec6860d SHA512 f35968ab12b872c85af6b2410cadedcf9fa7e17352a40f3dc557c86203aa1c38753710aab9ce55e986ee2c98b64e14123c65083655445e993d0b53431db6dc93
 EBUILD pygobject-2.28.6-r55.ebuild 3541 BLAKE2B 7d20bfad727c2f1e56b28a2d01ac354c3becd1529019eaaaeccb35083c74b8932ee14f061b249d8c02f601f880a8455c3064cd89e2be137e9eeb0bcd3f2a2799 SHA512 d4c7e7a96b5151472b20bb1663b94383acaa526c5df4d545289ca9fe0cc18889238df8b1aeaddf19a1a46cd046b43c46268a65b0e820dc7ebe403d05d664b64b
 EBUILD pygobject-3.22.0.ebuild 2940 BLAKE2B 3a5281e9483d976dec0854b885695e6b612782a4f0c1766ce416b0d1ea8d0c27b00853e71d9ae87c7c96d4ee82f94e3d9c657932f1f87231b3768f5a1c9e28f9 SHA512 999d60141ed662a29b0a8f28c57b4bf3e2dbb2770cb82d573553ab18cc7e45587989b99d740bcba4908724f9c2095fc8665b3a24c1bc1185a20b334cb431bf48
+EBUILD pygobject-3.24.1-r1.ebuild 3196 BLAKE2B 187c3a69ac96ced30663fb25db5fdf85ecdf4ca0b52a6c5d8f7a18658ae682ebf685b3aeba79e2ef6521d1aa884ce08dbef617149ce66171939a1c53e45cee12 SHA512 89aa2f4264c9494441288e8be4757bdcc93c8056782af1bca77b4083ee11806a41f0600c398159d49df3ff889c7a50a8e5310727098ce0c4a2590ec59ed99bcc
 EBUILD pygobject-3.24.1.ebuild 3130 BLAKE2B 9c911260ffb68368a769c15bb64fc13e7c668797496742f2a5083f30f0733257cc2f5aa163a65dc1e6cc4302400b72d49a2ea8893111784823ba70a3b4087313 SHA512 0e4a7dec040586acf2163fdf8a9c5c3814679978c92da8cf6984ab37c2c5810743d18eac0d6589edbdc86afcddfd63aff47c4b718c8fd18fadd60d7626c16bed
 MISC metadata.xml 353 BLAKE2B 20a18942138d7ceab468b01a639f92248bf94f0e6a015a0c6c34872cf60ab56ef91d9b36eebc74b3d3133ecbc6cfbf2aedbc24369165d0fe9a4e832394beb022 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc
diff --git a/dev-python/pygobject/files/pygobject-3.24.1-py37.patch b/dev-python/pygobject/files/pygobject-3.24.1-py37.patch
new file mode 100644
index 000000000000..31250e3561c8
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.24.1-py37.patch
@@ -0,0 +1,255 @@
+From c60ef6a2bcc05010a89328d5fc2704d1aa505e2a Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sat, 10 Mar 2018 18:04:14 +0100
+Subject: [PATCH 1/4] tests_gi: Use capture_output() context manager instead of
+ manually mocking stdout
+
+---
+ tests/helper.py  |  2 +-
+ tests/test_gi.py | 14 +++-----------
+ 2 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/tests/helper.py b/tests/helper.py
+index c4308fee..892cb740 100644
+--- a/tests/helper.py
++++ b/tests/helper.py
+@@ -113,7 +113,7 @@ def capture_glib_deprecation_warnings():
+ @contextlib.contextmanager
+ def capture_output():
+     """
+-    with capture_output as (stdout, stderr):
++    with capture_output() as (stdout, stderr):
+         some_action()
+     print(stdout.getvalue(), stderr.getvalue())
+     """
+diff --git a/tests/test_gi.py b/tests/test_gi.py
+index d0c72b64..3b77ff2d 100644
+--- a/tests/test_gi.py
++++ b/tests/test_gi.py
+@@ -13,7 +13,6 @@ import subprocess
+ import gc
+ import weakref
+ import warnings
+-from io import StringIO, BytesIO
+ 
+ import gi
+ import gi.overrides
+@@ -24,7 +23,7 @@ from gi.repository import GObject, GLib, Gio
+ from gi.repository import GIMarshallingTests
+ 
+ from compathelper import _bytes, _unicode
+-from helper import capture_exceptions
++from helper import capture_exceptions, capture_output
+ 
+ if sys.version_info < (3, 0):
+     CONSTANT_UTF8 = "const \xe2\x99\xa5 utf8"
+@@ -2836,16 +2835,9 @@ class TestModule(unittest.TestCase):
+             self.assertTrue(hasattr(item, '__class__'))
+ 
+     def test_help(self):
+-        orig_stdout = sys.stdout
+-        try:
+-            if sys.version_info < (3, 0):
+-                sys.stdout = BytesIO()
+-            else:
+-                sys.stdout = StringIO()
++        with capture_output() as (stdout, stderr):
+             help(GIMarshallingTests)
+-            output = sys.stdout.getvalue()
+-        finally:
+-            sys.stdout = orig_stdout
++        output = stdout.getvalue()
+ 
+         self.assertTrue('SimpleStruct' in output, output)
+         self.assertTrue('Interface2' in output, output)
+-- 
+2.18.0
+
+From 1826e41cd317ba3c19cf8767b1ef8752f1865aac Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sat, 10 Mar 2018 18:54:28 +0100
+Subject: [PATCH 2/4] IntrospectionModule: __path__ should be List[str] and not
+ str
+
+This fixes a crash when calling help() on the module which got stricter with
+Python 3.7.
+
+It's a bit questionable why the type has __path__ in the first place as
+that's only meant for packages. But let's leave that for now.
+---
+ gi/module.py     | 5 +++--
+ tests/test_gi.py | 6 ++++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/gi/module.py b/gi/module.py
+index fd8f5080..9e8b5256 100644
+--- a/gi/module.py
++++ b/gi/module.py
+@@ -124,10 +124,11 @@ class IntrospectionModule(object):
+         self._version = version
+         self.__name__ = 'gi.repository.' + namespace
+ 
+-        self.__path__ = repository.get_typelib_path(self._namespace)
++        path = repository.get_typelib_path(self._namespace)
++        self.__path__ = [path]
+         if _have_py3:
+             # get_typelib_path() delivers bytes, not a string
+-            self.__path__ = self.__path__.decode('UTF-8')
++            self.__path__ = [path.decode('UTF-8')]
+ 
+         if self._version is None:
+             self._version = repository.get_version(self._namespace)
+diff --git a/tests/test_gi.py b/tests/test_gi.py
+index 3b77ff2d..2fa0423d 100644
+--- a/tests/test_gi.py
++++ b/tests/test_gi.py
+@@ -2813,8 +2813,10 @@ class TestKeywords(unittest.TestCase):
+ 
+ class TestModule(unittest.TestCase):
+     def test_path(self):
+-        self.assertTrue(GIMarshallingTests.__path__.endswith('GIMarshallingTests-1.0.typelib'),
+-                        GIMarshallingTests.__path__)
++        path = GIMarshallingTests.__path__
++        assert isinstance(path, list)
++        assert len(path) == 1
++        assert path[0].endswith('GIMarshallingTests-1.0.typelib')
+ 
+     def test_str(self):
+         self.assertTrue("'GIMarshallingTests' from '" in str(GIMarshallingTests),
+-- 
+2.18.0
+
+From 8adc8be0a2ab17e5215a4bc6f63a9ee391237596 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sun, 11 Mar 2018 13:13:30 +0100
+Subject: [PATCH 3/4] _struct_dealloc: handle being called with an error set
+
+With Python 3.7 it gets called with an error set and tp_dealloc
+implementations need to handle that.
+Fix by saving and restoring the error.
+---
+ gi/pygi-struct.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/gi/pygi-struct.c b/gi/pygi-struct.c
+index 4d5b5411..e2906e0a 100644
+--- a/gi/pygi-struct.c
++++ b/gi/pygi-struct.c
+@@ -61,7 +61,14 @@ out:
+ static void
+ _struct_dealloc (PyGIStruct *self)
+ {
+-    GIBaseInfo *info = _struct_get_info ( (PyObject *) self );
++    GIBaseInfo *info;
++    PyObject *error_type, *error_value, *error_traceback;
++    gboolean have_error = !!PyErr_Occurred ();
++
++    if (have_error)
++        PyErr_Fetch (&error_type, &error_value, &error_traceback);
++
++    info = _struct_get_info ( (PyObject *) self );
+ 
+     if (info != NULL && g_struct_info_is_foreign ( (GIStructInfo *) info)) {
+         pygi_struct_foreign_release (info, pyg_pointer_get_ptr (self));
+@@ -73,6 +80,9 @@ _struct_dealloc (PyGIStruct *self)
+         g_base_info_unref (info);
+     }
+ 
++    if (have_error)
++        PyErr_Restore (error_type, error_value, error_traceback);
++
+     Py_TYPE (self)->tp_free ((PyObject *)self);
+ }
+ 
+-- 
+2.18.0
+
+From 2299d46e7a57a74f734844ae28bfd536e89e5254 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sat, 10 Mar 2018 20:03:33 +0100
+Subject: [PATCH 4/4] marshal-cleanup: save and restore exception around
+ cleanup
+
+With Python 3.7 some Python API in the cleanup path clears exceptions
+which makes us return NULL in the end without an error set.
+
+Make if safe to call the cleanup functions with an error set by
+saving and restoring exceptions.
+---
+ gi/pygi-marshal-cleanup.c | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/gi/pygi-marshal-cleanup.c b/gi/pygi-marshal-cleanup.c
+index b4d04bc5..0e4eda3f 100644
+--- a/gi/pygi-marshal-cleanup.c
++++ b/gi/pygi-marshal-cleanup.c
+@@ -93,6 +93,11 @@ pygi_marshal_cleanup_args_from_py_marshal_success (PyGIInvokeState   *state,
+                                                    PyGICallableCache *cache)
+ {
+     gssize i;
++    PyObject *error_type, *error_value, *error_traceback;
++    gboolean have_error = !!PyErr_Occurred ();
++
++    if (have_error)
++        PyErr_Fetch (&error_type, &error_value, &error_traceback);
+ 
+     for (i = 0; i < _pygi_callable_cache_args_len (cache); i++) {
+         PyGIArgCache *arg_cache = _pygi_callable_cache_get_arg (cache, i);
+@@ -112,6 +117,9 @@ pygi_marshal_cleanup_args_from_py_marshal_success (PyGIInvokeState   *state,
+             state->args[i].arg_cleanup_data = NULL;
+         }
+     }
++
++    if (have_error)
++        PyErr_Restore (error_type, error_value, error_traceback);
+ }
+ 
+ void
+@@ -119,6 +127,12 @@ pygi_marshal_cleanup_args_to_py_marshal_success (PyGIInvokeState   *state,
+                                                  PyGICallableCache *cache)
+ {
+     GSList *cache_item;
++    PyObject *error_type, *error_value, *error_traceback;
++    gboolean have_error = !!PyErr_Occurred ();
++
++    if (have_error)
++        PyErr_Fetch (&error_type, &error_value, &error_traceback);
++
+     /* clean up the return if available */
+     if (cache->return_cache != NULL) {
+         PyGIMarshalCleanupFunc cleanup_func = cache->return_cache->to_py_cleanup;
+@@ -153,6 +167,9 @@ pygi_marshal_cleanup_args_to_py_marshal_success (PyGIInvokeState   *state,
+ 
+         cache_item = cache_item->next;
+     }
++
++    if (have_error)
++        PyErr_Restore (error_type, error_value, error_traceback);
+ }
+ 
+ void
+@@ -161,6 +178,11 @@ pygi_marshal_cleanup_args_from_py_parameter_fail (PyGIInvokeState   *state,
+                                                   gssize failed_arg_index)
+ {
+     gssize i;
++    PyObject *error_type, *error_value, *error_traceback;
++    gboolean have_error = !!PyErr_Occurred ();
++
++    if (have_error)
++        PyErr_Fetch (&error_type, &error_value, &error_traceback);
+ 
+     state->failed = TRUE;
+ 
+@@ -192,6 +214,9 @@ pygi_marshal_cleanup_args_from_py_parameter_fail (PyGIInvokeState   *state,
+         }
+         state->args[i].arg_cleanup_data = NULL;
+     }
++
++    if (have_error)
++        PyErr_Restore (error_type, error_value, error_traceback);
+ }
+ 
+ void
+-- 
+2.18.0
+
diff --git a/dev-python/pygobject/pygobject-3.24.1-r1.ebuild b/dev-python/pygobject/pygobject-3.24.1-r1.ebuild
new file mode 100644
index 000000000000..71ec333741ce
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.24.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test +threads"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.46.0:=
+	virtual/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.10.0[${PYTHON_USEDEP}]
+		x11-libs/cairo )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	cairo? ( x11-libs/cairo[glib] )
+	test? (
+		dev-libs/atk[introspection]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-libs/cairo[glib]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
+"
+# gnome-base/gnome-common required by eautoreconf
+
+# We now disable introspection support in slot 2 per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
+# older versions of slot 2 installed their own site-packages/gi, and
+# slot 3 will collide with them.
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]
+"
+
+PATCHES=(
+	"${FILESDIR}"/pygobject-3.24.1-py37.patch
+)
+
+src_prepare() {
+	# Test fail with xvfb but not X
+	sed -e 's/^.*TEST_NAMES=compat_test_pygtk .*;/echo "Test disabled";/' \
+		-i tests/Makefile.{am,in} || die
+
+	# FAIL: test_cairo_font_options (test_cairo.TestPango)
+	# AssertionError: <type 'cairo.SubpixelOrder'> != <type 'int'>
+	sed -e 's/^.*type(font_opts.get_subpixel_order()), int.*/#/' \
+		-i tests/test_cairo.py || die
+
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	# Hard-enable libffi support since both gobject-introspection and
+	# glib-2.29.x rdepend on it anyway
+	# docs disabled by upstream default since they are very out of date
+	configuring() {
+		gnome2_src_configure \
+			$(use_enable cairo) \
+			$(use_enable threads thread)
+
+		# Pyflakes tests work only in python2, bug #516744
+		if use test && [[ ${EPYTHON} != python2.7 ]]; then
+			sed -e 's/if type pyflakes/if false/' \
+				-i Makefile || die "sed failed"
+		fi
+	}
+
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	local -x SKIP_PEP8="yes"
+
+	testing() {
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		emake -C "${BUILD_DIR}" check
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	dodoc -r examples
+}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 4f0f2c65c2c7..515ad8a02aa7 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -3,5 +3,5 @@ DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 EBUILD pynacl-1.1.2.ebuild 865 BLAKE2B 7f1f6c7a037719c5e94cd46eaf9c32c2949b64f3371af5a2254da8dacdd0633bfb5d0a8fe0f8f131214499d186510f48c89ffd6c9c395ea839d47825477409cc SHA512 57a53e92e4d562a826f8dafbc9691f92beca1aa6c112eec0519dafd46efb51962c0214b7733240aef2657f612d2fd3cd1129fc0c3efc7fb82838e06f4822d523
 EBUILD pynacl-1.2.0.ebuild 861 BLAKE2B 50369302f5b01db8e932ae94c6e41fce814b3c446910fde9aed2ba92e067d10e642cbddfe2e55b79311308b5dc71f98123a5e5926de18a2336b1632226b786cb SHA512 65695f94648eaafb6c163f3f10e221a0c7e1523dba6a15ca831f2387952d13a7b17327840ea2af7283b9ce1d13b2bd9512e72b1bc942d4885b93061c4f204d32
-EBUILD pynacl-1.2.1.ebuild 994 BLAKE2B 4671cc1068c9ae68f4ba39dc3860efeeba1980132167123d0a6529d175c7eb47f4d60ca5f2abbcacdecfe277340d196294757fbbb340f2a0f6e0a176ed25b070 SHA512 b8241170e4d723060328eaaf311f6e695cd18515627c534dbe304cf88f8d942e5e3c2c8b8524bd45ef8d77e4d2e1df6ec1f6a2ecad3aabf80af6401fc53c687a
+EBUILD pynacl-1.2.1.ebuild 1000 BLAKE2B b2e14ebf3685d7335b302ac979f999c7f83786cc951add894ba3ecc520aa43ec01cf91d70cf9d09d8e34280e605da728b674121b06cd4ac61392c8d586fb9bb1 SHA512 ac10bb5b7743dcacf868815cf78028c26362a2fa2ea2b7612c0d0d44a8b60219d655dd86c74204bc531a81c4639619cb135dcb6574d76d973813700a91d2fbf2
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index 730a7c34145c..7d9759f68b5e 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
index c81a68a56559..5a4b7b33f17a 100644
--- a/dev-python/pyodbc/Manifest
+++ b/dev-python/pyodbc/Manifest
@@ -1,5 +1,5 @@
-DIST pyodbc-3.0.7.zip 85722 BLAKE2B 4725d2b5ef6e3ea59194265479b51f78025a9ed054e8c57ffb08b8255380afc0be1cfeaaaf64e611c5d9f1d301b152a2e7f2c928d4b6543a9c34317cc4f04e1b SHA512 35d4b17324c60f15bc8647961fff0fa74afa02e37e1019a399add468cfd96e0403f2f7259f3c0164e4c7cabce67de7c300c9950602d9293b0b94a84d2ed02ffe
 DIST pyodbc-4.0.16.tar.gz 204168 BLAKE2B 6e3ee7bad91f26992264edbac9db946d0c290a7a0ea7843ad4a13cc03aaec19272f91ec611e812bf9ccf86267d04ed3e69e07ede1482f5892a29343d39f543d0 SHA512 53f80ee7333210a1e20e89aa17ca7c2b57363826ac09069213454951ae35f8de689535c05b2278783e8b4a71d178860c3e1efebf51980343a59a9b190e41dda5
-EBUILD pyodbc-3.0.7-r1.ebuild 641 BLAKE2B b2470fb83fbc7bbc38ce1bebab7a6c0aa45e282e05eac1e8764f23dbf5b3cad1bcd9c75d59cbebe9c3e016e4a54c322370400ef344d283308848719f005ef4b5 SHA512 f9c82dd316f8546173edb5aacb2116c659c57bf345e8a2babbd2a78f9163dcd4e886e706849b45d1392f2256ded848529b0573fbbae871de55d456f30f87d921
+DIST pyodbc-4.0.23.tar.gz 215152 BLAKE2B 856c7222394b2a8efa4bae173189bf4753c800f1fc98c8054766243400574b3ddb4e45841892b6baf87c5f872de5c78c7a1a3d6b48c3aef9d38a68653ba14fab SHA512 1788fd1118e40449af730a99427c3188a01ec85592bc2dcc7a49fdf0d4332e27add62cfc5e6c20d635064d8ff28eb8b800621d8127e309ffcac4aba144b49049
 EBUILD pyodbc-4.0.16.ebuild 624 BLAKE2B 5067e82181b60d8029486e0c81c72b2de6bf4726b64f942b8d47403dbf38acfadd7ea510c4a3680d2fef905819584a04ae5af3d5fc0de3b90f89b562188d45d9 SHA512 97d85889ded31c344c0c4177fef9912b38e42ffdbd29654674c01663b20a533ed018d00a0262b56fd9373ac57062d70548be0c2dc2577462ac15149e13fbe151
+EBUILD pyodbc-4.0.23.ebuild 616 BLAKE2B a498463fabd99bc591b3ebb3007282430d78789d09a36fd58f0fdd97226100c13b799298626f10bd76844e299fef05a94d52bcd08c351ca642fb7090c81820c5 SHA512 67ebbf818edc83d3110f9f9b8c988a88898878ef29a2da0a899df59498b522a61d53286a7cdba432d338acfa299b8e7826f4b99d10661307be14cfa5667fb107
 MISC metadata.xml 367 BLAKE2B 530fc01148229a40c7c1e062f3c277b8812a5c434b1a96112425906c6976aac3b4396c42faff69b2cd03a1ed1e5990453cee9d8f1eb8e355f9dde2d0b4f4d42a SHA512 4e776353a7d6e61d0572fe852830214d0ee0eafbd9bad6ba19851e093f413e7d5fcd7f8d33c7c75be107b98a3003ddf8432390694c7372b5bf7eae05379ea38f
diff --git a/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild b/dev-python/pyodbc/pyodbc-4.0.23.ebuild
index 3c15583d4825..861c2d98a6fa 100644
--- a/dev-python/pyodbc/pyodbc-3.0.7-r1.ebuild
+++ b/dev-python/pyodbc/pyodbc-4.0.23.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="python ODBC module to connect to almost any database"
 HOMEPAGE="https://github.com/mkleehammer/pyodbc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="mssql"
 
-RDEPEND=">=dev-db/unixODBC-2.3.0
-	mssql? ( >=dev-db/freetds-0.64[odbc] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
+RDEPEND="
+	dev-db/unixODBC
+	mssql? ( dev-db/freetds[odbc] )"
+
+DEPEND="
+	${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_configure_all() {
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index 2a348a1672ff..6f352a2ba0ea 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,5 +1,7 @@
 DIST pyperclip-1.5.27.zip 16938 BLAKE2B 653b2e74b6f56839ef1f9d59b864218ffd55866660aa7de4284f0bab4c28b0c1aa7a4a65bce0842003d4744a5d40c87943e05bdea13098e250e534a8cb6c2132 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74
 DIST pyperclip-1.6.0.tar.gz 14273 BLAKE2B e91f198d23eb0791dc610e4b9af940694f0857243fbf5caf46d485882a588e3ab537e2a190a1b40e0d9ff4821c8bf977da19559a5b33694d106a68f1001f61a9 SHA512 faf1cd8568a911b263c167fedace8f5f6756e108e3a2484dffa8d3da441311fb3277fd703d5eaea662181250d7b2cc975e9f8ca484dfa2d1cd4470171bbb972d
+DIST pyperclip-1.6.4.tar.gz 15687 BLAKE2B e3520e228bfe2f2de1d307e927f15cee7e5327acfe07071432605d0c0c021ff6bb702e20a743da8120db58fd12a05fca19f5881e80851f41d2cc1034e310f6fd SHA512 4a07476b96fc704551248eb4eb2d69a910f75c266ef0adf4bf804f8694645d910089cfef831569e1d819570873ee75c4339024a89c56fe3eabc5529d07b8a540
 EBUILD pyperclip-1.5.27.ebuild 480 BLAKE2B f2669d4f2d2e657d7e421600be69c6a97200d0f4b80186ce98d25e9c205ea73abaa1f70a5f138feafbf14634db003944b63903803f00d317ac5118c22eea54c9 SHA512 6c5578da9d8733d3136bdcc3e06b31310197ac289636c9f698b40a8e1009616c0743948e99c77c22bb417ae1239416d2019dad5a682b476aba4ddb93fdb6ea4d
 EBUILD pyperclip-1.6.0.ebuild 485 BLAKE2B 06c92bdac6bd1616b938717d29972ba5031e1dda7d48b81aeb46249a6d51646f572f7f70f0f79c7358b69d76c1ce1dbd4c5a1276bb382778e9238f8ca52d78a8 SHA512 ba3ccac1e5ee186b9c4bc45a36e2b432aaff44815da6db11de2a99b458572e4faf5a4a1734054f3e6e4b63b7953d3f506f0350d7669c26f30e9038eebde21c1b
+EBUILD pyperclip-1.6.4.ebuild 466 BLAKE2B eec22f3db2ee34ec58f7ddf518c591c114de615527db11efedf79fcf80ad3839eb7b91a0bf4ec1b11799a8cc3aed57e1637178ec8ff0f40e39ce2cc996217c07 SHA512 88e9a5904ffde8403f50a53db7db29fc04b88f10816ad35b4d7486491de451c55dafa9809fdd8e5eec645bc5578b8732cb591a257d964ad4eff24dc856d26196
 MISC metadata.xml 430 BLAKE2B 0010f6ce7e189967ada83b89ea6449d6d4a894f9a04a649895f46f9d5af3349bc2b97ecbdb1e6f32a35c4ab3caa97c2799a950d6627e8225b0170bee943d6950 SHA512 883b80ca383707db508144d0434f091827e1809c9029a380c9369f8f98d920e69653767e9034eadeb730611601a0fbf09a222a45e015e08ef95c7fb54158d228
diff --git a/dev-python/pyperclip/pyperclip-1.6.4.ebuild b/dev-python/pyperclip/pyperclip-1.6.4.ebuild
new file mode 100644
index 000000000000..32cb49e01f95
--- /dev/null
+++ b/dev-python/pyperclip/pyperclip-1.6.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy)
+inherit distutils-r1
+
+DESCRIPTION="A cross-platform clipboard module for Python."
+HOMEPAGE="https://github.com/asweigart/pyperclip"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index be5761189b58..ef982a5c9759 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -25,5 +25,5 @@ DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559b
 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 EBUILD pypy-bin-5.10.0.ebuild 5951 BLAKE2B 08ab9100162de3469727fb08a057d209e3809432e1fde15487f66f97073eff91145da0adeb961f5efb0e045b12a7af892966a121294f0ed6ae4119fedf5ff314 SHA512 9a6672f5702b3858353ed6c53222f427962754d72293f87e0e768806d2624539b48957c02e68cedb292de93e337721deffe2cba121f720ba0a6fde8c6e0bf92e
-EBUILD pypy-bin-6.0.0.ebuild 5951 BLAKE2B 08ab9100162de3469727fb08a057d209e3809432e1fde15487f66f97073eff91145da0adeb961f5efb0e045b12a7af892966a121294f0ed6ae4119fedf5ff314 SHA512 9a6672f5702b3858353ed6c53222f427962754d72293f87e0e768806d2624539b48957c02e68cedb292de93e337721deffe2cba121f720ba0a6fde8c6e0bf92e
+EBUILD pypy-bin-6.0.0.ebuild 6277 BLAKE2B 87ff3104c49ddaa0ecdfe85433ab8e258de55487f025dfd849dc48cd6885e4d3365b398a6ec22fa53a71830fbc206bd87270233f355cf903600acd7a0cd0c8e0 SHA512 2158d69a46abb87bea0f7f006ee6ce6a681bada8ca532042416a5d1797e241293988d5070ada0f6cac02ffa822a08397aded11e8009d7c56ef8e7cb9cf4c0bc1
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
index ef34c44ba088..2330fd7634d4 100644
--- a/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
@@ -148,9 +148,20 @@ src_compile() {
 
 src_test() {
 	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
 
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
 }
 
 src_install() {
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index c2e06f3aa868..45c10665579f 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -6,6 +6,6 @@ DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559b
 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 EBUILD pypy-5.10.0.ebuild 7860 BLAKE2B aef28d2f43bb879586b3988345e58d04bc624d6134491787809fd34bd35bd004ed5589684adf428601fb885879da72fd4991e82bd8b57730c67a13b5c25040e3 SHA512 7b67815c1efe03ab475d25e685c0ecf4408873986a99b9bba3d7cc067e5bbffde32b5af8ea13c3e2c2d12351fbc88123ba706cf8b49d40178cb672335f1a2b9e
-EBUILD pypy-6.0.0.ebuild 7860 BLAKE2B aef28d2f43bb879586b3988345e58d04bc624d6134491787809fd34bd35bd004ed5589684adf428601fb885879da72fd4991e82bd8b57730c67a13b5c25040e3 SHA512 7b67815c1efe03ab475d25e685c0ecf4408873986a99b9bba3d7cc067e5bbffde32b5af8ea13c3e2c2d12351fbc88123ba706cf8b49d40178cb672335f1a2b9e
-EBUILD pypy-9999.ebuild 7870 BLAKE2B 4b7455f9ce4d640900f0bed356d8d1bb43750944685e62a96a299c18a8ec9ffc560cdd666bc2ac98dac512c87981a36e808893e492576a830394d6767926830e SHA512 a9975515dc6c9582105e829cbbbb8c50d87f22a8adaa7c4d0ba06fedeef13f3d5635912f887b958552ce6e983bdfbc6736ca340b999017e75fff346e53fd9997
+EBUILD pypy-6.0.0.ebuild 8186 BLAKE2B 5f77473fd6044bdf93b23420c3905e55d6b225c63124fac1815563580ba495cd7dc1dee9b402564f541bdf0a2318ccf306219a9b3ced13103bfa729193456e16 SHA512 c99870cbacaa963c3d94ddeb22c2da64c552e3de7d7603205df53c6eccebafbed89a4adfcaa1b2c7a509a7e5a6011ac7435b840690f2a4a1f91782c247a07ccb
+EBUILD pypy-9999.ebuild 8196 BLAKE2B aad05ace0ebe6cfd5bf8227febd78e0f84447890310d8127e27d11d77a97180dfffc1783bc635ccf08d7df278e338ccb08fa1f7ba4b2ac0cf88019c42a1fc18f SHA512 1e30f0f9f8e2879687922c16a433bf9a27eae88e804c725eebbdad8e531956f5a938d00e178de0de31ff5ae2e25360ffee1a9e260f0f3874bafe5032311ab1e7
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/pypy-6.0.0.ebuild b/dev-python/pypy/pypy-6.0.0.ebuild
index 286b7be69e1d..3f036775348f 100644
--- a/dev-python/pypy/pypy-6.0.0.ebuild
+++ b/dev-python/pypy/pypy-6.0.0.ebuild
@@ -226,9 +226,20 @@ src_compile() {
 
 src_test() {
 	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
 
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
 }
 
 src_install() {
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index c0bc0a26454b..11f050a7d0a6 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -232,9 +232,20 @@ src_compile() {
 
 src_test() {
 	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
 
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
 }
 
 src_install() {
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 2dc9bdb9327f..5a8d1995e778 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -15,5 +15,5 @@ DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc54
 DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
 EBUILD pypy3-bin-5.10.1.ebuild 5543 BLAKE2B d790bc82ec0c0f4e48bbfabc557241fb6eaed1e02678764ac887f498b08e277205d308126a4095a553d0d568499d6062cd76c47af1d887b0dd318a9a66fdb9f8 SHA512 ff0391da50cce922e424f2e5d47bbcd6584327be54eb03fe5570a6df45ddfab3dae510053e820961678dbc5c4c24d85bf59bdf6ce2f7cbe13ea1696a57712dff
-EBUILD pypy3-bin-6.0.0.ebuild 5542 BLAKE2B dc3e9eb90e28bedbd7b8de1e33dbf960c82413ae3df27cf05aeb09975292b98400f39f7056b0ed4b05c3a5d02c58ca459e9ad90a956047902faedc516d0ec4c6 SHA512 dd348bbbf0c575d1599e78442336a4b2ddd09d6fb995aa1a0fb4e9661a312af70fdf166d54b45c326e9e3ecf3d1dbe8388b61c1cbe9d0b85983cd58dee8e155e
+EBUILD pypy3-bin-6.0.0.ebuild 5547 BLAKE2B 27f7df0cb40c23e17bf1bca4d350f42fd5583a4c034cf79b8b6e213137089f1254c38f90a81976a194ca908c9046219646b4326a4bd1acfdaabfd67b275cd215 SHA512 23523b49c740d09b4e871e8ecfbf72e40a929be0500153398aadaaf8b17ee9ef92f3d03e8b3ef7d189ad2c377e4ef03dadc4d68716fe36e797c0f360a19962e8
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild
index 89c4fd6f16ac..262971abd21b 100644
--- a/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild
@@ -131,11 +131,11 @@ src_compile() {
 
 src_test() {
 	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
+	local -x PYTHONDONTWRITEBYTECODE=
 
 	# Test runner requires Python 2 too. However, it spawns PyPy3
 	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
 }
 
 src_install() {
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index fbef1072a02e..8facf122eaf0 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -6,6 +6,6 @@ AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773
 DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
 EBUILD pypy3-5.10.1.ebuild 6917 BLAKE2B 18198e6dd1b66a2631dc32192af024a16b5bff8c6aceac84c2d36ad92eef7e20be35a53223cdf57e3bfc37fbdf4381b7e274dced1fe245e30999e3685dbc6e85 SHA512 4babcc4db87573e392298486c5aa10193812f1a95655bdcb17e9f652a8c576ccf33fabdffa191f20e8296c21f1634a409abffbe189bb5947cc1b1d152344488f
-EBUILD pypy3-6.0.0.ebuild 6916 BLAKE2B f2c4b2eb150a75f97d5e51bb0cb765e44fb9afc95012fd8973e2f8cc7081817e0e7659dbc27b39b068bb89d7c37ab7dd570ccd6f37a8ce36a2ec5109c78f2a3e SHA512 e98fac1350c85e525380ab44b2ba58bb95f69a37262b8c2ef68c15445eeab957c1d7b17adeffc3b13c4c0333b1b3bb10c54ef17afe1382647e4d1738406ca2b2
-EBUILD pypy3-9999.ebuild 7505 BLAKE2B 96003e743fe05db573ab2fcc808ce342e33bea0253727bc877c82ec20af76c43dc762eafd0cd302286e7148aba432613773c58b9d5caa9b75a86bb04e4abb09e SHA512 91802f59f33cf9d8e0ef43da5e1e102a4f3eb8781ad9f0b9e6d5b627d7a47589cc4e6e7286f049f9b2aa55b472e4d23a190fa575d945e058a6a9134ff3f633fd
+EBUILD pypy3-6.0.0.ebuild 6921 BLAKE2B ab3d2be852a4687f570f9eb5aac9c04679c5f23fa01b4fd41932fff060307c81fd8b1627aafd9e9a905473ed9bb408accda15611d3377c11c4d8fe008a42bda9 SHA512 b0e217e44bcc83566ffe7bc0bcdecc76e86103abe9fd7fa268b5370915ba3f929963bdce600ddd9857cc66936da4452aeb6aabcabfdefb87606ff645378e34b1
+EBUILD pypy3-9999.ebuild 7510 BLAKE2B f76a8d31d84391fbd6026bf57c2e7d9b75a33ea5bd8096db3935d03483acd1f41461d0da131497ea574d6ff64538311bf514ee7de9d1fa686bd4a76b934d9de2 SHA512 4c25f0cc9e328fc28cb4e9e4acfecc2e33b1bb7366c10dfb1ce9b7a9d405982ebe03ff7c05f6458550d460ab5b73d3c60c8f44b96257218cc7ecdc9955691cb5
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/pypy3-6.0.0.ebuild b/dev-python/pypy3/pypy3-6.0.0.ebuild
index 71af571b4767..d32be15922b2 100644
--- a/dev-python/pypy3/pypy3-6.0.0.ebuild
+++ b/dev-python/pypy3/pypy3-6.0.0.ebuild
@@ -193,11 +193,11 @@ src_compile() {
 
 src_test() {
 	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
+	local -x PYTHONDONTWRITEBYTECODE=
 
 	# Test runner requires Python 2 too. However, it spawns PyPy3
 	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
 }
 
 src_install() {
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 61b32ea2ad54..9aabe19e3d37 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -220,11 +220,11 @@ src_compile() {
 
 src_test() {
 	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
+	local -x PYTHONDONTWRITEBYTECODE=
 
 	# Test runner requires Python 2 too. However, it spawns PyPy3
 	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
 }
 
 src_install() {
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index e01036e355d6..b841978996ca 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -2,6 +2,6 @@ DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16
 DIST pyrsistent-0.14.2.tar.gz 97650 BLAKE2B 343990acbd1cd566a410508514393b6e3c4cf074bb2f1bb46404cd64af05a7397c3abc357ecc29fc82b9fd390f567ba4fa4a3c9c6dd52045f40f28fc7eaa97f7 SHA512 06ae1b9d15ac72b09d2fdb80e28849a105cd6955f206472649996318c2dc9915f251d76908a913c02d5583e1e818ff456af496b13fe9b094c043cd2548b2b6d5
 DIST pyrsistent-0.14.4.tar.gz 98660 BLAKE2B 08c6773ed6c8f4951bcddccd1b67ea11187feddb939b5bd9a529f3a2c3a162507a274f5efccdaf7b41a435484c89e42f78f065b4ed4d1f5dba02e39407096858 SHA512 6a2807be742c8aa33e8e244a449457774a9fed9a8a3d5f368f2aa91ca94904d3a8b73faec80a4e18bee48f765305fba4f8f1d2e66153a6cd3975ae412306fc35
 EBUILD pyrsistent-0.13.0.ebuild 921 BLAKE2B fefb8ed3b72ae45f33e1f520304b21c1627c0f4a67e7120afea649e8536d7443acf20796fba0c5fc7a53cda7115c5b2fae2fa20aabd8099963e8a997b4b0db1c SHA512 b3e18af3f9e19b75132af80b0d9e612e4b880198397e585f206a2ac5d077c04d758a8f3263ea6c171d1f123b3a24f27df7e10278e35d6b9fefd87fe903ae8065
-EBUILD pyrsistent-0.14.2.ebuild 922 BLAKE2B 2cb6994b9f0ed1da61c7a512b5e0ff3369a374eee3b391ef66ea79c88690b6a59d49a9b36f2e92f5ced46ccd375ce99a6ee0b19287d5a5ee1dab3e63ee8f33a4 SHA512 45e6df28127e381ac9d9c6ec560d75b433e8ec22c460d440b6f053dc9f738241154a0650d35d7d2411d9ae38b9e89d1f4ba2e7b7b75a5dba1dbbdc3c2363786b
+EBUILD pyrsistent-0.14.2.ebuild 921 BLAKE2B 6570b1724d7eec9c674cb1f38463ece112c68b5b5d4cd0f436e9e9d6d4d6f889e0711c3e9c979ae5e919383fd286a2de2a3038a74a615a561941dfac793785a4 SHA512 ef3f7588f45752cd8dc1f9b252f360cd4ed849c9a0ff355c204982b1e30a385398dc6487b0765537db4647b39e4b33a3062a504aa9c97aca0ad98cd8c2cc465f
 EBUILD pyrsistent-0.14.4.ebuild 933 BLAKE2B 77ea6867738ca6543e9b85e636b469880ab2f3a702377428781c01ee64e3821b12f8ce462124b361376263bec5b7c2754e941ca756145354d3f0da685089fcaa SHA512 5a7fee44ecca25d29defbd3f98795c27ff5b16a54a415bb24b05eddda23ba583f497d6410f116c5daa794abf3b13d39d7c281cef0816cefa61e3cc63d003e581
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
index d42860840717..59676d967126 100644
--- a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyrtf/Manifest b/dev-python/pyrtf/Manifest
deleted file mode 100644
index 1e727c21ae2b..000000000000
--- a/dev-python/pyrtf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyRTF-0.45.tar.gz 32837 BLAKE2B b6ec2ba832f0d7e84cc4de525c260191aec04156d22ccfe2e710110ae3f678f5cb119e08eba04aaa626b4c22cf343e31541ea7baca343f7bb9ea11fd80351397 SHA512 d07478ba7db6d3ef3e6c1925a58fb50b18936fecc4562338dd5b05d23672a4509a719b657a5b9e60bab5351f2be77551354fc9b856d7a9d3d4539733b05ab360
-EBUILD pyrtf-0.45-r2.ebuild 557 BLAKE2B e4b08e60d2a4989a32b51c3441d512bb563ceeae461d9a8a06fdd3bd368e1802cc7873fdbd14c915c710e42d1509a8670561e388fac52eeabc56705d5e3ef509 SHA512 c667665178ffa40976a1cab648867aa1a533a2f344b6d7644ed5e5f04d78dfbd8153592828a7fc92762bf2837e072c627596346e1ab7685a6061fb8093a81c0e
-MISC metadata.xml 315 BLAKE2B fa1074dd45945b5de27570552075e8fda68cd109ab281f0f04dad9338563f4a8badb8b76389e13cfacc41367727e804d94da87fa6ac37f7d11f4c02877c86897 SHA512 6fd0624545f5bf55ad8ab2c227baa026f0f877619167dbd99df1d5cf0e2929dc687b30b699303b05381449343a85fae5e72395ee4233f1be9a242302d233e3b9
diff --git a/dev-python/pyrtf/pyrtf-0.45-r2.ebuild b/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
deleted file mode 100644
index a8cd7f64ebca..000000000000
--- a/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="PyRTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python library to produce RTF documents"
-HOMEPAGE="http://pyrtf.sourceforge.net https://pypi.org/project/PyRTF/"
-SRC_URI="mirror://sourceforge/$PN/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index 34cf02b6e809..7eee9141580a 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,3 +1,4 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1.ebuild 558 BLAKE2B 35c1173ec8f1c200daa3619f7c444253c40f56745f69b672678e50cf4a21eabc368a75cb3bea3caa2a8760811e85527fb6afb0c06756d5408176d076fc44b9f2 SHA512 b74b7faab19a1f17d75ca277ed5534c9349d543f1bac09bfc5702ee1a29c2a14edec29043c8011396a4a57ad9f687b3818937ece2eb926c2a6606d95e69a6442
-MISC metadata.xml 391 BLAKE2B 637dd86992ec6257c70596d2e0f3f31729f95d1c3a8f02292b9ae03b858e1b1d828efb28d382b730eadb979da34b49a0cabdcc6acf5914266982fcf628dbff24 SHA512 9f2f7252b4d4f062d63fd392634973c0ad3febc22375631afd41f53f45bce5ae9dd0350f926576bb18883b91f9d5de60881fca77d444703fcfbb706c7802067c
+EBUILD pysendfile-2.0.1-r1.ebuild 581 BLAKE2B 0c5cc1367734424a69a5419947a83fac94a6f37686b4c489570111f91cb55c65da5bb1950428f6b2ec8c0566fa7d6ab2b0c0794367fe18adb989ed7a2ba25b6e SHA512 6f647fc1538ed4d9f4d2f2d00558d386116f2774053d1f225dafa841bc32b9d7d1c56da6dc73584b6805d5f2f168a8db25cf588daaf5bdad41e4b79181c65d21
+EBUILD pysendfile-2.0.1.ebuild 562 BLAKE2B d1c7f2b6b2e424cf0f38f858ea337be3a42aa5c22acf5d8cdf2f9b3065df4030dd83eb84258e9222ebcd745cfd786b3165693efa67fdf31739c21680be5fa759 SHA512 03b5e142c2aa7df7edc17ad986d2963ae7e049216d72ccab470cf605facaef524fd85ec7ab8f0292b52ddfcfe49a32394f297fa56a1de9f6d60a5387a47f314c
+MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/metadata.xml b/dev-python/pysendfile/metadata.xml
index 95cca6de01c5..3bd59c476c5e 100644
--- a/dev-python/pysendfile/metadata.xml
+++ b/dev-python/pysendfile/metadata.xml
@@ -8,5 +8,6 @@
   <upstream>
     <remote-id type="pypi">pysendfile</remote-id>
     <remote-id type="github">giampaolo/pysendfile</remote-id>
+    <bugs-to>https://github.com/giampaolo/pysendfile/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..6add938cfbae
--- /dev/null
+++ b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python interface to the sendfile(2) system call"
+HOMEPAGE="https://github.com/giampaolo/pysendfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" test/test_sendfile.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index 06a159635b5c..a01300668133 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
-DESCRIPTION="A python interface to sendfile(2) system call"
+DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index 25b314ab97ee..1c094c80dde0 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,8 +1,5 @@
-DIST pysrt-1.0.1.tar.gz 11741 BLAKE2B abb2e208b40f643d953f53bd0e1848a1ca412a32dcf4660f4c975c7c84df401ba773b9f55a7d4df170c8c9ffba14225a9abd75ac443d51e9a3bbc2a3f5237d35 SHA512 cd03d40ebef953d7ea67073a114f10a87eb142670ece727d09a31b498835d8485ac0c125f4281b6ababdd6f0757f9549ce38cb05eda79b23ff17950ab891d0eb
-DIST pysrt-1.1.0.tar.gz 12171 BLAKE2B 8ed72f59f8340b800a4f75ac0cadd313061934abfa8ce6307eb4e3e33551bb8a0629e2be1f2ec1c635e9c3454239354c67ca624adc4be5788a0664af40a4f13f SHA512 31d085ca255cc9a09fe0df8611067ad39db36789b9cce89638382b2bcd5c4cad93a4cf1b19d852eb5a954fff89e602ab6359d4846ba9c6ca05d4b7a3b27ffa24
 DIST pysrt-1.1.1.tar.gz 104027 BLAKE2B a035234d687a6d7e69123a012087b8d065cad3904ce422b3a4390b0f6a0ad8471e35d7f5d9cd7e835ff2238566dd0b7a40a039b88d5b6d3a4be464e390847d79 SHA512 607f80c1f66702d36b6fa54b293f59c6a28415d812bf54d7210075d1c84a7547ce2776c0809910ed3d79c08a3c595ce74719976d8f2818820a3f4a306ffc1825
-EBUILD pysrt-1.0.1.ebuild 820 BLAKE2B 52089c41d13ac2d04153b07bc0704a6edd4ced12d808a2ef9b28bfbad0494f51d9c65f93fe9ee90506a83e81096a07a82703b9c4993521a17f73aad005a0f3df SHA512 06bd27ff5fadcaf223422e7179b20f298f58450ccc150429d442f37ad4db1423ede33d9e7871465c0b1f61273eca7c1d3511aa5176da5445cdca719bfef96f1f
-EBUILD pysrt-1.1.0.ebuild 713 BLAKE2B 2e593f8ea96dca3a85209034596cedab28a677c8afa700c2a7a8060e8475cf60ac52866f2a01ba4451bcded90ca770ad5b4d1e6c8eeeb2bcc0a648cc00eab4bb SHA512 9d366f9ff10d75f71e208d62f5232c965c350f518c58d0c5e8409a3b67b9e5c537908f7d46131ad8a9000886ee6303842888eb8d18e115cfb221feb57aeb9721
+EBUILD pysrt-1.1.1-r1.ebuild 787 BLAKE2B b1b1b4cf22afdd3d264c59cec74c3cb89e82e29bcb481c8978209a0fad885aa2913b19db11cac27c9b3120d4384956ae0b1fdfe448492c7e824ab63868ecc0cf SHA512 c00499f866395d77b939605d1fa1fb510b33bf5800bfd02b4969b18457b06f9cca8f40d01b1c82ccf667983fcc06a990eb7311ced6b473d334534ee9f05b8320
 EBUILD pysrt-1.1.1.ebuild 785 BLAKE2B 4213efbb3d6f39682bc596667f20eeeaf05426c2a71f3777b390be0e56bf178cafc5939b407ec27bf62f2c8fe6f0bae42379be190ee680f350e4b4786d2e4c79 SHA512 7eebd0eb137737839262767ce185db46da7d0804660139506be8a79d015a69ce87ba61abc4c4e6ed7346ef44d3779ca5f8d1a8794bcf4b7a1bfcd5bce09d99fb
-EBUILD pysrt-9999.ebuild 713 BLAKE2B cbfa442e6d84942b2e0ad81e61d28d5d6e7b02431c60f3c9076022aefcaf6f839abd75d2cdb39155813e20d4f74972b4b306bf9a1477846cf063ca2570b932c0 SHA512 298500c3743aef8da7d89f90084ece3755653d6ad71f7d233f2c15687629323b9dab4b593afa2106a5d9c842b80ddff0eb3dbb690ffe0b0125afe709df6b7986
+EBUILD pysrt-9999.ebuild 787 BLAKE2B b1b1b4cf22afdd3d264c59cec74c3cb89e82e29bcb481c8978209a0fad885aa2913b19db11cac27c9b3120d4384956ae0b1fdfe448492c7e824ab63868ecc0cf SHA512 c00499f866395d77b939605d1fa1fb510b33bf5800bfd02b4969b18457b06f9cca8f40d01b1c82ccf667983fcc06a990eb7311ced6b473d334534ee9f05b8320
 MISC metadata.xml 425 BLAKE2B 1a1b0e96edd162f5349513bb5bd1a2b740a0764e4983c31ad71186227815c9767b0295d3c1b78fb019eca9fca59c6b119d5f4f571dc127b5f3589709837b8424 SHA512 a483c297944a2ec9b417a4703fd64dfbd34b8a7288f12a00e082dcf9c907c52d8c6f05eab5bbbf444eded62a42db6a9aa5799c35ae7d41d1b9e4e9b5417c2419
diff --git a/dev-python/pysrt/pysrt-1.0.1.ebuild b/dev-python/pysrt/pysrt-1.0.1.ebuild
deleted file mode 100644
index c4f45f56d838..000000000000
--- a/dev-python/pysrt/pysrt-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-# pypi tarballs don't include tests https://github.com/byroot/pysrt/issues/42
-SRC_URI="https://github.com/byroot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=pysrt \
-		|| die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pysrt/pysrt-1.1.0.ebuild b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
index 1dff10036683..5ceb7f709502 100644
--- a/dev-python/pysrt/pysrt-1.1.0.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
 HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
 		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
 
 python_test() {
-	nosetests --with-coverage --cover-package=pysrt \
-		|| die "Tests failed under ${EPYTHON}"
+	nosetests -v || die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index bda2f23780fd..5ceb7f709502 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+EAPI=7
 
-inherit distutils-r1 git-r3
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
 HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/nose[coverage(+),${PYTHON_USEDEP}]
 		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
 
 python_test() {
-	nosetests --with-coverage --cover-package=pysrt \
-		|| die "Tests failed under ${EPYTHON}"
+	nosetests -v || die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index e5774bfc70fc..7c538b094ff2 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0.ebuild 703 BLAKE2B 46bff612ad0a69a2866400a792ed9bd0607b50824b8a4387a51041120b2a5fe155aa2075577744222d47d554f767806574d953865aae7642102bd5e3671fe289 SHA512 2b91aeea37c5fe09d1e63b580b6a61e829de58ea2571f8bb1daa990719f90f57b243f2167ae3f53fbed3ddc2233bb13e0ec08bdc408c78ae78c8414e8aeefc16
+EBUILD pytest-expect-1.1.0.ebuild 702 BLAKE2B ecf2d298a80633d92f103dfdfacd8de0843323cf5d55eee4d0954395edf6ebb7fc98edfd40226c6d6d80929909cb06db6c7a71bc537b8e82d31b7a31031f472c SHA512 1114d34b201df94d6247c62fef6a3f67f2424dddcae4b4e7874a135d11a3d900f7ef9f3c1b03c160429e7282ccd23528889fe5d1d7af952f222bb31a824dca6d
 MISC metadata.xml 357 BLAKE2B 29b8df313fa5bb9f7666ba95df518d3ada2f9bf783c2e14cde2f404cf10504e5631ad2a512303acfdd0a4ffdad845fe482082d5234e6b54818f38c83c07391f9 SHA512 6c6151ca1a141fdbecdb4eae172cf6d21bd41f2827db435f8d1a6a4dd95743fc291f302848b9afad0e1fdb9e7bb8030bf0f8e46a69e8d4ad9ed0d648b1aef870
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
index 190383ebc5b5..6ddb7b912de4 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 4e807224393b..ab247c1e7d21 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -4,4 +4,4 @@ DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d688
 EBUILD pytest-mock-1.10.0.ebuild 1028 BLAKE2B cbd60a3bcee5a94bd6d665b10e6652dec896ee8b678f07d0e8dcc2629447646a3f2c5ab3607b0b00c023b5f49eebb1825f7e49455280e84921f98400558260ac SHA512 cbbc0dd41de2e126585dec4d5033192e42ea151906dfb05043eb0af54e663134e4b1d62ac455119eb802b7361bb8b7c8c975da028a7e1ea9765971d195c7d8ac
 EBUILD pytest-mock-1.6.0.ebuild 1068 BLAKE2B 001bdcb3d8aa15ae46ccae85fabebdae90cbdc7e9f3a804f05c4984daa0532b39b2d738a36c8b154ff03469b673a3c6d424775de4c277aaac59857671bb831b8 SHA512 712dd100338130ab0306632b7832dee14fffee2de39d3b785b6cf0b4ca2b447fd09fc75fb7c4f714702aa6b8094168178b3a7b71ee7b3e7a42921fe459f4eec4
 EBUILD pytest-mock-1.6.3.ebuild 1028 BLAKE2B cbd60a3bcee5a94bd6d665b10e6652dec896ee8b678f07d0e8dcc2629447646a3f2c5ab3607b0b00c023b5f49eebb1825f7e49455280e84921f98400558260ac SHA512 cbbc0dd41de2e126585dec4d5033192e42ea151906dfb05043eb0af54e663134e4b1d62ac455119eb802b7361bb8b7c8c975da028a7e1ea9765971d195c7d8ac
-MISC metadata.xml 354 BLAKE2B eeb8bdbdcc7cebcb451e7c40a2ed5d0136d35e6b6a63e79e1df73762b40302e16abb4263e8c4cae8f1cf5849377cf6ea12c7ccb042737d63ec75252ca99f511e SHA512 83a168d22f4d604827aa42966ccd1b99d53f069cdfffe69b29fad8f13c4959ff287915c0fdc29e53ce2c3d5625b4f4620861b927571dc91c93ac199a5985a3da
+MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/metadata.xml b/dev-python/pytest-mock/metadata.xml
index 6c61486a96fd..46dd2d763fb5 100644
--- a/dev-python/pytest-mock/metadata.xml
+++ b/dev-python/pytest-mock/metadata.xml
@@ -8,4 +8,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index ab7216059e34..1176d5f81ed8 100644
--- a/dev-python/pytest-relaxed/Manifest
+++ b/dev-python/pytest-relaxed/Manifest
@@ -1,3 +1,6 @@
+AUX pytest-relaxed-1.1.4-no-autoload.patch 391 BLAKE2B f4d7e9eb5449bb22e3056136ab2c9baf1ac281c9f400345fe9cf794c16200279113528cdae7911f559f9c771e78b7ada354985fb1945aac96c1b1cc3807515e8 SHA512 27f45f5b6a6649305f2a1be67277d70b9fc9de4e1ad937ad7e9be3775184167838d9daf518a1967b4069c6133cfa858e768f9a70b6f1a73486f3f32e6c98ce2b
 DIST pytest-relaxed-1.1.0.tar.gz 25942 BLAKE2B 6dd34044ec3ae0b5c85f0a76102aaeafe3dad8748c0cf34666dd3550162a2968191efb8415467259a4f072905af062aeabaaaeb475ab68d47aa8d79e3cadd3d0 SHA512 010e37c4d0c63bd00af8851bb50e52af7f8f17769be042e4941e8d8ba451920c24dfa6cdf74cd1b3ca4b3e1c71cd5e1ac34ffae855fc261cf431c212f98cbfff
+DIST pytest-relaxed-1.1.4.tar.gz 26854 BLAKE2B c9b4d7c5c68fb24deaa9b107960eec7b24ab1cfe4ed37f0ffa99b4e5a9d3572be860ff3bc39882f5024fb6aad73f5f976c450294cf713483bba655af56b70245 SHA512 d4e7ed5143ac9f1bff1f911e4ab3aede076d154dcecc28ce96cbc49782d186214893b942a3548da2789faa51df5ddbd43ff41c82b9bb9d0d52f38a2000fc0c6b
 EBUILD pytest-relaxed-1.1.0.ebuild 918 BLAKE2B 1e395bebaf4838cb8e5dfb395693492ed42bd898a727ac1b83098fa1fb374e71d4c4ddf4dfd0b3a225e0b69042f206fb28cae2d5697a8c40f08c9d9bc3be32e7 SHA512 14d7160ee46b35cecd9cdc6184f9a8abdc55e0588d05462189e14b84e87161c95bfabb9854342b597b24c074dcc778e11552843850fafd4e93bc05d00e7848a5
+EBUILD pytest-relaxed-1.1.4.ebuild 1192 BLAKE2B 28b346c01c2eeb62de158bf797390c3ca983af69e5d5ce56ed87a68fa798d2cff6872064f6a9274d5092fe13a70dce45dd0dcd3595ed552dc6ccfb79dbfc3116 SHA512 ba3843d927157827d6282da930a75892d952b0bbc5aeff97a558ffc85b134f409c33a597ec9abe064c2583f09bc4d2569107df221c6d1397c47877f072c4d6dc
 MISC metadata.xml 382 BLAKE2B 858b2e05190a45c6842f93638cc598f3b97b3481a361438789a2f1e4aabfd474da056d5a3396927e555d4395cd1ac13393fbb0682aa3fdc6c734b718c0451ebc SHA512 9a59cb814efe45123a5d8fc8fe8b81d068013c58fb6f4e04bd9c0267c4c5ec1f1b254770ba6f5e43a645093c84a477d903e5d981c89532732c840e2026ba40a0
diff --git a/dev-python/pytest-relaxed/files/pytest-relaxed-1.1.4-no-autoload.patch b/dev-python/pytest-relaxed/files/pytest-relaxed-1.1.4-no-autoload.patch
new file mode 100644
index 000000000000..b176e4e86c3e
--- /dev/null
+++ b/dev-python/pytest-relaxed/files/pytest-relaxed-1.1.4-no-autoload.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 28c72c7..6feca5b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -22,7 +22,6 @@ setup(
+     packages=find_packages(),
+     entry_points={
+         # TODO: do we need to name the LHS 'pytest_relaxed' too? meh
+-        "pytest11": ["relaxed = pytest_relaxed.plugin"]
+     },
+     install_requires=[
+         # NOTE: pytest 3.3 broke something, not sure what yet
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
new file mode 100644
index 000000000000..7ed7aeefa0e6
--- /dev/null
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for relaxed test discovery and organization"
+HOMEPAGE="https://pypi.org/project/pytest-relaxed/ https://github.com/bitprophet/pytest-relaxed"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pytest-3[${PYTHON_USEDEP}]
+	>=dev-python/six-1[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# We strip pytest-relaxed's entry point to stop it from autoloading on all
+	# tests. When this package is installed, it has the habit of being
+	# autoloaded everywhere and break every test. If you want to load it, add
+	# "-p pytest_relaxed.plugin" to your pytest invocation.
+	"${FILESDIR}/${PN}-1.1.4-no-autoload.patch"
+)
+
+python_test() {
+	pytest -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index fb89cf4143e2..4a840e577054 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,7 +2,7 @@ AUX 1.15.0-test_manytests_to_one_import_error.patch 991 BLAKE2B 1562721b00b0b551
 DIST pytest-xdist-1.15.0.tar.gz 87799 BLAKE2B 6990137c02f70a4ce466aeb7692cdc66adce09d475ddf31b7997abdeb54e148770fc74ee872e0f86719749705bb28ca7e56181b58f3906326c99d6051bd46fe6 SHA512 6429bd0c85024a2dcb453e4264f06d4a548637c4dcdeabf73d2b78a112ace70ff61cf0849a4845cc70a7650d10a99e5fe1087d3b7dba4b941ec0a771fc9338ed
 DIST pytest-xdist-1.20.1.tar.gz 57076 BLAKE2B efac9a0d96b2d4e28b078a7a88ba8df197fc122683d25577cc596f840977f4c116b8c7df1c397e03a50edc400265bae4a8b3900c22da388d0662a71858d7f4ec SHA512 f36e02062e946993bfb9bfaca5aa14c138817f1ad8a8013c5a64b416e91abbfb02502a371c4507c4babb15ac54aca2dce5af4ffe72ed0aa167f670bddabd4b3c
 DIST pytest-xdist-1.22.2.tar.gz 57866 BLAKE2B 356f9dccb7d970e6073dc724233013503939d92072c3fab47626e9ed36778ab73499a990a6f50271ae93b82891a09be811843907c18ae64bf93f76510338c29b SHA512 69a0a233fe52ead13cadd46c134c67e4d0fdcd2a77929aea3da2530cd54c283d46c6d416a1450016ba7e9127b30bd85add99b562d9ec0a49bbe1c08b7828df68
-EBUILD pytest-xdist-1.15.0.ebuild 1233 BLAKE2B c3e1f13ccf7cd4569618238f728ad47f0a1c2dbb9ab29b446ad95ca64dee015328251a706ad4bde3005849e0b1ab6359bb857f9da55a425215251b0c0f3f8fc2 SHA512 e5b59c895849f8099c171595e7bb6eb30fb640d1bc01939b4f7c2640c01bf8cdcbf7f92335682f2b3cd3fcd03cb489f073cfefc4abdaa07ccc32eaa57f87cf04
-EBUILD pytest-xdist-1.20.1.ebuild 921 BLAKE2B 6735a921804434a81a91ba2a8de8410864e2a106fb0a9c0afcb059fb7fb1908b4ec191a9d953616fe20438c5f7e8c7a70cd7e7e5a388ada558dd8a5cc141d193 SHA512 d462c38e44db9a5f6272ca1c00b51b90d0d1ba372b44079f07bfaa66bb81063001fd9c43c6db94255110ced87adb541031e33b5179623c49ad4924fbec45e920
-EBUILD pytest-xdist-1.22.2.ebuild 1106 BLAKE2B efcc17939cd2b3c43963c0c32660477169bcf967feeb361afe2d0961d195d693926f9c801e3018bd364bf35c4aac1384a730e261b82652b1752cb74da6f56237 SHA512 ff2d9282352be3e6707c6b9c0c23ce2a557fcbbdf9c2118473a4584c0b9414617ca34e05094da8c5e787047b834f6bcaba078f99462f1bb08a55f707979203b7
+EBUILD pytest-xdist-1.15.0.ebuild 1238 BLAKE2B f9f17170a8c0f777c86f715ad954de7daaf3f2dd8d3432f561fcb43b92461ed4d374122eec99e636467ecb3f4d376ab5a07c0605e12d50fa663bc26c025c8df2 SHA512 f639099d0f809555acdf77bfbdc783b92985f45608163a30c7ab01a5efc5e16995851a72eeb09b90876ad738e6accc14e69fd852f62e8880cb0900bfaff721bc
+EBUILD pytest-xdist-1.20.1.ebuild 927 BLAKE2B f15b00b5a68556d0a5f725616199d40e130f8cbc6b9250fdfbbf54f1d05b6fd0440b1aa55412c34e564e4acc113172ec140e614907c244aace48d2736de520aa SHA512 4fa357bafcffa5b77bdebbc36b26dbf400ba178bb4d629b56a3a52e080b397438ec66e7fc5f42f31ea95f4d811f8f4e17299a2974f358a5db117389418b81eeb
+EBUILD pytest-xdist-1.22.2.ebuild 1112 BLAKE2B 8bd18da522c4e9460860ead4d2f5662cab9d9da4dd86c762221942781ed02fe3cc6faccc495c394ae36b6a75f30f9198d9c90a8a6e8345182a78e11423e91a83 SHA512 735a2be777d3054f5b3854d27dfb61f57e3490e1e2be8ec5e2a12acc466119ec3056077917a80a762e416428fff11ecc53c1b1b1346379542b3581d9f8bd662f
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
index 48686f111781..3ece3b234d6f 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
index f2e4b6fb85ee..acd463adc2b8 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild
index b2b5fa2fb32b..74768c3d2d41 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/python-application/Manifest b/dev-python/python-application/Manifest
index ec36e8e60527..4abce6f9c8de 100644
--- a/dev-python/python-application/Manifest
+++ b/dev-python/python-application/Manifest
@@ -1,3 +1,3 @@
-DIST python-application-1.5.0.tar.gz 43552 BLAKE2B d36c3b0af9766936dae4c45452278e7f6b49dc830d1490fd97e455596b6564ac24b1c78da76237ace873ffbbadb3d9d4975728ec28e82bc39e4b12df2d9519bd SHA512 9bf683a88bfb11ab5cf86b2d1ef86e22cf6fcb6004f0059b1d3cb2e1cde46827ced57a1cdd313c1d48dbd1ad610e9d36617619f79af748c55c517089720cb2b1
-EBUILD python-application-1.5.0.ebuild 391 BLAKE2B af56191a8ccdfc5c5cb14fcdf7fd11a7d473f6be8f7a3737f95e86e943a8ef45789a013104fd0c8527c67994ac5e18f597430e3981c21071d63eaf1dab8bc5ec SHA512 2e09c0d0378b87ed55c5b13d6505bc9a44b91a411a7bd9fb9b0c02b00f38daa9d147d9d47a849f535af30d48fd8e177325a8630d673be1394bcd8f5fa48dfbfc
+DIST python-application-2.1.0.tar.gz 49045 BLAKE2B 32b3a5e20d5aed21a399651ab8ac8c2b335b3f3076a1de688057851a883afd0d4454c34390e7a0688f0bbb716dff8a321481a509eaa3ae92daf3635ef6236d62 SHA512 54bf7c2257d84d213af5c1c192ea87c30a4c54ec5c334e3dcf4d536e610ffe9f56073b033807818c639b4e2585c38b87d6c7405f33b1ab45158fc6613d75c4c7
+EBUILD python-application-2.1.0.ebuild 381 BLAKE2B e05aebcea19d434c7b87b70a96c06e9aa3d190ea85e845931844fde939d57f19cc415ef3271affdefad27aee7b2624edff4e4f5b3df5d460457aa5c1aa71252f SHA512 a4ed655a2455d78b98ea893b5a992eb1fecab93a63d903c14d7ff4c636a5d5d559874929184bcaa0b25d1404387f7fc0ccecf72fd5f335195017399fa4d25984
 MISC metadata.xml 1284 BLAKE2B c48df5628c15a6d309dda0d21f36c699240a9d903fc21b37c8cc464612e19c3417a249d4a1670add02d66f3f7bb10809a487e7cb94ba59c0caf5eefe3ccd424d SHA512 a40bb81f3a76e9d3012ce5aa6a49f0671c5449856afaeb278f4b7bd32eceaf63cdce667d81385fdcab7af4180f80e46f9123a71140829e5f2d6388b73d919fb1
diff --git a/dev-python/python-application/python-application-1.5.0.ebuild b/dev-python/python-application/python-application-2.1.0.ebuild
index 0dd28d0ff556..77319b3cfa47 100644
--- a/dev-python/python-application/python-application-1.5.0.ebuild
+++ b/dev-python/python-application/python-application-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
@@ -13,6 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE=""
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-consul/Manifest b/dev-python/python-consul/Manifest
new file mode 100644
index 000000000000..61cf166e851f
--- /dev/null
+++ b/dev-python/python-consul/Manifest
@@ -0,0 +1,3 @@
+DIST python-consul-1.1.0.tar.gz 27548878 BLAKE2B d048419b1e1a29dbc56b0b24aa4da011c80b0a9aa5b46cf6e0dc6c7156e7a53a51c9f58ce1dac942236c7a16aec6c6c5f52d214eb52f3d87762fff4fae162a8d SHA512 502baea07753efcf4012e2a337acaae78be60c2ac7a36d3ad50054259db71ff6297acf76314659d2c3cf9b1ff3a2d609244f07c0640b51623a76f8244880b890
+EBUILD python-consul-1.1.0.ebuild 814 BLAKE2B d73f3afde02b727c992af3c31d44922da439abe15577b8fb61a847b6821b3dcaad8d2fb5c66a544ae4b4501dc900c7644103e5c3dd291408ee849319887c9eac SHA512 c00a759c9af7915a79f0f05e1eafa8965cf1eac9e6a95f2a1945ba259142caa468c44fa1215a54611d96b0c500cb3c447382ac8e8a55e4c72574e1564e5dac47
+MISC metadata.xml 343 BLAKE2B e43ff67db4013c7476521ae4d82f31bf39620bc87cf8edac7a3dd6915eb360125499adabbd7a077ea21344e9661f5544d446fac6a39085a974a17311496a9930 SHA512 4b7eb7240f9d504990d9783a7b08f5a555f52d2cb32173989eb483fbdd8c4d0fb0c727aa6e18d56b354007d8b8c12266b3e0412efa6fb2d3228c87e91364202a
diff --git a/dev-python/python-consul/metadata.xml b/dev-python/python-consul/metadata.xml
new file mode 100644
index 000000000000..42bd80dcbaea
--- /dev/null
+++ b/dev-python/python-consul/metadata.xml
@@ -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>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">cablehead/python-consul</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-consul/python-consul-1.1.0.ebuild b/dev-python/python-consul/python-consul-1.1.0.ebuild
new file mode 100644
index 000000000000..414d22a70c4d
--- /dev/null
+++ b/dev-python/python-consul/python-consul-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# 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="Python client for Consul"
+HOMEPAGE="https://github.com/cablehead/python-consul/"
+SRC_URI="https://github.com/cablehead/python-consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	>=dev-python/treq-16[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
+	${RDEPEND} )"
+
+# needs pytest-twisted
+RESTRICT="test"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
new file mode 100644
index 000000000000..1c4cd7db9bf5
--- /dev/null
+++ b/dev-python/python-cstruct/Manifest
@@ -0,0 +1,3 @@
+DIST cstruct-1.7.tar.gz 8768 BLAKE2B 9b66c1cadb5c32965fe29de4e1f3bf2a3f00695d3c6ced4cf28dc85d8580b7fbad626633f9672e25521e5e2fde93049a953c6fe089fb154aa51c82f080427121 SHA512 c3a612ec4c5778801a9d506a49b8817b56fb99e1788c4894ce753178aa4472cedff3b842fe1f40a925e76efbf737166384c279ed0f697655d6ea8d5f1581973a
+EBUILD python-cstruct-1.7.ebuild 626 BLAKE2B fc64c05cf6ec83840e1193bf516263833194c09321b16c012a7f7c643b524941b30ca4b3525dbd8ab57403ae6832e48af7616dc0700f6392c678e32330890cf9 SHA512 916f4d0912959f559fdb28b4d6b99f9a117026599a9ed0d74248eff8079c3ae0f3c928404d579464583b620830aa41d244c4687282c20d31fd84cd34c529cbd3
+MISC metadata.xml 352 BLAKE2B a2478767166958184fcd375f35b563a7a8e55de1c27068cc0959eab9fe6ace8fd1d42e3db862114e73bf7bd30181a09dd0bb3342ed48bf5db4496a882751197f SHA512 979cb550fb49246beeb8dcc2adc4119af81d80c7ccfe2ad21be0eaf2ae0042ac0c38a974366686104038ba5ba960910464a64b86782cf12156e44bf0faa6b2d2
diff --git a/dev-python/python-cstruct/metadata.xml b/dev-python/python-cstruct/metadata.xml
new file mode 100644
index 000000000000..7570280ec6e6
--- /dev/null
+++ b/dev-python/python-cstruct/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">andreax79/python-cstruct</remote-id>
+		<remote-id type="pypi">cstruct</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-cstruct/python-cstruct-1.7.ebuild b/dev-python/python-cstruct/python-cstruct-1.7.ebuild
new file mode 100644
index 000000000000..942424ff8aa5
--- /dev/null
+++ b/dev-python/python-cstruct/python-cstruct-1.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+MY_PN=${PN#python-}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="C-style structs for Python"
+HOMEPAGE="https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+S=${WORKDIR}/${MY_P}
+
+DOCS=( README.md )
+
+python_test() {
+	esetup.py test || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
index 1f392e8aaf82..d4f820e999dd 100644
--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@@ -1,5 +1,5 @@
-DIST python-ctags3-1.2.3.tar.gz 45646 BLAKE2B 3e8d2044a8c06f903efc02d4fa62a0dc3446426ce716a694b8b3daeba92aec56773f0c02a0a360d15a475b4cac32686f34997b98302198c667137b3c1b093f28 SHA512 3bbe730e75a5ae36208113c6e2c43894942002ee37ed700990416fe54d5644b2d2be795935d1392191aae11797ec613ca143343a287596a0a327027c2f170525
 DIST python-ctags3-1.2.4.tar.gz 47774 BLAKE2B 4b1844a6a0d6d89e014206b728e1f1d8b964db2b85afe599cfc254b68f663052d7d1169c257378243e22929297bd254e23ce4c21e1ea1c9a60d7007727c322bf SHA512 db6be08164da71b17de1a7fa46aaa60a5b83784f18ca4e2314e3b9954abe8996d5e07ed98aa024f70899fe87cf53d37671c9f42e567766b4a8af0f728df2bcfb
-EBUILD python-ctags-1.2.3.ebuild 560 BLAKE2B 7f273f6a33998af09ff5539a1e8fcf36df6370df66f561622a4f192be5368e476d9ea0511440e319df7ab288d400dc242d2759e01d7663f32de5977b0a569029 SHA512 a079511d8c81d637bf8b289d31b1fa367cc8659d3eeeda3a2a7f7e70452c846ace9053d1e99250936cfed19668543b77b5799d2fdf238ecdb0a4ef48cc0338cf
+DIST python-ctags3-1.3.0.tar.gz 54615 BLAKE2B b334b834cefb01bdbf2c061d44ef6e38070c2b3e5da6de25beb09d24bc9d5891a6892a4b0c9e8fa8f8168bf344c10880ac987e263844cb3dd21303f8c2d105e6 SHA512 3ad4433d69bd159879ff4eface5150acc8c0f609cc7597885824056ce4ec148e55ad234dffa53f07977aa3ace24846e180adce5316a2950ac8d4ff58ad128b68
 EBUILD python-ctags-1.2.4.ebuild 573 BLAKE2B 689ce02e21ed9d40b8d2ab07d83b9a62ae061f40f2fc83056588fe79d18deda60ecfff9c9fa71a8055ac3752413a9ba3d39bd135c0849a6aeb437d6a2f05094f SHA512 db31dfa573e1ce74f7ec8ab11cbb8a87d8c465347a4f15d6b5ec3386332f9b72941deb089785dc8e82c6e00d4f3f91db4724d9787dc3e56c73718dee30db0cf7
-MISC metadata.xml 454 BLAKE2B 910f1b1ed0136361ce7aea161214ad0bcdefcb23d7244319cdcfb0bc2614236e5fee7a3c6fedebe12a37196e9be59e9d9835edbdc4441357dfaefef71abb0cd1 SHA512 f1b9a8992b0714cb96333c63cd4447915c387ed2e7e5367f9a131a3b1dd18592646915f72235f9f7cf780724d73da3da19a61f849a6dbd6c75c4e0329296e571
+EBUILD python-ctags-1.3.0.ebuild 574 BLAKE2B b5b692fd105476c8372b96eaba836c349ce88ceb6e1e37a056efd36e2bbbd88978f218083089bee5c0dec00adcbe622142531acebf8ac11ac480e72dd23643f1 SHA512 158a18f532c559822a14538930eda289e29c94d14096e9f5106f6159e31681e97da1b24ed0bcecf281fb08c1b58c79ea454cb24bf491e417854d58d8324bb3ce
+MISC metadata.xml 455 BLAKE2B af37b4a79a49f4128c7ed43a10ba5a384d5d6d4a33912cf74fb59ddbddd155184f1e47161519649ddac98556ad17cee495913321632f30a629704eabf7fc5d11 SHA512 480ef8e0ccfb6e278348ed31be811e51ec6a845c984c92d9d215d0375305278639dda7e409b66f18860ea980de149656b0dfd8111d26aaf79787e3c7a34ce848
diff --git a/dev-python/python-ctags/metadata.xml b/dev-python/python-ctags/metadata.xml
index 7e80c76c504e..123026b36366 100644
--- a/dev-python/python-ctags/metadata.xml
+++ b/dev-python/python-ctags/metadata.xml
@@ -8,6 +8,6 @@
 	<upstream>
 		<remote-id type="pypi">python-ctags3</remote-id>
 		<remote-id type="github">jonashaag/python-ctags3</remote-id>
-		<bugs-to>https://github.com/jonashaag/python-ctags/issues</bugs-to>
+		<bugs-to>https://github.com/jonashaag/python-ctags3/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-ctags/python-ctags-1.2.3.ebuild b/dev-python/python-ctags/python-ctags-1.3.0.ebuild
index d4796aaae819..c676cc532493 100644
--- a/dev-python/python-ctags/python-ctags-1.2.3.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-util/ctags"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index d4be79bc0701..5d4e955046c1 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,5 +1,7 @@
 DIST python-daemon-1.6.tar.gz 41564 BLAKE2B 6ed3dcced0deef859efc733be38d807726ad89c405a2b83bbc05d0e22f8bba64521a82f1127d28b6f69c6553c375f3607d1904e5b6ff190741b0b3c399054953 SHA512 ff9480844d8f57a09f27067aaa78669c167f66b2cc05f9b3baa660bc0aa21228d4894eeaeb3440611c1e0f0d5633b1c60eac60893da4a86d1db4b94d99961299
 DIST python-daemon-2.1.1.tar.gz 74276 BLAKE2B c2ca4d1680555a559009224391151cdffbaf49ee03c0a2985184b336a3d1a8c8372423b3b527199daa5f38a29d52fc879f18a719531afeb18642f7d6cb59df51 SHA512 e2abb9fafea32fe5bc7d239387e3c22aa99f63df31cc4f57908ffdb5dc7f2768358df6ba5f3e827b4f83163628649f58a973b548066e8c79ab3c6c6ce09d8007
+DIST python-daemon-2.1.2.tar.gz 76176 BLAKE2B f8252bb3ee23b9d2a4ac33057df98720708b2a7e10c38c188c537d3c90ad641e33ba73e39f1bbfca10655e2ebd5d550179ed55d09a2f767832fa1d26accc9e21 SHA512 28ae118fd652a0a26524215568df0b16264e3a844640fe47f0a08c45c7a16be1b60d78293c2fc13edfe1402a8b5dcd72ec11101c3b53e5b66f232b7e21d5d346
 EBUILD python-daemon-1.6-r1.ebuild 622 BLAKE2B c4c0a79d1c7a37bf356da9d1edcab78a8005b2fcf34b126562c4fab98ccc231407a653c01a45e593e17f5172dfe19e3b37af0bc3e7bb98873f85c1fb46a41771 SHA512 4651fa6553e2945f99968de7357180f9fa59fb577afcfc1f1d84b4c573fe050f4ec6d377d7a0036aa1b55ea17dac2436a2184c3b2c0edd8d6c30e559a55045e8
 EBUILD python-daemon-2.1.1.ebuild 824 BLAKE2B dc4a8c6d794c92e67dd73f2a83388a1488f0799aae9e62f7fcbbfbaa9cc2115b0ecfa447f355748965a8751a564583290f614ddef29a6cf1ed6cfdecf5928e02 SHA512 39839bf51a3449d34bd38609284e0500d360f73f1eb1446a29ab39e5d04ea233cce126645738068d9206d82dc4b3b23174683062d23bb15110ae54c060c04178
+EBUILD python-daemon-2.1.2.ebuild 801 BLAKE2B c82229ffead375d64a2b46aa78075d8c8eeae2648c00ed23d74f306b950ad3a2360e3d95c582b3ee6dfc99f903d9dc79cffedf24dfbaf70d885e6476713dd6be SHA512 460ffe3fb1aaa2a4e3cf40114d7a0ce571d3bf8801afe6703820080b6047bc9a39c16148ef889c583efffe76057822811ca2f944f92d6a801cbf74906f865925
 MISC metadata.xml 316 BLAKE2B 413934d7b67818ac0d3ddb8c1e5040de2f3008a2e1c01efff6afa4c0aeb6bb849391bdb8730e14091c3efffa47566b831d44cd7728cc9496c6e3bbc7a6c56d97 SHA512 b3b79f6094ec59bc09c2a14e3752edc0722c0e50c9559ac59e6c1355577c1f36ff98ccf6af969d0624b1e6b8b907a7886f6daafb6c0d789a403ec402083b06a4
diff --git a/dev-python/python-daemon/python-daemon-2.1.2.ebuild b/dev-python/python-daemon/python-daemon-2.1.2.ebuild
new file mode 100644
index 000000000000..ae66b2d9571c
--- /dev/null
+++ b/dev-python/python-daemon/python-daemon-2.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to implement a well-behaved Unix daemon process"
+HOMEPAGE="https://pypi.org/project/python-daemon/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/lockfile[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 03bfbf4f4d5a..3bad5a504f88 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -4,6 +4,6 @@ DIST python-dateutil-2.7.1.tar.gz 298061 BLAKE2B a6bc2a3bf83ff234ddc53db5a3353b1
 DIST python-dateutil-2.7.2.tar.gz 298000 BLAKE2B 4091108b125eb080809c74cdb53daa27973b2dc4b2c4f79eba2afb295fce7b6c21a8589d4643ad5af212900f55dc4139711929d5c7c4a2b094ac749d76125761 SHA512 b8fdc867aa67c4e5602bb3e9bf906dd4d32a6616fcdfd5f39d146d849a46d13c266bc9c2eae28490399fe608ba19dcb824d05ce96d556de07999449eaece7dfc
 EBUILD python-dateutil-2.6.1.ebuild 945 BLAKE2B e76a7b5013c9c5bd1d4839b8b96a74e26bdba1845b33264959f892af6ba4ff7613721ae8329c350656a706406a33a0d95af2cba6044f8123c40c4e937c3fbbe2 SHA512 47a4de4eeeace543f6ff2763a6adf29e1eaa3b1e8724dc462b8ef9290c20dca5276be4a6a639ec75e1932ee87b489e4bee3be8efe36c2ada86abaf33c4094b2e
 EBUILD python-dateutil-2.7.1.ebuild 1132 BLAKE2B 923c7bd5fbbd51013ebbc630f56429272ebcb768f68cc51d70d734dc477a4f0e614b4da6a411702384c78720b7e661a8d69e7fe12b00b4057bcbac3374c1b636 SHA512 d64f414372593288610a36fb6300b4153d9f306d1d414ce166887ecd011f9e8b9442738e5d43c7d4e5d3f485910663879ac3757d8f378a4f0a7846c017c76d46
-EBUILD python-dateutil-2.7.2-r1.ebuild 1220 BLAKE2B 666671e9869f1ac4c8fd9be7a03c5319dac66f8ce44ed18b38f4158ad87257fd8da0eb0f5f99be57ac0b978909043abc2084e8fce548ce09fb5df914c59ff533 SHA512 9463f26b25984f8860c9bb38dc7fd344d9a448018d05fe2cbbf9c39c77d56ab3736034f9c1cac156c9598bdad79406165f0260871792511c43237b1468b30000
+EBUILD python-dateutil-2.7.2-r1.ebuild 1219 BLAKE2B 5e0ad779d089876779e42f6b1a85309c2c8ae6b5185b202b9d4c8358ed63c071f9a75dbba957d0accf3dae37fc993284056d4eff09c59c2aa9c1712e3a149f5b SHA512 8c01d20902630bf6f7223170bb765ea2b5614639fe1a43b47277e16fee871217e4cad68f80b682d284ec73f2879290d17a573e6c3f23a0b6556badbad29036f6
 EBUILD python-dateutil-2.7.2.ebuild 1132 BLAKE2B 923c7bd5fbbd51013ebbc630f56429272ebcb768f68cc51d70d734dc477a4f0e614b4da6a411702384c78720b7e661a8d69e7fe12b00b4057bcbac3374c1b636 SHA512 d64f414372593288610a36fb6300b4153d9f306d1d414ce166887ecd011f9e8b9442738e5d43c7d4e5d3f485910663879ac3757d8f378a4f0a7846c017c76d46
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
index 5a50def515a7..96f69e33981f 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index eaddf3640a35..d2eb5b571de3 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,5 +1,7 @@
 DIST python-debian_0.1.28.tar.xz 292404 BLAKE2B 78634043fc0dabd378bae171a485931b080dc0d31cc7e2ea448c000a1c4250e322f900cf0a0a4c3a8505af6f10da692d0fad948bc253ede7a38e4fe98831924b SHA512 ffbc924fe2dfd5790d49aacf80109bbaa18126bb8d6c9b8ffa25e9ed8b1cdeb28024a8dc202587682088e2e558da1642385faa4afda925cbb2edf6f304592a0d
 DIST python-debian_0.1.31.tar.xz 295720 BLAKE2B 3b3a68ab5604571355a15afac181e488c278ca78ab4c8a6cba4c392a0a89fd778bfd37e69a369d50fbc72f5080cf37fdbd31771f5d973c386795c436112ea347 SHA512 d2bf071b088e53ac132f91e5983c092bddb9736b3fd1394dfd2654fb8b6af7f89982af8debba8c4af21086d4f8a3ef86393fdef25ef18bcf71dcb00a60a8ae5b
+DIST python-debian_0.1.32.tar.xz 296028 BLAKE2B 15e2678a1ec2f4d96baec8b9e3ce7b84d8ad37f520fe9f174d6fe9cac8adbcbb73f628d9c3cdf39eca2639855e797b8f8cef4c9517063d61aa1e3b3ce7f1df2c SHA512 2b55d9a3100028699ec63dd4861a4f60d44e03662cc144784a37cdd980f3ff276e6cd2e535a50cdc6db28bf44affdd576259d73e14e16a2bbeeeda0de0bdd194
 EBUILD python-debian-0.1.28.ebuild 984 BLAKE2B 6a19343653ea6fc582cddeb6b80e425edd85523034db18850d74d24d97f67e6c9e0d7145c665de1832b0585b22b1947ccca4c8157f3ff1ae46197580b97a85a6 SHA512 365ceb69505d32076eb84ce231049ebedb06e79a34d69ebd9658ad515ff9148f874e03b00a07604dbc425fc66ff661e465dfcb19931c058f17b1fe3a429b394b
 EBUILD python-debian-0.1.31.ebuild 1012 BLAKE2B 5dd74b8cc4b46986aa9f4fbdf24cacf00015f9244edfbeee83ceb39249c4a2f49164d87120e5e8061413167f327e12e366045e78ac4e21645553f31058a391ca SHA512 cba45cafd403488173b1fe5ffca9fc65b38dc5fe70072305a53a06b1b6e7a35ee19914cd1c10f0200fb39e93079e1d82c1742dccdc8ad329c689999f7ba4a38c
+EBUILD python-debian-0.1.32.ebuild 1015 BLAKE2B d4a280c1b3f6524156acb61b7658dcf637636ef99db7ff27918d23b4ce88d33e1d702bf107e8715b6b91eb23f8e28ae88b1a977a970bd06f99b606765e89c049 SHA512 1e42e1b668be2058242211283e1a3c102fcea3246914665b01f97310d3cb11a1c5facfb1083caa81d7ef01373ec8105121e3d348a004f098ae5d5d027c783401
 MISC metadata.xml 357 BLAKE2B 0b0bdfba85c4141c9931d4a363d204fabd9dd2e22b4d7a4af11bd97837fe6ab0cf0161fc154f396198b12d0084af54702a4f0ae0ef0b64f4d8c9efdd131f448a SHA512 452510eeb22c1db33118dfcd518488f42be0789b5607c9b76d316b14c6d1a474b6bfeddfc4034389a136c408bc4180ad704b6e1b0eac1381f9a77284b7016e39
diff --git a/dev-python/python-debian/python-debian-0.1.32.ebuild b/dev-python/python-debian/python-debian-0.1.32.ebuild
new file mode 100644
index 000000000000..03133f9a7a5e
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.32.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=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python modules to work with Debian-related data formats"
+HOMEPAGE="https://packages.debian.org/sid/python-debian"
+SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( app-arch/dpkg )"
+
+RESTRICT="test"
+
+python_prepare_all() {
+	sed -i -e '/import apt_pkg/d' \
+		-e 's/test_iter_paragraphs_comments_use_apt_pkg/_&/' \
+		lib/debian/tests/test_deb822.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover lib || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index d9dd0767cbd6..b9029d92bda9 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,9 +1,5 @@
-DIST python-ironicclient-0.9.0.tar.gz 95562 BLAKE2B a7030494cf706fd000ee52e2c1d9eb6e8c091ae667ddfb185dcf3fad16298229209340e92622310f70a44f0d32591175b6272f0fd1778e562a8c59c126bee9ba SHA512 324aec8ed9861ce2df4b7783b7bd8b98e30efbc8775ddcb4668f760d8916248df0d32def5cb2d30e9e743ff30e5b6717c653ca6e5cb9ea25b536a369ac45be5d
-DIST python-ironicclient-1.11.1.tar.gz 171255 BLAKE2B 2bd5c0be160a552826a4a6b767022e266b1765fbc4b4befb55a90c533eeb6ecb5cb289c708f83b7e87762845c6cd051854d05a1b8886f8f218c3c29a09294e62 SHA512 d8f164ad46a7fd3d3fd9a11e44384f1acb52b0ce9b4567b08a7e59d32e2098678c74afd2025689df1f0959d72072308867fec57ee0a9e14ba8ea33ec4ca8cbe6
 DIST python-ironicclient-1.17.0.tar.gz 206742 BLAKE2B 8fb92acb02e146916dfebd677ac1c179e78b0c16af80fe59361de6def1435d58466a1b9aef9798a05e0ed2ddc30e860e7da7579c2e6a336ff5f220d41b93b51e SHA512 3a1594d499dbfb508a87e87459308cdeb3eac9987116c8a7a250c5751fc1d4785056033e521ec5d99514a2b6c84362e7576dfec9c4941970422cf2757262c651
-DIST python-ironicclient-1.7.1.tar.gz 147835 BLAKE2B e656657833e7b5728d3c7f38707be01c3dbbf224101db64c05f94a2bab2bf0b64bc957aa60b84e383ff3170f77fb599e5132f1ce284128589ac0372cf654d29d SHA512 65d94f745c9544805bd73f77dcdc7f0ab731f932a01629089a952af6f30b85d1db38f518cd4e82ec0346c13dbcaf1eb0e4e166b28d940c77fcbb57ae2465ac08
-EBUILD python-ironicclient-0.9.0.ebuild 2203 BLAKE2B 01c5aa5c65a97fbd2ee26eaeb80f287d35c326856be41217bbc7116daa48b5f75d842c0f8835893a274fad6476d983b3d89892798dba946bea11aa422c45bff0 SHA512 e9670db90712bc76d643c0906889314623eeef2e893390db3909eb95445d615f3f2b7463f2642e34d3194a131b015000acbae00034ae724cdc3c1a5a56e19b46
-EBUILD python-ironicclient-1.11.1.ebuild 2460 BLAKE2B 2dbf35ea9e0c3dd19461d35430ab3302fe2975bafae04316f08cd6e38e8a1136bd9516644f248f9e8a76ce11e46226916b75fbe8bb171da90375c93c93dccb71 SHA512 776c42ab4568f98b2d26bd06ff014159d43c18a4ddc0d67161d377f9b06f8b2c035691c480299cedbbd97f650f16397881f54e786cfe905e3c349438aa81f61d
+DIST python-ironicclient-2.2.1.tar.gz 220436 BLAKE2B b36a5d0b2c297f52a121aa96007ce03556199d7d6139198e39114f2931fd7004bdf76fc5eca369247975bb9eb6d853a2fb4be133976de0ddfeb5767ead6c3c1a SHA512 1827dba991c59cea8a43dd11d0f8f0f1dd6ae41a7f1f28d9d200bac61ae9a4901ac280107fa91a95ebf24072634eadee2e0140f5e1cf5962496f34997815aa04
 EBUILD python-ironicclient-1.17.0.ebuild 2778 BLAKE2B 117941e1a013bb8d60abeae7973011dae66f3b85cd374db082ea796099a775e060f9cf0e2274745d0cbe7b7ae4c2a4f7928c2d562fe48c261c5caba0277475e1 SHA512 972cbd0bd4a1876e179bcc7ad0bde169baa45d23ebb8cc695d1c95696e8999345fae2d9812100702faa769ddd1e3dc48721c212b1b469fd15b58e324fb1423ce
-EBUILD python-ironicclient-1.7.1.ebuild 2457 BLAKE2B 8f87a9a4ceb6c61f2b87e83ac86b5bf1afc17505f3011fbdd5012979ad5d013e98c6bced54637ee751374f52503bf19f93082184f991b9b62ec5ea6a4ec32d12 SHA512 f7f8b44fb3a35798ae81bd4a6841781347af600432f8ba54b014a3f581f18008e03c7942457bae8144e663f5a2966e86a6fbbd60949d7aa3363efbdc05fa0e62
+EBUILD python-ironicclient-2.2.1.ebuild 2587 BLAKE2B cf014e2da2d367a4f011088799105cf1fea8bbbfacf479529034e0b17ccaf1f2ee3c5c1e60a9886104f0fe46d0655543005b7d367a78f696ae3e6439b46ae247 SHA512 f66dda4042bd242e3830de45dfd3eb669d316ec002ea308853ef61894d9b5e75326534bb8a3b9b38e0c3087aedc8e8ce2fb21a99fa1ceae7d39b7de9c89a164e
 MISC metadata.xml 462 BLAKE2B cda46aaa523a8b818fb5e2dd53bc4db023da327cace7f21db32939249266f7cda27e09718d41701fdd03a2e9ab7c131c147d379525c8036ea2564b799fb90b4e SHA512 8e3b7de241be41bf1af0431ba75d275c5295f197b1c80174d52bc1f38c413300c9a267eedd7034f01200ddced7ddd0143942ebb4a496665ca1105551fb411453
diff --git a/dev-python/python-ironicclient/python-ironicclient-0.9.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-0.9.0.ebuild
deleted file mode 100644
index 1cd53910dde3..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-0.9.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-"
-CRDEPEND="
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		dev-python/doc8[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
-		<dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild
deleted file mode 100644
index 0a9a407e86b1..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-1.7.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-"
-CRDEPEND="
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		dev-python/doc8[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.7.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^tempest/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-ironicclient/python-ironicclient-1.11.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild
index a325de10acb9..074f56903c06 100644
--- a/dev-python/python-ironicclient/python-ironicclient-1.11.1.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
@@ -12,29 +12,29 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 "
 CRDEPEND="
 	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -42,20 +42,22 @@ DEPEND="
 	test? (
 		${CRDEPEND}
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		dev-python/doc8[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
+		!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index de1e8b466b59..2727b6fd387d 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -1,6 +1,8 @@
 AUX lzo2compat.patch 417 BLAKE2B 56aeec39b58a59a66fac3f99ca5e8299723f73897916b45d8891b623cea6cf30dff5ecc87e98fef5f0c7b645f5cac2202343cbdc5cd9de4f5b1e7f8d83ec0d00 SHA512 eb433f90ac40fc85de8872f2bf94805712ff4b085bbcac168aec230a55b325ab5474746b2aa0a81b0e58b04e9da50e10877bbee66768106a03f7d83c97c7ffb3
 DIST python-lzo-1.08.tar.gz 13046 BLAKE2B ce4e2d2b1497ed93cdc15d157228bd7b3b6395b19808ac9c91ebfc3da6506a0af4d4e770f6e13a23e6ffd6f38cb2fd6e91f949d44680a6ea236e4c3704fb43aa SHA512 94b33e3b0e62b9c8a97147507f4516706d25d62c63ea938f0748e520a3e27760f0e3be142cb3e68aea132ae06759c91b3a4dac8e5010cdfab633e6c8d5904d8c
 DIST python-lzo-1.11.tar.gz 13823 BLAKE2B 4be60c85aae64e8837f7f8ec332c16f8c86d2e8b2e965e783cb9b0c6c942aa13750dc194679b71a6a0d733bee66313b8ca376853cee7063a46567222f80daa7e SHA512 580c68d2a5fdc43f6cb904507795c25b686c42074f217d067f51b336afa75d3eea10fcb7925c84aea352ce4383c591ff70583bef6c2fbc74116487ae87e1f87f
+DIST python-lzo-1.12.tar.gz 14042 BLAKE2B 7375e9b200a17cc1ad2c4dfdbe6491082af8d120b2b659b1e9bbff00eaae568e04dc12e5c13de3a028267a1e8e02bd1522a9335db73fa6a5a4ebc7ca4b341fff SHA512 811bdb282cfaf33427ad641d0342900c5af1f17b7033d76593288c3846b0feefe6ef93253152add97b2d6420f937de2745c8e7508dadf33e72b11545cac3be4d
 EBUILD python-lzo-1.08-r1.ebuild 622 BLAKE2B 58ad08becc27f5f6bab25a9e4beb590b049ffe0a0a0c35315ba665bbb415a9333e22e315cb6a64b9f0c8daa77e6d73acc225d9f028e14cf72deba7b65dbc7bc4 SHA512 908c281da215817826e0b9b2dbbc3b5b24179c504d0ddf2aa5b7b58a766a023a52f713a84f61a387518323658850b061c29a48babcee461624711b8d17c05fc7
 EBUILD python-lzo-1.11.ebuild 726 BLAKE2B ef953f48e706a763d5c21a821378704c6f8ec52c6887924040edabcece346e569b4054995fd713984bc8e6d5d839bb867c84ca713f16d8b00a6682cd61468120 SHA512 ec8f2eaecff6e53b9fcb4d433b6ff55fb58ab025dc157e70d87c11564307f58cbd994740bee2294381c87491189405bcab56984db3842a15dae6e386bd0bbbc3
+EBUILD python-lzo-1.12.ebuild 730 BLAKE2B cc8fccf9b937e9849c8836d5b4e3e8e304f62feb81e4cd5b73eb9cc719fde794be6b3f3a54a041c022858998e0779758c09c2f7d110719e39a5a6ddd63d81344 SHA512 721daab3d0364960a42d0ded698eaf54dcb549ac2922764931b29b2b2cf11e90ef8ae36331ad95b5febaac72510f43450e41b672178d3617a6b0b480c0956f9e
 MISC metadata.xml 385 BLAKE2B 4a726b1896f55aa03b8b9a1a1f39107751f372b7bb7b0b9759447a7d42fcc97c142ea6ea3a2de8358d0bc00cb0e73b12c78c0b03e8c52c93092220761b6eecef SHA512 634d30e62ce3a8c09b3de241642e9ce8b059d9d3ff02e6530642dea4b0b4bcc8f108566bdc5ba52f6e63214546e11f734bdc094ef60ad13197b9f74cab71d03c
diff --git a/dev-python/python-lzo/python-lzo-1.12.ebuild b/dev-python/python-lzo/python-lzo-1.12.ebuild
new file mode 100644
index 000000000000..c580f4bcf7be
--- /dev/null
+++ b/dev-python/python-lzo/python-lzo-1.12.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,3_5,3_6} )
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Python interface to lzo"
+HOMEPAGE="https://github.com/jd-boyd/python-lzo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/lzo:2"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	hprefixify setup.py
+}
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH="${TEST_DIR}"/lib nosetests -v || die "tests failed"
+}
diff --git a/dev-python/python-netlink/Manifest b/dev-python/python-netlink/Manifest
new file mode 100644
index 000000000000..04d526f714ff
--- /dev/null
+++ b/dev-python/python-netlink/Manifest
@@ -0,0 +1,3 @@
+DIST python-netlink-0.1.tar.gz 21664 BLAKE2B 09a920256adeebee6762fc8ee7dcdabb38fe7e603d196b8b0cb8210023ee297eec26ed94b5171db2b180b7496c4c8f98aaaf7e3ad55c965051aa73f8709fe0c6 SHA512 ae4a55f7a12b4eab48d4696e41a90a47b4f3a298bee953d5234b47b4889fee61190a6cf30f4ed529f378f05231584116fbd85ebc0aeaf1e14307316edf16043a
+EBUILD python-netlink-0.1.ebuild 753 BLAKE2B b964a4b46916af66380708fdfd75a57ed29cd34121673745bfbdd3f1c48608b7e0222cd6a1df79319d3246b57aacb655adee2007f700706ece189ee1ad38b84a SHA512 1aa63c234b0a7b1d96238ec5f42a0d9a956cbdc12ba79cda7d1cf332ca7c91219d96d2d67b5e938407ce2f4900dd470d8aae0bff78ceb5e2698787cd01be2e9a
+MISC metadata.xml 351 BLAKE2B 664adb116a6714215debf7d93106e6a927222bcb090df2b113fd4e073e12248475a198042abbfa4759be50f0046a2235a51bf98ca0ce8ed58b5b69bf8f385aab SHA512 faac55a7c82da89d5947a9e877bb9faaa264ef7658dab357f8750da84c2ffef08eb89befc2c18b5d90a8a9dda87f608d74047cf4f69eb44c972d4f41b65b74a5
diff --git a/dev-python/pyxml/metadata.xml b/dev-python/python-netlink/metadata.xml
index 3fd7e1e6f1fe..7e8045c80ccc 100644
--- a/dev-python/pyxml/metadata.xml
+++ b/dev-python/python-netlink/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">pyxml</remote-id>
+		<remote-id type="pypi">NetLink</remote-id>
+		<doc>https://xmine128.tk/Software/Python/netlink/docs/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-netlink/python-netlink-0.1.ebuild b/dev-python/python-netlink/python-netlink-0.1.ebuild
new file mode 100644
index 000000000000..3ce39a389a6c
--- /dev/null
+++ b/dev-python/python-netlink/python-netlink-0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="NetLink"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Pure-Python client for the Linux NetLink interface"
+HOMEPAGE="https://pypi.org/project/NetLink/ https://xmine128.tk/Software/Python/netlink/docs/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="!dev-libs/libnl[python]"
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# setuptools-markdown is not needed.
+	sed -e "s:'setuptools-markdown'::" -i setup.py || die
+}
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index c5f89494647a..e9ffe9ce13bf 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,3 +1,3 @@
 DIST python3-lxc-3.0.1.tar.gz 27424 BLAKE2B ffdf128e06d7b256652588af7c464045479ce907d2119dfe9780737c7bd5f3008c01d834a79f63932bfa51e3094a9d40af46c4cb6c3be72108205d65a8ee3d11 SHA512 7e6b6cb9a02e5af8b3fc8aeefff2954c68d2d1154751fa97a70bce86131021571e15db86bb0d6900a93dda78247e37b75cdfe250bf4d1b7548dc8383ed3d45f6
-EBUILD python3-lxc-3.0.1.ebuild 491 BLAKE2B 8c1bb3426469cb9ac16b93711cfc7fd2cf968e98445a7b802c21787b86274a8477eb6dbe7fd715c9cc2b22162d9023d6a7aad7fd54ddef206cf303a528d26d80 SHA512 a649decb8e7e0ba5e38d8385fcecd92cf150879ef8dc74c89611538f9581b151e9c6b4c5fd46e2f37a4d91dad0599fd2318d5a3a388e9242a8c66bb283dd601a
+EBUILD python3-lxc-3.0.1.ebuild 488 BLAKE2B 2647e70a041e8471ba5c319ba18f68bb2633a7314070b43b28f4a1f8a42730175eca28010d807be9128000439f2decb70b5651bf54f265f3b0de018ee44898a3 SHA512 cd2b832892317b2da908180b99d6ba7b231ebf563aee9e963f445dc2793d1cd3d020a40a22d03379e4ea751c2d28b3cac2b77cd9813bc47acc283aabc763db47
 MISC metadata.xml 475 BLAKE2B 4542a3c6240d1afce6fc554a255ed7097ab9923879241e73a77e391be5ee7f6638aaeb5f28ee859735c8abe412c3e62726aa64d67ce744ee1805bb7375dc1d87 SHA512 9db5e045665924cdcd5aa9d843be61c602440d2a18328db38733091ed0050e3c21f14c280a49c1db1bdcf9ae095b7bc58e50b5f3690e092502da87b2b5fc984a
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.1.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.1.ebuild
index d448c380fbc9..4d7d4c4b10d2 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.1.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-emulation/lxc-3.0"
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
index cc9c4e5f237f..30bc814faaf2 100644
--- a/dev-python/pytoml/Manifest
+++ b/dev-python/pytoml/Manifest
@@ -1,4 +1,6 @@
 DIST pytoml-0.1.14.tar.gz 7679 BLAKE2B 071ea5f91f9bfb07b55ce08a5d055b9ecb5425534380f16074452dab9a740aceabc7cb50c290cad388e1ce3854b561572577c50f4fe1ac47b7baca8f7233cd6e SHA512 1a608dfa563ebf979bd72b7fad755d3c02afbda6cff99a0ed9a36ca8eecaaea5f89b7b39ff1f5204dd7302e8957c8304dbc4c221e56589c7654edc0fe93f3178
+DIST pytoml-0.1.18.tar.gz 8110 BLAKE2B b3c68b20abc919b1c2f9849f8f754d1e9e2df1832a573a8b660d665dc05d0ce1f7501ef898b96e56e1136b19953386fb0386c4551b5e25c5c5f3cce16ee6a702 SHA512 659fcb9ad14e11dc5f6dc8a9a74e8d88b1b712f889e4ca35a014b4743950e81aa468eef536e159ae26b9fceeea8c2da5f6b0c5db083f467a929b3308daa3bf2f
 DIST toml-test-fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz 16627 BLAKE2B 8cfa6fbee59f6482e22a03034ea0c37751fce337b7b7f652d959365c05201826344c1096f0a696aa84c0cd2f79fa3df6dbac73c1bf32f86d5e84db77a46c3fc6 SHA512 fea37ebf547633016a83c8e59e7d01a8df2e2795fdb8954246d10e4763675474e112fc52adfed38d3d8ce25bb5a60ef820f798aec2477b0fb7755f1cd6a66a98
 EBUILD pytoml-0.1.14.ebuild 761 BLAKE2B 2ad1fc738d3424daf9b89bd3c15461a13cdb3dedfc85e07b5dca7e7caac513417830fa78890f8a3a34b004ec043d318431112f27d4e5637b7344e9a1e5ecce39 SHA512 f2d2b977649851808b3929aff22580e8108ad1d46e903b272e8a09976066585a3990b673a20462a42bbbc9785a02d64df121256f4ed258a8ccb22620767abff0
+EBUILD pytoml-0.1.18.ebuild 761 BLAKE2B 1b8d6f0ab900f22d993de61e22797643eadb982375b63961204a7820ebb9806b57c751c6f33e86911a43e4f53845507f0d14c417c21ad5d5e34f74370fb049ef SHA512 e0ba829c35672311ff6927db417b003878c6887210bf485fda8eed54d7176c5c82dd8fd9db6b35b7361d4c5754e301cba18a2a3124ba493db8aaa70ccc41d2f9
 MISC metadata.xml 362 BLAKE2B fade23ceaa3b73c711e020a55500ce06c2b948a3dbafc1d39900c813a19716a8c3688ee1c83e500427b361559b6cec31f354a33f8ee72669ddb1e46ab6ffe45d SHA512 6122e392ec59d0c033d04e9b5855c28f81993755a1be2b688608a4efecbb6fd3f61fb5a6d41b3af294b1c0beacfd8edec39a454ff2a34ed0db088399301bdc0a
diff --git a/dev-python/pytoml/pytoml-0.1.18.ebuild b/dev-python/pytoml/pytoml-0.1.18.ebuild
new file mode 100644
index 000000000000..d08273e5ccc0
--- /dev/null
+++ b/dev-python/pytoml/pytoml-0.1.18.ebuild
@@ -0,0 +1,26 @@
+# 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
+
+TOML_TEST_COMMIT="fa9501a192b7c46b82059caddaef978e3de883dc"
+
+DESCRIPTION="A TOML-0.4.0 parser/writer for Python"
+HOMEPAGE="https://github.com/avakar/pytoml"
+SRC_URI="https://github.com/avakar/pytoml/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/avakar/toml-test/archive/${TOML_TEST_COMMIT}.tar.gz -> toml-test-${TOML_TEST_COMMIT}.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	cp -R ../toml-test-${TOML_TEST_COMMIT}/* test/toml-test/ || die
+	${EPYTHON} test/test.py || die
+}
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 93c2d190451c..4105be82cc51 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -8,5 +8,5 @@ DIST pytz-2017.2.zip 502168 BLAKE2B a1e02967700d0624d2c48bcedde52b772471aefcb1dc
 DIST pytz-2018.4.tar.gz 308066 BLAKE2B 665cebc5b535aafc92a1858b718d22818810534d8680a82ef3a0b66e6092f24226c36eb74feb690e25578b4d6ab8288cc4825eb5fb793345e11b0e71c6041868 SHA512 8a15e64d0d1a4b75c1e92360b22c06a41a692fe54fc8bfcff8cfa671095232d87f7929240441cd4d46826cd13f21d348125509c899be5a0b19bc7a77fdcb43c1
 EBUILD pytz-2016.3.ebuild 1005 BLAKE2B ea6435f49fee328a671e0e0c34256634daed5a76f4a7d9833de852c02eec0c08a5b4aa44a6310510d5aa6610b647c2bc609e8e1174843dce4a76eed9dd34d6a3 SHA512 3c96fc10d3a065e4e5073100583d8596d0641e76260623f714b5101a47a01222b10188bb1d80de3c3688f17bcc2b7f6a79fe15c81c97052ea8a693720a6042b8
 EBUILD pytz-2017.2.ebuild 1025 BLAKE2B f0ab3840ce36de0bc3a9c9e600230e038fc12efc726e4363a587dd064c0ca616f2081998bc9c7643bfaf1e2bcf3b3043f09d873e4e60be7a3f49e7030d772888 SHA512 27961b6a7b117f4a66a4c29bdf640e5ecf39f8ca3e70288d4379b689943672f32b193297a960ac83616e4f951ca999cf4cc0224e407d0441a83fb254f9fdd309
-EBUILD pytz-2018.4.ebuild 1033 BLAKE2B 8e02771270dc879e153ce718b562a807fffe5af0993d8dd7f707b338c01644194dfa6ca4d72a32542a0bfddfee724230b78c47985129c0b6c2b4b8955f7dfffa SHA512 8c708d09a34247c0b45709c2dfe61cc53ecad2d4313a436d9dbae91db289b1fde914202d118a9584af3b76d05211fde18d80ba26e1152ad5adf88a0a02fc0c57
+EBUILD pytz-2018.4.ebuild 1029 BLAKE2B 911f0c75682d7cb40f04f7a15c5b9ba94a2920199f1562814f90be7d87bc6118bc8df39391cc2405cba4f465339316f633860c891f908f25168e91b9b98d790a SHA512 578f3e0c207e31b483f4435ad7d065a0e905181c5f2cac8e5c8b88b0a25b182b884eefb37876010526ecc6139d7016cb70baada84095c2bc3402ae51cffe1d37
 MISC metadata.xml 739 BLAKE2B d96611c8cdfc1d45fa86eabcbcc60ed1d3f7e7d2a358a2fc5cf54a64ac3427140299651263e0be1cc4d2f87750df81c4adac9512be75ab334d38f44a375238ea SHA512 b7c9e6ea1b5bd128f1c5ce0a77171d0b7cdbb6f8ffb186d92aa4167d2d84c60c28c647cae66ffc7532350bca13ab65aaab5eb441f68321fc786a14b90f8813e8
diff --git a/dev-python/pytz/pytz-2018.4.ebuild b/dev-python/pytz/pytz-2018.4.ebuild
index 341567f1db8d..342c46e3979d 100644
--- a/dev-python/pytz/pytz-2018.4.ebuild
+++ b/dev-python/pytz/pytz-2018.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 68aeabbfa9bb..a605866c7a28 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,7 +1,6 @@
 AUX pyxattr-0.6.0-xattr_header.patch 1780 BLAKE2B 43244b281bec7166d539155c66e604c907f2e74197414422c9486c93bec84ba8f4515afd20eb6bdcb898207200da4d1071489a7390a14e835531816a5b458865 SHA512 24531ff4fb116c69b8ab3e432753bad2d0b704c86ec21efe69741f2d34ced24c6a580872acab0e063f3be3dfad4f91199bf61fb8d1485d1c86a9266f7c163cd9
-DIST pyxattr-0.5.5.tar.gz 26718 BLAKE2B b8d599ed0194fec4809ebdb8277fa4023e932ed49a8a6253a7c6a879250a73330334bd8a72b0c9d9bfd828cac1454659d23b55b5e608bfe0109392988709beb8 SHA512 77b732a7e524a7c31a0511df2c96c18b214f93c6ac47276ecdf12ed95133ee506fa882b2532a7159aa2f4e02a7128e33bb8883ea632a5394297d98fb28898327
 DIST pyxattr-0.6.0.tar.gz 31057 BLAKE2B cf6e99c499dbcc74305970413803e5cf59508e7ee1bf247afe42e576c2dfaf118a374ad6f8721b9d9c482f8be0c222d26b82997dc1ccc79248d5f52b2064ed8d SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb
-EBUILD pyxattr-0.5.5.ebuild 1438 BLAKE2B e2d3d5db037f6c151f0b04a7bba09f15b4cb7b65e7a2d95f79746c42b9b71fd1071b1ae580efddec000962aa037a5b29ac6b6b3f05e315d1aad9e932e964b13c SHA512 82a2ba279df41958c198df3bdccd3e11afc3b8f9e21dc47395bb248cc496c1e4ffc90f0c079bc1ecc4c15f09e5b1794b0c4f16351db7d4b5a54c641017dee184
+DIST pyxattr-0.6.1.tar.gz 32105 BLAKE2B 0334d056ea652492fcc7958e0caf0ec438253e287c3f2ee663c0eb059fad5f01bba02963fc90035f84c129e19ee08e11bbc5573cebef6fd7ffe5c65adddc02ab SHA512 2c2defee81e2bd7e7e7f67d33676858f27494f12ba5c3d34bd548912a058cae562e9e9ed0dc5697892d1d55c29f2a5e10455260092b63faa54e40b841c42681d
 EBUILD pyxattr-0.6.0-r1.ebuild 1971 BLAKE2B 1fc033ef38e9b0e0b2000138709504bbcc9b5b1d9ef2db2c719718046ac302384b71307b6283809cfd40c1755a3c34f902bcfd204c6ff88c11d97bdb8b86394b SHA512 46ef19addc2a7639ddcd56104228f2e9f26efc3397b4420bd7ec96d17493622c4a38f2d637452a5c9cbf8b56686b7f6696c266e5940be9c6d98b4fd0e4824200
-EBUILD pyxattr-0.6.0.ebuild 1453 BLAKE2B a5eeb237b3d96522ae101d2616b04848ff215ab02f2598d9af348f6f10a47c3a8b6493173c9a2ba7474f74b7fdd255f840aafc7342c608f931e8c74152b0ef1e SHA512 f8a07d34395d66ac643a66360fc2bf28506b62f2be62ab4bdcb8514f81c3831987740a646a384c520e2468f75a06b46a279db7a64ce39eff9dceab4ebe27f369
+EBUILD pyxattr-0.6.1.ebuild 1925 BLAKE2B cf663d8f195d41cee61902ebcfe1c90892fc964a3407b98f48a249c4c8a11545b418adaec505ac1798366c6e6a29d6a43a976e37ac40a1de748e7486213e03f0 SHA512 3a6b1188e49a3819408fb746e59b4e597a38aa7be5873d1bc87b2b40f45024521ddd6cf91cbf5c83d5ab2a698809a611ee337aecbeb7b81eb46eb013bc085a15
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.5.5.ebuild b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
deleted file mode 100644
index 443601b32e01..000000000000
--- a/dev-python/pyxattr/pyxattr-0.5.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python interface to xattr"
-HOMEPAGE="https://pyxattr.k1024.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://pyxattr.k1024.org/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="sys-apps/attr"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i -e 's:, "-Werror"::' setup.py || die
-	# Bug 548486
-	sed -e "s:html_theme = 'default':html_theme = 'classic':" \
-		-i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake doc
-}
-
-src_test() {
-	# Perform the tests in /var/tmp; that location is more likely
-	# to have xattr support than /tmp which is often tmpfs.
-	export TESTDIR=/var/tmp
-
-	einfo 'Please note that the tests fail if xattrs are not supported'
-	einfo 'by the filesystem used for /var/tmp.'
-	distutils-r1_src_test
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyxattr/pyxattr-0.6.0.ebuild b/dev-python/pyxattr/pyxattr-0.6.1.ebuild
index daa8071fc78c..295830a83ed7 100644
--- a/dev-python/pyxattr/pyxattr-0.6.0.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.1.ebuild
@@ -1,8 +1,8 @@
 # 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 )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1 eutils
 
@@ -38,15 +38,25 @@ python_compile_all() {
 src_test() {
 	# Perform the tests in /var/tmp; that location is more likely
 	# to have xattr support than /tmp which is often tmpfs.
-	export TESTDIR=/var/tmp
+	local -x TEST_DIR="${TEST_DIR:-/var/tmp}"
+	# Ignore selinux attributes by default, bug #503946.
+	local -x TEST_IGNORE_XATTRS="${TEST_IGNORE_XATTRS:-security.selinux}"
 
-	einfo 'Please note that the tests fail if xattrs are not supported'
-	einfo 'by the filesystem used for /var/tmp.'
+	einfo "Please note that the tests fail if xattrs are not supported"
+	einfo "by the filesystem used for ${TEST_DIR}."
+	einfo
+	einfo "The location for tests can be overriden using TEST_DIR variable:"
+	einfo "  $ export TEST_DIR=/my/test/place"
+	einfo
+	einfo "Additionally, TEST_IGNORE_XATTRS can be set to control which"
+	einfo "external attributes are ignored by the tests."
+	einfo "See https://bugs.gentoo.org/503946 for details."
+	einfo
 	distutils-r1_src_test
 }
 
 python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
+	nosetests -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/pyxml/Manifest b/dev-python/pyxml/Manifest
deleted file mode 100644
index f79d063cb282..000000000000
--- a/dev-python/pyxml/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pyxml-0.8.4-python-2.6.patch 1749 BLAKE2B a74d43f7494078c9a6c784f96a696d3d2880195ff4dbe1b36cd4e200e6086cb545367c123ee66af9a38c4f5ad7ac4081885307da2912d7d636ffec42da6bfe85 SHA512 3c79b8d58da01bbfb1ac3d20106e9ed40b1e3c8d52abf216c764efc505a08ce37d1d06d282e7ba311f00f0839c4314d2664efa57228e6007ebf26ca5029f5a9d
-DIST PyXML-0.8.4.tar.gz 734954 BLAKE2B e052bfd298f7e2016d7077330401d077788e22721b55d7b996f53abdc48b1717472a9d47d5567f7c0d6d53c2ca4933a77743e8248e56128f58b089eac64d0811 SHA512 68d9802a58b8ce90d668d2ba659136dc5377e224fdb837284fdcaf640f28b3bb400bf485d602689905d56121b9ffaa7f7758b4a2f262d1321c8b9890952c8a1e
-EBUILD pyxml-0.8.4-r3.ebuild 1768 BLAKE2B 8af8a228f8988dbdd43ed0fb167ce3b3359689a70838a45b1635f80fa6de9cdc99f35a8015327934c4cf9be2ff5e70667ed451cc306fa2a0473f3973d2d5ba65 SHA512 55dc8fe3984b8611930fe72f61f4275f33dda8b69c025e8ceefe33827d08cdabbceddb37ae67e547d149434fecabe3b324370d15fbf504b384814368297eb6af
-MISC metadata.xml 315 BLAKE2B bcd15fdd61eea8393ce618b9ba65073b87e56c98610539581edab6ef073de7857b3c7fbe57fd14f04de0cc2eea116e0edfa14ba801b9744ab2721e88c50804cf SHA512 36dc9d30db0cf2d1a46dfcf5869fa8f77e762291893b1e51ced88d22d599d06575de9a6a1658a8a3194daa174bcd0f69bbb59c7f671ad448eee0e28b0b56a016
diff --git a/dev-python/pyxml/files/pyxml-0.8.4-python-2.6.patch b/dev-python/pyxml/files/pyxml-0.8.4-python-2.6.patch
deleted file mode 100644
index d29b0b6a9eb2..000000000000
--- a/dev-python/pyxml/files/pyxml-0.8.4-python-2.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
---- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-15 16:54:36.000000000 +0900
-+++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-15 16:57:02.000000000 +0900
-@@ -24,8 +24,8 @@ class ParsedAbbreviatedAbsoluteLocationP
-         self._rel = rel
-         nt = ParsedNodeTest.ParsedNodeTest('node', '')
-         ppl = ParsedPredicateList.ParsedPredicateList([])
--        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
--        self._step = ParsedStep.ParsedStep(as, nt, ppl)
-+        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-+        self._step = ParsedStep.ParsedStep(as_, nt, ppl)
-         return
- 
-     def evaluate(self, context):
-diff -rupN PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py
---- PyXML-0.8.4-old/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-15 16:54:36.000000000 +0900
-+++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-15 16:58:58.000000000 +0900
-@@ -28,8 +28,8 @@ class ParsedAbbreviatedRelativeLocationP
-         self._right = right
-         nt = ParsedNodeTest.ParsedNodeTest('node','')
-         ppl = ParsedPredicateList.ParsedPredicateList([])
--        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
--        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
-+        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-+        self._middle = ParsedStep.ParsedStep(as_, nt, ppl)
- 
-     def evaluate(self, context):
-         res = []
diff --git a/dev-python/pyxml/pyxml-0.8.4-r3.ebuild b/dev-python/pyxml/pyxml-0.8.4-r3.ebuild
deleted file mode 100644
index a21d3cca4dce..000000000000
--- a/dev-python/pyxml/pyxml-0.8.4-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-MY_P=${P/pyxml/PyXML}
-
-DESCRIPTION="A collection of libraries to process XML with Python"
-HOMEPAGE="http://pyxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD CNRI MIT PSF-2 public-domain"
-# Other licenses:
-# BeOpen Python Open Source License Agreement Version 1
-# Zope Public License (ZPL) Version 1.0
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND=">=dev-libs/expat-1.95.6"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-python-2.6.patch"
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	# use the already-installed shared copy of libexpat
-	distutils-r1_python_compile --with-libexpat="${EPREFIX}/usr"
-}
-
-python_test() {
-	# Delete internal copy of old version of unittest module.
-	local BROKENTESTS=(
-		test_filter
-		test_howto
-		test_minidom
-		test_xmlbuilder
-		unittest
-		test_expatreader
-	)
-
-	for test_file in ${BROKENTESTS[@]}; do
-		test_file="test/${test_file}.py"
-		einfo "Removing dubious test \"${test_file}\""
-		rm ${test_file} || die "can't remove ${test_file}"
-		eend $?
-	done
-
-	cd test || die
-	"${PYTHON}" regrtest.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( ANNOUNCE CREDITS doc/*.txt )
-
-	distutils-r1_python_install_all
-
-	doman doc/man/*
-	if use doc; then
-		dohtml -A api,web -r doc/*
-		dodoc doc/*.tex
-	fi
-	use examples && dodoc -r demo
-}
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index 45306228e92e..6080d7fb025f 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,5 +1,3 @@
-DIST rarfile-2.8.tar.gz 38204 BLAKE2B 27195b20b18e836f782477e71983e6600d1875d53aad99945e83e4fb5542912620f476ad07673341de13bcce2f8bf9282c6f08e5657a6f9ea348f40fc5fc399b SHA512 6d249b1be9f286185d37fc5eaeae01c4b7153bf6248e66285099f7b9f920419986c27b006fd5511ffe4ae6e3b5214956ccb37ce5be5fc2673880cd7b2af0f98a
 DIST rarfile-3.0.tar.gz 110665 BLAKE2B bdafa33600f1c7791af40f4e8c7b6a43e502980dab22bf6792a1b19eab53ea6c29bb6cb2ae4989b9f43d58c326b89ce466b9e2f82f60bad4892131895b15d400 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4
-EBUILD rarfile-2.8.ebuild 448 BLAKE2B 16cec693d389a277ff6956b3f40b3b9685517400b14b5244f7b11c0082224bfe0405cc7bd4c1d9bbb171e5fbf9d1d6c3cbb8737b2b2bcb1b35be8b531316cfa6 SHA512 99c8a36364fec6f8f4824c678c4081cbb4fe4aa3424bda4c7583a5431e1ab72b882e5453fed33c24c666f0db0ded7a3e3f46fe3a930afedcdfa9852346c9fd95
-EBUILD rarfile-3.0.ebuild 452 BLAKE2B 3940dd5c5d511b88e958a9ac6415991235b19a6c2ef022997e03971c5b1cc0f80461afd663618dd10274de39a0ca0c671c33c0df04c71614b7808086923097f8 SHA512 491dd4c5d101ceaadf684e85e48beb3a85d605dca73c45d0242d6d1221b61a8aae47f3a3549bed58418ba3112ea01d9dbe0e4b21a2b00a0032e55a01f844560e
+EBUILD rarfile-3.0.ebuild 501 BLAKE2B 1ee21d475e5388636015e73cf1cd3813f4cbb140636b4a5fb0635d8989d265487d6d4fe08e425a45252f49d344b52c968048e1b64f70bf18553af10927d0b72b SHA512 6ecc4e740b7be2f355884d79d44e059e799d04d817adb06d9c7be9d5ff6898c9e8b2a56d57e43f5266f2a77fe060850b7ca79cd8dabb766cf6600e97f949854a
 MISC metadata.xml 665 BLAKE2B 1e99ad6ff0a0a07251d392632d0f2443dd46b622ce8af2e7312e310c1d419459bd98d712c7d33660484b6357c7eedbb32bedbc7a714b2f8a42c9684b5e0db855 SHA512 265d14703bce5b7955872c2f415e537ebe1a6228a6b5b4eec112103679c8412073ffc9506a5dd4af648c20acac78da4c196e139d7f93bf280c77d28d9f024045
diff --git a/dev-python/rarfile/rarfile-2.8.ebuild b/dev-python/rarfile/rarfile-2.8.ebuild
deleted file mode 100644
index fbc32864d4c6..000000000000
--- a/dev-python/rarfile/rarfile-2.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="Module for RAR archive reading"
-HOMEPAGE="https://github.com/markokr/rarfile"
-SRC_URI="mirror://pypi/r/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+compressed"
-
-RDEPEND="${DEPEND}
-	compressed? ( || ( app-arch/unrar app-arch/rar ) )"
diff --git a/dev-python/rarfile/rarfile-3.0.ebuild b/dev-python/rarfile/rarfile-3.0.ebuild
index 43081f2ba218..a45b45aa3483 100644
--- a/dev-python/rarfile/rarfile-3.0.ebuild
+++ b/dev-python/rarfile/rarfile-3.0.ebuild
@@ -15,5 +15,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+compressed"
 
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	compressed? ( || ( app-arch/unrar app-arch/rar ) )"
diff --git a/dev-python/readlike/Manifest b/dev-python/readlike/Manifest
index f46266a0a4df..f09b8623de03 100644
--- a/dev-python/readlike/Manifest
+++ b/dev-python/readlike/Manifest
@@ -1,3 +1,5 @@
 DIST readlike-0.1.2.tar.gz 5068 BLAKE2B c716b4a36a2933b48ed43b2c5830dc922cf800bd4c4c83119a1b0b705bb2ff91e0a20bbc7e762eca37da306e428fe809207ebf67d40b8a9acb86d854af4c7e95 SHA512 4ecd694c69c615ec37da05341596af4ec26abeeda78ecf10fc3019533a7ab092ed1e1e4f8910a7835d7ffb157b203cb0395a2eba135d3aba861abb75d466980e
+DIST readlike-0.1.3.tar.gz 5023 BLAKE2B fdfe9fe80cd2bb9bd53d83efc6b358a8f375d757162110271aafd7bd7c4e1c941e760c1526c9dcffd60506322171c7b9f4f7d768acfae6569a74da02135ad4bb SHA512 f4ecaab4bc068660b0354092ff1594f245c57f4ae93e37ad53ddfe1eb33017b241237f6e573e9abff1ae87ce59da8fcb3fe2ae4a7bd962004ea5313c1fbd9719
 EBUILD readlike-0.1.2.ebuild 452 BLAKE2B 4991a93fc5a0ea7fd668766b3c7c8ace09c27cc6b1b75cdf1fa323e3f0a7c678275890d1b4f895423aabd2b9d3a61abf3a71daab94e4c8b8237da49a355127dc SHA512 284865515045cb48ec0a4d9a430a7e28b2197aee9698566f7d4892938a60bd0970b97954af5e02da9aa24cd0bf28a06f626a55ff104a5f0929f5ad5ce2c37b45
+EBUILD readlike-0.1.3.ebuild 452 BLAKE2B 29c268c21862c84e34890310e02039bd533bb8f99f3969925cdb5d8835780521f9a15293dace5ff466eb1a778ebd755d32924c8c625055791c5f61b6a2ecd2d4 SHA512 da7d0182a2247d43fd58cb5bace2eb4bbe6ce0a79c5ff85ae3156e6f40428676ae1a2a2556cb7b97b0eb6783bff4b34913e0c49a1b6c4975dadf036edc4bed31
 MISC metadata.xml 398 BLAKE2B 1b1d25877a4199f171b4cd18aa5c80cf6ff734e6a814d6a550a51e84c62f8a1a53d5742a1c7cd602f2643efd28e8aa32cfe8cc6139391e4440e52d0538e93744 SHA512 9652d90ccef384118b6a4c10dc1dd2c9e416c2f1a13bff3a2e803e017961b2e99f53fd51befaa80f7d4a43933add48b79aeb0e79780cbc4d9f37bf99dc39fa01
diff --git a/dev-python/readlike/readlike-0.1.3.ebuild b/dev-python/readlike/readlike-0.1.3.ebuild
new file mode 100644
index 000000000000..35d57797ec36
--- /dev/null
+++ b/dev-python/readlike/readlike-0.1.3.ebuild
@@ -0,0 +1,20 @@
+# 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
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="a python library similar to readline"
+HOMEPAGE="https://pypi.org/project/readlike/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index a213ac09d5c6..3ba0c914cd26 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,5 +1,7 @@
 DIST requests-mock-1.2.0.tar.gz 40219 BLAKE2B b5ded6c97d920bab0c610c1be1c80f299e56cccd393c824b5c9ab3e0c298491b8be0b285c440bc8ba32eb1eec2eca14ec363d0f188c5b095192a56d01383c322 SHA512 ed24d1809aef597219ae2b0b376156a0760040795ccd660ee38f84cd1ceed58cbc5009764d7a365d31f941ee16e2b537b92ddcff92bcd8d47b7e95c67dc8d82c
 DIST requests-mock-1.5.0.tar.gz 47824 BLAKE2B 90d540e2372430c70b0ada0bc48a3a8085452e062e9ab57a232d080df8312c2a722c01d61fb399fe2a6bc31a2d6d61914d8d0e2c912a2e439062b27bb31914cf SHA512 21838017ac4d3066e2240b40b27bbe16f3bd989f37eba90f0a0d0cdb997e7e65c6d9dc63b31f64daaa6146cc3c6bccbba86382eda3f2ca72eb7cc8381969af36
+DIST requests-mock-1.5.2.tar.gz 47581 BLAKE2B 46beefc45e01355939a76b85e43a5b57cb1a870666eab7f610cad3e8a04a17da6a0864f9776a0f09028c847e8a4f7d0d2389a36f9a0431ed733a364d0f712c0b SHA512 206c91e892df84e38dcdf1264559128cfece76be2ce43b9c98238dfd438795d8c4ce3fcd43feb30246fbfca2d78832a23430ce1c9d3a7dc6e4417df5d65a8d3c
 EBUILD requests-mock-1.2.0.ebuild 1003 BLAKE2B a00179065fafab878c218677048be534ae3415e8aa7b69edc50549acf208cae28e3f87f6a0603687b300aab88ca10c8ab96f7e6276174c6c466ce1ea28e80ee8 SHA512 824e726de49409376cf8bcaa61ec492929e8260481fa054cd6844da7c7ce6e963fb05f106536ddde33614c09821316008b4c8cacd6be8424c5ffa9a5a1ad311f
 EBUILD requests-mock-1.5.0.ebuild 1661 BLAKE2B 87da1c1772940d5181c8732b8426cf2fb0a58747f0c78e39a9e705f23aa28eef735eb05e635a53106e1d671b7e67eaf1411ddbb319bbd6c4190f027a5bc3f29a SHA512 4391ecddb12dc742d1188e4b1c6fe6c60f950a686736efd46bf558a9d53b41b2d397012970139a50b587ea8c32a8f0f3e77c417b7c8550add5601edcdb883ca6
-MISC metadata.xml 381 BLAKE2B b69401a04acb38bf976897fd9e0110f4c39c160a1fc69ef799d7a3fa934ae9258143e264d783f16813c61f866eeaea901b332eadd35a4cefd335dbf826943c63 SHA512 654e7f3a3324b844c147097b3af1dc6de182e3494a2ca8214e1f8f5d6794667847171c3d5570dd8b2d3f8ff3dc3fcd76821477854be6cdafdde0c6626110597c
+EBUILD requests-mock-1.5.2.ebuild 1663 BLAKE2B 1964798ace8b91e024cb73d4f9d312e57278d343486eba528e3b53abd317ec9a875565453fcff87f05dbbbc2bc0caec3c8064401ec539c9e04e654ba0b6b8920 SHA512 b0cd711e270832e0c1cdea7078848e7af40fefd06c3a65a8fa226cb9b8984977635e8b9fcaeb64e39e4eeccaffa4b8e02513b3510fffa7a3ddc4366898c26b89
+MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
diff --git a/dev-python/requests-mock/metadata.xml b/dev-python/requests-mock/metadata.xml
index 3123916606e5..8041b506dd0e 100644
--- a/dev-python/requests-mock/metadata.xml
+++ b/dev-python/requests-mock/metadata.xml
@@ -8,5 +8,6 @@
 	<upstream>
 		<remote-id type="pypi">requests-mock</remote-id>
 		<remote-id type="github">jamielennox/requests-mock</remote-id>
+		<bugs-to>https://github.com/jamielennox/requests-mock/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/requests-mock/requests-mock-1.5.2.ebuild b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
new file mode 100644
index 000000000000..5c4420858b1f
--- /dev/null
+++ b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# Disable reno which only works inside a git repository
+	# Disable intersphinx
+	sed -i -e "s/'reno.sphinxext',//" \
+		-e "s/'sphinx.ext.intersphinx'//" \
+		doc/source/conf.py || die
+	# Remove the release notes section which requires reno
+	rm doc/source/release-notes.rst || die
+	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build doc/source docs/source/build/_html || die
+		HTML_DOCS=( docs/source/build/_html/. )
+	fi
+}
+
+python_test() {
+	rm -rf .testrepository \
+		|| die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index d53e543c8e6b..b8e06c71f285 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,3 +1,5 @@
 DIST s3fs-0.1.2.tar.gz 24574 BLAKE2B 2b62202d8ceec078ca93c6da895a81648c83e0fbd764dbcf4cb1a0ce2c2a8a7cd16a3cc5162d095ec1272b52c9da743d8c8d21f5b351e6a4f3d63cbd77d9b43c SHA512 52be23ccb2dd8c63675287895d00fda94adf010ac878ca12e5c8eefa25c7076c000b53bb4d2bb7886550cdd0d226cdf51aeee12f2ad7bac46537f190ba72ec2f
+DIST s3fs-0.1.5.tar.gz 27215 BLAKE2B 84f059eafe14a4faf8945c355763d31a49f38c3ae6cb05170dbff0e7ad435f9ea79617fc538d237b565d20a0b11603ea44d9e71339fd40c1ad16ad0af903bbd5 SHA512 5285da6d82de1e68c4cb0fad5a93eeb59fdffba663691d79cafd1b428b60e17fa21e0ff3a50df701cad7f351017cdc538954b0516782e5ddcf6c3d5910f71144
 EBUILD s3fs-0.1.2.ebuild 643 BLAKE2B 4ce4203792d09869c8ecebae5315d4055ac8debf442ddcf8208ab78c4ced6b9bae989c6bfa4e760b71d9da1e2648168cec30cd734e047a2ee5455b94d1063ef1 SHA512 c73aa52b2f5648444e0c741f94dfe8863176d6932c00e21752a7e4941c5f242b0694dac51dfc2dbca69f3f708ee21425215175baacb659f12c05a367206c6cc4
+EBUILD s3fs-0.1.5.ebuild 649 BLAKE2B aee9f59864a1306cc697c8d29598839ea6ceaffec299d94314a88ad95c5d32c322eddbf92c348d6fe0ba714012f400f6aa5f1d25eb5703b1ef3206ee215320ef SHA512 97cb2c458426aaac34968a677173722b498d09ca50592991bd216b0e4c95be9ff1872d9b0bd507259c0ad6107ddbf05a2967346b98c65c0ad9cfe876ccef0b9a
 MISC metadata.xml 519 BLAKE2B c4ab17bb17c687ac00bf13ae441685f6484334dc588f65138dc616f7cd8a49debe0eac5ec11c2d7485eb48855238ffcb25612d687b75ca52d58a921b311e455d SHA512 f8c6696ea3f62243be9f39ea56dafe0bdf137b49aaa3ac2bd793301c043645d2ce63c6cd7cc1a476a8f554317ce518f501ce0775f89f8bebb66e3d3d806f4926
diff --git a/dev-python/s3fs/s3fs-0.1.5.ebuild b/dev-python/s3fs/s3fs-0.1.5.ebuild
new file mode 100644
index 000000000000..ffec642e474f
--- /dev/null
+++ b/dev-python/s3fs/s3fs-0.1.5.ebuild
@@ -0,0 +1,32 @@
+# 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="Pythonic file interface to S3"
+HOMEPAGE="http://s3fs.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/boto3[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	   dev-python/moto[${PYTHON_USEDEP}]
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index c2df6d459870..87f823ee7b4c 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1,3 +1,7 @@
 DIST seaborn-0.7.1.tar.gz 158146 BLAKE2B f547e41306634f41091ca5641319abcdb1d22359d67591f115009cd95cdf50463e3683fb1ac911ff9dee3d7628320a76fbcbaa9c91510937907a40a0daa259c4 SHA512 6c730d87a97f0df3b38b78ee9255d47b900aece1308127e2772dc982b19691efe6afe192752c89cba9e9532b567dc1c3c103675e580e6f1151355ea89d1019b3
+DIST seaborn-0.8.1.tar.gz 178865 BLAKE2B 7f81e0737331edac805e88183f387ccde38d4b27d601e43462342855cdfe245cf1c721ef03ae7cd1b23cc6641e20d51f38bba6c8ffc4a9621b069c6528d0249a SHA512 05ed621c2624b4b981118f9e6100f593ab23620e8f86c82b55a298944135f3286798d5cdc6c215c134f2fdecf9b3a7631be8c5136c0dafaf1f97f05f7c6739d7
+DIST seaborn-0.9.0.tar.gz 198184 BLAKE2B 4f4072a186986f9eb649c6fdb6edbc7a28b6f4ab6cc132652b8c4c595c96500b4853b5593f39b46f6f0073d916f9cd51f3ecbb2d23f4d69991e46e702f10ca44 SHA512 01cc9a8e80102eed6a35be8ef2c3357d1f5eee53004887a5e0eb1f4dcf696987e19b9e371e95fad01fff60042ad5a2873a6d265a43cb506172a50ecd5ba55b3b
 EBUILD seaborn-0.7.1.ebuild 861 BLAKE2B 877d9f1245db09269e2421c7d467c93cf80d5eb4afca016e943edf806e8daca4b71bde2871ec99f54bf847e402fd2d2f9b1337de726b6dd06b7460811423fd3a SHA512 80ee544c6334384276a2f66fe0e4c141cf735cc279ad476558daf321d189aafd25743c317a7e9f338f557209e135dea5829af8d7e305d1d25a7aecf7cba4af5d
+EBUILD seaborn-0.8.1.ebuild 861 BLAKE2B 877d9f1245db09269e2421c7d467c93cf80d5eb4afca016e943edf806e8daca4b71bde2871ec99f54bf847e402fd2d2f9b1337de726b6dd06b7460811423fd3a SHA512 80ee544c6334384276a2f66fe0e4c141cf735cc279ad476558daf321d189aafd25743c317a7e9f338f557209e135dea5829af8d7e305d1d25a7aecf7cba4af5d
+EBUILD seaborn-0.9.0.ebuild 861 BLAKE2B 877d9f1245db09269e2421c7d467c93cf80d5eb4afca016e943edf806e8daca4b71bde2871ec99f54bf847e402fd2d2f9b1337de726b6dd06b7460811423fd3a SHA512 80ee544c6334384276a2f66fe0e4c141cf735cc279ad476558daf321d189aafd25743c317a7e9f338f557209e135dea5829af8d7e305d1d25a7aecf7cba4af5d
 MISC metadata.xml 1741 BLAKE2B c1c19f61b7964ce77784415d3d964425a53e7a15d5e3148b7ee8474603f771eb07fe7e44fd0fc0a155687831fcf11425e963ed884c982541da707bf46e393658 SHA512 ddea613b7d13e3fce33bca903896fcbc0cf8f383f423cf6362190c9159675925cb297f57307ee223b43d2b15d41634e39d8ad2535071db0771a4ac9e891265d1
diff --git a/dev-python/seaborn/seaborn-0.8.1.ebuild b/dev-python/seaborn/seaborn-0.8.1.ebuild
new file mode 100644
index 000000000000..f7f36034b4f1
--- /dev/null
+++ b/dev-python/seaborn/seaborn-0.8.1.ebuild
@@ -0,0 +1,38 @@
+# 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 virtualx
+
+DESCRIPTION="Statistical data visualization"
+HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cat > matplotlibrc <<- EOF || die
+	backend : Agg
+	EOF
+	virtx nosetests --verbosity=3 || die
+}
diff --git a/dev-python/seaborn/seaborn-0.9.0.ebuild b/dev-python/seaborn/seaborn-0.9.0.ebuild
new file mode 100644
index 000000000000..f7f36034b4f1
--- /dev/null
+++ b/dev-python/seaborn/seaborn-0.9.0.ebuild
@@ -0,0 +1,38 @@
+# 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 virtualx
+
+DESCRIPTION="Statistical data visualization"
+HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cat > matplotlibrc <<- EOF || die
+	backend : Agg
+	EOF
+	virtx nosetests --verbosity=3 || die
+}
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index 19d6d569cf48..193caf4091f3 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,3 +1,6 @@
+AUX send2trash-1.5.0-fix-broken-tests-on-py2.patch 862 BLAKE2B 1d0e43f642c47f5b9f56c5e82361c7376501c0b1f5f34573b6a954bf849f26fe9d2bac456ec474c1cef0a24d62a0481a5a62d04b92c943556b97d45e574e410a SHA512 2b63d6fd6c684c950fb3e60df5412931e95dbab18c360a0d3c21a3a99ed011a2c494cd74b1fae933de1e2edc81e7bb9b6f7d46f84c1b04f9c6b3c1b6b6876fa8
 DIST Send2Trash-1.3.0.tar.gz 5563 BLAKE2B 54fe34a5f984ded219a3c17f0e06b74a2e5624a8bda8d5723087a918217041bbf6a2b20976b0b4ba71d4a1e08d9ce645b8d5d7fb022ec8e5ed72786496e1ee90 SHA512 d308dd06ef7a11ad7bcb5d9195fb52aa0c0b8e76590ef11b1576d14815501c32c48b96167eb0a325e4f27d0dbf77f41c012a128d30c8f05d9d5ebec9967e21f3
+DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
 EBUILD send2trash-1.3.0.ebuild 619 BLAKE2B b9fdbfacbf69f7ad0437b173a3f53e20fa9679f8be6ac43d27f244b52d69feab928f1915edec1083f0cc1457b2ac9738e9e0875d8b0ca6b787daf2f07f699e1d SHA512 d4fbeb53d17bc10091d73f00566900afa438ebcfc301437dfa401a855fe389e06fc58d97ea7cad899b81372d8816294d33c0dfcfb210a275f2fe8a8fc5e1aa72
-MISC metadata.xml 381 BLAKE2B 5afbd1afb5fab636015e710ae55c2e7b6c9eb24d1ffe0418f4ae4c6d02befdf4d50922d25ae6dcd134e2f17de1cc5a7bcee0467cdfc03ac86cbf5b31d33153dd SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c
+EBUILD send2trash-1.5.0.ebuild 690 BLAKE2B 741f79918094127a8b83b7cf342bfaf27245c37d7bdacc4244cd9ffb8315f6915684830e393d8d9ea65753ad25adc4d1f0dfdf19d863dd0af6da72ac08acc5f5 SHA512 ab84e22b16a150c079b0d97c08118c7e652434ead58300af98b3ff58afe2f1d8857fca283f82a67928bdb307bf0e167aec53f2bdbd8dfc7589d523f2b4c4f865
+MISC metadata.xml 495 BLAKE2B ae16e355c25ecd42a185794076c1c16315e311a59165c3ca76b4452374d1347d075b626fb0c450557c3ac3e7dd200854ef06b1d45213ee80fc7c6ece4f34b357 SHA512 1c8d9152257865cf74594076405912a922cf3c564d56b6e660cce4615995a4d2809ce4e4b3edc30e35fdb5ac71ad4da2534bf5e242dc3f74cee7704c84ad5328
diff --git a/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch b/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch
new file mode 100644
index 000000000000..3f2a64ca2a21
--- /dev/null
+++ b/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch
@@ -0,0 +1,29 @@
+From 74352462f5df2cb5708b96458b81afef3070c800 Mon Sep 17 00:00:00 2001
+From: Virgil Dupras <hsoft@hardcoded.net>
+Date: Thu, 26 Jul 2018 08:30:39 -0400
+Subject: [PATCH] Fix broken tests on py2
+
+---
+ tests/test_plat_other.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_plat_other.py b/tests/test_plat_other.py
+index b94295d..ae4f391 100644
+--- a/tests/test_plat_other.py
++++ b/tests/test_plat_other.py
+@@ -6,7 +6,11 @@ from os import path as op
+ import send2trash.plat_other
+ from send2trash.plat_other import send2trash as s2t
+ from send2trash.compat import PY3
+-from configparser import ConfigParser
++try:
++    from configparser import ConfigParser
++except ImportError:
++    # py2
++    from ConfigParser import ConfigParser
+ from tempfile import mkdtemp, NamedTemporaryFile, mktemp
+ import shutil
+ import stat
+-- 
+2.16.4
+
diff --git a/dev-python/send2trash/metadata.xml b/dev-python/send2trash/metadata.xml
index 9dd529756191..0267c38bf914 100644
--- a/dev-python/send2trash/metadata.xml
+++ b/dev-python/send2trash/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>vdupras@gentoo.org</email>
+    <name>Virgil Dupras</name>
+  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/send2trash/send2trash-1.5.0.ebuild b/dev-python/send2trash/send2trash-1.5.0.ebuild
new file mode 100644
index 000000000000..8d102d20e3e2
--- /dev/null
+++ b/dev-python/send2trash/send2trash-1.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+
+inherit distutils-r1
+
+MY_PN="Send2Trash"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
+HOMEPAGE="
+	https://pypi.org/project/Send2Trash/
+	https://github.com/hsoft/send2trash"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-broken-tests-on-py2.patch"
+)
+
+python_test() {
+	${EPYTHON} setup.py test
+}
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
index 35a5f1ed17e0..89ecb82146c1 100644
--- a/dev-python/shutilwhich/Manifest
+++ b/dev-python/shutilwhich/Manifest
@@ -1,3 +1,3 @@
 DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
-EBUILD shutilwhich-1.1.0.ebuild 508 BLAKE2B 4a8ec8e9196227c9ebf92b095a01a5713a32e35d9f455b594a536b43bfb15ef85cdb0eb02b8905e39a7f9b1033216b8e03f47fb27d34d5ab577ede8ca91a2025 SHA512 a3596780a5ecd7c13edbcbb7cddefa97aad02865ff69738877d640c2be31ee63543faf7638a8c6e0acd1c1fd56ead2a459b87352d7ecc4ac41464da8489cb723
+EBUILD shutilwhich-1.1.0.ebuild 513 BLAKE2B 5ea31ce42b36524c1983aee886d6e8cb025e26c033d329cae78ad6ca29ecf910f08b696c5551bdb56ab1c30a7bef3634deabb03b3054166da1415bbd1ccaa830 SHA512 05385fd317ed8d7990e903e1a2acef3d5ed99b26ee8f4e1d6561e704e6ae1001735129491db186635e48e2246fa32c7b0e9c33a1b3443876161311bcb774c77f
 MISC metadata.xml 711 BLAKE2B cf4caeca6cba1b6211e4910618287135ca84240d348595c91389578a2e2f887c1f88ebabcbf3960d0d6472169cd1b65455d1d8a4b58fcfa530662f75f29ffef4 SHA512 69223961a781434b4877e7648f9f2897c1dcb110a559e64dfcdfb6c26a696f8aeee4be1fa211e07baa01f1c9bf57f3ef44d43502a6635841e14e45ae524169e9
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index fbad293f2c08..96649b834e1f 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 3e14b055b2a2..6304ca3800ac 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,7 +1,7 @@
 DIST simplejson-3.13.2.tar.gz 79735 BLAKE2B 5feb87611451054ad8e856e55a4a6bca50470f7f72692de9ce5abddf9eb214e29505124634d4d5a4f825366afe9a97614c66cbe14a73a4e57a5f2f62cac876e8 SHA512 ea29bc615de7fd0eb2a98f5dbeea74ee49b6fed6602396e77baf4480c86f975eff7fd868ac44f62a1c2f3721d4fa5b807b74109e5e28810df70dbad758110f41
 DIST simplejson-3.14.0.tar.gz 80112 BLAKE2B 5866adeba886b4b4f526d4d7fb7ac65f12fa8cfe593a0ac40419c6f04e2f6b776adea49fdee861be54047666b7275bf229db7f7815515a9273878bf0eb68c5f5 SHA512 a81b20a75840566d5985803f35c56ee6957a433f0a9a6fc2f0fb2d46f978925cff0edc2f2c06fe85e7155c8301fbadc962152671c29310c6306f63afede75f98
 DIST simplejson-3.15.0.tar.gz 80963 BLAKE2B affa7da859bc2b2426389d881b53abdd086a2f7082decc9f8968859f54354d50747eb6f1cb8c4cc0151ef1e2cb8ecfb8aabd9f2151eaff2f39c4d08b9430f432 SHA512 601d575a5b8be66a33df28f27292ed12e5aeec39c74aa5a5108d82890dfb45a086e7a3a5072e012031209465c5c518909b4c1fb261fc055e6b9b1523a6bc39b4
-EBUILD simplejson-3.13.2.ebuild 872 BLAKE2B cf3ce8bb8520a4d40e49209282b3a8a308aeccc16ce27cdf0ce9decf4592719e57840458b0dc7fae20fa774a078c71023f435a0db4aa460242b19eff1f68b39e SHA512 2a2a92b201a87144d442801aaca7dd6240ae97f4cd3ef39b88e98b4f469cfedfd5156e5f8aa7a9fac0f28e03ea363eaa1a50637ddfff9c8c003adcbb15fdcebc
+EBUILD simplejson-3.13.2.ebuild 877 BLAKE2B c59d6dfbd246de58f98490255ceeaf018cb0fb92ccf34765f265689a9dc4bea993f11f248c01c3634de4c4b928bd0872143afa9c0419788df8bd3f2455703e26 SHA512 e4ca98af16c511c049c89c64c354ba39d9c299f7670cc33b291126b861013d4611dcf0f32884dd32dd63547f9c8d11c4186a48f22cc9cdfcb378e69ca573d400
 EBUILD simplejson-3.14.0.ebuild 881 BLAKE2B 58e8e1b64333e861bfebef33ef1134f8cbb66cb82e724b489cb72b0b1771c9c5641f5b87b34bd3a346f6ef14905f02cadc6e5cd877d474959ad002f051158a52 SHA512 d1b7cdca473cbfebae39f4b88b52f462cb035fb9a3e7c69fa821158b12eed9515b6fb2ac26f0dc678f57ec24535796300b33ad26ed982c176f512bddce2348cd
-EBUILD simplejson-3.15.0.ebuild 883 BLAKE2B 5b760a55ffd121a4dbe0be090f2014bc8002a04c0cb2190568a136e23107909496c8293578f3b9f64c655c006b2e92d4dc40fda084a72dd37b38eb26b942fed2 SHA512 0ab879fbbb03f21ef12185002daa81b3db93e32841222e8fdebb6b420c791c7834f24cffcc784bfab64eec0e97f3bd2982384a44062b9e19279f04e88295189a
+EBUILD simplejson-3.15.0.ebuild 889 BLAKE2B 251df843a7eff9412722dd53cb6e2dfa998586c1ce919183696903dd51dfd64d7cc835760577f45d09bdcf6586f15a77c7994ba0f44ea13a09b8b8d947720cfb SHA512 7a067e64b71904d89dbfd21d06c47ca15a8a0415712c103cd59ca81222b8f14f2bc77e44f089e838e60adb7eff4fab5e878aaab67c2f7f93823c0d9310e12990
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.13.2.ebuild b/dev-python/simplejson/simplejson-3.13.2.ebuild
index bae56fbc5a52..964d4d7e6517 100644
--- a/dev-python/simplejson/simplejson-3.13.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.13.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/simplejson/simplejson-3.15.0.ebuild b/dev-python/simplejson/simplejson-3.15.0.ebuild
index df7af5af1964..9004215f6c28 100644
--- a/dev-python/simplejson/simplejson-3.15.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 06e4b30fd3ba..b4b5dbfd99f1 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 BLAKE2B 77cbf582412c4c800d18979165f501a684c1c4bdfd2e488b75ab10aee86e5696481751b7f146fe9b259ecbd94b7d456ec86f24ec2d4ef2333e79991c1846151f SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
-EBUILD sphinx_rtd_theme-0.1.9.ebuild 536 BLAKE2B 0b54c322f29a864e873b0d15b2b13bb4c19fbac74aa103f3fbfbfe3d2d4babf315e59cae194936b2871749623c9823b43fd4f2e59f67bc946062f56222c9970f SHA512 f621712ac4c56cc0849f76f0f8f5935e674f527cffae1b50bb5b3d60ede5829ef42ff11cac072659c067d21f5c13de49e5592db063849318d31dfd240772f651
+EBUILD sphinx_rtd_theme-0.1.9.ebuild 535 BLAKE2B c3826e00c2b5031a4a62e6610ffef29d874171c42ad1cb3d1e85f42b66b37d54728bce53849beebb4b4a4f07af638d093ed96474da22056be86e2e854242f4d8 SHA512 d2319f60ce16e54a0128181dd514ee15834650698bd92ee0c5e8a11f3c698effa7f2fd282e0def285e9a8a0a2d688ae8caa4d83953c9cc9548d135844902b87a
 EBUILD sphinx_rtd_theme-0.2.4.ebuild 573 BLAKE2B 57c49d5d218a093e3ecca79e9d5afae353e0d4a1166f91c9557f83d85bc947b75b6468806d34a4a71df59f240ffbc0833cccffa0b1757c5147f791679d816a9f SHA512 ffcf88cab85c8b30aed7867a177bcaf61af24591ccd17652db168ca2d8e04a37a66cabfef38489572069b66cb12f34f4ea84ebf84c82a1082baa2402e4db47aa
 MISC metadata.xml 393 BLAKE2B 0964b64f29bebc684900cd181b7947897d10f617c091d6936ccbfb27f91356d83de2ad0172a95245b363cf6005fe2defe8e80aab2bbcec5f292bc79fdad7b7d8 SHA512 f3ccf901c6d0a891880bf06e1708a1e19225cf1ba60c3cad1e8bf5dfb665274fac7de87b4363734f8f299a9af589e3de64b9e38ca14a405fe33e4c63321e4572
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
index 6033d4f18e5f..bfbb21322d5d 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
@@ -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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index d0043ce95bad..40e5f6dbfd14 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,5 @@
 DIST stestr-1.1.0.tar.gz 95353 BLAKE2B 70435cec22d56f38fb9d87484b261fd73d79f8ea719ffd67861e2504580d6e2932b762839e44dc4c9e348e448693a80e8173850d800374643bbce15374137c37 SHA512 7490f0982c77190adf97daae965a957fc40d0e418a64fc38ccb50817a7266b06224e61f17ae9c84edfe200417eaab726cf834646bfa2efbac67ea029dea54df1
+DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
 EBUILD stestr-1.1.0.ebuild 833 BLAKE2B a4282cf93626dd2c91b2e1a7397f84c8c3da4c761f21fe28830b8ecc363ccc15130028d4b8fc1c56b10afce9885eca83f6175a80ea9851fad5bc2e18e0d99091 SHA512 ae04747dc2439e1ae91ba89496b9400f22844ea703d1c11337b0f0436096ab31115625a424e871748ba72a60e3c9ad8ae82dd0efc13b4d83024349a27af073c2
+EBUILD stestr-2.1.0.ebuild 1085 BLAKE2B 57fc2853ff2a471bce42247ebd66326d097f38e1589cd2853ef04700faedd5c741f5b91dfedc6c1b953508d81c07e4dba37e7a12bf04b6fa8d96d55b2bd87386 SHA512 5cb2df21078aca0d8b9c3601aa9a7399ee48b6ec8c340d9e6be8a761d0b24be5bfe844aabf2d8348b28f93d7b13551c482211692ce8a0c8e0dc6bdfd10908eab
 MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
diff --git a/dev-python/stestr/stestr-2.1.0.ebuild b/dev-python/stestr/stestr-2.1.0.ebuild
new file mode 100644
index 000000000000..372ba5486727
--- /dev/null
+++ b/dev-python/stestr/stestr-2.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A parallel Python test runner built around subunit"
+HOMEPAGE="https://github.com/mtreinish/stestr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]"
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 8330d587d691..5eec89953364 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,5 @@
-DIST stripe-1.75.3.tar.gz 181924 BLAKE2B acbbc05db9bb7ed61d5ea0995f69164d3c781a54d8e033aa4e74f0d7334993b70f21799a022ede69219c7a23dfa516e8e340b5009b7cb26142ac077dce24babf SHA512 30c95740bbf2a756ebd4e9453195907c8239bd9e36377363429ee269ef27e04fe60bdc3bde921a5be0ad7ab59ea1859dbcfbbf39d6da8b81aa163cfc7793ea5e
-DIST stripe-1.79.1.tar.gz 180317 BLAKE2B 03ea5b816a6892eec4041958c9636b3083da2cb46d98bd2a85da585d51d02b1a809dd57b7507e4c965824a52c5093527b44bdbd18a2defa659c766c8ab17668c SHA512 a3255eb01692816ff6f729af0d77abf9aedad0cc3236c7f4f3172047a45378a1c0f820e1bd38676ad334ff5a9d6d2528ef2f1e021903dfbacb980a3b2dd8a7f8
-EBUILD stripe-1.75.3.ebuild 457 BLAKE2B a2c8a2c7f8de450ce46064be766b8953d80f276bdd0a95e3687ec2cfb28475d1bbbe4353956c2e6c9f765db985baee1651359e4e17baf5ab1ca9a12bf29f6581 SHA512 d8c6012d0957a21bee6a433857796a050cb6de2cd08b67e071cbea9b713ce4d8427fa037d8e263eb99f613093bc270865a7a8650ad6345ddcb45d4238acdfea9
-EBUILD stripe-1.79.1.ebuild 457 BLAKE2B c75936fad3114182081bc7c01c1368e77f85fadc9d8ff52ec491e6a3b241831fe3f2debe1ab66083a4e64937c0038a27bef835653adf51562ee7f2463c0561a5 SHA512 e6e5efc654d511290c041dc3ef8d3e4c09966456fa2f398f23d36aa5ed05a9e30572a88502f67f52ac373c7e9a90cd7c2cf00f9cfa74112d1630ff18f859a310
+DIST stripe-1.84.2.tar.gz 213050 BLAKE2B df6c195a183d15bdeb7ffbfd2f5683b0b667e8a4df7a637d3960369e1b00a90c74bb5d97af64c553e2f250b2bb7bb698d015a65c3da312f74bc7b141c4b63dc5 SHA512 7d3e1a20c30b3c2fa087c9fe86b04462db4b6cd742ea13daae2754ee6b414656847057b30db48634c6d02ef01d8e510359505fab212325a3db36dfaf2d72db38
+DIST stripe-2.3.0.tar.gz 213813 BLAKE2B b383c724331d5ec21452aee2eee49c789e2503057c4648d9e879fc561b87cc70ba918bb1e620db3bca380150e62d41433f1bfa7f9b6f164731d3d68542d5f056 SHA512 ba88b18b7328d917379d8474373a1f87717d67cf305022b80eb05c74b8055b825cf30cc879c4e99dbe06dc99f03464649e637d83d70c902b84f5873dd0776453
+EBUILD stripe-1.84.2.ebuild 457 BLAKE2B c75936fad3114182081bc7c01c1368e77f85fadc9d8ff52ec491e6a3b241831fe3f2debe1ab66083a4e64937c0038a27bef835653adf51562ee7f2463c0561a5 SHA512 e6e5efc654d511290c041dc3ef8d3e4c09966456fa2f398f23d36aa5ed05a9e30572a88502f67f52ac373c7e9a90cd7c2cf00f9cfa74112d1630ff18f859a310
+EBUILD stripe-2.3.0.ebuild 484 BLAKE2B edd8bacf2c513a941a60632ded6876bc11e141fb6ebcabf64c32ac5964c3c53ad26c8ea53c0d064e978d6e5dbce6cddc1b1048698a8016469b441dc35bcad435 SHA512 4ba5b6c40fdb73f708a20c1b7fa843741311ecde00bccd9cd720c06fdfd4bfa5d700ed5b686df37b6b8c558f4c0b066144220529bf2523c709d5bb24b53c1d53
 MISC metadata.xml 539 BLAKE2B 9232265d094774d1f04cba8e358a9655034184c10561bb8db4f8188381fdf7583971f67d5418f2969ad4a12db46a94b4c87c3eb9486eb0ac251fad9bb68f7707 SHA512 f0052ba8457139d76ddce67313bc973564237b409801d3d6da181c495c2d80184076cbe36468850a1ddcd60de50327e728fc3433a8a4bfe9608713a33fdbe9c1
diff --git a/dev-python/stripe/stripe-1.79.1.ebuild b/dev-python/stripe/stripe-1.84.2.ebuild
index 8c5c55ccdc19..8c5c55ccdc19 100644
--- a/dev-python/stripe/stripe-1.79.1.ebuild
+++ b/dev-python/stripe/stripe-1.84.2.ebuild
diff --git a/dev-python/stripe/stripe-1.75.3.ebuild b/dev-python/stripe/stripe-2.3.0.ebuild
index 5c90df0de3ce..d336c7b648a1 100644
--- a/dev-python/stripe/stripe-1.75.3.ebuild
+++ b/dev-python/stripe/stripe-2.3.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
@@ -13,9 +13,9 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
 RDEPEND=">=dev-python/requests-0.8.8"
 DEPEND="${RDEPEND}"
 
-DOCS="LONG_DESCRIPTION.rst"
+DOCS="LONG_DESCRIPTION.rst CHANGELOG.md README.md"
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
new file mode 100644
index 000000000000..7f9f634aeecb
--- /dev/null
+++ b/dev-python/tappy/Manifest
@@ -0,0 +1,3 @@
+DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
+EBUILD tappy-2.4.ebuild 992 BLAKE2B c597c7998eb08596ec0f2336e6c54b5db7716e2b6f87dd97ecd0c16c30e5ebb3d94b3aeb0ecccd2e3d6c65fe86a5ad9564d628c3b3e6cd200cbc447c8be404b5 SHA512 7093caeebbe16d38783036f19a5ea88ab29edab56bb977d34cd099ad7710f7c8269aa1a32a5955c1c5e4964094e40627098f4df32bbf5e2f81bb6ddb3b71dd72
+MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/pyrtf/metadata.xml b/dev-python/tappy/metadata.xml
index 05ae47510e59..2cf31a2dbdc0 100644
--- a/dev-python/pyrtf/metadata.xml
+++ b/dev-python/tappy/metadata.xml
@@ -3,9 +3,13 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
+	<use>
+		<flag name='yaml'>Pull dependencies needed to support YAML
+			blocks associated with test results.</flag>
+	</use>
 	<upstream>
-		<remote-id type="sourceforge">pyrtf</remote-id>
+		<remote-id type="github">python-tap/tappy</remote-id>
+		<remote-id type="pypi">tap.py</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
new file mode 100644
index 000000000000..7c1e42f927b7
--- /dev/null
+++ b/dev-python/tappy/tappy-2.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit distutils-r1
+
+MY_PN=tap.py
+DESCRIPTION="Test Anything Protocol (TAP) tools"
+HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="test yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	yaml? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+DEPEND="dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-unittest-mock[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 949063e37e62..0365420ba7cb 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -2,6 +2,6 @@ DIST tempora-1.12.tar.gz 15208 BLAKE2B ced6e5d069780b516ff791ee598683f59d02588d4
 DIST tempora-1.13.tar.gz 15956 BLAKE2B 7b00c4cf04628c1bb6a84b7044a22921f81bd77ff340342d7256acf8bb8b1b427fb15b9c10c28cfa4c99b02e4cee6e2b26ae53be0ed7ef67e3d6f528fb2e9a3d SHA512 98927024f07196a51b8d61017786cfc258db289ab9c98942cca2501074c1675bf1213770ad00db1d38829017bb9928cccde7fb344c170b2f485fc68505737485
 DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f1fe94fffd59982431190e2807c2dc577ff83eb90ffc5fd2b2f8415965de1d77e4dca0dd02291733bfbb97c SHA512 2420e32a9b8c990609d8f09225004e0b1c445cad1fe3c3c74625cb8317b552469acf2d3b28aa56633a87260a93c77d73b02178cb662016c514bc740aa01399e5
 EBUILD tempora-1.12.ebuild 1368 BLAKE2B c5f7a160aa7d8fb6bd04f66a5043a799a92ade386ae18fd9998a75bbb20d44ddec6daf909630bb34e23c765611a4cfcc6f6675bb4ca45bd553ad39eb4e6c2bfc SHA512 9ed24331515ee0c03c51598133338f7213e652dff08f374a4bd4a8d869ad07e330e5de48aead91e27321a5ba12b212290639774718f77df60cb2cd865124b34d
-EBUILD tempora-1.13.ebuild 1403 BLAKE2B b003fc6754003f3d89984bb22eac679903fe4db5a5ef87c1a09911430eebe0a632ea7fcd1eecd1358a16517356b47721de2cdd61720b83a2e4823c77138e60c1 SHA512 ff2762051801607a78589d92b54245d38ab8b3f0cce863bea3b67ea4509e14fef113c1df3b4ceb649b31e015fb4b99ddcd720f3924cb1d4b800877e8fcd7bfb4
+EBUILD tempora-1.13.ebuild 1421 BLAKE2B d856dad0a36da36f487d13ac71a47ce143e1d007773b42d86722bc0f5cf3d1d0f6d6979ba838f025bfac187d09675cc12f0cbdb921b17623bdb8511a05b6a175 SHA512 95f93b44f046785caa7385b24a51a2d2b110c2628fc423fd60f3dc5ff8ffbf106ad06a630775ddbeb9582631cc439b7711bd47e24934aef3a3feb1c9b29667ee
 EBUILD tempora-1.7.ebuild 1274 BLAKE2B 7cf4856b2eabd47a99c6150512e678c9c436fcc3511f2e23ab848d0e96ecdd5e49c235c86a5a942b620d6893fbbde546665d9347c9296465ce19a2caf83960cb SHA512 0e4a5b8e6296894c411accbc107a8dc677bd68ac0d6b190c699200636ab853e3980de9691a316dae2f928008ca87a7137e98c7fe6c0db89a0cba04efebb9ea8d
 MISC metadata.xml 514 BLAKE2B a504d20d519ee139ccda1418b4a6f4d9c1b47a17dae26a57e2bc9e55d31b44f6f74b4a3835a6e9f376431b2428b5885b6931bdd6f11d57549c9ac29593b8e0ef SHA512 aed0cf45d8b0d1f3aa942dad7d74c572d6cb501c0c61438ca6bf97cbdfa51091cf9c32753cd92440ff69c7faae67daff0ccae28d9223b182ea89426bd4bf4fb1
diff --git a/dev-python/tempora/tempora-1.13.ebuild b/dev-python/tempora/tempora-1.13.ebuild
index 55cc14bf4e43..27020aa721b6 100644
--- a/dev-python/tempora/tempora-1.13.ebuild
+++ b/dev-python/tempora/tempora-1.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -17,14 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
+# The calc-prorate binary used to be part of jaraco.utils
 RDEPEND="
+	!<=dev-python/jaraco-utils-10.0.2
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-# The calc-prorate binary used to be part of jaraco.utils
 DEPEND="
-	!<=dev-python/jaraco-utils-10.0.2
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
@@ -33,6 +33,7 @@ DEPEND="
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 	test? (
+		${RDEPEND}
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
 		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
@@ -50,6 +51,6 @@ python_compile_all() {
 
 python_test() {
 	# Override pytest options to skip flake8
-	PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 1869879a062f..301f056b1b3b 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,4 @@
 AUX testtools-2.3.0-py37.patch 1740 BLAKE2B 10a1e774fcc436b1e4f33075f807ab70ec79a7d16338cac35f63dbeaf4ab4f95d5f67c69886918405edb7ef939b9cbae00176202705d08a9f1ea80f08c3c6af1 SHA512 e8a441464b8d6e2a75f95b26e83c2b2fefad262fa193bf088b65c1101fb34a9d53ee7a3554cf005519a44cc007f78df74d32163e5910f447318c2e89e67529d3
 DIST testtools-2.3.0.tar.gz 231559 BLAKE2B 6ae098e368cabc0bfe45736324819687a6086eccf868de7eec312caf7c64b5d75a3168f3966d5cd0b05ad9295957a7aa1ee3c1589f076de1f5cb619b197ba08a SHA512 558fe6a1bdce7215f9f6f178f469a2b76948dc7ff0ce27400482a16683474edb81d9bf90ae48b6fcb8df9eb70759341b694aa162ed3d9d4abd372981cdcd8a64
-EBUILD testtools-2.3.0.ebuild 1534 BLAKE2B 588d4b319b39d8a7151a53a6bb36123e3e8d3ddeefd02454dc10f2f50306162b15451a0ebf66c08764eeb6a16e3a437afb43c2082ee140027cd112039db3e624 SHA512 ba2d2bd815dd8a957bbfea894a16112d0e534e81343dc888ade7fa4c135e0ddd8e27ed25f256a31fecb4db56a426ef7433c480be26955dd413333fe7ff278f15
+EBUILD testtools-2.3.0.ebuild 1533 BLAKE2B 0d7174ab4f8f080e04c945ed90864f1861e8a45d139a279e8fef80ea839a9949a8ad3877362e346436323ab7e51cd45324b90202a55352c3ad784399aafc40f3 SHA512 40a9b21df0dfe4e1b49b5a0fb2ac9799bf90929347355f607519897850b0a4e013dbd784d40cdbe05eb53dcc9ee090e44857d9b5c724ef353fb4db0bf6a0b38d
 MISC metadata.xml 554 BLAKE2B 251f32aa81267f470d8f5d1f22bd2e2354fc39ec79ac326dd64333e73e5cc8ab35d6633e1ebce2bad5086d55f838fb129d7cbde2e1d36cf77945527e6e786157 SHA512 ebe5defc73dc62044732463b2d295c08ca24573c34b689150f3865247b34ef6d925437a0c97598c3260ec037c4ed3644017601fd2b7127521c7c352edc1e6384
diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
index c56966713e1e..53088bb0ad95 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND="
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index 30ca78c137e3..637dfbffe8ad 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,5 +1,5 @@
 DIST tld-0.7.10.tar.gz 242027 BLAKE2B b72d673ecf4753f95d0bf8403abb296eef67b7aeea7233e1b8e3ae262667a252d7cd5125c8cd3a11b5422eded604ccc3c86fd7d5ae1a500f926b9fd6464b9acf SHA512 e144f2eb037da482965636cb14c1d0bd91f66d9836f1ea0662b1a34d6760fba7784f26a398d0a1fe0ae4f15bc79372dfd92d94eb624b04955320813b08ab4968
-DIST tld-0.7.9.tar.gz 96340 BLAKE2B 070c1b602d01a97c98aaa8a64663c748b66d5adc385547d2c220601698060643e41bfe846de000cf24b9aeda5f6e60aad6f9bf06fab382d6312cbfc24d79dcd7 SHA512 294157567c57c99eafa97cadb9522e49adaa9d13323df18a76422e4ffa17b5ce6d5fb5f7b7663e3390e92dbffd51287e978c7856892be377d0265f10d7d06061
+DIST tld-0.9.1.tar.gz 479262 BLAKE2B 908be345720b2e8131c89fac9fbbee7137674aa036b99076e60352b5ff37f682c3f5dcd8bf4bade58fffeeebeb6cbd2924042db9da383373ba4542639189e1d1 SHA512 167629fc1f837c12d8baeb83b032fe10291ba5444373b225eb73bab515e46efe5f29f83acd1eea07caa54d6b69fad8238d531867f1956c13243bc1908961a4cf
 EBUILD tld-0.7.10.ebuild 506 BLAKE2B d9b68a00294b7cf309469389fe3f20f253f549cd81d6a032534fc94604ac02572615b797f7e812e1c30937710d7ecadec448560a3ef1c48ef385b2879bfbcfcd SHA512 3238e3342bdee14dcce77e162e753498eea8f37e9ba3a00f90fe8875e59bb6ce1b5632bbb46edf3ef6ac014720435022b4020a3c6260c6b0d5bb4f535faeaeb2
-EBUILD tld-0.7.9.ebuild 506 BLAKE2B d9b68a00294b7cf309469389fe3f20f253f549cd81d6a032534fc94604ac02572615b797f7e812e1c30937710d7ecadec448560a3ef1c48ef385b2879bfbcfcd SHA512 3238e3342bdee14dcce77e162e753498eea8f37e9ba3a00f90fe8875e59bb6ce1b5632bbb46edf3ef6ac014720435022b4020a3c6260c6b0d5bb4f535faeaeb2
+EBUILD tld-0.9.1.ebuild 506 BLAKE2B d9b68a00294b7cf309469389fe3f20f253f549cd81d6a032534fc94604ac02572615b797f7e812e1c30937710d7ecadec448560a3ef1c48ef385b2879bfbcfcd SHA512 3238e3342bdee14dcce77e162e753498eea8f37e9ba3a00f90fe8875e59bb6ce1b5632bbb46edf3ef6ac014720435022b4020a3c6260c6b0d5bb4f535faeaeb2
 MISC metadata.xml 419 BLAKE2B 48f0e2b96669406551c66e56225022f649ede7feb5e435e73b229f2fba514fd90cc1c542b34c0f31ce5f3bf7197c16188d83cd63542b7017caf114b2a1f0feaa SHA512 fd4fa0a5a30087e046f21cd68d7f5772b20a12f24ebc16641c45e28c1e033a4cf8ac99419f4a70f8d6e7997e6c612681c34e9e576632691ec443360effc75d40
diff --git a/dev-python/tld/tld-0.7.9.ebuild b/dev-python/tld/tld-0.9.1.ebuild
index d21297618516..d21297618516 100644
--- a/dev-python/tld/tld-0.7.9.ebuild
+++ b/dev-python/tld/tld-0.9.1.ebuild
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 9e0952a42a2f..913b4448da6d 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,6 +1,6 @@
 AUX virtualenv-12.1.1-skip-broken-test.patch 542 BLAKE2B 8c924cafcc0ee78b3101d55a58db8f352f793fb873a2d82b00b13a41fea9b556d90613a8df1b4a86939b22573542d2187366a9e551ed3090c62d6bc4566779c7 SHA512 9517f2efccb3cd177370cf66ea12244a39e762aae64e9bd412fc05af087648066deaf62d381b52a0eee1487c82109df4bd463599eaa641890c32eec48b694f25
 DIST virtualenv-15.1.0.tar.gz 1865011 BLAKE2B aa460d9188189bf44557417a3a878f4f58d6c4a66fda2da5dd9a69e2ec04a8be6b5cf125160b1f00b4a32803dbf8231a006974499e9110101cac5e522d82eaae SHA512 46c313fe855483cf42def0ddb319df7513bb00ea2c1570efaf1236b4e0074df40d574f3858a3d3760db988b9021ca2046c40a355cc5a3ae32a2802d6120bf255
 DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
-EBUILD virtualenv-15.1.0.ebuild 1235 BLAKE2B 2a2e2e1c5ffb29500777984c1b7959b060048309ed13f0ea080c5aa43676dec5548ef50f8d7a8dbf55320d3a93e90ec0077d746ffe4c7865a4705384964db903 SHA512 0a312b9526c342da33355edfbe17c33bf1ac859de8a61830ff5cdbe951d7c0c9f0105df40343fbdf2955eaf7aac1baff7cff8df4cdfd45d544c0244106937898
+EBUILD virtualenv-15.1.0.ebuild 1234 BLAKE2B 887b1d7921a370d675a791fd9eb0f13d4d97e75a210858684bc6c68b2c77fbb91101b1ec4cbd00aa24d7954fbb12efb446271ce38fa9d052ecee5339a2d3ef25 SHA512 f2527ed0ffeeefa0786787d1bcf8a00c3c6bf0e6513bc6ff8a4f4a3f7e8cd2f971bf452cfca509140c52fc655d622d76bc70f949b89a74702939e8541a230f74
 EBUILD virtualenv-16.0.0.ebuild 1247 BLAKE2B c1de7636186f497c729a98990d8a0849c137b800e87b522c3a68f3808459ca866df1ad95c2d150c6b9bf61acb1ac8864be50660285cda61293fc06fc2233355c SHA512 200547d32b339933989e25705ecb327e2a2409fd93013d5b0de512b2b6da925fab1eed3a370900a867c62cfc6ef6cf67a1b9bccfda69a85b80fb555ae90d9a23
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-15.1.0.ebuild b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
index d6f1fca73824..67998978e966 100644
--- a/dev-python/virtualenv/virtualenv-15.1.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 4d292a1777f4..4973f61e3faa 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,5 +1,5 @@
 DIST voluptuous-0.10.5.tar.gz 41436 BLAKE2B a768e519157ed6999a67e7c759588c4558d3e694e4c5d4a1da0567737d249664e985661b57f9f8595fd7cf5f1b0d05d511616d6d44604443b948bd414b334412 SHA512 2024121c56a91cc3bf5102ca68f8347461b2041da9a352eade0e0ce3657d9a477a60a7a5823e8f3628eee7b327840b5c4eba13c106ea49ea91a553d6b5edd363
 DIST voluptuous-0.11.1.tar.gz 44346 BLAKE2B c0715293fbde6ce9008916d6e016d52920eda1906dc2ec292deee4b6b9f596f2d50592486b5a89df6a90e0512973e12cd69482e55f6c3a96ea0cc4b3e52bc77d SHA512 7e2f3ea122f739944a7820a536551abc45df9847a0c3daf5527eabd781b904706ea708c885d724828cfdaaac66774d2f8e7b42d3376de1c78ef2be9f535fd58f
 EBUILD voluptuous-0.10.5.ebuild 526 BLAKE2B 88924b75d02810542ac9336dba0243598b266fc8d6399db1c8ee13d48d9a8aec67b3c7e51eab682ebcc93cbc35c8735eb9fe7db3f1dc43b947c5b1e2c00a8ce7 SHA512 72af81709edde0c895c8572370fab008933c8c3a00ba37883be2a38c0fb98b5159bcf86940e0d4ae93359a7a5a996fb55445b86aeef1caa5483ebbc1a4ff25ae
-EBUILD voluptuous-0.11.1.ebuild 526 BLAKE2B 874b6410fda60412003c9733c301d442bcf97e66496a3f7ba107163c317fe8e768eba5d17842b721fd0896c04b7df5996fdd93de5c46af4d4c44e18359620b13 SHA512 590e84a05d059da6c8cfe8ec0cdf4b1ef9e1856d5f5cb28433aff990e3793f0e202c0f9d75dcde200ed973c341a1bd00d0b645ea20e4f168aee88b5afb013946
+EBUILD voluptuous-0.11.1.ebuild 610 BLAKE2B da504c2d2949ca428b9cf72b0d01abfba4ad840be724c64c02440bf7c2eb77c89efd21a1d744a15b654a6c67dcc3112a45e0cb8460b26a8c9ab8bd85931dc2e6 SHA512 446db5cb35cb065536b3317d5910b4c06a4c731e41f31b01179e65871074141f47b85dbb19f28f3b2132b2d83c5a9caf622805a3580e16de1d5b2df28101dad9
 MISC metadata.xml 590 BLAKE2B 6d6c101d04be60962c428dc495959500a2a80aab39b7353cbd2694d27794645766c1b92b1ff09f9d8c72c5cedb4f07472a94945e8a48263d44b0134a6a0eed2c SHA512 ff4732c5a379f2607a97a45c56def4955bc542446c5545ff807138eed3992d71ffd4b3638f122accf1a272537c071ab0304717a43706efef191dfc7b35422bab
diff --git a/dev-python/voluptuous/voluptuous-0.11.1.ebuild b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
index c0d7560a5588..06c021e17ede 100644
--- a/dev-python/voluptuous/voluptuous-0.11.1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/w3lib/Manifest b/dev-python/w3lib/Manifest
index 877347c6e97f..56813abeedcb 100644
--- a/dev-python/w3lib/Manifest
+++ b/dev-python/w3lib/Manifest
@@ -1,3 +1,5 @@
 DIST w3lib-1.18.0.tar.gz 37709 BLAKE2B b6fc2b7198cbf82ab509c7b2d9d77c4362840ffb70122476684d16c7c1f0ca3b9b6fdc63985a0c3eea5498c16595a4fd18a5179865d66fdd657a0c9c526194e5 SHA512 5d7a3453081eae79807f6287f862b1b6af196d1f3db19c4063d1730b0e736496e3bf2c96021d4b7237cd448a52450131e2a136c776d0ca74b4222965033289e7
+DIST w3lib-1.19.0.tar.gz 37989 BLAKE2B 4e33ae608c2cb7f924219e3e7fd752e7d4e473d7b9d8ba0994cc0d92d817a7f63645df502c440d1d37d347f0ca9791f3d46da3f9e92fb2c7be4592c4b77644ac SHA512 253a5fcbc93a6031156f43fbcf77e04654dd132a90f06bb2929ad372352514412b247d863b6fbe558553129746bc27965b7de56f80bfbcb828f0a53773b41eb7
 EBUILD w3lib-1.18.0.ebuild 490 BLAKE2B 43868c18642669cb6305752f4a3448a348c4168d79a79252ebb7f025075a58e70e8ba92891d2727b9d7f47fe1eab42822926a1b861f366e3609d94c6972c94af SHA512 18e3a49757822dc3f646cad3fa47eb91cdc85906d87f73feba336757e4b6ec5a2a324a5ed2dc6130be064c9183ae10a0b0b9037b6c748637ff30e21ce8369b8c
+EBUILD w3lib-1.19.0.ebuild 475 BLAKE2B 658968f089573e3afcc65d0980b22704d1d886133fa4e517e686a479d4c300ecad1d8c1f9ec2a50853730eaa9926456d142ff16293c3134068fbba1e0f22872d SHA512 87069923d846892dd6d9e165dc2fbf9eba37fb661455421b6021900edf7a9f3724fa32af3cfde64f9fdff3112abd1ce8595018aae0627921b128b037bb6c5fb5
 MISC metadata.xml 457 BLAKE2B 3330b2292c818d9bc66cbfd91ec93655d0285003778c39e8acbe267f16f46dd175639f5c88f9cc388d7d856ce1c463da62131a548e0bed0075f0a5e79787fb7d SHA512 5136e07ca268ec52f678a36a8aa2fc254d74e104da0303b5427386bcddd86618f6a76383a4808cd7aff3e179294825f8b70458bc7341e062164ae78e5f5b2569
diff --git a/dev-python/invoke/invoke-0.22.1.ebuild b/dev-python/w3lib/w3lib-1.19.0.ebuild
index 1db8ec13df92..c9ba06661319 100644
--- a/dev-python/invoke/invoke-0.22.1.ebuild
+++ b/dev-python/w3lib/w3lib-1.19.0.ebuild
@@ -2,14 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
 inherit distutils-r1
 
-DESCRIPTION="Pythonic task execution"
-HOMEPAGE="https://pypi.org/project/invoke/"
+DESCRIPTION="Python library of web-related functions"
+HOMEPAGE="https://github.com/scrapy/w3lib"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-LICENSE="BSD-2"
+
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 078cd74c9137..019d2a123554 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,4 @@
 DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
-EBUILD wcwidth-0.1.7-r1.ebuild 683 BLAKE2B cac4d8f1c4046ff724fe464e8b03c781c0da044fe521d48c4c9efae8cf13bd27ec0d5698add345d54c36fabab9e3db6cca73c884637f7ec497e7876d01ca98fc SHA512 b77b2133a3d132ad18705251c325538cd9b278c270e718123d856f408af1300af67d235e247a23a86badf35c3dd0aedc013cf4a1ef18e7a9ae6c4bf260df95c7
+EBUILD wcwidth-0.1.7-r1.ebuild 685 BLAKE2B 386eb98ca6aee6176368d5cc1b8c4bb7209362d9ac33a34a481ca2bd13272805a83a72ac25bc75a6ccc0e490b419c55de00ddf778385fffc7fc26be559b9fdec SHA512 72bd8353a6e6ed5ee0ee604b2d3f700017000bb1db04c5848c39d42a2f44de162f7bdd9b66c8cdd5e6e4e56083353a27b490bf55f3b5264c712169d4c9c797c2
 EBUILD wcwidth-0.1.7.ebuild 658 BLAKE2B 961127ddf24313a87dc0a71ffcba5afec059b2b2e1971775daeb71a2aa18dcfc72a19b370ed0a4c816e87f70f1f4617f7e73c38d838e3a0cd10e435e8fb21a75 SHA512 b868e87270ed8df5ff8fc8ec4a8e12fe8ecead63240c38139283bee661eff5eb1f9dc705ee6211b84c9b8683bba95794efd6a9f7091f87f886ccb4a2d712f5e0
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
index ca6f6b62186f..befdbde04d6e 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index a747448bd079..7e0e82d4326a 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,3 +1,5 @@
 DIST webcolors-1.5.tar.gz 29960 BLAKE2B 0d46fa57b54525594547b1224801308961f9265dc76866153752e411dcf81d3ca2566cb289bb9f0cd486bd6ec1ffe7cf88f99a04f5554ae43f183175c9eb925e SHA512 84ce8cbbbdb4523bb146cf379845b549570623411a56651a7f9b9687152b7adc9dc42a3a0f684b55b61fb7a3d51d49d3871100b56725c86a727e3374b53c84b6
+DIST webcolors-1.8.1.tar.gz 33118 BLAKE2B e16ff2d9549eb09638722a6513749ec0bc91cd63ba69c19667ddea9c07aae7f9fa2b0fd3390a9b0f6f420f245ff3157d86a585301ba77e724146a7cee0ef4ad8 SHA512 45ddb4ec030206c3ff1edb7de6b8ec1b5f2f9ef5068f37a7c43b66531a2dc6b290cced2af1ca18794aaa9ba17f297022b2f9cc7a92a74ee9b68f758abf7c104e
 EBUILD webcolors-1.5.ebuild 685 BLAKE2B 602dbe072de8ff57661f190e2c8761c8a26b1917eb4c40662e637d3982b954f128a412d22f4fab3e8426198d100945dc43804604058fe23e09785bd196ee85d4 SHA512 2b185483f1e05dd8fcff1338aba6deebdf3643ecd6ecb3a5fd81561b1ba5d02af641ae6891421dba4e567d35ac635e412583a629285939344b51c333450cdf17
+EBUILD webcolors-1.8.1.ebuild 691 BLAKE2B eb9da4609b3f2cf99f24c09055260b1d8d67ff2c6f6e6b97ca6b5de0729d8c6b886e10b72eceeb24bdd3bdb64222cbd9f5d2f8da9b949c6862bd808b9533b758 SHA512 465b13f89f983068409f0404af9cecf6040c1229cdf48103160f3b87faed1a76b7ae5a21804b45dc45c14a0d644c20886a13fa0b24e6259aceeb8f02df52b4e1
 MISC metadata.xml 373 BLAKE2B 77ba0f1d033aa4955155891349878942ffb67450d1e4891c87f068454546c73feade5f683574ae6a4263bf9cdce3f2beebc188e3812086d84a6cdeb840328c48 SHA512 0b99d1cca8cba614a64f182192f08d168e01c3d5dd3227f4425f41f438769b7b0566be41c9d3a3b3bd98825582315c035a7641766416fc5e57816b72d27d726b
diff --git a/dev-python/webcolors/webcolors-1.8.1.ebuild b/dev-python/webcolors/webcolors-1.8.1.ebuild
new file mode 100644
index 000000000000..d3a857f49790
--- /dev/null
+++ b/dev-python/webcolors/webcolors-1.8.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
+HOMEPAGE="https://pypi.org/project/webcolors/ https://github.com/ubernostrum/webcolors"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index d7fa880e35ec..05d84bddd052 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,3 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1.ebuild 850 BLAKE2B 1ea38dd3062f4a4b2b950d34d6c1333b6f36119fed4d48619018d93b222af2b63bf1deba4cc387ce5157791657ef95f4868152a21914f14a1a91aa422b9f205b SHA512 1f6be459d7efc02d1fc98ad52802a2f7abc80d6c989dd2c6c1425f32881f86e57e6b1769c83e8b22db0282e1cca7cc95c44a27bcac60ee44a31017bd7c9a4fb4
+EBUILD webencodings-0.5.1.ebuild 849 BLAKE2B 21c01bea62f47c3bceb5d3b72f12b31dd23ecf32255d7485ce1d1ea157456df54b40da8caa6455995e080713a9e87a32ba249280f54cbfc9a294bf62ad8f2f7a SHA512 e33cfd2ef62c9b53e9178981506c5ea68b7621714ca913637a723ad60408fbb6b6e46dbe4506cae588c418b70662f2436f08107aac9b9b2327d108665bcaa8ae
 MISC metadata.xml 575 BLAKE2B e04ef356f2e32b91dcfcf94b1f02c86782491f811d71e45b19731f9e0262d42d2419a152b99c52f575db57f682d7a6820a2a2d1e4ee79ec1beb810c238907578 SHA512 c734aada8a2ab7aa8cc6f25fdab99d9ede6be164d23acb8dbda9f7988aadf9d12b6e3043f5adb050cef277523b4a0c84d770ad1f2f75ff7d21d774c403d960ce
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index e9163a780597..eb789be99690 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index c0edd28311cf..5db9a5186636 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -3,6 +3,6 @@ DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
 EBUILD ws4py-0.3.4-r1.ebuild 1789 BLAKE2B 7632a4b805400ee65e170b8ff526b28da8a351a6f2c34a058d423b3d2740b7b3ba74b950a1f0ac63a1e85115560a9839e53c8826e854f3a6d94251c90971d343 SHA512 9b8956dc48ffb144c1d8556243dfd0b5642adf5a8d9f456517607faaf4caa2dea10c7efef5584fb2b95bfa8a043c3a3b455960f79937629f6ed2144f6679c788
 EBUILD ws4py-0.3.4.ebuild 1743 BLAKE2B 5797daa805c311bb89e6ef14ff8b86ec77f8812935e2fd10f34167d829c24d418ab8af04ff416fa62628f83bc33fe7e66728414ac77d4a837ae3c46e835c9d0b SHA512 91d39f5109f2f98409c4a6bc33b55ecc9ae612427b4c434d1df2b75c74846ebc642814bc0b81d958592146ce1777b1dbb47d75d12460a2700139feb1ef678eb4
-EBUILD ws4py-0.5.1.ebuild 1755 BLAKE2B 6276862b17f7fbc7a9bf95a3343e01cd16c7ffb4c4385c7440048a04266db9cb3c57ca485581a4a2520bc1238e8ad8357feb16c8064790bdfdd6f002e267a595 SHA512 a198764364e797663aed1d86002cef4d366b1f10d3f6d49f9400364fa38ff3a0f0930782ac6d516458b09c352f0930654b39b861c167e8047d7ade167f28300a
+EBUILD ws4py-0.5.1.ebuild 1754 BLAKE2B 23013d3a9d80a85c8b7bb8c703882c0e46a3a8d142496d8d890fe90b971eb752310d0b410556a24cfe8f30c60c9995d6172922cdbc4341d77b49383440acf56e SHA512 3e293b53b077228ac4b165b510ba7d3bb48622fef26e0e5d91e2c334682f12b4b6108332071215a8f5a16dd2d943a3be9f0e79c9f929d674ea265ded0f452b9f
 EBUILD ws4py-9999.ebuild 1756 BLAKE2B bd83be441081e43d8d304a863b5e65260b4d7da44b925510c19e80d2939e1471a33cf6d6b728fdff55528267f72b0d456fa6d271190646827ddb41298d788851 SHA512 878bdf409ac89a5d07e7b8f2b3c2e76a54985050b843e12f695ec172ec19d1ae1dec8f7c40ea08c6e1a19d8a6a27ec5d699cefeb822ff50e710c5455358ba810
 MISC metadata.xml 469 BLAKE2B 7c2212a53fd485fe5e99a53741f0d828bf09fca7dac40ddd1c0326eebffb1f0fef0c305ac00d61747d6184f3f309e711157f0b715d3fc49694bedabb9f09d513 SHA512 a368692c9de68b711cae8c35305b35e445f47046ecf2226d36d5944be4e8a6d29311c28c6ed74ae794517eb2f20c0b2eeeb0ce33e719029b843c8d23b2e2e838
diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild
index 54b81d3c3df9..2cda31b943f8 100644
--- a/dev-python/ws4py/ws4py-0.5.1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 2d13fc932ef2..42918f333994 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,3 +1,5 @@
+DIST xarray-0.10.8.tar.gz 1630608 BLAKE2B d211918a73c81842b0850ed65daa41015e5ab16da9aebe56b86252aeae16141cf540e22b6ed7c758f6db74ca68c9f81dce0ce65db7d054db6ca9d2b4b62e7b0d SHA512 962650f49690638cda9cd91e2d09209138127dd603a7a1e10407e114ee806f61a33f6e4ffaf63474c2d5ad0ce31717e5cae5e3965179a198c62bef013df252a5
 DIST xarray-0.9.6.tar.gz 1491394 BLAKE2B 42f0e9d8c0c2c4194cab72a309671fc4ebe18feff9d8593291e67ebf26e896a4d142ef4a75e8358ca8425822537949d9d69e970cba568c187696ae88c81cc09a SHA512 f7a12da324e0afadbdcf7abea33d4450189ba4b761240995328a530b67e2f2134b31bf961f8fa388e2296c26dc2da2cf14c113ab86ac301d96b7a35af56a5107
+EBUILD xarray-0.10.8.ebuild 638 BLAKE2B 091dde0d34147db1b18fec6c12254aaf6531f3bce5218ddda23e833850bf5709de1f9f6f3d8ae446e881a2c1c8af51d35ad6470f367f1c615b7ff14bff96d026 SHA512 7049a25b24438394fe22075aea25d2af52de12c3fe6dd5c90cb4b7ba36a87f2caae8a3b772ae094d52dd16e76ada8f907aa0cb7f3cc559d9e2ec293586f3e7bc
 EBUILD xarray-0.9.6.ebuild 638 BLAKE2B c58617382c00c29c7520c01a99c5f95df96411f86cbd825399e43192f4f186761be7d6494ce3015fadcce69cf06588711333547d93570a14965f8796ea209072 SHA512 c23fc52bbd5bc8eaf198a54bec09042e9445788ed379c5c9a3c64bbb3184369f1abded531ac5023a983119429ef9659b3c39bae4d87bcfb7bac0a23cec669461
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/xarray-0.10.8.ebuild b/dev-python/xarray/xarray-0.10.8.ebuild
new file mode 100644
index 000000000000..f2e42e221e95
--- /dev/null
+++ b/dev-python/xarray/xarray-0.10.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="http://xarray.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/xlutils/Manifest b/dev-python/xlutils/Manifest
index c76a2a89bd46..114a0d73bc6c 100644
--- a/dev-python/xlutils/Manifest
+++ b/dev-python/xlutils/Manifest
@@ -1,3 +1,5 @@
 DIST xlutils-1.7.1.tar.gz 62278 BLAKE2B 5d90074a660ad15405d6a6e75e2da9a8eb45a7e516c70f4e0a1d34eb8db0d8a9b865ad0241d7d39719f77b1bcc4b3bea5e5ce358ebabc81b46a2ed6d4176ee58 SHA512 196ec5cf99e7ad5a612c455e4e293461ac89e6e93c28790e34dcce544c8689a9ab122e37458d3b6ff24137c3646607fa8768ab3a4c2fa4a3e2e59e0ac05d675a
+DIST xlutils-2.0.0.tar.gz 61614 BLAKE2B 51fde8ef1a0a88ecccfb3cfb332fe8a31101d29865cfa6201001d272db34a5f210e988ccb99ba00344f80dd457a5c91866af12061af9342d556953700cf02916 SHA512 7b6c39912a2b23d718b1aaac2f21770f1e5b156fdc7416f11d4a7e6b52195ffffb982aecb52b5571599eb4928c7e09bbfb20fdf2554f0c49c286b243e2fb3ea9
 EBUILD xlutils-1.7.1.ebuild 870 BLAKE2B 3a0a0f91918a7b155e48a40028396cec72d5ba200edc2f6b749a15d872c5bc7ce1c7e0d2ccf631b2db18ed73371bc6f7ed3c888412fa399931451fe52ad825ba SHA512 28947f317dbfe44c3c2ad0796201ea048539346da333bfb995bd61c47a6e3788dcc9b7d75279d9690200c37d1591e3bf137659a89657064ffe274390581ea3b4
+EBUILD xlutils-2.0.0.ebuild 822 BLAKE2B ab66146ca6f0c007b84a0847994614fdfc3160ce94604b5ebb2e51c9620f71b4a171bae3260b14a5f0fceb0c4faf051a92a05a900c5fdd1987ec6607b9253627 SHA512 bf233c23083299a929f21ebfd0a5b23f460fbd00dd70f20386a3ba948e4a090bbd754cac7b094c09dd6f70d3fcc7efb90024d1b0532919237a20f05838b89115
 MISC metadata.xml 320 BLAKE2B 73ea3f716e530a41155508ff0562a9264659d59bf40a8bdbd4a75e3d073a83e96a6c3a520be9ce1f300c32f3e5262f231464503e36f7988ddd9972447a308459 SHA512 c83e7b88d50078775118f9c2b9a7edeef32272247ae55c30a99d1c9927b4d3fdfe12393500f93fb3a2a7ec37d0d249355d39887a4f26e75f9c24d585ae3204c4
diff --git a/dev-python/xlutils/xlutils-2.0.0.ebuild b/dev-python/xlutils/xlutils-2.0.0.ebuild
new file mode 100644
index 000000000000..d701317d1024
--- /dev/null
+++ b/dev-python/xlutils/xlutils-2.0.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 )
+
+inherit distutils-r1
+
+DESCRIPTION="provides a collection of utilities for working with Excel files"
+HOMEPAGE="https://pypi.org/project/xlutils/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/errorhandler[${PYTHON_USEDEP}]
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v xlutils/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index eb76c0ba18c9..dbe8c1e02f79 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,5 +1,7 @@
 DIST zeep-2.4.0.tar.gz 146930 BLAKE2B 998e6f12b264b168f0af95847a88b1ac58a1645411f8edd4fbdbabc9292179130145d5987df3edf5d559ca6f886bfcdc94bcb9426d6288b3e16708acbe10f4fc SHA512 7bd21d8feede66678557d7f6de3788509ae5d1785dd0c1ec4ffc076b73e8dac8df58eb6cc63c53ac4e28399bf1ac74ca93ef5710269406e88ea2da05f7456a5f
 DIST zeep-2.5.0.tar.gz 147413 BLAKE2B 30bedc5f95a5b911c402cdd5c13b117e478c0d63b37247a604a8b75eefb3404a5e4e7469ac1ae8188e9b3e841b706fd2bfe975bf8068e74ab07ed6aec9901c6a SHA512 f8eaf4eafd85d1464df28161a2cd39d9ad9079aa4fa39f3da11f352e52d3144b8d2c4b53a642c0ccaf70cac541cf7fca3a89b85b60bac7dd3330f4bb7a9bfc10
+DIST zeep-3.1.0.tar.gz 158081 BLAKE2B 6432c05d6bbcbade93c1f083a13a66d679b3060b1d44ff6c996b46e3f9602e6464a63c1ac2fd77ab07eff353e52613c327998d3dc2ae8c2d775c00e3f5e18f3c SHA512 392125b2bc6d796bfbe4869dfcfcaeefadbbd627cd92f6fb5006dc16d1692a3d20659b9c662852e47eb2c3f6671466dd836f67d0ad7cc34bf356c8822bfffcf4
 EBUILD zeep-2.4.0.ebuild 836 BLAKE2B da7093d7c176dbd7c7de5bc437078115fea26ac12db66a87340c62381fe014a70a08bb8d9181a482fdbfaa12dfe06dde3b7d60c2ecb9a38e0813e65bcaea815d SHA512 ab6958245c65fda9d3d9d5f9416a1757fcf1024db68b33b2819566887bd00b978abe6e7f4059b1e5ce739025f4dd5d8de5b02eea7abe7dea5e2c509d1e994029
 EBUILD zeep-2.5.0.ebuild 836 BLAKE2B 90c8ccda196786f70ac7620ad76753e81bbeb96705ff28581fffb2c972e87e7af8587edbcbbb7f29015b5c03af7b198d375321619d515cf4521248709acf1470 SHA512 fc9e3b16799f5824aae5ef8cff1771ee873ab0344d5f496679ba45d1f45a9c66c42edb072c437c99e66c519511b91e8d41ded62e93cf9a9e2e36b352bea4a6bf
+EBUILD zeep-3.1.0.ebuild 863 BLAKE2B db15f637ee0c8f80d5a5ae6dffda25b58e4fa09bb46b8bf30ba3022ed464b6f0c5f54fe4d7a2433465cfa02a3a79d88f3324fb2432a0387af10176d612fc0e22 SHA512 a8bd9eca606300851dc37a499262d665bcc3233931ce2ce3c005a28126899766ffe42bf2b88332fa1ae5832c3529c1881de90e55f23bcba591eb778a9e6b14fb
 MISC metadata.xml 589 BLAKE2B 7753eafe2db0c0494f397bdb185d121f6cf380a7007241d2a8a5e87b8a9080c026ee07c8d64d1ca1e661137c315492e28a6f6fd33578bcdc54432d9f183586c2 SHA512 b6d919287e23bc7a9aebaa3103678b7ca3927d7348a3470a266eaae25795851840c479307fd19a8fadb13f1e051b60bc617726fcfcd14983085fc33670f826ae
diff --git a/dev-python/zeep/zeep-3.1.0.ebuild b/dev-python/zeep/zeep-3.1.0.ebuild
new file mode 100644
index 000000000000..4584200815ae
--- /dev/null
+++ b/dev-python/zeep/zeep-3.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
+HOMEPAGE="http://docs.python-zeep.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="async -tornado"
+
+DEPEND="dev-python/setuptools"
+RDEPEND="${DEPEND}
+	>=dev-python/appdirs-1.4.0
+	>=dev-python/attrs-17.2.0
+	>=dev-python/cached-property-1.3.0
+	>=dev-python/defusedxml-0.4.1
+	>=dev-python/isodate-0.5.4
+	>=dev-python/lxml-3.1.0
+	>=dev-python/requests-2.7.0
+	>=dev-python/requests-toolbelt-0.7.1
+	>=dev-python/six-1.9.0
+	dev-python/pytz
+	async? ( >=dev-python/aiohttp-1.0 )
+	tornado? ( >=www-servers/tornado-4.0.2 )"
+
+DOCS=( README.rst CHANGES )
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
index 3c11ac78778a..25365aa4b3a7 100644
--- a/dev-python/zict/Manifest
+++ b/dev-python/zict/Manifest
@@ -1,3 +1,5 @@
 DIST zict-0.1.2.tar.gz 10839 BLAKE2B 6256e6202f6cca1db025d21c42b98163ad897ceda6a1b878e75165b358ec0a4b9150f04ecdc05f5408dd74c97212b8301d1f45d91f92dad138789570ffcfa562 SHA512 13fc6647bc1506bc5e8f69d39a07851a06634949ce917f294762ff3143c8a539117f8731b103df2663708fa1e8c968359985d9c4273aa952f500a89019c176e3
+DIST zict-0.1.3.tar.gz 11199 BLAKE2B f91c51888816b3b3693ee272379e36c58141afeba14cf25eff9e1416cd59900ca9ab146d7fe806a22939e97dfb3f1657e443eb1420f4d5170a3723df32c3d73b SHA512 2051ff589f9dfc822ceb6a0adebb62e7b782bd426be5035163e78031814927dca221bfcc27ce47fb3d0287b1ec7e1ff120ccebf150e447df213aaa2136f744a4
 EBUILD zict-0.1.2.ebuild 661 BLAKE2B 2a5f82a0cf8e103bd5e7612d19a216049091b6020023035675eef152bb9715afa7ac7ca94dbc2e17205b8faaabf19ca96125abd1b665899062a619650e60a8c4 SHA512 5a53259e826af62cc6ff376cf8bf311a110ae2ac9101cdfbab395edcb103a24245284e7046eee1ee7e1f1a5095cd4f91b22ebfe33a5b2f90508e57c8f741bfb3
+EBUILD zict-0.1.3.ebuild 662 BLAKE2B 96b8a5abc9e7f99213410251a2f3292f1c536b905d00506a0ec85a2f69bc1f35f66115080b74bd1ab182aeb28d928c185ec8b9e833dfa4981f3c3309cc943f79 SHA512 a8e62894099a7b93b311dea5d630fa265f5eb81b6624fc283e67797d3d0fb32b8d6dd42ff6893696650d2e552a3c2d2c2e3a6865daf972f9197c41a3a4644473
 MISC metadata.xml 372 BLAKE2B e0704ea4318d17b85ab75fb9818e2ec6993173823f2b0d8fb92413e9ea83095a5ad95c05e69c4f6ae447c9cc2fe7a2735355b311e84b6036780a6b48ae5e7ff4 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0
diff --git a/dev-python/zict/zict-0.1.3.ebuild b/dev-python/zict/zict-0.1.3.ebuild
new file mode 100644
index 000000000000..7879fdb202c9
--- /dev/null
+++ b/dev-python/zict/zict-0.1.3.ebuild
@@ -0,0 +1,30 @@
+# 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="Mutable mapping tools"
+HOMEPAGE="https://github.com/dask/zict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/HeapDict[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	   dev-python/HeapDict[${PYTHON_USEDEP}]
+	   dev-python/lmdb[${PYTHON_USEDEP}]
+	   dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
commit	e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree	9cb29a544215119b5c5538e37211b994ce1c87ae /dev-python
parent	480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)