gentoo resync : 21.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 18:59:32 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 18:59:32 +0100
commit: 520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch)
tree: f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-python
parent: 3811bc3072bf19e2be351d2c63f81532945c0f21 (diff)
438 files changed, 2070 insertions, 1334 deletions
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index bbc2fbebb31f..a702dd190865 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -14,7 +14,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 ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Babel-2.6.0.ebuild b/dev-python/Babel/Babel-2.6.0.ebuild
index aaf13989c173..81c3bfac87f7 100644
--- a/dev-python/Babel/Babel-2.6.0.ebuild
+++ b/dev-python/Babel/Babel-2.6.0.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}} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index abfa44fcc470..b78af8bed46f 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -2,7 +2,7 @@ DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab
 DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906cbdd1618e31f39b60d16382d54ff5e00c493153eee2be8894edc8c96e57fc2703620db5bafcf7b7a4f1b72ef SHA512 1a41f69141da9f66e27110e7a1a5955f76d8ae9353ff7e54182c5bb6ca16e8b4799031e4df1049af54de513da9f101e171e4312b2e7775f2cab9116d5b50c0fb
 DIST Babel-2.6.0.tar.gz 7960433 BLAKE2B 0edc3b3391eb3d479eae9a223668af96e1ec47b84b13d0bb66c0e1772dc5de8321ee06f0d0dfeb6c9364a724286d0ee50a3ab4c2ea789894057fca39bb11dc46 SHA512 a87f26c25f1e48a64d1e7ee112bc0c325a6268e0e716a81cb6814a53f0add8f3d579babd2ba064f160298ebe3ac9711aa5d28f112582ee287767b6ed8427b6e0
 EBUILD Babel-2.5.0.ebuild 1471 BLAKE2B c9c9e00923f2b27400a7898c0bb69025840bf058569f52220699cd468980f17132faebca0b5710f9fd797fd4857d49d8d5768ef05d4768908b7dbaa41245e36a SHA512 eb9807bb50fe367a92cff89826189f29135c08006e77aff84d0228ecf6e772011050148aa4e655636206aaca7ba7281818ee448a7d457084f38c8ac7bfd7c511
-EBUILD Babel-2.5.3-r1.ebuild 1539 BLAKE2B 6842ee24132b2aa410561db4fb283deaab493d07b9300c4e619090ac9aac0a4e43142d0c966af537814f3a4a2478e9587c43bb2005f3402c3f2ee56cdc6417c0 SHA512 2964da6282dcb0b301be414d89c3e665dc573a8d6574590f1b941d69f250ee29ee2669fc9685f2f624727df6910f61b660495ab8cc82a88de7359b32564ef0f7
+EBUILD Babel-2.5.3-r1.ebuild 1535 BLAKE2B 75ab55fa191305f37b155ebe0cd34764835b4631cc49fbb640326469e8b152c3e82ebc9ef87bef1a95e166f65e24c0f4599fbbc4579e7670798a5b4fb9961c14 SHA512 fc6103483986f71a897fa45a5a3be209048ff8235c0e489e38f02cae4857f5bc6e2caa4fec151557f591e62d9a7b7c3cb56a9fa7eaa6e25af4a5f2367caea2cd
 EBUILD Babel-2.5.3.ebuild 1472 BLAKE2B 130348dc2960f5ce61e4708069826ef73fb18c0e24117e514a0329843448037fd0534cf649c18af2fe6b04452b1b777c5b64bff37cc23c071d4a7b56827674a2 SHA512 6a23c39ef56ec915b73128eafefb895fa19a1743159a5578d24ad77cd291328127324a95b5687483f9a2cb51aab982bc117d9b4fe6940f170bf4383af15b0f33
-EBUILD Babel-2.6.0.ebuild 1477 BLAKE2B 7175cd34d55957aca7504228796b4cea67fcff1eae1a5bc3273ec4f1f63e4d054a17eccff7c23d04d2731a426b49b3a4d483bdb6c46ee19f3843f9988fb723e0 SHA512 4a4fb579eb2cb0be946fa770705b0cf968229beeef367fbc4dde652604d7fbaaa411abcec59b5df213fb4503c0b3349d31cdb28e9a65efc3925c71abf507be5b
+EBUILD Babel-2.6.0.ebuild 1479 BLAKE2B e4697f6443bac97f602d520ea80b469e9ab9901f4bd8af0e827236ba6789f328285131bfd7806db838e736341940f12478f5c6d9bdad734477d2ffb00354117f SHA512 7d0fc140635ab543b7701783cdf90cbb27c832b97037ccbeaf386f0f6c92162988bc5f11f892a228638179db1e49183ab9cd1121dd4d39b868d0f8d32501aa76
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/HeapDict/HeapDict-1.0.0.ebuild b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
index 3a4e5471a901..d0eb974418e1 100644
--- a/dev-python/HeapDict/HeapDict-1.0.0.ebuild
+++ b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/HeapDict/Manifest b/dev-python/HeapDict/Manifest
index 7334996515a9..a56a5dc61c85 100644
--- a/dev-python/HeapDict/Manifest
+++ b/dev-python/HeapDict/Manifest
@@ -1,3 +1,3 @@
 DIST HeapDict-1.0.0.tar.gz 7713 BLAKE2B 19aedc2e7a61c74b93aa8883603520bc6ffeebae4ac4c4a4003023bf6b1c65ff55f9ef571a3e61ea92620a18eed281ad603a61e1df4f03a8811096e9f0964ab9 SHA512 1210acd3a6f3e091132d8b87963ec46c81d3141e1788c2a127fe348a9052d73225036aeabffc6a2089c7811b8571a43477055b746df6b128a645123862076bb5
-EBUILD HeapDict-1.0.0.ebuild 483 BLAKE2B 6e2683fa789c69bb3931bd6a81a09cbe7b9f060e487d42a830ee4b0765c631763d143138b994f7d26bed4e6f6e83e2463cdbd861878b1629b1e80901ade62d5b SHA512 419d1b412c29b7d1c8806475c493a28b59bdca2611fdd63a82d5bb8d60b94741623117531fe3ff0b94a392ada71dc00db202c2904a767a54d9cbf4929b5053eb
+EBUILD HeapDict-1.0.0.ebuild 482 BLAKE2B 94a649973f075b156162567df7d23e0df5e500ae08f689d852d509a34707ef209028ed94c3b96eeb7e6278a628e4562ca9495daf2a5ec715cd02f38cdc1f19e2 SHA512 2c3ecc0c5284b9091ed7b430b48734eed2346fbad86e55fe50cbaa1441136e263ac78cba62b634f362c6a503e9fc58e101e10d20ce4d7c6baac5bd0e37c33de2
 MISC metadata.xml 522 BLAKE2B a4feb2dcf86b348f8e07a76c82261db274d46668bcddd36677e8896eeb993badf321987a592ddc37bd85a9f4e237bd12c6df1cbe289fe3b3354b37352ab70786 SHA512 aca6d43cfb9d6eee3f47079bc26874f12e95f8efbdd4bdcf2685b65374b5a6500de2f12d065bdbce12b82496b931c3c00ff9ffb7aa1e040c11ea033e12304be8
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5e8011de0000..526038e9cba2 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index 88af0f870208..305c27c69599 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,5 +1,5 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
 EBUILD PyContracts-1.7.9.ebuild 1069 BLAKE2B c79a442c967345de74626844dc744e024be08d4280241f570ecf09052ad0bb6febd2ca119055ef49a38657b6e8fc7cb62667aa9b1d004a5db00930521131ac2c SHA512 739d9f0be7390fcd1f656fcc9328e5da1e134b3470eb946de88d5be32e2b76d85786ad30e35453b1363c77f342f6faa5f07ebb89635827ddf63e53fa5d4d1c9d
-EBUILD PyContracts-1.8.0.ebuild 1080 BLAKE2B 77e41f43c56c5211ef3371e2a65364fd1a3337bbc1e452d818bf47aabe5609b38b103f7a30c8d1dded205238e296c64c617a0b98c3598341d93503981344bd74 SHA512 549e1a4c89447fefa094fa4b01de69db2af899efd9db6c4a89b68b75be141d19172b982fb2cda66d946908d13566993cbb9bb1e36a968eb57b34db977bccbd0b
+EBUILD PyContracts-1.8.0.ebuild 1082 BLAKE2B 3fdf79e56f6ef327b1062ce1af90fd60360ab46f79d74e3ec1de89e5797850ba39fd120024897144586c41b8e86cc8a5218390608fb43443748b22224f039b80 SHA512 8f1e4887fc4c90df6c9a87997fef5fbfb77b2db6a16c1fb53eae5239513f5de44dc5d32e166db08535f84d612baac04610b2d5c8a233c92111eff87420e408e9
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.8.0.ebuild b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
index 90f07135645b..042cbbeefb33 100644
--- a/dev-python/PyContracts/PyContracts-1.8.0.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.0.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 4cbf495d62c7..7d696faa742b 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -5,5 +5,5 @@ DIST PyGithub-1.40a4.tar.gz 2668409 BLAKE2B 5638f228620fc5c6741f79e3272ba374a71b
 EBUILD PyGithub-1.28.ebuild 548 BLAKE2B 3e8eac8c0cd4d349f2c6455c83b282756d406a40015a4e1e7cdc21a53308efa355ca6d84e1276d43eb4b547f36cfe517b8d0d9d5bdf23c241786da935f0b02d2 SHA512 0e84d2ed8b517e48113443ba17054558eec90509e124de6d400c7ecdd047dcbdc1626da257d63cd31249ed7a24be7bfc71746594bb175cd6111c48b7107d83cc
 EBUILD PyGithub-1.35.ebuild 600 BLAKE2B 7c0d0d18a008afef48e8fef0703721a2ceb2ae7555c3e0b9561bd3514d6d31e41f088b49997d250631111f9f1f34b5d58b049aba394d76fb8a178ba165ab568d SHA512 2741d9e431c6271acf3aba3e7c8d1d878e7bbd3fa388e60d2bb0b40edf20ae3ff0f3fa5c5186eaa7bd9ed9142f8d97c661782870dd6734fb12c7abc5f3d2cbc6
 EBUILD PyGithub-1.39.ebuild 602 BLAKE2B 89204432003da588daea27b3237af0bdf5a01ad376de7737f3f93dc9aca1cb44f04fbf577f357d5a735858b530879d28ba798ddccc2479f7f1319402b8d33e24 SHA512 61e73feb94f59fffcfd5f5dab933c1e33056ae6a98a790dd14e5645875719dc2ea23c6593d8ebf88199c9505ad6079759bd5138bde0201ec46fd74c955a4a72b
-EBUILD PyGithub-1.40_alpha4.ebuild 720 BLAKE2B 57ef78fbb71bebff4d759fb022a1144edc4d1a466e22a885bbf8aece7b6aef7c403751d75a3d8c361cbf3f7688bb4539244feb27d6c70dc5a762c6b651f82c7e SHA512 8d20f780420b94183e00f6724de75906cd61560dea54827c1298b6b11d9315472e6a76defc19bdb2b98d2df51175bce747b4225a2c45b898898f89750242b7bd
+EBUILD PyGithub-1.40_alpha4.ebuild 884 BLAKE2B b0a5826da69be366fcac6f72fee153647f545a64bf22b6ae5398d727ac907b20ab2096420a12f98c716746b85d52cd711f53b69a1e5e4154fc963996f79d3bab SHA512 04e169dd24c344724fb8c7198ae631eaac3905a890bc7234a8177baf44ecb92ddb7e1e595e7ba6664da96dd1044483e14deb7a52b7c7876d8eedcaadfe99d505
 MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild b/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
index e44864c83d71..2d9c8b0680af 100644
--- a/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -25,6 +25,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+python_prepare_all() {
+	# tests requiring network access
+	sed -i -e 's:testDecodeJson:_&:' github/tests/Issue142.py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	esetup.py test
 }
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 8e6e337aba5f..fecf2db0b4a1 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -2,6 +2,6 @@ AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
-EBUILD PyQt5-5.10.1-r1.ebuild 5725 BLAKE2B 0999071426ac7f8437ebb20f088ba0ad4e1bf4a338316435866a4f26c47e65d4a623f6f00e60b2e2950f0cd19b6e36599cc8d5cb77379c41e77dfb4287387b65 SHA512 f88f7276a9e9fc5258763c8314f0230e7cfbb9e742902923e524d35277669521cfa1e89689a22ac9304e6eef80e62b0f9e7a6a397f6b2269dedf6017c4094b9e
+EBUILD PyQt5-5.10.1-r1.ebuild 5724 BLAKE2B 002e3c67a42297d374cc28c3580dca391af1514b73d0f959dac3cb0b62d5c3765d643068e486df16f176abb377c569ca4a7740ce03e88ddc1579f4dc16a763f3 SHA512 4f39b48dd225cb23fcd27162f77af1f70adb5ac504799dfb18d52f7ccc00f18a0fceaf40e16ca9353f0f80c65ae3a4cdad7c29180a7d8e39396a1c49e501fdce
 EBUILD PyQt5-5.9.2.ebuild 5687 BLAKE2B 42b0f29d9e9652571b29acfdc3ff90fe5bf1f4ff8776855df37faebb92c11c5e6c049fa10d4d8b6dcb323da379dba0a8bbf231f6751a3be715b7384847d2730c SHA512 d71ebc7f8f90b4e80566a31b8eca0a291f51aeef5cc66f8c860581e69ca70131339606f917e9a1f0e99beb5132796721bc9033667c977ca4a92023be5c5bca8c
 MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
index 3e595d177050..55b8624c98a8 100644
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNetworkAuth, QtNfc
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index 417a0d567173..ccb8cc133e28 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,5 +1,5 @@
 DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0
 DIST PySocks-1.6.8.tar.gz 283450 BLAKE2B 72b52fcdb9f3dc3bd71ca75cdbaa159c0b35a81fd4ed9476ab043819dad3efac76615bc751fc6014e1358a13a3a735023bae7f502e2863b5e733982c16758db1 SHA512 9b544cf11464142a5f347cd5688b48422249363a425ccf3887117152f2f1969713674c4bba714242432ae85f3d62e03edeb9cb7b73ebd225ed3b47b3da6896d5
 EBUILD PySocks-1.6.7.ebuild 594 BLAKE2B 661b2dc419e6a329f8d05ef90fd455237dd523a02edbf808ce68bd65fb1be3793351b9e8ef46a4a81e6876ce923d9e5a06f1005e45938dcccff71cf270e955f1 SHA512 e401376bccc8ebf59c6736bd552ad95a6c1e6d21bb6316230432ed79b1cb2016689cad85f45ff83677a653b4bd33528ff21ef0b688da2aed6ec34b92515ee563
-EBUILD PySocks-1.6.8.ebuild 889 BLAKE2B 4304c14d6afa8b8e56a43e8837734073141207525d5b947405a7b6ef958aec5f33c656fe17d70ffee7d4f9b2c3a5f32a11a3cf266d5508e0175fde5f31d8fdd2 SHA512 309fc780fbedf51f2ab5a300ca7232b5bde9ecf59337769470ccaca3cae6354ca6d8972a181df83b1eb1a34f9c6822e1bc3b82a841066332527cdd17e48221e1
+EBUILD PySocks-1.6.8.ebuild 891 BLAKE2B 53563175d2a5238d92bfba2f0d5d3c544f1cc9bb571eb4071cb6f47f61cae67f3efb13abe8eba769347b9faf3bb70da3b2946e65569ab7b1ad5f2ba5327d1a5e SHA512 629e81b6f1f7a1c58df8a7212ad7ea29451e40fc6f6401b709623cecad95f7a50618de0e4ee2651697ca1b4577e4ee27c9a1d502292622fac8d339918a9d8782
 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
diff --git a/dev-python/PySocks/PySocks-1.6.8.ebuild b/dev-python/PySocks/PySocks-1.6.8.ebuild
index 95d6ac757db0..5fdcf84da6b6 100644
--- a/dev-python/PySocks/PySocks-1.6.8.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.8.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 76cb5f02ae10..fc94a0150123 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -2,6 +2,6 @@ DIST alabaster-0.7.10.tar.gz 10486 BLAKE2B fa4e08cc06a22830e7ad1a5cc5e2ead40d919
 DIST alabaster-0.7.11.tar.gz 10998 BLAKE2B 93975fcb93cac425d6db903f89c862041dd4817a1a411adb2b8d0e9af754be6f1a9649934b183678290debd71722146a547ced7407a9da10741d88a806d5bec2 SHA512 3b3762cc9f0a04296d07bdadeb7e77ae007e307bfad81d8ddfa8e883dcf7577bf544957b3664ec4cc354749fa249627071474466dc771c5883c75571c86d8f3b
 DIST alabaster-0.7.9.tar.gz 10485 BLAKE2B c3a22dd8b813f2dc717a1fb24d252db949f6336cb5b785603f933d4cf32236f9bdff117118d85ca3f6995e761e8d2689feb2c69be516ab681dc664323da43605 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8
 EBUILD alabaster-0.7.10.ebuild 549 BLAKE2B f77214a48102e0180908d429b4789c2506e443dbcf80d39526905b0d801536da43a53c44914f6aee5d214242f8a24ecd63fc1611769246b02f9084b58745e821 SHA512 c7db4066c01d964a285426bc8e783bffd085c2f874e90c339c6c666b751f23134fd135bdbacfd3519c8aa8e2fd8eab87e8da02f7e8263f4c6ad3fcaa9c9a0868
-EBUILD alabaster-0.7.11.ebuild 549 BLAKE2B f77214a48102e0180908d429b4789c2506e443dbcf80d39526905b0d801536da43a53c44914f6aee5d214242f8a24ecd63fc1611769246b02f9084b58745e821 SHA512 c7db4066c01d964a285426bc8e783bffd085c2f874e90c339c6c666b751f23134fd135bdbacfd3519c8aa8e2fd8eab87e8da02f7e8263f4c6ad3fcaa9c9a0868
+EBUILD alabaster-0.7.11.ebuild 551 BLAKE2B 5f556550fc40ea3fb2c19d49f0721c7a34ac7531ff90c6ffde8decc9037cbf3e75370295936d951ae68bb7cf000bd5911c1fb85f1825017e4c65e1646b75250c SHA512 24bfb0b2f393a2c4b0f295b2fea2add1ecb7e2b089a3f3a4635cc1671a057ff03c953ef51895f9166f562c8cf180a6f33d8184e32d7d93ce4479b19ae9f3f3dc
 EBUILD alabaster-0.7.9.ebuild 514 BLAKE2B a59f7f5a7a1da542c832ed7a186f77366caff8187c17d7992a2ad039c718127893f6efff900ac10186e76998af035b7f16314abbf8e899cef8cc8146f237e2f6 SHA512 5818d0decaecea3d5340b45c01f3e8e6000f94e7be42a018252a53dd8e9bc1dec17d806fef2367656a7be359b08da987143658895681c219d8e09f720c892480
 MISC metadata.xml 384 BLAKE2B 55991f34f966ecaa57dfd6474f3ffc0d25b04b106c3a45c6d5fbb88457598b7ea93ef5edbb84af23fcfd1ff4b6314c6c56397a5a52da64e3fde3ce1f40587d6b SHA512 7464f7780562e6a8aff5a243e0a87e08740b06210a25c83ec82649974b0b50aabcab46f6c35b5e568b898ae8a4d10087961ae8953785f4dab33b62cf782e4657
diff --git a/dev-python/alabaster/alabaster-0.7.11.ebuild b/dev-python/alabaster/alabaster-0.7.11.ebuild
index 20be9d08b437..cdf92e20f5e2 100644
--- a/dev-python/alabaster/alabaster-0.7.11.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.11.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 7c8d8633f08c..4704b76dd0d6 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,3 +1,3 @@
 DIST apipkg-1.4.tar.gz 11224 BLAKE2B b59e3fe39030f1f1f7f41e121d7a4e242d7155be5f7b2b8f3cd7550772acceacaf2d9540cf98bdb51e6d132af937d634bce3699b950b9d9aa9a618009cbaebb8 SHA512 118f806706944513f50d3cdef596b32f8ce585cfaf94d2531a6d260f90a0e2147177161aaa6f5d6823150e6182d0f73be3dc01259b8a2f8d710733a22ea54789
-EBUILD apipkg-1.4.ebuild 811 BLAKE2B 6291106d4ea94668260d2ced86cfc327ea414a4edbebc445677b50bc7121948865f71ae7a8f60ec356744022bf83f82f446782a9b69cde183dcf8394bbb38750 SHA512 1c8491fd22a97059cb51ac4834d83633cbd3289904f65c87e7439c287ee380dde3408e322c3220334a791bd1d849acb272d72f96659d20463888a5278e790ea8
+EBUILD apipkg-1.4.ebuild 813 BLAKE2B a7bc5e252dad8a9ba07af06998ca4d422706a7cdcc393c256812205f484586635474c4c3463f5d7ebb3568a4b212f39fe14766fc5c05629469c25712e8495bcc SHA512 903743ad41540d81445196b93cb535ef0bc3cd325e4306aa289efe26c691f2a2abb61f1f2bafad1c71b1cd1cf7b6c8f18f661ca3801e9f13af48aae6b7905f06
 MISC metadata.xml 309 BLAKE2B 693a9a5373548cbc3c78db6df12bd9dc7aad3bfd3665f702f65a18a1799dc089869d5577ff6d6dba67573393970d8b85c356387a53786376503d33f979bf6e52 SHA512 0f74900faac286382377f2233aaafc9a6e8d7b49c017f60c7c451728d67cb9b9505f57903901a56f67327364951e2e7ab7dae7c852ad70b16070ce48ff3f93cb
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
index 22b3c3a64f11..ede0a24c6f78 100644
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index cb1a5582c90a..d246814ed6a4 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,4 +1,4 @@
 AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
 DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
-EBUILD appdirs-1.4.3.ebuild 1187 BLAKE2B 8435f5c829d22d9f0c84d45dbd50ce1de925e97b3110b85195881b24bcc2a7ff4988ef4a3b99982f488cb71fb3c11c1e02ca8c596adc5ca1c6716bd3847bfdcd SHA512 a5904317594dfc2119a9da22b6e3cfd9c0d7a6bcf9721c506cb51e2202d8b181acddd91a99ea6ab725b0836c7a188bff49fbe191a628b0af89730d9ec387bb0f
+EBUILD appdirs-1.4.3.ebuild 1189 BLAKE2B b7153266dc48ce033932233d18e169bb52d5cd3f6a5e01c3b10e19a215441ce1522fd0be1e508f10ab3b6e550b299f4d9662db5d9e11f8e502eadb93b8560d53 SHA512 0b87adff7128a4d724d3a410970367630f5fa39a54eda3abb134e5e44164073c487e5b8177e9a1b4c64de7c32897498ed2719ccfeb766564b8389ecd165ba730
 MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e
diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild
index 45809ec5dfb9..424b6ea510b3 100644
--- a/dev-python/appdirs/appdirs-1.4.3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index d6dd186df8b1..146846dc7d39 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,5 +1,5 @@
 DIST argcomplete-1.4.1.tar.gz 37219 BLAKE2B eff9c8b8a2996d2d57ca99516071a1c831f9e64be4efd72bf930dfe7fb2404db2aa03546e761ae73b5d22f8ebe683728c433ab837eee5c073616e7d32fa32010 SHA512 3e9fa64fca93baf14fddd653947ff0269004e8783de0567931dafb9e4d0dfff2e2450ef6df331a4d648f5ce1d817a422f52d8d30b94315cd54fd82102467ded5
 DIST argcomplete-1.9.4.tar.gz 47471 BLAKE2B ba64acc1fb2ae336166504db3dd991227c4e2a04abc6909ecf6723c1d2ce82ea65453ca2dde97316da9eaaa5b60026a6c8e4f3d658f1ed8122ca4fd00723fca1 SHA512 831958dffc75c65e2a63918d1e6f5e1fa47ec753b913c978e8d1d30d430ab8fedf66c99d8df23b2abc547b42c27335ccf47811224322994316ca2225c85ce346
 EBUILD argcomplete-1.4.1.ebuild 966 BLAKE2B 3a049b2c11a5dd77b7734f7fd2dd10dce8feb20bb2453ec66c687ad7791d72edac3f56f247d2c7e39e77b7f393edb397bd0d4102b28d89d8c73a9de292c42e59 SHA512 29ac20e6a8ba868066bbb203e82fa30496cc5a117a5ec5719fab3b0f347128b0fc3ffa1241e42af08e87df7ba3df50e78466683a10e15899b452919460bcfd25
-EBUILD argcomplete-1.9.4.ebuild 778 BLAKE2B 46c160b6c5493842a52e8c07a0146f33f7528624b552e957923af489acecd6fe4fcd46ce59135f0538b6dc4b69888b87f11d1c823c5d32a36e9766e7ade8fad9 SHA512 434b6b83b2a961542ae355a3fa23016d7d3fd855988b5ea1ff22233d93f265e43cc7639ce818f1990e065e8e350b0118d627cc176e6f72ade785b59484ef5b94
+EBUILD argcomplete-1.9.4.ebuild 777 BLAKE2B 1e3a96300deab5ce6a97661eef0cfe277e158f2f95eab32dcb5606b1342993ed9bec0f66a085e844d88748ca9f762414ab9e8a5c3007cb69fec8780bcede47df SHA512 4c29afc5cb98fce869ada9bec5bbca0097c19d22647aba6fc3d71425c1310a2d25971d52ec68529780cec897c19306f338dd37aafc00173b618acee535ce141b
 MISC metadata.xml 385 BLAKE2B d552f29df1805f58bef2bbaf91166ef43daebf78d36a079c9b93bee54a8165d33576e1f9c238e7070f64253e0ff71c9b6a18c63b3321b5a400f8d287b10e4a82 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d
diff --git a/dev-python/argcomplete/argcomplete-1.9.4.ebuild b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
index 03a25240d56c..605dea0b8c71 100644
--- a/dev-python/argcomplete/argcomplete-1.9.4.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index ec190b23854f..9ae4d9ed76f7 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 759 BLAKE2B 2391496d3b56d02611f7bebf585d646b96cfce3ec11427ab3573a686f0da628f1f33352ee30a78519f69cbb445409ae89cf81156c168514c97135857ec5298e6 SHA512 08645d7ad9306603a4025e5f41e452415a9d0c3f84680d76d38f71ab284bf79e8cda6f5f1e0b6e2cd380c0ebe8ee27a22999c167dcd22913e0d5ad6dd98a0f42
+EBUILD asn1crypto-0.24.0.ebuild 761 BLAKE2B eba0f0960cf374ba17884e0234d0b2d80b9d261416e894603cd80a1e3c540f812663f4a42ac9d27076512a0eb1be82885437a16df3f9a23f774bbce18d169276 SHA512 82632364cc7e20566e8d0c7ae5101a19961c27839c3b879d84064561f3704c7e425e1d12faec0046d3185bb1e7f232a48e247e8c55ca317d64c1f162b04c736b
 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 4c0223c37691..d56c1190aab3 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.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
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index a56e12e38455..073c912cb570 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,4 +1,4 @@
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 EBUILD atomicwrites-1.1.5-r2.ebuild 578 BLAKE2B ad9188acc6f21a3352510d2efae465d010e763f21f45d6604979b4a48da0e77817746037f8472bc86bdd034163e0c75da40a56784eb0e979e856b5dc86d8eeb0 SHA512 1af57e581631a2cda8f7ee9de709bbd2abb1475d5f25331d9fa2683e5b75892f897e68f092f96b5ffe522a5d2b1966aca0a81a37fe80c38f08b9599d63d2b715
-EBUILD atomicwrites-1.1.5-r3.ebuild 915 BLAKE2B 92a50d27d0c31ee35b3315706f77c46e87ac5253989b6cb6911be3de7c6c354ac1d941b58de4ee8efa4f01d16726dc63738344f2cd6eaa405e5adc9c5930bf5a SHA512 3c6603a11de4d3420d40f45fa9fb3a2dd63afd647b9ea37ae9374df148d075b4e0032cfca31baed6daf4c9737251f1c7bbdf7ae4f786e75cbb669ee719971798
+EBUILD atomicwrites-1.1.5-r3.ebuild 929 BLAKE2B 9efabc3dc2005f270e2352da541da0bb1797d32f7b50cc0f53814e87996111967ce8cdc0bcf6c479dc870d16e65cbf96013015241be44d35edf20c4e9cabb924 SHA512 9e6d6b640e0ef4c1d315cec196ff39540a376938e08f305de02301ec2dfae3b0c06e81fbd9e38f4924e3aeb646a699ed2653acdd0f454408b51e5ee7d844c313
 MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
index 75fd01fc4968..b7da5c5dfb07 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.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
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index eb71181e6c33..5011fa6eed2f 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -4,5 +4,5 @@ DIST attrs-17.4.0.tar.gz 97071 BLAKE2B f755abe89cedbf1ced003087fb106fae7c38dbdf0
 DIST attrs-18.1.0.tar.gz 106346 BLAKE2B ae17d5e6cde83e5a652b40facffe3db2ad9d6940ef7e00a10c3d02b6015c23e9e17e125ec16100f1fd5e036c9f4e88cfe01b23b03bacdc36446ec0ef1dcc57a5 SHA512 9aa4421d1c16614cd26089c219f70602fd6baa5fbbf4aa96def189e9a41f8c761d7f522c5e167a63e366cf8b46e87477c345655f09738a14981bb40dbcd12b91
 EBUILD attrs-16.3.0-r1.ebuild 870 BLAKE2B e7b23da8eb4bf32594bd5bc17924231a4c42a40efc80963522a32361b2315aba095d6058d27351d772a91de029ad61ceff9a3418c4969919abe43264f8053cb9 SHA512 7c346b07cc557a999fc224cab21f3807bc10bb1e8b051eaec7905f4fb95f5c87e71a3081bd2893d8e371c08f43541226810590d5b43f801d1bc69f8f764951fe
 EBUILD attrs-17.4.0.ebuild 885 BLAKE2B d2e70f4ca7c9b7e1f96d671c757ff14b56132f139458996ee473f3271844c2c0c257443ae26d48d600d666de4a35a763d0d92acf67cb0df3c57acd01cd23570a SHA512 28f39a5c0e0caab4603757f7169e0159cd8aae2182b0a8c5b417125a14e28a31e6873076e1e4bd09588f818304faf549a14199e93910da8c3c88967944d77f15
-EBUILD attrs-18.1.0.ebuild 886 BLAKE2B 0ffe6d1e7b2b85f299e673f738fe7abca8c38e88f875191678367d2044a7e5552257d387f1e5c12080dbb883d6c93859728061f952ff57ad5b687624034810b2 SHA512 dcfbb5acb2f225437fefbfc41431fa45fb7d3349560bc960f83a83d3ecf711e8a6e28781c02d1e6d44ac31dddcec2e859340b7ef31e26fba2eb07725468f83ef
+EBUILD attrs-18.1.0.ebuild 888 BLAKE2B 8cc377f4fbd672a52828c293fc9c5d2afb2674560bd87a99eb3ac3533e9f2e60367b61a6711a8dbd44dcc5423a2b76ec6869bf213e77fc5715b1fe420359c377 SHA512 6024a95222e50e6af69d77178f77318424f2617e3b9a48b236e128b35635e3acefe9785b7011257fba04d46e3b6a861fa7045a1355787e83d81b8625452b70a9
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-18.1.0.ebuild b/dev-python/attrs/attrs-18.1.0.ebuild
index b9f32fe9dd4d..d7b72c150caf 100644
--- a/dev-python/attrs/attrs-18.1.0.ebuild
+++ b/dev-python/attrs/attrs-18.1.0.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index fafacebe9008..d8cc8146bf16 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -3,5 +3,5 @@ DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b
 DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40cefee847061a2019bb27f0982091e7628737211421ada351937caf9c6734cb445ee6462ce84b381030b013bd05 SHA512 a6f307d312a3ceb721071b5212297c73d2306894b5fafd39265578041a2859bd6f041ac43a654bdda4175a70a4e90e0db1ee35cd43fa620cd5c594b5d1988a74
 EBUILD automat-0.5.0.ebuild 1217 BLAKE2B 5b7feee89f96fadb7cfdaf227851f149d8c8466b272147c3966fe624ce697cc0150fded545ecd9267911d87cda5a6f6fc8255eef48df1a23650923f12b6245ee SHA512 eac5e670d9227e2bd4f78bb4c0ff986e2dcdafcd79919dab1b7273be18a47d146a5630e119f450f2115ffd8303f40d57758c4c4558555290d0094e94da029c8f
 EBUILD automat-0.6.0.ebuild 1235 BLAKE2B 1ba6654e880bb8e13246a98feeb08ec8f75c49d4490c782a3efa7be379a71a2256d3374b0ed121f84cd3b6dee9c5260b68298a34a9150d2288c6f7a6c224040b SHA512 e24ad712828ac8e950f5791c60c49fb5f1b322b70cb726b5fbb10092795d2d8bfe08767103da2cf2255113b8a31072e61e7ecfd71f5540323e35eeaedcf0321e
-EBUILD automat-0.7.0.ebuild 1431 BLAKE2B 6fd77980ad75e1a392a7f6ec6bdfdd293d57b8bf3a136a9acfcf3cc6c02b67905d088b27850db08d7c5e1f5e998f3d58ae364a1e3ed5dc3a9396138b971aa1ea SHA512 9f5b43144be52d685b7660dd168cb08772e1028ec49ffd2ef2884b09c705aebe6f58f24683b8b50549bf3dca68b9031497c3813f7e95101326bbbf8e978fd0ff
+EBUILD automat-0.7.0.ebuild 1433 BLAKE2B ff3a4d3f9e18c13a1ba420ee0e0d7dd565e5a1f6005808460803dad9910c093c9aacaf3b4614aef9b66aa48f0029bd81fa4400cbe6df85787b34585fdbf5caf0 SHA512 6aea5cbfb8bf3ea6fbf04f4cfba6f90a8c734639d0fb61830bf7413ca2aeadb603e3deaeea940ea6ab39ad7cc3bc218847a8763a1833996ac33b45f6d626667a
 MISC metadata.xml 622 BLAKE2B 10fa7f62095186a07a588b374c55dc084a483ff8848caff3322822964d57175a729e82948f984f4348a1cd0e5d7bc08c1d548ef674fb93aa08bd55343c53ba63 SHA512 f9feb6bd4b545a707d0539d42d20a0371eeb8a9e0984e922b3a0416a0dda97b6783c21cf1ec63868c200535d9a46e80b820424a1d7199074419780b3e7328333
diff --git a/dev-python/automat/automat-0.7.0.ebuild b/dev-python/automat/automat-0.7.0.ebuild
index 9671b0f11176..3da75c199ec7 100644
--- a/dev-python/automat/automat-0.7.0.ebuild
+++ b/dev-python/automat/automat-0.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy)
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 143f137f28e0..f783026db508 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,5 +1,5 @@
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
 DIST backports.unittest_mock-1.4.tar.gz 6034 BLAKE2B c347f1d45c610701b605cb75304f93c8fc7a8534e2c14efb4600a7c5cdbcff02e0534dbf572ac248d17dbc161dcabd8448941d8340a71734f29ff3294c8210f1 SHA512 ad19eba7c221fbb97ba710cbe96aa26de74ad8c70ea7b794d8dcad3dc86a55a45d36f542ad829fb8c4bcf09c772cf64532dabf337b40bf87c7b29e13236484a9
-EBUILD backports-unittest-mock-1.3.ebuild 1484 BLAKE2B a911092d905b3f6bab21065e8ba42ef79dc6dfc108f6a01001008c8833b2702a2293fbfcd30ee1ff5b5d26b43c9c2644f95b2f70fa09089c96faad6c66f5b416 SHA512 de31da2c1dbf0da81073e848a42045ef58d13363f000b85fce8c96a726de0c976de8d84abd54cad23f525c657813edc1d5b87d72d9cea35287353e8cb7091ec0
-EBUILD backports-unittest-mock-1.4.ebuild 1595 BLAKE2B 57401c88993ecab018473f9ff449e67132a567cfbeb98f01e89ced7350bcd83321a3480d39f0bac7703636df52c041026dccd96311a3acc0217e61f2154f8665 SHA512 ce231f12bc41423f1da9051c3c2cf189048556e1fb826f3d30426a670c0c5f6b186f41d95d37572bc79bdeb479d67bb62d46b3749bdf218425813cd244ba8c08
+EBUILD backports-unittest-mock-1.3.ebuild 1488 BLAKE2B cfab15cdb70e20c106e8cf433c8f0cc38fef786ec2fd27c8de678410a19846f33cc50ef26f98bee0ba7bb88eaa02e2b535fc6d56a1bd2536d5187e87fc0decd3 SHA512 36e6f557bef237197958df3af63d3b948db9e307a3c4ee61e34ce001b1ade6d29fb1a69d714ab5426dca8f46c8f3a812e2750372ca5c265d19e3ddb3750d81dd
+EBUILD backports-unittest-mock-1.4.ebuild 1597 BLAKE2B de120a16c6ea57a89c6df77e41b354ac45f91631757f61e5c6f089079297a75fc8effb7ebab1db4b914fccefe0d292eac059096c2925bc5ef43d22ea3cf8ec6d SHA512 5997255eaf6d77ab4f258016cb80a85416cce58c353312b793503bc776956b88b312cd74e3e2282f1b29a38d20729a4d35e3ae7e405a2aa153af60df5149a875
 MISC metadata.xml 657 BLAKE2B a5a51b30ebc334f17d09e38e1f42fc1e06fcf65de5a56810378909169cdce48bcb0acceb8b192bec54e67a254b0809a0339fb8ee11fee48e043a082f63fb9bf9 SHA512 5d0e58887da4b7362f3469c218af61c4ec31426aec212013f3ee19992fae9e664ce13b226c928fb0e6e6ea3efdd946d1c09b1da623a741e89b7b68b74e73cf24
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
index ff94ba6873a8..526f62e89be4 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # It is the developer's intention that backports.unittest_mock will be
 # used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
index 63a89653734a..37de4b04ea65 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # It is the developer's intention that backports.unittest_mock will be
 # used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
index 47aae2f1c2e4..82c469f19680 100644
--- a/dev-python/backports/Manifest
+++ b/dev-python/backports/Manifest
@@ -1,3 +1,3 @@
 DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
-EBUILD backports-1.0.ebuild 621 BLAKE2B 12d52a0b3cf6dcf5aa7de9702723fc36c1a5c7e7198c477712448905ad365ddc469b00628cc0e01e56093b293e684553b87ea945c227dd3975cec38af81c18d0 SHA512 d41c02868ee1c8beaf20fc82787e38772f5a915805b734b4a85766be17898dcdca4d405cb17ec943e27ad9564dcfdb3cc2154603a201c4b8087819ac0e30a837
+EBUILD backports-1.0.ebuild 623 BLAKE2B c33976d5ecded92b81e598e497fdb8a27200e6013e8527d09f93f862e713b9343991e4b8e1d748f4d5a56af41f0edb0f183f0aa4c25426c0a0c2b4207f592ff2 SHA512 75203b8ebc77e595995217c7bad592bb4307fbccb8e2b07939d6673eb070f0e505a414d29a9f2dd2b8525f46329ecf0518bbcc03201eed0bf6e36e178fbf8dba
 MISC metadata.xml 335 BLAKE2B cd3125c95ede34cf51567293406cfb3b489874a7a2fd594e157c9167fa2b3d0cc5a4eea670851a648ed81100f0ccb246ea64d316b432d516219f61c02425feb2 SHA512 d0432bc56a1e591a0f699d61f2195872cb62e591027212cba00a127c89d9a2c29a54da495436233ad93c3868f98b184c73da9057be26ce9abada2516be518e30
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index 3859037d5e64..b2d5b07b2588 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bcolz/Manifest b/dev-python/bcolz/Manifest
index 1b72a8b923bf..934578aeec54 100644
--- a/dev-python/bcolz/Manifest
+++ b/dev-python/bcolz/Manifest
@@ -1,5 +1,5 @@
 DIST bcolz-1.1.0.tar.gz 914616 BLAKE2B ccc5ea84907c16df6aaef4a85e1b89c415b909c240d56746ed1144c22255c7d5f85cd791ba99b3cf5777c2459ddd5c1e26bf489fd7b1fb69709b587033040019 SHA512 77d3cb45658304036273ebe7ff006d3770d86745e8bd1dbdb07db0a2a1ffcd3268ceef2cbdec0579e8e65560706eb3ed43664c90078fe2811a497b4abe01e511
 DIST bcolz-1.1.2.tar.gz 1271418 BLAKE2B 322a755ce3a744d14e185a2a242cd9c2326033404f15a8bef789d0f9cb961a63ad12aa28860c0f62577cc61091983e17e043deafe7c2ca78f0ab2c620da2e395 SHA512 cc0149b5a8a0ded7653c4f1e2232fbf8501027538a3e5d8de4be0eed096e17e7d3845f19cb687a533a4c385b31f5a5262fe140a27ac63b434b57667ec5a55e66
 EBUILD bcolz-1.1.0.ebuild 1401 BLAKE2B fea355dbb044696a1362ab2325a0242621632195bd9afcb47582a5d16a9127603d2e62c19596b815939f7615a7e3fc2c0658f0e462cb1d8557843a7692119b6b SHA512 77fc5b1c56372ab79690793194d22d7bc8b86bd2b9fdd2cd2592a4bc8e0980d65d583895708bc21dad28fd557178fb36e82009fac673156281cd2c207019cc78
-EBUILD bcolz-1.1.2.ebuild 1141 BLAKE2B 50bf6e1318baede2fd1e23a1abe8389451bbef5f6e856c12036c6676b8e6511628d061b067a3182320c07cecb96dfd227a5268f36c60f8e9eb0d27b558476460 SHA512 11f713a18c5f8ae770fc8cf20d9339764ad6777305d3b53a905d18550485644109b680dbb2776521939be02575d855199565d451d548ded58b34b51b39fb291f
+EBUILD bcolz-1.1.2.ebuild 1140 BLAKE2B fa182c1113deef5de0c1f282b65b1a353788266369e88efb814b9767cbcaeb689df0e942a98c50d82673d8b685b1cf8a597cbad7872853bb25056dae32a1c60b SHA512 759a6f4c1961e48504b3deccbf452df263e52148a51b6210aeef6b01cd0a5cb1fca466f5c62a704d195eca3aa326fcf53937aceea4095fb9351a3c1aab82b6a2
 MISC metadata.xml 853 BLAKE2B 65ce8db96ca80674e08d006cc5b986cd88868f0b3ae4581cf4cc5e785062de60fb6990c286006e3386443dcee4b1890bf973790ff38a3344e2fa01eef1567440 SHA512 65bee839731be99ae673f86f4d5b791bc115cd5b65f3fbfc79c7e2df35dc08af59bb2fad4ab3b9ee2588582644b10153f2d932d2c292ab0e1fb0db92d88a631a
diff --git a/dev-python/bcolz/bcolz-1.1.2.ebuild b/dev-python/bcolz/bcolz-1.1.2.ebuild
index 354447a3501c..ebc0805f1ff8 100644
--- a/dev-python/bcolz/bcolz-1.1.2.ebuild
+++ b/dev-python/bcolz/bcolz-1.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
index 8f6a83b5b39d..b42d11508a7b 100644
--- a/dev-python/billiard/Manifest
+++ b/dev-python/billiard/Manifest
@@ -3,5 +3,5 @@ DIST billiard-3.5.0.0.tar.gz 155959 BLAKE2B dcfbcf7ca7d53cc1963d9753736e1001d2a4
 DIST billiard-3.5.0.2.tar.gz 157299 BLAKE2B 1400d5a562dcab33c83a64cc7f7d14ad55b75677c3bb4c050cd4ba08a1f882e65d033653628fc3f2b52942081da3d5661fb0bcc5f2dd95f81a64749cd47d324f SHA512 581e1ac361324b36d79e280072952e490ef3470709b094f001c579feda54578c8e7b3e5afc93a5f878a6118c56afff7e59e13b3d3f2ccb2564b9b27cc810dae7
 EBUILD billiard-3.3.0.23.ebuild 1488 BLAKE2B b037786b4be54a2c19816d8649c159dbbc028ef2a00279a43e991fe8548b0e71e4e7b10851ab084bb49ec34ece0c4b35cb3ccd5180b02cdb23ed3417152f6ea5 SHA512 9418cbaa16bb543df4d573492e4d5f150a81511c12399bcfde4875b5bb62df6c5ce5424989015cd93f92703283c3faf8be36ef5ddc501ec3520daf5b71159dfa
 EBUILD billiard-3.5.0.0.ebuild 1526 BLAKE2B 2c0f8fef8d5eace38ce9b4ce8f0aa3678096f0ef7b48834e58219e7e9d7a982f3110e68f8046deee76c814a6117cd2926fa201fc160d5bcd62d81412ca4fc484 SHA512 bfcf1d875352065d91974f2927d6053b54850477b16095a90a2e2c1a97aa8114e90d33286ea90ab0d2dd78de96a169925230caa855d708e65f1dd4aeede4dc5a
-EBUILD billiard-3.5.0.2.ebuild 1053 BLAKE2B 668a8a5ee0d20240b19a6f375e098b38feb1401f58f4a5ef68e6dff9c0327342d29d70d49b35d64deb2fc3e9f8d8758d2b388c9373bf7063bc61bdac6d19bf62 SHA512 82d54f2cf9a6be570d21e2e231d17ac5b4f2fff7aab27cc869cef00395b106b998b3f20117c6882480c2a9ff7ff88cf5fb0a634e28754d6d2557fa2316b0ff0f
+EBUILD billiard-3.5.0.2.ebuild 1052 BLAKE2B af7b79350a0140953e5c6f41de9b3cf2cae60b4bbe703dd878a093ea1fc1694db34d13d86b15abe23bbd972e4399afe4df3c8da807cad9d93b6b6f4ffdf300bf SHA512 824aa93d21111c9c37ee995307334ceaac15031e0321fcb7a73f7c54f87f6428f25ec31b262cb5a576bf2640dcdfe66e8db85b333b3bd86aee382f3b8e342f7b
 MISC metadata.xml 366 BLAKE2B 1ebf602d203fab55800c4b1c9df304a2eabab36beac69affe09a3429cf94daf9481436f4216f7e697cb4dc864962ed3a0d6ce3c476dcbc325292c7a38e331718 SHA512 f9784ef6cb7607efaced1b96745e9fcbfb13cff64d2be2cefe2e28e5475d8386daa675592f22d8f7fa23949cb015de73583dd8ab392aa9b6383e0befe30dc8d4
diff --git a/dev-python/billiard/billiard-3.5.0.2.ebuild b/dev-python/billiard/billiard-3.5.0.2.ebuild
index c02f3b17638e..0a00bd984dfd 100644
--- a/dev-python/billiard/billiard-3.5.0.2.ebuild
+++ b/dev-python/billiard/billiard-3.5.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/blaze/Manifest b/dev-python/blaze/Manifest
index b8b3988b90bd..330e6becfe06 100644
--- a/dev-python/blaze/Manifest
+++ b/dev-python/blaze/Manifest
@@ -1,5 +1,5 @@
 DIST blaze-0.10.2.tar.gz 9681767 BLAKE2B 9972d0f9bb00ce462f20673e9e164d504bc1157730bcb36a42b53ed1523a73bde36a1858ba7df1f813c126291251c6170da8ac70aaaac8932206de5f3e063a10 SHA512 01b7c5563f928c336f13eb13c6397f1089bca7c1cf0824da672acdabf28b18356c52678c58b2fa7af303601c6013e9d6f4fe26359ee6ab9a01f8b735c7d24a56
 DIST blaze-0.11.3.tar.gz 9691443 BLAKE2B 13734e3b2f63ad044991644a4c8243b449c5179a80efdaa5faf6ecf443434bec7a00953f0f17d73885b9e9fa506e72a9bc369380d2d7a561f5da064d8339e03f SHA512 030079e5d3f17355dac588154ffb7ba7993935dfd39bce141341b6e2b9a17f812982ce83776ac1e4224649a343b58615621347ba65e5aba2ca2e568d755f276f
 EBUILD blaze-0.10.2.ebuild 3169 BLAKE2B 251c9d778c6a20502395e5eba9d9269a3adfb3a7adc532ae0e41f8c5ec0495fdf9f61dab81de53967d62f80ebaf139e25dcabcb03175a432faeb32ca89454157 SHA512 53c7041857c51de3cc55485f4a235f92c44320ac1c802fa37b6bd716ff0a2e5e275d2814eb7324da169761f096f440d2601b504ecbd2ed5ae50ca90a4778dd98
-EBUILD blaze-0.11.3.ebuild 2170 BLAKE2B e28ec9f152270027a8e1437df60d23d1ed999d3708942d87373e7c96c308bd85a58c9179ebe8210195d7c4b76a074e6cdd6947682a7a3fcca03077c63da68769 SHA512 b42644dc3720168bb1d6fb4b6f818543cc0ccc9a35a345d69606f3d2ef30027f048aa158c98876491333867f919302fe9c141db2c9f66a7a3040ec90c963144f
+EBUILD blaze-0.11.3.ebuild 2169 BLAKE2B 0ffdeef67fc94e45865f17599c467ddc7429784a8d37cb3ee0ad51564c5ad25929541b4ea938aa173d3618bac3c0c95bbcce2b6f28edcbe8908bf61c6dd2b392 SHA512 02d0c9a2e02bb78fdf3d96773d815ec0f735d9b8e00826004f3710f47a099f14a5b36049dcce369ec6a8a14bfe780b94f7759f12968077506325adf79eda9a64
 MISC metadata.xml 619 BLAKE2B fcf9cafadca88ba8f5465f681c3fc87159a1e8f7fde68007f85d5f424682fcf4fae81b6002c73043f1fcb6c492e618277a2daaa7140086324ad31d84cd97004a SHA512 2fe8804a4e526991e088834f7d3a49a1273c8da255df259a3552b4a4613bf0386bf464e025e191eb0087258b53a003efb0b6ed1afdb5ceb5e9e7c1c9ebeda7b8
diff --git a/dev-python/blaze/blaze-0.11.3.ebuild b/dev-python/blaze/blaze-0.11.3.ebuild
index 0eec45f052ee..30747c684559 100644
--- a/dev-python/blaze/blaze-0.11.3.ebuild
+++ b/dev-python/blaze/blaze-0.11.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="examples test"
 
diff --git a/dev-python/bokeh/Manifest b/dev-python/bokeh/Manifest
index cebee92ac176..4dfd8aa6d952 100644
--- a/dev-python/bokeh/Manifest
+++ b/dev-python/bokeh/Manifest
@@ -1,5 +1,5 @@
 DIST bokeh-0.11.1.tar.gz 3383140 BLAKE2B 68a368d7817e4066378018e6283177d5b8cc7e8328a9d2db0b678514016fd54c3d6c7d837e4df0ab0668539fe403a036cb660ea475aded6bbc685a138dffc087 SHA512 18cfee85698f1ba548c34fb223dc57e36584951064e65fac83cb8388b129914a8f67970a133ef2d1a67c06e50cbfb565a27d33dc9c90f5027a1739d400894706
 DIST bokeh-0.12.6.tar.gz 13720124 BLAKE2B e8fc1c42b530622bf6de8e13e81ae45e6d47985cef1ed81a2e32bfaef2a246a09c25210728cf434da6d4a0ef8f47ade1be5ee9e9318cc0a071bff36b317069a1 SHA512 7a293169521b690bb2cdcefe3667f869e75f2b718d6122af63201e2fb2e530eba931b3fa2ee3474a8ead758039cbb7d756acc0349e2f0820d72a4f754b9301b2
 EBUILD bokeh-0.11.1.ebuild 1976 BLAKE2B 8cc911f6f3a04377abd040e5e591aa5f98a4de75aed7501c1bfa6784fa927822c2411759553ed7f74ab40b6e662546451971d88ff4cbd0b44fc2432ef415850d SHA512 be33b62616fe13fc8d3c5f2a390143e929e57505169223e69ca4eb99c7f2357479560c8ca9bf100df8dc49fae30e2cc9360bb1b9141eaa7e696eb63901e26303
-EBUILD bokeh-0.12.6.ebuild 2137 BLAKE2B dda76af573d925a896da70fb990cf8f798b0fd6748deebd6c40354502bfaf663b196bde2064a4334b80e0f793f5f918fc07ade3f9fbaaac4e399a0a865d1b8f5 SHA512 e11b803c1d05a2f78af7b30dfd7a52d6ca3fa68a134df4af7bbe1c889c64f1e105fd6563a2f2206d1ce612849b05ec5bf6ed2e6f77486b50bffa5b68e86887a0
+EBUILD bokeh-0.12.6.ebuild 2136 BLAKE2B 6752728c91d3c45ed3a060a87872ce73a6e4580c8fe3d34a297e04bab8c1a32256a7bfc836a07c1b79512668f9e1f5e4a5e69506df8798e05c9f1721a813b080 SHA512 b6e719dca1eccc9e92f509bb754c9fef4e7348144d09010d74399d3e701af875f682eb517dc702f51d81fb7916b43aee49b97b4032837f3f39dfe60fe5e84916
 MISC metadata.xml 879 BLAKE2B edcba4dfedb81192edd9a32b2ad320582129f0efdd9ccab46d99ebc0e561784f04f53fe1dd80243513ea0a69ab3dfeb1d36cda6a5b37585cc26e2c203194a8bc SHA512 46419cc11f266c9e5d51b35c4bd4a75c4c82446dc8a9f06b6ac7ef3c742a371334b56e98a4bc831bc4f5ccee0222ba7f2b36a44d32fc4ea3aaa092b32c7429c9
diff --git a/dev-python/bokeh/bokeh-0.12.6.ebuild b/dev-python/bokeh/bokeh-0.12.6.ebuild
index e3483aea8436..367f827dbd47 100644
--- a/dev-python/bokeh/bokeh-0.12.6.ebuild
+++ b/dev-python/bokeh/bokeh-0.12.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index b32cf4c6eaa3..da5008ed2891 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -2,5 +2,5 @@ AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca9
 DIST bottle-0.12.12.tar.gz 71554 BLAKE2B 4b0d0d77c5ebaddcafd44e16a052535ded566245324d39e97a39dd20a193360487f9489e8e89471dd92ca35d6c5b2e8cbe1572a958db31b69d32d3e32f1b6403 SHA512 cdba3859129680f08b8c641708fd884ccf46d404786cbf48435d752fece998a446f49799e4e05e979b967843866f3e966a35a6cac7aed3270df55fae508bae31
 DIST bottle-0.12.13.tar.gz 70870 BLAKE2B d8bdef473181ce1cf6c0d1ea3537c407e68d23c1c44ca33e26c647d3b3783040d466b594c56c10cdd007d23bdf1708412d3e3ff108effa9e8a92e1b22f7a6c69 SHA512 86d106eb08e0b736a85aa69871f2d1e23c1d6f71948b85718daf131002c53c000e092ffdfe5b36c60460473467a2ca2b5af19767344689ffe638245e6859a80b
 EBUILD bottle-0.12.12.ebuild 1436 BLAKE2B 1f9e88d48d449c2754dbc0fd53910ed082e60ec8d73b0ed07e2c1562a9149cf331b72193e9a6803247181460c1ed4305b7af52278603df6c6e6cd414501bd38d SHA512 bfa08b0c9e6826f11e2a3d4818205d3ad1a193cb3838eb777e2e397c69ba4f3763da3b71233d091b347329ba95673d2d8ba2f7105cafa8c712cf1124a2ea951e
-EBUILD bottle-0.12.13.ebuild 1457 BLAKE2B 0898b64962ed5aa1594644ccf9f3f0b32ce830c9f21c830f239f8dda3a19f7d3c6cd028651179ff8a0308d90733ae992617757e981cff9d69d8eededb7798a08 SHA512 542bae4260e75b1ca1953f0c2fed718837ae6dbc35a3a77f928abf7e5cbffb5f58e81f00ec293c1d4ab64c5a0888ff3405adad578141f658e1aec2f4a4ab89eb
+EBUILD bottle-0.12.13.ebuild 1459 BLAKE2B 55b14207cf3b0e0f1e59c9149308494ff22181cfb163811e60bafa185f96d7c854fc9bc3e682e3a1688ebfd41dd8935656f762ca2df247575a7e4c912ebb5db2 SHA512 f135aacec7b08d9daa733f8ba36993b4fbb7e84a57cda28bdc18d642f0b8019d2f1fd494875715a9e8ee25f32cd7da5448f159571a4170c415a0a81161df5ea1
 MISC metadata.xml 319 BLAKE2B 29a2c856ee0a0af9214a5cec842b697fcb095d2bcf4702225b2e81d4f715967c29a383da78c43ac60d4464e27e651e81f1b085684b0b6f39925a6df7c36a54c4 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251
diff --git a/dev-python/bottle/bottle-0.12.13.ebuild b/dev-python/bottle/bottle-0.12.13.ebuild
index b75ec9750ab3..9dda25c9e7dd 100644
--- a/dev-python/bottle/bottle-0.12.13.ebuild
+++ b/dev-python/bottle/bottle-0.12.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index a9d9d363c8ca..54e68a9b4c9d 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -8,5 +8,5 @@ DIST celery-4.0.2.tar.gz 1337804 BLAKE2B b040ada555d02c2c943ac86211b06d03e738db5
 DIST celery-4.1.0.tar.gz 1331689 BLAKE2B ac134d26a21bfd1172ea7a2ccc5f9934b4fdf56dccb6f840726040adf5b81ab0c675c0c93754340c0429c4eb5777a344be74415a795a9dd6654578979609cecd SHA512 5232adc43ba55d01f2b030382075750033e0c5c2abdc8308903e0cef7a465513b7765e2ae495da6555b377452ae233500530ef9d57e584a5352a54c5f4731c64
 EBUILD celery-3.1.24-r1.ebuild 3482 BLAKE2B 4538afe2f8b0e962c6145c92825badc7c77c13dfc3391e724562ec74789beddb0157932c21a765b6526426c5166efcc5b94fb7198691fa93e5b4bcae7f492f08 SHA512 8d6106606edcec4e54a0a1036b7c5c03b5017c313b9c7b9b0d959260829e4434ea7b090769bc06f57a397fd12431237fde3e1d845b4de4a1cd3db5695aebbfad
 EBUILD celery-4.0.2.ebuild 3553 BLAKE2B c4c7602e9ac2b231c9ebd7dd3c8d491d65e645413cab98b59fff3f689b89467849f46296c396f986c1f89e489a7eae96f8132da27b6d36dd9894e60a81dbef67 SHA512 b1a3ece067c63401684fe380f2078da4953b1bba7838daa4a57e85f2893508d180e483a1da1e235fa17498434ea312d278c72641f94bfd3b7dd616295fa5ab6d
-EBUILD celery-4.1.0.ebuild 3495 BLAKE2B 2f910a5e9cdcab171166bcf309799064e4b4b8434921d08db5052de064421533005655cae9091b40e4b1b22bb097a3aff6ef63b7b253bc5782236c65dd68c81b SHA512 eb670377abe1f96a5bd5a7367920a8b89e385df15353a2ed976db5bcce12c164f02183ee8c4ba406d9d53f60ef3a873f687bb960925cae6a6b63cb2c7f04a677
+EBUILD celery-4.1.0.ebuild 3494 BLAKE2B cd6530eaa550aaef2fa28fa89d91668a0da3424fdae092b2ca3b094806fd5d04925f51dbf93c4a77427ca900bb9016b33612dc274a55d56623f0cdee30e74569 SHA512 538e2a67869db5e0162e961f1d73e4ac5867b8506ad77d37131073adb5a5c91c964968b29877591161241cc6344a62159298e61157971b6140d363f170c793b5
 MISC metadata.xml 598 BLAKE2B bc341fa57796448fd24ccdc7cc6aab80c4208fd70ed73a3d2d2387ecdcc91ecb9ef862794b204d404386e8d6508387fc5aabd0b1895674e717073c6403ef870e SHA512 3edfde62756b7f2ab3d138fd297bf7335b238d027dd1d6a261533979f48b05fa4913b0f43a766075fc106c59b1ddd43cb6ba21aaf9c67311b0ba3df00f20975c
diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild
index 6ad15fdc11b6..d3123184b976 100644
--- a/dev-python/celery/celery-4.1.0.ebuild
+++ b/dev-python/celery/celery-4.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 # There are a number of other optional 'extras' which overlap with those of kombu, however
 # there has been no apparent expression of interest or demand by users for them. See requires.txt
 IUSE="doc examples redis sqs test yaml"
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index a5d982c6f456..698fa833ba52 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,4 +1,4 @@
 AUX certifi-2018.4.16-use-system-cacerts.patch 340 BLAKE2B 42278c6b40ef6daef71a2ef3da75baf78833906c1cd018757b0b45d8ca623cbb5de15e5d5cfa444eb360738b368ad2111bb5594beaeb910275c65267b7532a34 SHA512 8c0b36be0ce23132fe739be4a173f537f4f8870fe0f5e2c98add13e94c0c23490cd0aac30e289193820790eb8580770e178e32b9f16b28255fd95565d6015faa
 DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682
-EBUILD certifi-2018.4.16.ebuild 1430 BLAKE2B ac27d6e38c40c4869dc5a69be1c63e990c16496e539190388b5fbd7c1c7749baa42ad9023704807d4ee60eccaab649465fc0d5e385adb501b9c37f90d4b094a6 SHA512 bc0ffe9fe6b9847be34af0de7f5a5954cd0fdde932f86ac234a601aa67ce347281ca36d3c3512761939df143c7b7a050467c6b4e9d8139c4d998f428d16294a6
+EBUILD certifi-2018.4.16.ebuild 1432 BLAKE2B bb47a7540342de66b48c28009cd33cfe4a7ce17e8ded2106bbb116b4ea72dd19434aef370f83118b1cfbdfd24e552d733af3466f97c40caf92a70d1539779906 SHA512 e0b7fd95e25fef05d4a96acc15ba50e78492bb0adea74ce74a3abcf958dafe76fdbad8816b8b9f3a4da6fc3999fa0a68b26f0391a8e2f633ed111be08d6541be
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2018.4.16.ebuild b/dev-python/certifi/certifi-2018.4.16.ebuild
index 7daec8f073af..5d23427124f7 100644
--- a/dev-python/certifi/certifi-2018.4.16.ebuild
+++ b/dev-python/certifi/certifi-2018.4.16.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 )
 
 inherit distutils-r1 prefix readme.gentoo-r1 versionator
 
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 5d6c5283bea5..50cc6b74952d 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -4,6 +4,6 @@ DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
 EBUILD cffi-1.11.2.ebuild 1477 BLAKE2B 9a60ccb178b38795fdbebfcf84ce2121c7a977458298bef4ba4c7afabecade0f60b2b839b2543f9b91e2ccaab359cb4df5adde0c52d2dac5b218ec903ff3c23a SHA512 e2e547c243dca0709a12afd77ce860c05493c7fb168a8769d7f7cce63ea0676dbed886c2522e39a193901d009581216805dc204a2189ad0d1a1f7e4c1a337349
 EBUILD cffi-1.11.4.ebuild 1479 BLAKE2B 7353c50581b27008f7f686e65d3c9c6345d19956d4c474736987a170b78739e0c670826ac47cde007c673e82da9e6c6d845969567ada82fbee0d5f78914ed057 SHA512 3b2ae49ad76a9b351c7d978211b8574cdb771c99dc71ff05c223fbe5174e86282e0e572a87673127e4c3f3321dd05c5c1a73a2c6a2ca529ec1d0a6eb03561f6b
-EBUILD cffi-1.11.5.ebuild 1489 BLAKE2B 68e7925207c5186f1ff397d51650f161404e4356fd96fd31ee3616149f28549b2709e71e2bc17e266f99a1ca0be45cf5d2674f00fa34f547510d587af59f4510 SHA512 295300abc925566f53f1ce960546c669df8fed5cf759a7d28f11608dc77a195d19ef1e322b32b074c1883a6158f727fd1059aa8801a24c093c73e44ea459aedc
+EBUILD cffi-1.11.5.ebuild 1491 BLAKE2B 1e616c9958cddd57864257b46bbb139db12f8596262e32d92863446f2efd6626898e2d5e7bdf6c2968c8c9ba0c1ec1af2820258cc474230393eaf794afed07b1 SHA512 f367dc7ba8f1eadbc0feb400782ba315e9ef5cbd2268e67e9a49bfb715bcd7c0a5697b4345f8a27ea038916d7a8976166e48825d60676a3a268c7e0502c004ee
 EBUILD cffi-1.9.1.ebuild 1467 BLAKE2B 294f1f7ab2cc16b168493f855c74fd041eaf03d2418c854a16157f540f74f99448f0cde38701c5c5a9f0d35ce53baa1020f3db0b7f759f36d8a822cde43a7167 SHA512 035c9d078beb565cd09f5c86046b5a2466bc1d697afaf7a3cb0ce92a59fa4ef09efc55060be995c9c91e4dfd945001c061d1e4f63672d26d89fb72655bc0b6bf
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.5.ebuild b/dev-python/cffi/cffi-1.11.5.ebuild
index 7d740d2b6b19..14fa542c3c9d 100644
--- a/dev-python/cffi/cffi-1.11.5.ebuild
+++ b/dev-python/cffi/cffi-1.11.5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cgkit/Manifest b/dev-python/cgkit/Manifest
index 16ee5b11e21b..b4fa1e4b26b4 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 2130 BLAKE2B 3904341c977941d3e7eaf58a5deb77bd98d016f3283f3c9297c0a11e02e20a1df45e43b0015ed272f488de7a6fdb0330eaf1e9c13a0f434993d56325be936a18 SHA512 0048823508f37487ae9c7e3887cf51cd99413edb5eddcb8b977a0dd3befff5293f766dc820d763269f02e87565d9dc3870b6975e7ccf5fe1c69880fa559d3218
+EBUILD cgkit-2.0.0-r2.ebuild 2129 BLAKE2B b14eb62c5dfd14ee4debae0d05de64675ed0de355f2c9ee010e8d09a2f81c367898a368488e208bd845449f50598c0a50cfbcf6a50ce68fa273357e239338166 SHA512 ef6ccf0ca0feb6f0734333c94b9cbac00981c60b5d954c7c495527a6af4a6e0e0522f364823189f04fc3a8cd89396655e1f7e8492b9ea7ceddc6a7a715bb8dff
 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 266537ff2c90..38c4d52f34d5 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 749a07e15e60..f1218851df3b 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 1011 BLAKE2B f2aa7cc13f410436e07116ce3dc9ff1af005e7989cdfdce122110bc6a593cb2831074e286b88e061e9b5158e288671c489e4923c717a146807e51ef1e6b30fa3 SHA512 25c925ac055edc12c3fbaa093e695cd8aabd61351636fca2625ce4d53451576f0a69ad87a99a247d79b8b880a8961f6eb8bc6f86eac5c46f1516c7ee8e387bd3
+EBUILD chardet-3.0.4.ebuild 1013 BLAKE2B 3ea7b8a5cd7ca4d081821b3b04283af038e2f190b6266b756ec0e2dc7e36ef5ea31ca39d627267953aa56db0850e05bfe12e59b4f06dfd263d776b32f3de446b SHA512 88f6cfa5cdb71ba64c06291b5a05ace6f311a12639d8b45ee8515e6c53779c102134cef19b1d91b4404139cc4a140c1af433d20fa7ca2118642863f29fee4347
 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 16910a427f31..34471e6d3049 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index cde0d3f98a92..7dc22f02e3b5 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,5 +1,5 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
 DIST constantly-15.1.0.tar.gz 21465 BLAKE2B fc3781e521f3a9988567c437e456e2f8215b8d61115e076d4f9fc52926125540f59bad457413105422d31184506bf7fd3fa38711dae8a8057b38941f2c5584bb SHA512 ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3
-EBUILD constantly-15.1.0-r1.ebuild 684 BLAKE2B 3fbf3ae29294ddbeee3e0f2a3ee272a375c8c295c977fc323a58cd90dd3b220c6115bcbe17bae4870f532d51f535c214ea21871ec77ef70f9e5bc81855a7d9e8 SHA512 e17107868f27237aa7a2d13b2d5026454fc44cbc4361fd252fccd54d5569eb8e097a0aef67f980ea1ce36b20aaf0c067491185db9b723d4b1c99fc49791a06b2
+EBUILD constantly-15.1.0-r1.ebuild 686 BLAKE2B ebccdf6b5fbfb3d893b9a115ff09ddf70689fea157c07e9839c6105fc29b45fff5e0bd5bc4101727a68829398c93a77891ba2f73c697bb2cd402870e9baecd04 SHA512 c50adcb8a5deef943947469fac9cefa0f7cb53a71f7d2ba48c863534e5a5137dd6a1152922c94bd4ad68d48c32b1d114a2e06a269bc1302414f8ee599dc52b52
 EBUILD constantly-15.1.0.ebuild 565 BLAKE2B c36aaae886fa470209b556b9bfe52b8971af1f3fa8fdee47327b944408ba0b7895d00568ae0303ce05cd3b34f5a1931b384115289a0342973414c08c41cf6d12 SHA512 9a9c85522581041c253f7e9fa603aae3fd5747806c482398dabc398db6e3497bc96423e61a446d454301f1254932eb9827e8ddaf09ba86b2e29a7d59abcca19c
 MISC metadata.xml 714 BLAKE2B 696bd5218dd217515c0b9d6ac7afc0da90ac2ed404120221de9b35a84621533cf1aa8d55878c722f55a59c2a36a4216a092c88efa0936e94dc980a1ed577c990 SHA512 850ed41a1f806475ac8a877f78d4c4df161a81ea47fe08df8e0fd9161f6823ca401519b8c007f06f5db182924e906ffc9ca912b72b4f2f9e66a5ad80d8f67f66
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 83d70c85da06..641235dfddb5 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 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/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index f71bb5e18d46..abd2e644e46e 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,5 +1,5 @@
 DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf8242d5e4b0d4e9c036ed0576c4ce8300669fd09d4ab3b019d8d49bdb79dfcdd03668d5af8519119013c931f037daa8 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66
 DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
 EBUILD contextlib2-0.5.4.ebuild 612 BLAKE2B a8fb7ad569e4793d01c265615025ed788241e35144a206693641840477ab5486eeea51ab613ca2cd1d52567396565104e7cd6398b7375a4b99bbe6379b120951 SHA512 a62109193b08b5200a432bf5c75b33fadd0d357226c4d99edd9426b25599a0b74424618160220145b7255453951acdc3b57b7ad5d694d8c662fcdeefe72fbc99
-EBUILD contextlib2-0.5.5.ebuild 669 BLAKE2B b3f749c13eae2e58d4ee0747d95e5f81324058ac6d5d9776bd680e45a335ca100f0dc98d3422f442d437da579675290cedcf23e5467858e76d79a27787824434 SHA512 d4566027b66d5ce8129037df541bbe52bc05fa7308f72f51b2282ee8192e1b58cebc26c901c5850579512a71c441bf9bd02b1fe42047496820d6063e1824c477
+EBUILD contextlib2-0.5.5.ebuild 673 BLAKE2B fc6ae0c3141bc5dc7b82713ae7348a5952d28e4789aadcf0b4333bc82df1afab413aae4b6a2bbf5f2f66ceffe56733834afcca37b435f8ad85938b1c4447530f SHA512 6bd69087714deea8a35ef1dbe3c89823337b149294412fedbda45ed3448eadb3f99a8fc7b128d8fbded8db19cd7d6117bc6a63aa933921eecb80f52af8f41f1c
 MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index add08a62c816..97a9d05fdf58 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 5f5abd316330..b81d5331f33f 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,3 @@
 DIST coverage-4.2.tar.gz 359873 BLAKE2B 4bca9c44922ad99203d65387267c62bee02b0368dfd70c758dbed959ebaa1352366603359865662cde863ca1518de21a4d33d22b86b78ff75c2c23aecf4d726c SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23
-EBUILD coverage-4.2.ebuild 1245 BLAKE2B 9146f844ef6f4853d6e2ec957d202dde1194dc33fcc0d1ac8de8dd97943cff87689f17e00902bca4e3b2cd0d7ad82edc2cfc45ad8db5a318f94e93cab312666d SHA512 d2833e62f9df13113d452e1aa9571d41d3583c99aabeb2e9d146abaaf6dc6e9e1bd9dbc2c2e6fa5f764300e120644b622ca5839644ae27ee8a1059c0a9dcba36
+EBUILD coverage-4.2.ebuild 1247 BLAKE2B 871a4d52100301c94b9705088e9c349d1af197286a674fd9b2b66317686fa5af291e9a39351bd05ff3f7a807c0722c79c68a18ea6449f94760a4afc7278be9d2 SHA512 f4bdc919af801ae9f5ceff5d036b8eb628a0e9adedf1623fcc9943b3a2e509688388fed329d6b8a75c51f382636a42bd3a3d1a5de84ea7480ed8c5c7b7e35c6a
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
index 8a9e19b43af3..4040c392c655 100644
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ b/dev-python/coverage/coverage-4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-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
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 0378f23d7799..038f741c40c6 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -3,5 +3,5 @@ DIST cryptography_vectors-2.0.2.tar.gz 27011827 BLAKE2B eda02ca72a4a6a608050c531
 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 664 BLAKE2B 0e784c4896f238cb6a754a77cab612c57be349edee4778e07b12272264a494aa5ddb6ca39dcf8d91150c52352635ac878f8c107d8220a725d8bfe63e7942a954 SHA512 223378aaa89649f6c9387f91d651b311fefc25f6a86901c4483108f3e6b9a4556c634b4243f15d3e82c9c031c3427d851c636120d472df868ce453624fffd704
+EBUILD cryptography-vectors-2.1.4.ebuild 666 BLAKE2B d00059c6f5951592ba2305d587cac23d0b3c80585ccdaa913807150a33bc7dbee628208f045985f7b62e4c2fbb2e190bf832e3c4ca6ae16776e6872e867d682e SHA512 1963fb659fc8a7d1689947c4ce02f47d8bdcd6810afac4a26215042059caf508d94678f541056dacd2e31dfcba7d692e96502feee8163cdb28c99d0728c2911b
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
index db8ef24cc6d5..4c323e7d6ba5 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.1.4.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index c90734b625e5..a30d41472cfc 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -8,6 +8,6 @@ EBUILD cryptography-1.7.1-r1.ebuild 1725 BLAKE2B 3327c2607caa9f5fe09f617091dcb21
 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 2183 BLAKE2B 852470ca2a0a3e35c493047149dba669ca9a3c45ea271662c5e45179c891f8f179422e19839cb28306ab847d5e22ac80973f799f991025a703766f5b62725600 SHA512 7c15ba4192f28f0d6fb4df368a248d33eeef807e6b0e94c9f2aa61ae1dd4a9af4d1a722d28558302fa975cdb36695c5130e5e53684f91d55ee1a74d7c5814afd
+EBUILD cryptography-2.1.4-r2.ebuild 2182 BLAKE2B ed5ebbd230128b1d6f8a55a3c14d1e8094e37658a2dde1c4e495c9c8a655d36437c3f2246126d67df836a4fb51713e7a66d4873f1a78b3f56b7a7ddf59cbe66c SHA512 bf66f656fb468ca265688c4c883329454018bfc2fde4558ce2786db6c9b08a0df25c8d95a46310a2686fec840c731e5521ad0f41ec997c59237ae1bcb9f8e5ba
 EBUILD cryptography-2.1.4.ebuild 2044 BLAKE2B 2dd3ba08232364b585e92ed6fd83a204f9d1192ca016a796275a200b995c9e3244c687c042600be62a7245f327813ac6d95f6fb8fd1682c0b861cd106a5d2e72 SHA512 43cb90a1de0f0501cbff6385bff0e80eb1fe412479dbfca2bf8ac3d15e93b2c4621b80ca45c7482852620de97eab249cca0e7d2a050856cf4147c22d0523b2bb
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.1.4-r2.ebuild b/dev-python/cryptography/cryptography-2.1.4-r2.ebuild
index fc28a589faf2..d24836330f64 100644
--- a/dev-python/cryptography/cryptography-2.1.4-r2.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4-r2.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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 888f1af101c6..00e2e9c36896 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -3,5 +3,5 @@ DIST cssselect-1.0.1.tar.gz 21849 BLAKE2B cfe3637746329db224a44b680cda044238fa83
 DIST cssselect-1.0.3.tar.gz 34027 BLAKE2B fff15a50d26ce83a0480020e54d00a027a7f21ca2c4c45d5552c6b4c19f7be21c390650c4befa61b7ae2b63946de88945deb488ebd6c7f7fc470950dab233671 SHA512 08feb3a515cc75089657a508cd1a80c6aaa97d710f27e99f9e749a1519adc13c5540134c6a4e0d7f548b022b8bd23dcbe360530d2329c5da36e43aca1f9627d1
 EBUILD cssselect-0.9.1.ebuild 1125 BLAKE2B 92c022259385d1eeb53ee73c149bea0bde95cdfa13e8175de8ed6bcc7e378eab4e09ff524dd74611f9849c90070396608e88df1bc6330d3d7c4feae2adc2af6f SHA512 09d5eaefd9d9ffee00ee7f1f9815f47af4afc8daf47c6a521e4686a8f92d7ed50a2e501ee7d613f9925d48db624799b3adec9fb12c6e105d253efd9fe65d4991
 EBUILD cssselect-1.0.1.ebuild 1263 BLAKE2B 0ce1bba2b3928b61caaddb79351e77b272092411686ba9b86e3c168381450122a0494b9c44cd77ca584f98841b400b7f276a84fc07dbdef1627b11aa4151dd32 SHA512 c984e52bb1980fdd88aeafd1947e043d80fe29b2e4da1847cb24faa4513e69f5117aaa79c04037668a0e907a0e3f8bde6603561cceb93b70011feee30e00f00d
-EBUILD cssselect-1.0.3.ebuild 1217 BLAKE2B d77b250c27086fa8aaace537bad033a0dcebc87df79040dd8a592ede72191f74889d0b2a3277644a37a9f3169ddcbd05ea73fbf62a2c194e12d5771c4c0723b0 SHA512 d6f33906f5eb433f1f8af7acd53fe457825399063080ec2337933426e470da40e3e5a11a576c9860bec3c68da081b0e0bee51c58a92ea5c633d2a6deb9103168
+EBUILD cssselect-1.0.3.ebuild 1219 BLAKE2B b954cff124aafcacd6fd232cea1567b9c370520b645a60b750545668973246b6c6615afc334a47b8907b1d125782b48e464b3af88c9003d9b09ccae8b04b9f36 SHA512 9b4b017057579c8ff2c64a2cc344e30f96cabcc23711a734f822b05c633ce9d13be7592f8f6c541aa830c4d3d699edb0c0db67121215fd398a3018ff16afd0f7
 MISC metadata.xml 322 BLAKE2B 2ec56f6e5522f780aef1a27df29af54f7169cedf727e4698c0c3764002501a06e52db5a94901d795d75f792ae2e8eb7d82625f88e2069453c2ff4190352aa7c9 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798
diff --git a/dev-python/cssselect/cssselect-1.0.3.ebuild b/dev-python/cssselect/cssselect-1.0.3.ebuild
index 6747eb5c3925..acb3b56d3905 100644
--- a/dev-python/cssselect/cssselect-1.0.3.ebuild
+++ b/dev-python/cssselect/cssselect-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 95878f0e3507..893f99c7827e 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -3,7 +3,9 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
 DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd6653013698aa67ee2f71555f09813a8136ef92d6dc51ca38fe085e7bedc5e01d1a32bbd0885e62bd91c2e482bebd SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1
 DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948
 DIST Cython-0.28.2.tar.gz 1878797 BLAKE2B f04ae2b39ace94f33341bdc4f5e0871d34523070345340adcbfbfb1629e5bd6e2e6db6a0cf24dc392e245fd3c4ae162eae2e14af1c5dcf20896e5d2983c1ea0a SHA512 7d09d1fdc10f96eb6121657b71e059c38c479b4ca180965a8e5adb89ac0f9be50260ea46197c45e8ddc7c1339b9b88c140dac2c4a7a49e1943fb4bf24a73d082
+DIST Cython-0.28.4.tar.gz 1880943 BLAKE2B a97314147294c95fa0bd6d3fa1a1315d81f8abb46a1f2196009c1ef6f0dd7f47f81a7b31ab81d1fd00e8de37878a18a22d225055181ee74ffe4cc8105d84cd75 SHA512 67d2da2d776fc02193cfe98c8942e93905ec5e30bf4e0f9d5c965d930a034936d4c29c8248fccefff5db6d4dee054ec854994bea63fa3f64ff65df7550997c29
 EBUILD cython-0.25.2.ebuild 2140 BLAKE2B 98f31b72d1c298218c5b368a430ed0acd65b69919c833340dea4182abf949dbf3733bb1cd322be2d20fd23daee19ca68db377572e73f6a35e6f1dd16b1b6c821 SHA512 2e21871838aa75a31826ccc93402199427db7681ca3f6de8c44906212e64730d3e9a16fd39fabff97b358281a28a5a743308962f0dbe492c4bc27007e0a8479d
 EBUILD cython-0.26.1.ebuild 2084 BLAKE2B 94de0e3e0c221894148cda42d5a664e4036ecb929308185ae62c2a40e03ceb34d39a738ec22f17e1fe787ef99f4b5bebf33cfc6d6a5abc1064223c90eb3c6a54 SHA512 3cd6fe405a37f5c7174d2067c231dbb3dfeb634c161a90aa3e7b7c5ce2757642c2b71a9a0491b8c2d2c13eddfff6157e7e21b3c0f8ca66d2e509793c354ab10a
 EBUILD cython-0.28.2.ebuild 1963 BLAKE2B ee1c8dce215851a3bb5d104fc500ddf4e871a81fb52cf44471e1fbfc28a0bfcb08f9334cc934c90c99e4c0339e117e5e03b05384870cc05f919aa649bd73e26d SHA512 3047c57f88f5a62e0a8fad38d1cf1a9fdac95cae38c3c2db08c27e157f010b049281a1df118e66758a7e6ac0693ede6055d878268d97a3b7fc2316bcdcbedd35
+EBUILD cython-0.28.4.ebuild 2200 BLAKE2B 44e32fde8923b06bf65875f462de4eca5dc8d175663c0cd005dc3ce150d179bec8e56eef7cef6cd7539ea8b4ee18e853fac5082dccefeed2ff8eee2f9cc31169 SHA512 9065cd45c542e4eaa96cb027fd1940a2ab1abf5af31c4138cc319d74c5c658048fc7d550bd67d026dd6b474e42ab3f6d41e56203ffc921410df745c76e845408
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.28.4.ebuild b/dev-python/cython/cython-0.28.4.ebuild
new file mode 100644
index 000000000000..1b86fc1a6375
--- /dev/null
+++ b/dev-python/cython/cython-0.28.4.ebuild
@@ -0,0 +1,86 @@
+# 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 distutils-r1 toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="doc emacs test"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_prepare_all() {
+	# tests behavior that is illegal in Python 3.7+
+	# https://github.com/cython/cython/issues/2454
+	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 57f7079d3e82..7180d6399fc4 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,5 +1,5 @@
 DIST dask-0.10.2.tar.gz 357356 BLAKE2B 6d00529eb550de682221875d8c4fbf4c0447168b6c87327b02d0320cdd37e6490f67e7f0a09f814b9cdb453080785b011cdc50ba9b063c6569b4825833df92b4 SHA512 92bd671ff1483fe87edd34330dce321b88362d80ef4d836ab4eede87fdad5f657c51d03a9885a53924fb3becb504a8843cf852be08c88f5389f04c3f1b8aefe2
 DIST dask-0.15.1.tar.gz 2147022 BLAKE2B 79c3355e8f3c202e598b32ca057c237d07db283b04b99ea713a820869207af9f46cb80ab58c0a058ac327873851f2d89050a4b9d7ecac3c1e1173f6be5349848 SHA512 44e7119c2a8d15efb89e265e5752edb117dd06da8a5e7511b68c5859e9068aedb3595540645304f0322f869c83df79a497d731bcade79612f8fd3f4eaaf3763b
 EBUILD dask-0.10.2.ebuild 946 BLAKE2B c07be78c3879641077aee95e11be90880e27e81eab40a849f81fe44491556a3b000e5ec34a32094acc55239ceafc7c046eca49d8c2bba331979311e9d878c2b7 SHA512 611c1b6d68e0f6c74f90d2063d69e3b3e149aa0b95596c71b1cece2f8c1fb5e9fb5ef971ac857943d2e19eb52924152acc82150a45ed2bad59e2d14ed1ba46a9
-EBUILD dask-0.15.1.ebuild 1093 BLAKE2B 0ea4c72e309bbcab5652fdea32e26f5e102ccaf988486583b05b32d7fc34c97d2eace4414a342f990d92d2f9090a995fd1ecaf48250dbb535fb9cff7749731e8 SHA512 24d9e980eb28c6186bcc796b721c005cfd60c7c16852677ef3bbde7fde351fb587cf12780446c1494af301429f5ca6f26d870d43c2ff905b68ffd30334c377e6
+EBUILD dask-0.15.1.ebuild 1092 BLAKE2B c1713589564dc2fc2b83e30d32de2dad08015631ee385822078338246786f96a642c893366843f7045ff7b3918f52879187490d90feec279b27e4cf8bf68a3c5 SHA512 0d25a6946282883a334a93b8773f8fb79df65595b67dcbf854b425a264f944285a93f572a3595ed5506a89b47307f9a1e635ea60bef068ef4439bc29c0bdd4c8
 MISC metadata.xml 777 BLAKE2B 5574aa56065f36366ee721e25b1bfe06127a22a94666bfdcd1b62e4d03456948bb22db23f64ac7ffbab9816ad508f97fe23a2c9a0e34cd58a61946c6098585d7 SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850
diff --git a/dev-python/dask/dask-0.15.1.ebuild b/dev-python/dask/dask-0.15.1.ebuild
index 098f9d7aef78..3c38e399ee6d 100644
--- a/dev-python/dask/dask-0.15.1.ebuild
+++ b/dev-python/dask/dask-0.15.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="distributed test"
 
 RDEPEND="
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 7cd2142562e8..05a0356f1005 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,5 +1,7 @@
 DIST decorator-4.1.2.tar.gz 32325 BLAKE2B 19754506bf18f03748d61fe3cf85e13e91f5a7b4b3550cf087b1c9506fa2d10a4fb6c32914f7c2078a74ac34f5ffaf0edf8b15aa1f46d2eafa91926c40430dba SHA512 4a4b9dc39de9b3f00eae9b6829136f5d836355d3d719371440f69c33fdddf73636e9faaa8fc35829c64d5c5a61d968ea427267da944c524c22ad08b69fb6f0ff
 DIST decorator-4.2.1.tar.gz 33376 BLAKE2B 29a03fb4af1de8c60c5ba4a4b30f59f8b1aa8bbde107b9d5719cc0a084c45b58f7e14ff2046d7247c43d57717db57aea0db52dc068d73a73188a0e022c058cbb SHA512 8a6fc53f830470fe15d4bf9dfe8cea434019aa2e1734e55f873dc617138a6ba75d63ddf50a3fcd21a8f67d9d1b19c35c75149d8cee157e909aff4873093c4e0e
+DIST decorator-4.3.0.tar.gz 33758 BLAKE2B c967440ba18205233e5b032f22553cdc33dbec8a3c285407317d47910ce7dbc884c9802d1591f36a08b3f2adc5532145c92965946af81ad167735a5d0a65f047 SHA512 63894b12af62ad357638b99290c34c2207ba33813b6cd8ed554236ef45a091f337b6eeee829b2af82f2e71699902e49aff49acfa22d5449a7833ba382cda2751
 EBUILD decorator-4.1.2.ebuild 787 BLAKE2B 5807d744db9b5224594ff90de71f806abdda9866d67954336b61555a65a19667c363459f2f9a752f849300e46219989289e26c426138f9bce4244207dd0b381d SHA512 b8329497682fd22aa251712e650b512531f79ddcd66284adc9340255f3f8dd04686e6514c354425965bc298d10d184500dd3cd3073a7175bcc2985e4fd648131
 EBUILD decorator-4.2.1.ebuild 787 BLAKE2B 5807d744db9b5224594ff90de71f806abdda9866d67954336b61555a65a19667c363459f2f9a752f849300e46219989289e26c426138f9bce4244207dd0b381d SHA512 b8329497682fd22aa251712e650b512531f79ddcd66284adc9340255f3f8dd04686e6514c354425965bc298d10d184500dd3cd3073a7175bcc2985e4fd648131
-MISC metadata.xml 665 BLAKE2B e73aef85a2fa36e50a503bb86e9eee781fc10a3cf9419afcccacb7ae282ed957027cf905e9b056865a13ead6319571ce4508029c08005762dd813ec07d7e1265 SHA512 c368940486c27fe99f5ec094929db337680227ec74dcdc6a45a173d3163a1e0cee9d6830bb2ac531c17b48cb2f32f3dd7238d666748f856b01e3ed4af77d0aac
+EBUILD decorator-4.3.0.ebuild 736 BLAKE2B 41065d61e60d93ae2dd35bb0de9e1cf245e0e64b0eb1e894876eba2964eb9bfaa676015cafbf3f1f3b66a2463d06ff69c15b18732b05736dd017808c4b77170b SHA512 96a1b43a1fb30c75e48df43edb56030dc938b93c720e8259f0c768d9105be6f9528df97ef12ccef24c1c218c79cdc3eecc0864a11fb908da87bb8061f3583654
+MISC metadata.xml 731 BLAKE2B 9dcc846096fd68b11b1af0259b9707ca288b962a871c50b1701dba0e00011db27d3bc17970310b57b70301a51f083d41a3f6659ced9a7c34e48caaa60333af25 SHA512 6df81157bc757c8a8218fd75a28165cb8349d5a17a320db78582311d614a4fd586cf928e4d1c2158d8fa96cbc6537e26d85524839b688e82b29e5d7997819219
diff --git a/dev-python/decorator/decorator-4.3.0.ebuild b/dev-python/decorator/decorator-4.3.0.ebuild
new file mode 100644
index 000000000000..3e02054bc9f2
--- /dev/null
+++ b/dev-python/decorator/decorator-4.3.0.ebuild
@@ -0,0 +1,25 @@
+# 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="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/README.rst )
+
+python_test() {
+	"${PYTHON}" src/tests/test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/decorator/metadata.xml b/dev-python/decorator/metadata.xml
index 89e2810d4dc3..64b945f8206d 100644
--- a/dev-python/decorator/metadata.xml
+++ b/dev-python/decorator/metadata.xml
@@ -14,5 +14,6 @@
 	<upstream>
 		<remote-id type="pypi">decorator</remote-id>
 		<remote-id type="github">micheles/decorator</remote-id>
+		<bugs-to>https://github.com/micheles/decorator/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 1e0aaa09a181..db7fffb82b1d 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,3 +1,3 @@
 DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
-EBUILD defusedxml-0.5.0.ebuild 747 BLAKE2B ab1b62fe074534248d7f87eaf3e25302d729231ccebf5f078a411e69eb59f35a2a11ecd3ab26ef55f62ef1f72f7ab00360f127848176f40061ebe0fcd055f264 SHA512 7dbfb1dd6ed987949868ba4a1383313c540ab21772648b3f7da48c5b2f6944a8934e0b411aea3f78abf0e1176f2a879d785a4bd4b1ea4106f416610e809d4750
+EBUILD defusedxml-0.5.0.ebuild 751 BLAKE2B 67fd8dd6db7ca669670b05279502c2538f9e6dc759627b8202387830649fa56f59e886d7552b91cba4a9fdbd7289ad67ab982b03a3f01aa7741938d5a785bd13 SHA512 4c49c12cb21375ed96f5cca9e7d119652297e9ccd93e89016b41648b97eac66e371064d27e233e7cca4b1977d1ec3a11cf0271700f553498dbaecff3a1a6acb5
 MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index 8fb69ae23f7f..c6d9f341f42e 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/distributed/Manifest b/dev-python/distributed/Manifest
index 51ea0236f5aa..8b624e5ceedf 100644
--- a/dev-python/distributed/Manifest
+++ b/dev-python/distributed/Manifest
@@ -1,3 +1,3 @@
 DIST distributed-1.18.0.tar.gz 395888 BLAKE2B a1f84f93130b4e878d2b6a2059e71330fd10ac7be2c8e1d3fa06984e34dda4984180f496b9513f531ae21f3cc978f71f8e9492fcd5d644613a7d9ececcb5ecb6 SHA512 3603b22a454c7010c64fceb79b4aa024476bd038f4c27585c8f2dd51a2e4ace1c900dfc7c3bf096d4274be985003b72e9bd16af7b351ec9a65c6712a1f5e39d4
-EBUILD distributed-1.18.0.ebuild 1317 BLAKE2B 23c0cc1e32576dcdc172031c41d5cdc28ce88303ab8af828914aa466c1799948667a801ce4fef1e0692f3548d4c8e54515bb8991fa35abe889bd27a3d2a10073 SHA512 56b5ee86b4880a6bd8dc02ad28cbeb2cccda6c35b03ad9f9dc4a4ace40e9f000543e209a4f69db9af6de1385572c3d9802bcb420790b23af208114e7c74636db
+EBUILD distributed-1.18.0.ebuild 1316 BLAKE2B fb4c90d9d4b517247ae8d154c6033748a148bfe4e6d4417aae8416ceb5f5fd11a504537c348fcec9abf48717f8a3de78d6a416837f2059df4599c4894a78d009 SHA512 a6057878289ae55a9bda3d131a8b1ca7bde52c46cb9fb6e226f1a01007d2110e6c4cd77533c407793bf732fac57e7ed8e664cec72670ea903483abbf9be1675a
 MISC metadata.xml 511 BLAKE2B cd7c1cbc44915c6a922c188703d69260c85f0f1d4a97606fccec97b2d11deba4ef25f91dffe7fbd407a93dffa4f69f50f9289d948ebf4764da2980acdebe5ffe SHA512 b512481cca22a1dffd5620312825bdec9348b1a469be61874211dd25befb2111fab1ea79596087f5226b053a2ab660174508828d5300de9ff24119880995a296
diff --git a/dev-python/distributed/distributed-1.18.0.ebuild b/dev-python/distributed/distributed-1.18.0.ebuild
index 2c1255fb1e2d..d4748591aea3 100644
--- a/dev-python/distributed/distributed-1.18.0.ebuild
+++ b/dev-python/distributed/distributed-1.18.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/django-celery/Manifest b/dev-python/django-celery/Manifest
index b19ab59e13a8..54167433a5a0 100644
--- a/dev-python/django-celery/Manifest
+++ b/dev-python/django-celery/Manifest
@@ -1,3 +1,3 @@
 DIST django-celery-3.1.17.tar.gz 79615 BLAKE2B bf3d35fe281939f272bd5232b96d4db547ade3a68fe560a2479ff2dc4104110274862a3c1d1ad0a30d91f4cfa9bff8208775d3e0267544b5b415df52eeb3f0ad SHA512 fa68c85ee0eea778c5921c0373f3e7547bc644cd11d83e659fdf9bf4a80e317faca12ad3941225b073609a4716c5b9574d85c5c7063cff0fdb3deb0f1b86d225
-EBUILD django-celery-3.1.17.ebuild 1537 BLAKE2B 6aced5631070f8c66461b0631dbf725c012b8cfe68c0326def24192f55096debef233010d54963baf105b03da6526f4aad016a054f8817dc614c437e0724bc73 SHA512 51f2135366e86ccc7aeacd833f7333b2d43c3ee34c03817cfcac315bcd1d2dbf655b630afbc170a310b7c8135c0bac2b118b908846e2eaf5533c3168436d041f
+EBUILD django-celery-3.1.17.ebuild 1535 BLAKE2B 56976fdcfae2f1aaa79916fe8a852bfed64c498ee7aa1f0a7cb6b324867b47963005dfeacc66e23718eaa1c10aeaefb5274428ade525d231bff138b9077638a6 SHA512 f4f3bc270be38decb02cde5fbf342f538342a8b41b5ac941ab619cac01bc8d946ea5758a69c5c5630203e4c5a7d68ee8195ccc1ab86ede9bfae2e11f52e51592
 MISC metadata.xml 376 BLAKE2B 494555ec1ec63de45dc2b3524a620e5092c6aad50a65c259b49605dd1adc01b499e4c7e73a98eb4b04382e70e3bb5624a4448cf477f313744e560bcebfe5cadd SHA512 746bbf68f1ff393ab81b45679b0052a90aea4b31752190b9d047608f626f44c4a304ab150f11a2dd86a75cd98506bb4ca61c6d499cfa94afbbbb33b0e7c1a0ce
diff --git a/dev-python/django-celery/django-celery-3.1.17.ebuild b/dev-python/django-celery/django-celery-3.1.17.ebuild
index 3092cb13fc84..5ac1b237e184 100644
--- a/dev-python/django-celery/django-celery-3.1.17.ebuild
+++ b/dev-python/django-celery/django-celery-3.1.17.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=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit distutils-r1 eutils
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 5fb25f53e3da..a2cde230efdb 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,24 +1,12 @@
-AUX django-1.4.19-bashcomp.patch 1124 BLAKE2B b4bd25df1d11055c93d2812acc18471664bae353144b7c1098abf727a3eef37f01d5a1ec2e834639487a1051ef581842a8079b0446a9696f9c5f60d7a20112e6 SHA512 b1c2382f202dcf290cb8996ea174a1539783478fbf2feab18433f0cedc6c9dd0e088b3241131dc0fb1a5c621a45003ccb62146591ccac42218dbe38cf56f53d4
-AUX django-1.5-py3tests.patch 959 BLAKE2B 6aae57b504e04115fb5cfdfb053daccceef4fdf97fd7685d6e84acabd8248cf159a3d919de864f1c2b027522b0abd3442ee85859ad16fc08fff6877ace175c0b SHA512 cc746d43c2cc1c7f88fbffbf07ffc1f3b3fdcb738547658623c763e302c69372f8c8c014ac2a7196382d21aee0ba2ede92860a59a76ad3e14541015969935a92
-AUX django-1.5.4-objects.patch 1467 BLAKE2B ab1514ba7826823f8534c7d24cbdc9fc08f838f3af1cd53281e0171ad30186d88d8a387a4aaa99023b4379d232f07df142ac3934500a983940705d3d48571262 SHA512 09bdaab452f692679a15d0fbadf3c044417aeda0ce65b30bd2994d86b33ae93c13eb159fdad373a031ab2e0563861e29d1f9935b52c33af34a6afd25461e904d
-AUX django-1.6-objects.patch 729 BLAKE2B ec541836130ada6d03aabb28366689c824c914fe120d4d8073bbdc7682bb077f3cc2c935da217f27e5c585bbc458942ee00cc639266a4dfd75e13fc48726007b SHA512 e7dc3cc8e50b4b0d546983dd79f1fa2bf7680d04d1e401267334ce72ee065e0fac2b00f9287ccafc3fabca29bca4c1d6475021b5da19d145a2d90fd491bb7ae7
-AUX django-1.6.10-bashcomp.patch 1090 BLAKE2B 270b1a8d2d536136e03b5e033b64bad17cea7a1d30da414c9dc92df6c47cf0bcfbc4cb19d453bb8525d7dc2127ba3fd1466df6c580657a5ee02dbd31b7517a32 SHA512 43e6a0a23d713dfb2b002ee89f68fc8cfe5f18bbfb84e9addd37ca0aa25aaa704238833c9be781da0b71fe708fbe2831ef61952638874fd3b6d10298d9076118
 AUX django-1.7.6-bashcomp.patch 1090 BLAKE2B 7c3a960ade3b450da853175a7ea4afaab267ff96f4b161fecd7abfd0a534b7feadb1d70cae04f4242574653456fb0c8d1b92594e31dd977f68839b97f5be8cf6 SHA512 e7df516ea276eef06c79db2ec3694bbbbbe6724669281bc97311c9386f943f55bf65c4d41d07a4ecf2dc8abf11fddd0d07fc5a08f357365c67274c74280fc532
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
-DIST Django-1.10.7.tar.gz 7737654 BLAKE2B 54625d105eff94f64aa6d9e3afbad390a1d63e4d262e5ef8ec47c568438ad756eff1e59450d34139e6a3e3dab0eb2c16aa7fbe71b9a0379625e57ef8da45331c SHA512 2b16de21a1c966942f0d912bde4f5be7004f250e5ce3c56a5ac462f81f82e911da19fa0aeb9058670d663caecc1016ce4bcd93c1fa058675150caa33cfeb0e3b
-DIST Django-1.11.2.tar.gz 7865109 BLAKE2B 52b8e91ece9fc9d2541667320d7aeecd7101a16573141cf3f781153eaccbb0e6b0f90fbd4c4d90ae06e8b0e71c1cb4aff8f8eaedc1bef6afa13426d16744905a SHA512 0f1187fd03064b966241d6ed1a869d6f155af2598a7b9c8b2f902585265cb6df7236817e5f14907c362ce7420d08e881ff9461f14d673485be3b3e5c3d980e8e
-DIST Django-1.4.22.tar.gz 7802249 BLAKE2B daf3a23c4e863ec9e5ff538f4a0720036e035be0c871fb6342ef9b40b8bb7a3dff9a735a040f4c003bce815f10153f4cf31dfdc181cd69fe4db1ab217ea93d76 SHA512 03e833d95d8ffacf8cb753b8b8c15edc145830add322ad166c574a9a7428ed308082ffea7a73bcdb7315f489270fd84a38d1a8b12c090dfb9d68da5d281cef68
-DIST Django-1.5.12.tar.gz 8202839 BLAKE2B 9f177aa1e06b2d908448022ccd9986074abf66e58f4ab3315f5d3fb28cc45b77e23fc0c3933166e2720d1869b35a596d65350742a8015688f88c5358fa0e3484 SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d
-DIST Django-1.6.11.tar.gz 6764000 BLAKE2B 85ea8c37e0728405e0109504e81db92a0a4f31c908daa09fdcb73890df5724d7bea0a8c8322ee62b8b1ee07cf5a01078ba404140991799bc0acf1f31ca5003f5 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829
-DIST Django-1.7.11.tar.gz 7586798 BLAKE2B b48ba892e7c4830d122f179e7247862ee571b63ff840b9107d3d8ab21700ae744c6f51cfd7cb3606961b454c288c3f73f238301fcb5620b37b6fab4a1bf02ebe SHA512 2e3415295ee6b590e366b09adb261baccb750519b9bcef1bb09bd52a2db705c8082bfc13440c621a5f41dd4f9bd626792eba4a572e78de3b7caf93c951c406ee
+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.9.13.tar.gz 7498364 BLAKE2B f65cd9a20e6fa3f2f60e353a74d32f9ef1872a673ec60b1332cedeef99fbdd237a8221e3ff49fbc05bfbe831c6507fb745a63212a6739f76e889fce3445d3347 SHA512 bf642d5c342dd523ceb7a580213255ddf91a24bd5506355325b72c0eb91774d120ddb89d728a4b432ef0a587f8448e915c3217adcaa8ff5aa816873fa01ae7c0
-EBUILD django-1.10.7.ebuild 3166 BLAKE2B eff1f92ab4c4ea4287435e54d72dcd5bbd489927613fdbb6e3bbd92501afebccde739f3291dea6a1bebe149f994187525bd3bb4b5985746beb617b7e69050040 SHA512 3ded882997da3922cc0c590ab07e18a56a0263d841c13c7f24db719dc3fb5f67e447b36997b318e1d25d5b51927f9544fdea28f2dd6d847d9ec2451efb513567
-EBUILD django-1.11.2.ebuild 3172 BLAKE2B 160de7a2a45fc4692155fcb8359e0b2b5c385636800f69a390dcebc5fb4f945a5dfc3b307ede46926ee2db42f9ebc645a871ddacce8b601884c5b5209e3b3847 SHA512 081ec686557410c0b324bab98fa2cbfe992c5474ff1bffea1e69b41c885c5ba09be3395b977ac54fcf05011009c20b5c2590a852d0c63bade4b23b9084139372
-EBUILD django-1.4.22.ebuild 3014 BLAKE2B fcb30dfe5437b9404880a106a893b12c9074c65deb362acb6e51a4615cd5e083635f92d523670624227987bef63f3e0673c08f39f6ee26d1cf30ceaa4bd5bbfa SHA512 65c66f7c430943f883212928c9c8dd73025cb6e46ae7ed1f50f5bf7bcabfaccb844601a024aa1c8b74c73a8e828ac742a795c6e27aa39857fa9edf294ac0115c
-EBUILD django-1.5.12.ebuild 2110 BLAKE2B c215c334bcb5c901fbfad946a5b1de4af91004a22038fbca8369374d9d8abdebe2f312846042968bea78ea9c13af106f96965ec2c2eac07618e229d1000a9358 SHA512 38e653e8e3540cca2c576dfb94f1b8761730831624764b54bb8f3d1b4cf09566f77e37185cffd52d794ab012444cfa4d360f70e24e975adeca1b2e66d26fd61b
-EBUILD django-1.6.11.ebuild 2835 BLAKE2B 5a61a5e12e828e237db0dcb627ea70c1b245be1ec9c1889438f82eda90c60428ecfaff540b60db58650fab87aeaa6e91b50759dbaa1f1c733b674a15d6000c07 SHA512 cbf4c67a9b57a6bf411da5cc1c1b483751e3b2188924312ce1a21650d243be09c3056a2c317f835e75c71546184a31b2e35e17ccfb9fe1eb7899bb42dcf96ddb
-EBUILD django-1.7.11.ebuild 2841 BLAKE2B 7ae8b0587af5aebf5e48ad1dea5605e7030e09b7cd36df532eedd315dbd2055b3e16ff7ac1e19b3a4e64cacba3219ad31656ae61b2feb319958202b3ff7a1ede SHA512 ff53a330d4243ba10c97709c4e4e0dec0c82c7d7f3d9050cb464d0f5b979b302a94398fc1de3fd50ea6d27c42527da74daab8d3209b5d2c2f02157bb8efbdca9
+DIST Django-1.8.19.tar.gz 7359244 BLAKE2B 1c7b857f864527cf5b9cac8e08599e1f4f3306a828bcc253e0e59755da6d464592e627eb3743687b0410d308b3d089359dd79af0146b02e6db7f5eca43f04401 SHA512 cec71f4a1aaa3fcfc43a035e9fcd8d6fabde7aade43491f9205942cbeb251ae394e49ec6b5b2403b74c24b069064d44ae6070b151c0c949b940f2d46aa87774e
+DIST Django-2.0.7.tar.gz 7988568 BLAKE2B afc3fb9cd3f37b7488ad8eb46eb9ebb540c54b04661a44620951930a352537ee3a3072a604fd2cbbc95ea3fe112ebab25f45f971bc30ad48161eb8cda26db6d3 SHA512 ef42d9046ce3e7b5067c5b85114c0cb5854b0ebb1d3bae526484f11da8abbf04864c83f176e9c6e498c9140b134c9a517968c7bb0bc087c49bf105b2aae8644c
+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.9.13.ebuild 3063 BLAKE2B 16cb5ed0e10f6bb36ef6e2d57c46ba61412a56b5dc239ce47ca2c2e9c3c187e262ec2523605cf6adbf888fd59ff5ae568f470dc3d58a7f9fcb275ac1bf4c3e42 SHA512 57655bbd5cb3004852a28875b17e044c4445b6711aa6866ee2952bc3666dbeb6ff9607abd1d23a8445eee5dc69b636ea6c6e353990545214a5c8be7190ef3645
-MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
+EBUILD django-1.8.19.ebuild 3015 BLAKE2B 031a0bd274e2588473d5e4856224ac9b7f1e98c22b6c52adddfacbde2b26074d3bb83e69a9a09f9f29ac833dda45151eb0bf0dd9eca1d634f4eb337e9ab889f4 SHA512 f7c368a5875b0a0c3c9f1ec4a7c28ff2f5e8ddd048c42c57c4f2ccfba79d21806f20ca0602d615b1a974b3b06cb53f29198159f2fe15aebfbe322e4e6bb6ed9b
+EBUILD django-2.0.7.ebuild 3059 BLAKE2B afe8fad8175ee2abda5be42069a68ea1f15c258551e639395248730175a7a37bf69d958bef7fcc8bb8ca75db772390b364b03f0af87dacd3da8833cd0bf0789c SHA512 25c4497797a4049baf998499af58208cccfa47dc32fd279cbb12c2e4339c46f5a38467c994e7f3ac20667da457c4f6dbe163e8b5e2587fdba398ddc77ab9ddac
+MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.11.2.ebuild b/dev-python/django/django-1.11.14.ebuild
index d6f33979805d..d6a7c1efbc24 100644
--- a/dev-python/django/django-1.11.2.ebuild
+++ b/dev-python/django/django-1.11.14.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,7 +15,7 @@ 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
 	"
 
@@ -25,7 +25,7 @@ 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"
+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=""
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 		dev-python/numpy[$(python_gen_usedep 'python*')]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
 		)"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/django/django-1.4.22.ebuild b/dev-python/django/django-1.4.22.ebuild
deleted file mode 100644
index 0f0ba08919dc..000000000000
--- a/dev-python/django/django-1.4.22.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		)"
-
-#		app-text/pytextile[${PYTHON_USEDEP}]
-#		dev-python/markdown[${PYTHON_USEDEP}]
-#		dev-python/selenium[${PYTHON_USEDEP}]
-#		dev-python/py-bcrypt[${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.19-bashcomp.patch
-)
-
-python_prepare_all() {
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_correct_url_value_passes/_&/" \
-		-e "s/test_correct_url_with_redirect/_&/" \
-		-i tests/modeltests/validation/tests.py || die
-	sed \
-		-e "s/test_urlfield_3/_&/" \
-		-e "s/test_urlfield_4/_&/" \
-		-e "s/test_urlfield_10/_&/" \
-		-i tests/regressiontests/forms/tests/fields.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	echo ""
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "A copy of the admin media is available to"
-	elog "webapp-config for installation in a webroot,"
-	elog "as well as the traditional location in python's"
-	elog "site-packages dir for easy development"
-	elog
-	ewarn "If you build Django ${PV} without USE=\"vhosts\""
-
-	# XXX: call webapp_pkg_postinst? the old ebuild didn't do that...
-	ewarn "webapp-config will automatically install the"
-	ewarn "admin media into the localhost webroot."
-}
diff --git a/dev-python/django/django-1.5.12.ebuild b/dev-python/django/django-1.5.12.ebuild
deleted file mode 100644
index 79854907c61a..000000000000
--- a/dev-python/django/django-1.5.12.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc mysql postgres sqlite test"
-
-PY2_USEDEP=$(python_gen_usedep 'python*')
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
-	postgres? ( dev-python/psycopg:2[${PY2_USEDEP}] )
-	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_impl_dep sqlite) )"
-
-REQUIRED_USE="mysql? ( $(python_gen_useflags 'python2*') )
-		postgres? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.4-objects.patch \
-		"${FILESDIR}"/${PN}-1.5-py3tests.patch )
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	# https://code.djangoproject.com/ticket/20514
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
deleted file mode 100644
index a46445f638c1..000000000000
--- a/dev-python/django/django-1.6.11.ebuild
+++ /dev/null
@@ -1,105 +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 pypy )
-
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		)"
-
-#		dev-python/bcrypt[${PYTHON_USEDEP}]
-#		dev-python/selenium[${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5-py3tests.patch
-	"${FILESDIR}"/${PN}-1.6-objects.patch
-	"${FILESDIR}"/${PN}-1.6.10-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Disable tests requiring network connection.
-	sed \
-		-e "s:test_sensitive_cookie_not_cached:_&:g" \
-		-i tests/cache/tests.py || die
-
-	distutils-r1_python_prepare_all
-}
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	echo ""
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-1.7.11.ebuild b/dev-python/django/django-1.7.11.ebuild
deleted file mode 100644
index 86ddb5fc5dfc..000000000000
--- a/dev-python/django/django-1.7.11.ebuild
+++ /dev/null
@@ -1,104 +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 pypy )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		)"
-
-#		dev-python/python-sqlparse[${PYTHON_USEDEP}]
-#		dev-python/bcrypt[${PYTHON_USEDEP}]
-#		dev-python/selenium[${PYTHON_USEDEP}]
-#		sci-libs/gdal[geos,${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	echo ""
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-1.10.7.ebuild b/dev-python/django/django-1.8.19.ebuild
index 1e04f2344036..1f2e2d012e0a 100644
--- a/dev-python/django/django-1.10.7.ebuild
+++ b/dev-python/django/django-1.8.19.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5} 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,15 +15,11 @@ 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"
 IUSE="doc sqlite test"
@@ -46,7 +42,7 @@ S="${WORKDIR}/${MY_P}"
 WEBAPP_MANUAL_SLOT="yes"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
+	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
 )
 
 pkg_setup() {
@@ -67,7 +63,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 --parallel 1 \
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
 		|| die "Tests fail with ${EPYTHON}"
 }
 
diff --git a/dev-python/django/django-1.9.13.ebuild b/dev-python/django/django-2.0.7.ebuild
index 481a4e6cfeb5..133d40ffb7d8 100644
--- a/dev-python/django/django-1.9.13.ebuild
+++ b/dev-python/django/django-2.0.7.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python3_{4,5,6} )
 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,7 +15,7 @@ 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
 	"
 
@@ -25,28 +25,29 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
 		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[$(python_gen_usedep 'python*')]
+		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		)"
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
 
 S="${WORKDIR}/${MY_P}"
 
 WEBAPP_MANUAL_SLOT="yes"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
 )
 
 pkg_setup() {
@@ -92,8 +93,7 @@ src_install() {
 
 pkg_postinst() {
 	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
-	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+	optfeature "MySQL backend support" dev-python/mysqlclient
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
 	echo ""
 	elog "Other features can be enhanced by"
diff --git a/dev-python/django/files/django-1.4.19-bashcomp.patch b/dev-python/django/files/django-1.4.19-bashcomp.patch
deleted file mode 100644
index 26d5f7ee1405..000000000000
--- a/dev-python/django/files/django-1.4.19-bashcomp.patch
+++ /dev/null
@@ -1,37 +0,0 @@
- extras/django_bash_completion | 17 +----------------
- 1 file changed, 1 insertion(+), 16 deletions(-)
-
-diff --git a/extras/django_bash_completion b/extras/django_bash_completion
-old mode 100755
-new mode 100644
-index 1c3887e..748227d
---- a/extras/django_bash_completion
-+++ b/extras/django_bash_completion
-@@ -37,7 +37,7 @@ _django_completion()
-                    COMP_CWORD=$COMP_CWORD \
- 	               DJANGO_AUTO_COMPLETE=1 $1 ) )
- }
--complete -F _django_completion -o default django-admin.py manage.py django-admin
-+complete -F _django_completion -o default django-admin.py django-admin
- 
- _python_django_completion()
- {
-@@ -55,18 +55,3 @@ _python_django_completion()
-         fi
-     fi
- }
--
--# Support for multiple interpreters.
--unset pythons
--if command -v whereis &>/dev/null; then
--    python_interpreters=$(whereis python | cut -d " " -f 2-)
--    for python in $python_interpreters; do
--        pythons="${pythons} $(basename -- $python)"
--    done
--    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
--else
--    pythons=python
--fi
--
--complete -F _python_django_completion -o default $pythons
--
diff --git a/dev-python/django/files/django-1.5-py3tests.patch b/dev-python/django/files/django-1.5-py3tests.patch
deleted file mode 100644
index 16b2cc209c0c..000000000000
--- a/dev-python/django/files/django-1.5-py3tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://code.djangoproject.com/ticket/20514
-diff -ur Django-1.5.orig/django/contrib/gis/tests/test_measure.py Django-1.5/django/contrib/gis/tests/test_measure.py
---- django/contrib/gis/tests/test_measure.py	2013-02-27 03:04:14.000000000 +0800
-+++ django/contrib/gis/tests/test_measure.py	2013-05-28 04:40:18.983011224 +0800
-@@ -40,7 +40,7 @@
-         "Testing access in different units"
-         d = D(m=100)
-         self.assertEqual(d.km, 0.1)
--        self.assertAlmostEqual(d.ft, 328.084, 3)
-+        self.assertAlmostEqual(d.ft, 328.084, places=3)
- 
-     def testAccessInvalid(self):
-         "Testing access in invalid units"
-@@ -172,7 +172,7 @@
-         "Testing access in different units"
-         a = A(sq_m=100)
-         self.assertEqual(a.sq_km, 0.0001)
--        self.assertAlmostEqual(a.sq_ft, 1076.391, 3)
-+        self.assertAlmostEqual(a.sq_ft, 1076.391, places=3)
- 
-     def testAccessInvaliA(self):
-         "Testing access in invalid units"
diff --git a/dev-python/django/files/django-1.5.4-objects.patch b/dev-python/django/files/django-1.5.4-objects.patch
deleted file mode 100644
index 48e649081d34..000000000000
--- a/dev-python/django/files/django-1.5.4-objects.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Remove un-needed objects.inv files from d'loading during doc build
-diff -ur Django-1.5.1.orig/docs/conf.py Django-1.5.1/docs/conf.py
---- docs/conf.py	2013-03-29 04:10:14.000000000 +0800
-+++ docs/conf.py	2013-05-28 01:54:49.695008477 +0800
-@@ -91,12 +91,6 @@
- 
- # Links to Python's docs should reference the most recent version of the 2.x
- # branch, which is located at this URL.
--intersphinx_mapping = {
--    'python': ('http://docs.python.org/2.7', None),
--    'sphinx': ('http://sphinx.pocoo.org/', None),
--    'six': ('http://pythonhosted.org/six/', None),
--    'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None),
--}
- 
- # Python's docs don't change every week.
- intersphinx_cache_limit = 90 # days
-# Fix creation of html docs on python 3
-# https://github.com/django/django/commit/a5733fcd7be7adb8b236825beff4ccda19900f9e
-diff -ur Django-1.5.1.orig/docs/_ext/djangodocs.py Django-1.5.1/docs/_ext/djangodocs.py
---- docs/_ext/djangodocs.py	2013-03-29 04:07:21.000000000 +0800
-+++ docs/_ext/djangodocs.py	2013-05-28 02:34:59.057009144 +0800
-@@ -204,7 +204,7 @@
-                         if t == "templatefilter" and l == "ref/templates/builtins"],
-         }
-         outfilename = os.path.join(self.outdir, "templatebuiltins.js")
--        with open(outfilename, 'wb') as fp:
-+        with open(outfilename, 'w') as fp:
-             fp.write('var django_template_builtins = ')
-             json.dump(templatebuiltins, fp)
-             fp.write(';\n')
diff --git a/dev-python/django/files/django-1.6-objects.patch b/dev-python/django/files/django-1.6-objects.patch
deleted file mode 100644
index 597da6e6bb1c..000000000000
--- a/dev-python/django/files/django-1.6-objects.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#Remove un-needed objects.inv files from d'loading during doc build
-diff -ur Django-1.6.1.orig/docs/conf.py Django-1.6.1/docs/conf.py
---- docs/conf.py    2013-12-12 14:37:59.000000000 -0500
-+++ docs/conf.py    2014-01-16 20:57:36.253670094 -0500
-@@ -109,12 +109,6 @@
- 
- # Links to Python's docs should reference the most recent version of the 2.x
- # branch, which is located at this URL.
--intersphinx_mapping = {
--    'python': ('http://docs.python.org/2.7', None),
--    'sphinx': ('http://sphinx.pocoo.org/', None),
--    'six': ('http://pythonhosted.org/six/', None),
--    'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None),
--}
- 
- # Python's docs don't change every week.
- intersphinx_cache_limit = 90 # days
-
diff --git a/dev-python/django/files/django-1.6.10-bashcomp.patch b/dev-python/django/files/django-1.6.10-bashcomp.patch
deleted file mode 100644
index 7c6ceff076a4..000000000000
--- a/dev-python/django/files/django-1.6.10-bashcomp.patch
+++ /dev/null
@@ -1,35 +0,0 @@
- extras/django_bash_completion | 17 +----------------
- 1 file changed, 1 insertion(+), 16 deletions(-)
-
-diff --git a/extras/django_bash_completion b/extras/django_bash_completion
-index 8f85211..ab13755 100755
---- a/extras/django_bash_completion
-+++ b/extras/django_bash_completion
-@@ -37,7 +37,7 @@ _django_completion()
-                    COMP_CWORD=$COMP_CWORD \
- 	               DJANGO_AUTO_COMPLETE=1 $1 ) )
- }
--complete -F _django_completion -o default django-admin.py manage.py django-admin
-+complete -F _django_completion -o default django-admin.py django-admin
- 
- _python_django_completion()
- {
-@@ -55,18 +55,3 @@ _python_django_completion()
-         fi
-     fi
- }
--
--# Support for multiple interpreters.
--unset pythons
--if command -v whereis &>/dev/null; then
--    python_interpreters=$(whereis python | cut -d " " -f 2-)
--    for python in $python_interpreters; do
--        pythons="${pythons} ${python##*/}"
--    done
--    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
--else
--    pythons=python
--fi
--
--complete -F _python_django_completion -o default $pythons
--
diff --git a/dev-python/django/files/django-2.0.7-bashcomp.patch b/dev-python/django/files/django-2.0.7-bashcomp.patch
new file mode 100644
index 000000000000..2d886fe6481c
--- /dev/null
+++ b/dev-python/django/files/django-2.0.7-bashcomp.patch
@@ -0,0 +1,41 @@
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,37 +37,4 @@ _django_completion()
+                    COMP_CWORD=$COMP_CWORD \
+                    DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+-complete -F _django_completion -o default django-admin.py manage.py django-admin
+-
+-_python_django_completion()
+-{
+-    if [[ ${COMP_CWORD} -ge 2 ]]; then
+-        local PYTHON_EXE=${COMP_WORDS[0]##*/}
+-        echo $PYTHON_EXE | egrep "python([3-9]\.[0-9])?" >/dev/null 2>&1
+-        if [[ $? == 0 ]]; then
+-            local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
+-            echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
+-            if [[ $? == 0 ]]; then
+-                COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
+-                               COMP_CWORD=$(( COMP_CWORD-1 )) \
+-                               DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
+-            fi
+-        fi
+-    fi
+-}
+-
+-# Support for multiple interpreters.
+-unset pythons
+-if command -v whereis &>/dev/null; then
+-    python_interpreters=$(whereis python | cut -d " " -f 2-)
+-    for python in $python_interpreters; do
+-        [[ $python != *-config ]] && pythons="${pythons} ${python##*/}"
+-    done
+-    unset python_interpreters
+-    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+-else
+-    pythons=python
+-fi
+-
+-complete -F _python_django_completion -o default $pythons
+-unset pythons
++complete -F _django_completion -o default django-admin.py django-admin
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
index ca9edb307f40..db112676cb6e 100644
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/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/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 9e1ae621aebc..cbd40882c150 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,6 +1,6 @@
 DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2a8e179af14c0c3f0d5f9926cc3705dcec84d2b9b2b7b3854bf9de178256ad2c4ef4bc567c6ba0d95d2abc32b8ac SHA512 7b06cbc7bf7a7f9002e1d61fbbafdb7ee6fa804145e7ce7edc547384f22cac8f9a9072bc137e201ab08a49eedb5e4f2ea8a1f02bd806d7d01525bdedece4afb8
 DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
 EBUILD docutils-glep-0.4-r1.ebuild 1160 BLAKE2B dd01498b0945f97833ca83fe44b72be76200d08b4a76394dc0b8265de641cce0a85d094e245af02b7b1590afc211a218f52324a57683feefb17958683d21bf22 SHA512 083901d85a132393ffb1300bef09fe3f797580a41f3e74fb4dd6f6a23e621a353f262fa03b642a34f5a73b96c5be39bcaea6d531ca6881e36c7fd891078312a9
-EBUILD docutils-glep-1.1.ebuild 837 BLAKE2B 30df86111f7e2fd420595213d1862134166ea186d7cf2b24da6eb34e4277e1de5c7ff49597a6937e28f6dd97990aa38b45c29549a921b7d3250f1edc188a554b SHA512 faa4f4f2be9ac6e4b1ad47ace0d7796c55f59e4da23a8aa688cc02414f90c38189f6e176d497bed8848bf13e594b8e96dbbf0072aa8245e2ac8d0b10d14be56a
-EBUILD docutils-glep-9999.ebuild 573 BLAKE2B 032fc2bb940904ce0602226f004d4d8990bba9ffb35ca3e81774ab101106aaa147ead13d9e6bfbda48b7f48840fb4c0afbe5578a5c8e8070bde87afd9a7e164c SHA512 200f86c1399dda6276e98c83a649be7d1eae49fec9976f1b04234e61aeef73bb6f55a50d50b8add157e844061f7da7092e25e9136eb0acf059d1ab2f32200ce5
+EBUILD docutils-glep-1.1.ebuild 841 BLAKE2B 16a0cc65e90fa9e54e6aa8eb0eae5e88731c604488e3870b28843d0adc61cb377b520680ab96990a54e132d09a4a26d15dd05f0d09f896d2f6fc19b79c4b2b21 SHA512 a2b7e94eab916153c26a494c83091ac2271ac219f69b5e1a408ca5c1e1c07fe0abc54c2f9e7f88832e744df70c64d4989ffe5334a2795e725b2da14fad676366
+EBUILD docutils-glep-9999.ebuild 577 BLAKE2B 4f07f027dc2dd697e99cb49ba98dfc78066f8afc69e164fb89f21d966a51e789640735e207b73bda7277369f1a7e5c896cdc68780a8272c6cba398549fa904af SHA512 70fe29085c4587de3ba0318e07cc1695e8fbcbc227486b4ac4ae752d042f7eaa12a5ead487e3a49f16aa8f1e9f7d6c6dddd92c4f2c644dad09d3f80303d9d05a
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/docutils-glep/docutils-glep-1.1.ebuild b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
index aae20e340ed5..a95b48e98a97 100644
--- a/dev-python/docutils-glep/docutils-glep-1.1.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/docutils-glep/docutils-glep-9999.ebuild b/dev-python/docutils-glep/docutils-glep-9999.ebuild
index 7e55e43f001b..65057917193d 100644
--- a/dev-python/docutils-glep/docutils-glep-9999.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-9999.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=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 EGIT_REPO_URI="https://github.com/gentoo/docutils-glep.git"
 
 inherit distutils-r1 git-r3
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index bcd4c40bb28e..1b6518a1a69e 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -6,5 +6,5 @@ DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d
 EBUILD docutils-0.11.ebuild 1865 BLAKE2B ab64496926dfa4984d2c43aa079e8674288ccfe46aa177bba9526737dd87e6c0c608bc79326fab385da3e1cdc049b1afe27d4916ea832db005efcc917c3b97fe SHA512 5e2853a6ca36e893eb6df7392745091970c8a2008b39fa3ab9a5599c2100c889fe2ea1bf9e66cb28023214896c2d84403160fa0b9f4913caf80b962f07148c17
 EBUILD docutils-0.12.ebuild 1812 BLAKE2B 69fbd3323beffc4f47358bed59b1cbe1047a999173c244de9e1847eb1c7d7246b75f089426fc9b05c0f7be9e7cc02f99dce8a3ef2cca7fe76f1cd5764af4d0b1 SHA512 551c27aadc5132f4d0d1d38c900b711cd5e1bec371bd0f7a588a885409f11500ce4d7386982643af2a095cccc6655311ae06cf8901e506be428049bc5ec67468
 EBUILD docutils-0.13.1.ebuild 1826 BLAKE2B 7ce8a58e17edf3ae4fba6a8adf45b7e5f407f4aff58b82d62a0fd40285f17f83cc7824268e18dc3e6640478d51c433f708482ee40f2fea469a6806577b1f7c4e SHA512 82b9ad9c28a2f9ffccbb5025eddd339d6fe2366c32a95c819e06bef6a480635ecd4fea5c1aa7857386c83c36c046bbd046535a21132e802158084c5b2dba99ea
-EBUILD docutils-0.14.ebuild 1839 BLAKE2B e5b1124946320726d3aec879fc59e0755647f1e1256c4fa2c73f722ae22af308e74d13ff1c85944aea43ebb8fd522e7930013c28ed15147f7a5b9a546fe36540 SHA512 1e66faf8e597c5b45e0d732962be8528f86cdc02031b85f05b8bff5159725be2be8ea7ced14bf75b3bd22384a0e8ee74bea706c372a31a81d733d6e49653cb1f
+EBUILD docutils-0.14.ebuild 1841 BLAKE2B cf31c5fdb92db4e1af68e6d9efe47a3d38e8dc02fa2bf864118c793f018bd294e8f4fb91796f0c6226644628d29220ff46c0da356d068b21de83f792d52e043a SHA512 5d2950d05b82029c3524278b74030c32a820298ca97166a2fae074017e28c65e33fd6ebbeb481c15e9ffb806d2ebe94f9b7ddd523d4a605049b3a55fd24f92e1
 MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
index b7fb3c6832d9..2ad28f4556e0 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index e15d945619f2..729f7b73aac4 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,5 +1,5 @@
 DIST execnet-1.4.1.tar.gz 171041 BLAKE2B 7e51320969b0203a8ff55d69364c3fa69d747d67f5dd3a3aaeab7700192d63918bbc11ae29a1e26e466078f1ca87ea00ddcfe0f98132921bacfc95671c3ad7c7 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790
 DIST execnet-1.5.0.tar.gz 168497 BLAKE2B 1777f3a72cbf75e5bdef90cdda956a5d8101980f299a1bade6d6faeec52e1026a18a87c8b6b08c8d27073acedacd38473f68c6823908701816b4725edd3d9fb0 SHA512 ca2b571fafdf8f68b3cc7a04ee326e3255828d4cde28ead65d0cef325569c3a6dee09359e525152248038de65326ffc6b75c8362f53aa5c0b3f736eb596cb2d9
 EBUILD execnet-1.4.1.ebuild 1263 BLAKE2B 80a6575e5d030309388a6dc3f4a6e14a528aeff72bc0b6fc9ec7cc1657685ec98374662b5bc8218b728d10f726f703ea1d92ae664cf3081e8b9302f0c4ce16c2 SHA512 f33be0f997bb2e2542a4f9bc7f4abd836fafc013314bb4bd2803d39a6fd3e043183950a42f11d3768977c62262ae1948b660d2ca3a31498d388a30050c1afd4d
-EBUILD execnet-1.5.0.ebuild 1285 BLAKE2B 701047f7547c4199364374a5f716c1b503966dcf6d4d67dff836af5e2bf52cd5e8900385dd49c15bd8ceefff42c4244f1669ebfddc6fd18faa77cde1749272c1 SHA512 7b5111a48bf438dd0897f3e0694723f4bc3d23fa7ef25ccdf831c91b0b3b7740fca2803a9ab9de7ba5cc0e45e9e83553cf117be73c683d1af859b453d8adf6e1
+EBUILD execnet-1.5.0.ebuild 1287 BLAKE2B 7d218efe622b8a864eb1395b1e4394b8a732d41a942531d785afbbb03065edac00b0fabe93159bd4aced7a201bb7b8858b6916ecba1ddea4e291b6c41e9f37af SHA512 aea3c08d60dab2b06f15613eaf6a49c8a0de8eb5d090a50e518690fac81646f2d4a93054554b78138ac81ee3e315f2d0a7db8f8de709542dddee3456bd3bf9c4
 MISC metadata.xml 541 BLAKE2B a1e9f563cf102eef9dcde4800cca44d354e4cb7d77c20422074296c3eb2df1baa46f4cf5a803b07f454e98f902124f185ff24224f499d50577a2c2ed3cdbe21b SHA512 8afb04a008ce5704560a8f984dc5662abb01244b93bbf655bf0c66365a125a07dd1adca26f75df2bc89f923409b3687bc610f0ed739879a6f66167b799963091
diff --git a/dev-python/execnet/execnet-1.5.0.ebuild b/dev-python/execnet/execnet-1.5.0.ebuild
index 1041eb5b2767..f2499b4f744a 100644
--- a/dev-python/execnet/execnet-1.5.0.ebuild
+++ b/dev-python/execnet/execnet-1.5.0.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index b8c6bb0c9f36..905a45a43fed 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 749 BLAKE2B a726798ea12197dc233c8f2331ba65aa14e80b95a5c0af74fa314880a5606102e23edf08d8b6ffceaa45fe3e8a0e068219965ad15b6e973815f0b11f3e6f37f4 SHA512 cfd38c88f6f5ce7bce1b889016f148a3d68c325d6c40968d53a4e4cfe324ad6cb0ce8a9a21949c4663d39c15f448fce836187a7878668eb5086cfca7611f4788
+EBUILD extras-1.0.0.ebuild 759 BLAKE2B c899d660b213008d432271c9035136e24bbfbb45f172fc90b00d2fecd9d07cbb0d729e3e34ad9ce6101d4107aa76ee96e70d32b50ae1799c1f28a753f4cd8e2b SHA512 63b4889b311adc66d3d80a4b93a37a53eeb759f4d6804666ccd69d8234ddb20544a640c5d25bb95059c8b45af704ee74de604439b088c9e41e3f8ea719f3c652
 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 7bc9faaaeffc..925a6fda57eb 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index ffe0df40f633..f54da610e89c 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,5 +1,5 @@
 DIST fixtures-1.4.0.tar.gz 50411 BLAKE2B 2dddd3ea21a4b7cf62d58563b67a99a9ead0c32b62b818818567133b72bd85d73df4399173e262683f02ee892842b6444e06896592e1968f219cffd39e6aec0e SHA512 62e314821ea507ab5c1465fb626c29c91430b36ae4670fd05a3aa7180452989c393d35ab623da3646b25cf671a84861ab68d9529d04ae759c0d38efca7c7d8cf
 DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
 EBUILD fixtures-1.4.0.ebuild 945 BLAKE2B 6859fb63cf26af7dfcca7c5e547e21c4c5726c1ba404d9cf54cdd1d169b3a63d5de97b1ea5834f7e082a535690a3fd3ac50d8aae1ca142c3e12286586bacadfa SHA512 3f2fe16c2c346fcd2f7f3fa90352a52cb7179ecd9df812f234dd05503f238f821f6c5a3842e3b3eca01f7df0001494bd2b2ca25fb01aff6b41f6fd88af2e02ea
-EBUILD fixtures-3.0.0.ebuild 960 BLAKE2B 7fb0c9409d506350ba3aef8ff07181d393ff07c3700d7340acdf2dfe11ad091e74df3ab4a6194148e088077374dd121bc50a7655a6756a3c94ee5129c02c856f SHA512 9cbdd9cf1722469024ce4d98f10597d5e0bfb4c2b1b22f3586bf7a3c6788565bedd3b4755d74aa75a09ad69e38d19cc683b3f1ba71ec5871092c1fd8c3f4bf67
+EBUILD fixtures-3.0.0.ebuild 962 BLAKE2B abfad3bff92fd000cab5ff4aae6f97ff5839d2769d2c7ea53bf38ce168f912409cadf65ca2284b972e783923a68cb699d75212b12afe81f1116699fb64f40af7 SHA512 ecfd0db04defee175b4c3625f3b99de91e2a24a9a95e33aab1646d93bea88fdfa395f626c50a49a3a7caa066e3439ede2c7351c530381f4318f32e94d623d833
 MISC metadata.xml 889 BLAKE2B 4cabcada61b38bd01f30fe3f5f637abeab381b4dbac5c1f4999040afc02f22fb9ecc92930f724a26de040e1437b09a0cdcc67fc0964f92296061e0cc43b6decc SHA512 8887064dea4084b58983b19ff033b543fddaab24ee29e6b52dc4cde0941eac612fd5c7054bda842d69b900555e308f0b9bea388ee2af3ffb3eb04cf8f76a4232
diff --git a/dev-python/fixtures/fixtures-3.0.0.ebuild b/dev-python/fixtures/fixtures-3.0.0.ebuild
index 97eca1375e6b..8c0920ccd010 100644
--- a/dev-python/fixtures/fixtures-3.0.0.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index 8559916ed011..4f0b89d09554 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,5 +1,5 @@
 DIST flaky-3.1.1.tar.gz 29136 BLAKE2B fe2f47356e0279885cc294f22bc4588b502c7ada1d3f7a3728b1e3127f011f5900187669bb4e0755e706a1bd77e1804c42986a07c6d3dc58fe085967adb6957c SHA512 039ad115a52b8b3a31bba045874e1860f1e04ea9cf878316226fb22af3c715b3893570c2f7380cf8467107f1a83a4ff69d0e9135daeb2dbea4b8f873a192815c
 DIST flaky-3.4.0.tar.gz 29197 BLAKE2B 8f551a414cb06f5259d37785eb769a77105b1039398462288eeaeeb6acea8456c30cc7da6cf515cd99be2adb19a77282d2d0d3abe795761985f45ffd062de508 SHA512 14fda6312e4eb8260a8190204622a7dd274d0c946dda07ec8aa65e8c341f7f4a701c704c807f50eacf77589231b37c3bb06eec18d60a718f24e9b0182f7e8cb5
 EBUILD flaky-3.1.1.ebuild 1389 BLAKE2B cc36048c3dfe308c8166cf42c2ac3bea5289fe758433e8ef86c3ffc891298aa9db8a5332df415884e3b6f82a0943ada48d90bd9a7c921d8ab8bdd4ae1d4e666c SHA512 b5fdc991adf8d32e765dd5866aac03f69ab5f999af0c3d755de3915425fd4e6690077280f6bf58739ed2702db17f45ce0700887caddf5066a4220040dcbd4d99
-EBUILD flaky-3.4.0.ebuild 1410 BLAKE2B d4c21789e8bca78aee0bfed6843c2a47ee8d85174879bea0e0a41752beb504a3234833e05411da1e12237fc4d977fd3cc789a65784e01bf3aaa2fd93db4c711f SHA512 e2f915e322609583d9110971bdeb3ba7a25f340ed54974867fd3f25e1c11dd2b52f0bb2c14ee6b1054195f4bac8060cfbb507e281e2313200cf6b348615709ed
+EBUILD flaky-3.4.0.ebuild 1412 BLAKE2B 7ef25fda15bbb6a2472b90c8431639ad37b83e20791afe9b4a777d547f4cef9f33f2a93c261dfeb557041e1b68c301b23bc77bcace218c4572ac342a1cb748b0 SHA512 b5e198530ebc39d1f6efe14593ab5d027ff0eccf223e3657e32630a3e35448014ffdeb5162b4b39bc1da18e69e9ff31889384b175a7663be1643e9b30269ed76
 MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
diff --git a/dev-python/flaky/flaky-3.4.0.ebuild b/dev-python/flaky/flaky-3.4.0.ebuild
index 60c307a51b05..7f4a1830a440 100644
--- a/dev-python/flaky/flaky-3.4.0.ebuild
+++ b/dev-python/flaky/flaky-3.4.0.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flexx/Manifest b/dev-python/flexx/Manifest
index 0aa11d4411a8..14392d81298b 100644
--- a/dev-python/flexx/Manifest
+++ b/dev-python/flexx/Manifest
@@ -1,5 +1,5 @@
 DIST flexx-0.3.1.zip 418280 BLAKE2B 9b0d5e91b7a0c61c2b7c65594546531f7f611620d20fbe1ad487f7f8db104d106d75c2818364658901ce7133f3676f8274cea5946b9525a9f6b6f4f4fdd8c64f SHA512 3d98daa18e0f307ed24386fc59a59a4df1727cdc7483cb1fa7bc6c5b2eb8cba36fbc100a98d8549ac890ef8ba86b9acef77d34e26c99994b918f5344354b0bfd
 DIST flexx-0.4.1.tar.gz 287596 BLAKE2B 768100f6ed38ea7639e79c23a74a2ba38c41e4450920be4c331c159fed92ee8fd143de28c33ac7eb2625717c2fd53b90571a0a9064b36e5c9be4883d6e71468d SHA512 af9d84876d2c6b5f8b9fe7967dc282e4043456606c1574c10cfcd15a3f3d0d3f8f889a41ff254655eed06200b5d9c10fa27249343ee689ff62346031a4ed607b
 EBUILD flexx-0.3.1.ebuild 553 BLAKE2B 9d973cfd6c17563c4abf3bd2791426b72e495234c9309921c461389c8c233cded08e89c1ddebfea7e88e2611e6e7feaf1988545df3fd581d70734bf85b290238 SHA512 43409b4fc2e416d98bb27cb34821d4f28e956954703b09251597e90f09f5bd161358a7737251fa849cc66610f150e6436ee4402476fac6123670aa62d05401ef
-EBUILD flexx-0.4.1.ebuild 652 BLAKE2B f626b6e88647b013212811a8b855eb03e2e6f7531cb7961acf62247d0b951b0e5fc847d0ced6a63f1aa2346f4d5debb349f69ef616c2f9eb643fbba6df64efa9 SHA512 dc34d192bb8f828ac727883bd1e3e10eee1c3113ace957ebb36b94e156e14400784851d49189769fa9380a91801e1daf59ed15bf9a521f453c07eacbd90f6635
+EBUILD flexx-0.4.1.ebuild 651 BLAKE2B d0ea701e844c932f33b3aebd9b97cd9fb20b520a41f71c19ded056acdb21d25c39f5544e55902ae527588e9aed9636fc5cc2a7a8bdb8e870bfab07ca02950550 SHA512 f522ec1764a14167329971b94a4091e5391f2e0d718eeb0df11dfb3adcc57e8ff0a70ee47471ab3c0a0e953591104ba3fd79514109ce6a1418d6c36220197b4e
 MISC metadata.xml 509 BLAKE2B cae737d6d72895541b62c3aad8301bda5b44314fd46df14237061cfd260a57f524d803b7054927834b00316d1add8e28be4fdc05adcc6142a68986944e263ccc SHA512 5e15dab8c10def713dacd1e6883502c075aff68e72b839d89273d28b3edc7ad03cc82152e1f4fddbd416b08fb0efdda3df26832c99bab7cddf700caba0258492
diff --git a/dev-python/flexx/flexx-0.4.1.ebuild b/dev-python/flexx/flexx-0.4.1.ebuild
index 2f27036efa8c..9a87188c88ab 100644
--- a/dev-python/flexx/flexx-0.4.1.ebuild
+++ b/dev-python/flexx/flexx-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/zoofIO//${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 #IUSE="doc test" broken tests
 IUSE=""
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 11fde6bda583..9f627f387ab2 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,6 +1,6 @@
 AUX freezegun-0.3.10-py37.patch 2157 BLAKE2B 9d7815473f512a36431872664aae95d9aba815380ec08ed6bd54d764a3e65347c9214fbc7ede39b94964105f8fca2a3127e1eddb9b4385d30788b3bceb2f975d SHA512 1664ce2e1947a6b9b37beb3191ab83f3e7e257f500aa512c0d0d085af34b150fb964b18875faba976f0d094b80681e778a7b06b5251eaa1e811cfb2eaf9a2fb3
 DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
 DIST freezegun-0.3.9.tar.gz 18118 BLAKE2B 7382646acf0ca8100680cd44d22de3263541031686e05f7957023eaf22f2a1dea370c98f8b6af89a5075aa5636c304e6e7d5a1c64285aa221a73c732bfc5e0c6 SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17
-EBUILD freezegun-0.3.10.ebuild 954 BLAKE2B fed2e0e3ec65a6382dd8c579a17985d288d6a13b616a391f625a2c02a667633de2a518cab065d0642adaf85f003ade68baf55b682114699fc8e4029b25e02018 SHA512 5ec546e3cf035c0407dd0e046c877edbbf6d69bcf7c41f32244186ff8d202e1c8ba3fca091c51464e682ad30dc941a239346f3f260e02ebd00e111f1e137ec29
+EBUILD freezegun-0.3.10.ebuild 957 BLAKE2B bec9ab1b916ca8d8bd2cf9af1a698cdac8a473fbd9bafc98ba1c99c89a60c6abbc33438ed6cd27920479c1d66f9f8e543fc658747811e8626207994a00c8a996 SHA512 0de365fcdf602cea427ad229b4093d60bcc6ed7d0827664c152bb7845012773510bb24f829aa11d5b3a9fb802b71f0a51a909774796b7f395ba84440a5aa56f9
 EBUILD freezegun-0.3.9.ebuild 654 BLAKE2B a48e34dd3278053d7eb42f73e0e6c226f2c28d0075dfd7457bae59a6913631b0389334eaa1ccfef4535ffca72f3370f0a255f362a26c54c9f19ce37317384f30 SHA512 0060d7b5a703225eae1dc91cf3d5568cbb48926e1f60bc7ee4ae9936a62a7286f974d9887b91af19cc3269779ab9e68a334ab6208f239e5aebf9342a75c47510
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
index 0fbdf8bec99f..c25ac0361722 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-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/funcsigs/Manifest b/dev-python/funcsigs/Manifest
index 660caa16bb38..6a3246061b3c 100644
--- a/dev-python/funcsigs/Manifest
+++ b/dev-python/funcsigs/Manifest
@@ -2,5 +2,5 @@ AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 BLAKE2B face7accdd8bc2c5d3ab9dbcf9
 DIST funcsigs-0.4.tar.gz 25697 BLAKE2B 0b57ac0ce3aa8ff16724af9be94f297c15c94ed9083e2dd78796f134054db0e5f8213d1671352e0122a90bb2e8da78937c7a44f2e231b64de29afbb0dcf8b6d5 SHA512 64d821e94049ae906b9e5c8a2590f80a7d1d819554258e20f4170207576e5c8f65d32759a3f65bcb05fe721fa502658ff5767cd435932ea926c792c62ebe96d5
 DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
 EBUILD funcsigs-0.4.ebuild 645 BLAKE2B 6a24bab1b1d13f1a234e56f8a6ee5e50b418347f6efd3208949f1c9c5aee771028fc1d24df5c31ec9618050bb044a0d1c8e451c6783bdecd9c61bb2d0ec98da7 SHA512 a23d3c084c6d5f9893cecc4e82c2598d4e116cf0763229d75658ef23ab8669d3869d30ff864f53520cbdb22e2359d66b6124aae80cb5458972d40ca117eb0014
-EBUILD funcsigs-1.0.2-r1.ebuild 891 BLAKE2B 3b3d92a9a84329f80702ba3d3c354d98c53e6d26f92711af15bd3b5486ea886a7dd96ead2fdabf88ead2eb5909fbcfa0ddf66cea163cbec52176e204ebd305ce SHA512 a9835de88cc6b1a439c1b4752c4b2ed1331333f427e8e32ab142c18629da5ed3b3d7ddae148c20ef60c69d2f4b29cd017bd65426e509ccd44e6953fb0eba111e
+EBUILD funcsigs-1.0.2-r1.ebuild 895 BLAKE2B 70a41e8dcf5605552a16bbb5b6aa5710bbede0dc8ec235095d05f4d2b2a505d2807ba65046e7808aeb773e63cc10ddbd538155d4b04d0dd17a7aae110d90a1ac SHA512 68c27d6d0351566b754d36478f75e7298d77d777e34dae3def316858a18fe20017bad7e2a5457ed90e3c57ec066d240a3438cc575b1c7dc3acc0506f7286c9dd
 MISC metadata.xml 321 BLAKE2B 8aa6245455756e5d3a197dfb37bb706551ff8ea0c6beb047d0c59c54d2ed74853e6d9857d37a531a5313a7a85a0849f5e0b308a58fa98a3cce6040b5b91a1a80 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index 9d4466231cf6..6f23d1222a43 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index 806f88991e89..009896c8f310 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,3 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2.ebuild 743 BLAKE2B 6001a94f53f243782a825dac0e221daf1e78769c051fe567516a722532baac72d842c704cd0321ec6688d5c8bb2ffad4ab81cf54874575aecc3b2892e08a4012 SHA512 04c8749f6a054e226758c9838d15354c2e0420711221528455640cb9acdef96de907c6f929115166dd8cd4a8a4d9f48c3b1c90d9d8320f6596e28b820d03c1cc
+EBUILD genty-1.3.2.ebuild 745 BLAKE2B 18fffd4db162b81254756763702639aab42eeceea375c67d43516e4582a64b0baad3296b9b707338566d7baa2bbf2b351ec5ad2bfe63361ec9449499daaa8eb9 SHA512 49612d372e3c1f07eed6afd6ecf5e435c32f4c4f15f07c7be6cd3b0ae9b205594f703e9103f1e1ce89516150e81e1595edbc68a2f1d04dcbe0b3e4353588b7c8
 MISC metadata.xml 357 BLAKE2B c4b7d3382dabce66ab01fecd442eb82e979d27434b0888c06d75d138ced20b984c67367f632a9fe00602d8d385f2222af1e195b8cb5e8b8b7e50494b9b018627 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index 705d0477a7bd..4981c4de3fab 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 501bbb036c71..0aeacb19bb53 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,7 +1,9 @@
 DIST gevent-1.0.1.tar.gz 1455636 BLAKE2B 1de7c6986db96f8568a43aef1ff3c9b80b09047fc110a8b994db3cf2de39e7470478b78b631138d0d58ae4e2367f84bd8a45caced8e067d35ba0be98891eb7ea SHA512 4790e06b49536ad15856cf551c7ad4d717be2ceda8bc7d39fc35a0132d21f302e033f3294da426be4f6c0476554163776e5ffd82d89962503a720c453ff96461
 DIST gevent-1.2.1.tar.gz 2808619 BLAKE2B 2e3c15adb33401012951f0f93fe7f17c1c7597bb4021a4a9ebc7ecae390565d9892bb2fffe9cdac4f7e207d97d50da5d335ed8e42070d67d6be617cf955eb0b4 SHA512 22740e8e114869c1f53bcfd6796226927a3a726d4fd49d104b947f0c97546c7490eabea98b4492db794e21d26d0aee85f1e40b01d386a47063b042a719e61726
 DIST gevent-1.2.2.tar.gz 3108671 BLAKE2B f80df00f58ae2f65aa7f65fc9eac5cbf63a0084f24ccebc71ba9bafba72cd48fff2e7d0b1d8de7939dc669d7708e120fc14077cc845fe3ce212d6a80a42b5158 SHA512 1e2dd544cffea62ee32de2e4066b3f4c121058a1211b89da281ec3882f3763217fe2d346ce38b66e27df9f59cfe05bb137d1608a681dd10eaf06a33dc22f531c
+DIST gevent-1.3.5.tar.gz 4609085 BLAKE2B 55cb4111c9eaf9bbf636c9f1ef8d695def15a92e5591a0c441aae27f41a126487b37b8cc7a701a43453109f24114e3a0c584dff4b9b202018fd8334f0bae8e8d SHA512 4fd6d66e62437c859d653de4e981500fb3a025e6608b91fbb3d5ba4d8f0bff7cce980c03484c1c160a608427979ca763a6660d40ffcb45df4abe5f152ce65d1c
 EBUILD gevent-1.0.1.ebuild 1461 BLAKE2B 2d74fcc19654b02d952b6b0b4614633aedc38ad294f359004c59b8ea58e64d869e0eaed913f477147fd42bdb927ec03e178ce6e535cc832ce0afbe8b59bea17e SHA512 e8d65da8ede2d244ab2e9d67c626b84f83b0d1264ef25f63842a7787844411c188019426bd83b412de5fa8c6ce9948efabf29fe128c6e7c10f838d6a8112a76a
 EBUILD gevent-1.2.1.ebuild 1846 BLAKE2B ac52fe91163f2ff60cdd9f0681fc5887c910427cfc284e207bfe61a71d2d9ef3c076c2a71796fa063b7c3d17f835c02a328ac91ceb5695a21808f1d09d7787f8 SHA512 df9cb3451b2c186fed7c7db5d97164fe849bb721ac49c3833891cc1bab4a67874ca065c0c66508bd584433a9ef90f8792df2e37248290308b1421c8a221b2d5f
 EBUILD gevent-1.2.2.ebuild 1856 BLAKE2B e88950d1a0efff78649584c1f745a9212c3e428af471a7522c771ed2c784ef9700adbaeaa51dd54b43d4ebc83497ae1267538f338abed270c49260fdc947a25b SHA512 f9b23e2db58298a567f81eee28a0388814f5deec19ffcec88bb1c47618137997d20bb287abe6949cef157f8f062010f65b90b35ffb8736d2e02b2bd725a8f46b
+EBUILD gevent-1.3.5.ebuild 1791 BLAKE2B 8cdca98a2012faf3dab69f6933e24b575d6028a833ff90e02837fb63e23fde97d5af58939abad4fe3e3239d550d9e7a057529f308e45d4df007ab47a5a864126 SHA512 78545274f97b632aa9addf4782c098e2d85085100c2aeffd2b7aae0ca79bb7a6bfd921e636df8d8c9d5ea52952310526ad32d776960e8547248a7cd53c1381e7
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.3.5.ebuild b/dev-python/gevent/gevent-1.3.5.ebuild
new file mode 100644
index 000000000000..ea439ad7d480
--- /dev/null
+++ b/dev-python/gevent/gevent-1.3.5.ebuild
@@ -0,0 +1,72 @@
+# 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 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-libs/libev-4.23
+	>=net-dns/c-ares-1.12
+	>=dev-python/greenlet-0.4.13
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd src/greentest || die
+
+	GEVENT_RESOLVER=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py || die
+	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
+		"${PYTHON}" testrunner.py --config known_failures.py \
+		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index d0822b231f93..5765e5f13766 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,4 +1,4 @@
 AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
-EBUILD gmpy-2.0.8.ebuild 1548 BLAKE2B c7ac28100b86e7cd287126ea563b4f426c98e2e946391c0eb74765c682ba77ff219ed7dd8a8e16190ec6bd9bc009bdf4de6b80560e2d94accc87fd25510e6453 SHA512 381a3aab2acbf50f260a8ddf6eff4f4ce46e5480d6a30d29a000f788a51a4579f86a65d38437ebe6c69f18ad479673284fe0356427ef39e99862130aeb91b9e8
+EBUILD gmpy-2.0.8.ebuild 1556 BLAKE2B bc42bcbe57478ff9bb2e01dce833c0f5b9135c697fc8e401dd62bf7d50d15eaba9373816089bc25729ab4b80cb09791411a7362dd20dc7ac4038c70326a94f91 SHA512 d671fa43035f27593a71fc1c253d6ad32fb39a827332f50322c18250852b2970fd146a0a87676d77c7ab7c09840875bd2d65fd36eca399948c2d7fecab15a722
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/gmpy-2.0.8.ebuild b/dev-python/gmpy/gmpy-2.0.8.ebuild
index 348e2845c10e..d77f7fe344b2 100644
--- a/dev-python/gmpy/gmpy-2.0.8.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8.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
 
@@ -20,10 +20,10 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 IUSE="doc mpir"
 
 RDEPEND="
-	>=dev-libs/mpc-1.0.2
-	>=dev-libs/mpfr-3.1.2
+	>=dev-libs/mpc-1.0.2:=
+	>=dev-libs/mpfr-3.1.2:=
 	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir )"
+	mpir? ( sci-libs/mpir:= )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/gntp/Manifest b/dev-python/gntp/Manifest
index f6f9450d5586..9fd9201738c5 100644
--- a/dev-python/gntp/Manifest
+++ b/dev-python/gntp/Manifest
@@ -1,3 +1,3 @@
-DIST gntp-1.0.1.tar.gz 10889 BLAKE2B 38e80f26a1d6a23eceea43771c5c587ca00ac4b239948dffdee52908b3637644b07c22fa34e2031a32d6915507bef5051f41efa419db4da793d8a0ecf081fb58 SHA512 6e44cbafcaa5b60b39d3bb60a67786300acae5e3aa6fbab1d5cbdcb4a24fffba62f878d801683d724321d5c0e3a3b780da9c99d3faf8a578f956603e1daa49cd
-EBUILD gntp-1.0.1.ebuild 464 BLAKE2B 20ef9f6ffc992efb67f4dd4a4f8d7910206bba9bcb3530e7741fa92afe5cc983db29855b274f2197778db2ca68f78670f3f5283f6594fd0ff08d5527a6a5238c SHA512 a77349058a794b9c06d128fc4d8cfbefc0288f2ddca742c5b231dc765e4c63e9481292ade0cac998104b75368aaed235d5a637b92130c27e9e131c27a4c2618d
+DIST gntp-1.0.3.tar.gz 10839 BLAKE2B f427096ff1e0b81da7f3a6c4f4a477bdedd7c69f632d8ff7bb7780a0b31726341d78852f3819e5ae8764b96513b27c5e3a261e0885645b60b5146d3d36628a14 SHA512 77f4f3801e183eeacceedd2c0588e571e3ffb1d81fc13f222fc593035ed767af487c2242b8cece697b430e04a6dce589c3e91fd5784f29f477964307197053c1
+EBUILD gntp-1.0.3.ebuild 464 BLAKE2B ce730905f2a66d0e36ddd05728a189bf678e80a771936c2c4787880c631eeb12a977856f19982dd45edde3f3a3f4a93ab50dd71235fc4e6ec6781c111737c1ff SHA512 ea970a2ba857b053d1b5a5f933334ff1b78557a1c1878494380bcbc5eca38bf62e6ddc33afa4794cfecd4629971944bc71bf0a749bb9d74f6ac3cd69bf8c8a74
 MISC metadata.xml 372 BLAKE2B 355ee3bad65b04dc623309bd6b14ce8e25b0b16356b4ef6d08cfebb5f2e3b7a9959967e69fb66faee38eca60a6004e03e205400814cc136911bd46b9cc0b9a71 SHA512 c247337a79257cb729b1439a90f977f650169abe6d685edd8f74bf2841f3274579df2b2a3c32ff4a8c2c9771220e6f115295671407829ce145daecf652f43621
diff --git a/dev-python/gntp/gntp-1.0.1.ebuild b/dev-python/gntp/gntp-1.0.3.ebuild
index afaf45e733a5..bf702ddd3488 100644
--- a/dev-python/gntp/gntp-1.0.1.ebuild
+++ b/dev-python/gntp/gntp-1.0.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
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index e3ab02ce97b3..5075a9fc06e1 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,5 @@
 DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
 DIST greenlet-0.4.13.tar.gz 58382 BLAKE2B a4afd9621ccd6444738c9b536af7ad5ceef5d3c8c4193ce637b4a8580c7070805419a917bef131f397286fae13f6e6f23409f5eedb814a41fcfee98356c0951a SHA512 625aaa8875b408442139191e1a63eca71c668675229907335f5caee623487aba5305c1d53b51e1764ad982b8edd07d04f984e08a75318a0a5672805667917a61
 EBUILD greenlet-0.4.12.ebuild 1079 BLAKE2B 39169db1ed98f0685cb36a9761f68a6884ed5ba633a398d4834d53e09b0a43b835125769f4d8189793527a71a4fbd275142a9ce95c5af2a58df4ff487f75a099 SHA512 257224005781fb5cb1871714bf21963616b6c233653b7700e18d943ad97037d88b14e31622ff2317a894433bf3b306d4dbcebbd2c0f77b7d70e41c9d48fcfb4c
-EBUILD greenlet-0.4.13.ebuild 1084 BLAKE2B 0052f254ed678ee40ac9a17e514d4feb4654bec98a2ba10e51ce78180dc1f622e339ada4744488ec07d361115542367d785debc7f1ef7fb5ee39e2ef80d61487 SHA512 7cad57f57ba39f099784afb598086ab348e7d4011ae8d7551a8e4735b3fe991a72306ae91688330ffba9680b432fddb13667895bc0af71f361210d967bc1e119
+EBUILD greenlet-0.4.13.ebuild 1086 BLAKE2B b83981cb8992091fee5df423f5434d5afdbd06ef0c1f8f9f329e2396807d30cc39acd804a5f427ea1c3e5acd0546953c36638fa86219c7e459bb69ac8d09eea4 SHA512 3dc08375923c4e114d6680e9ae9e86623508176c8ea2d349cce535f9f5a5f7b01dd86c5c047548ff5a329ecf77cbe8e5e4bba14c1f330dfdf50085ebba00dffa
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.13.ebuild b/dev-python/greenlet/greenlet-0.4.13.ebuild
index cc9bcb53e847..83376ef6a4fd 100644
--- a/dev-python/greenlet/greenlet-0.4.13.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 7970db0e0b10..574c38e29083 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 2077 BLAKE2B 4165599af654093d9f90f6331dea96afa0b04fc8960d689ca0274ea303f23e5b9310b4b31c18de631e8cccb08a00c6b38865d170dfa531b1a3f3a78495fbc513 SHA512 d681cc292ef612540b18273c4f50b442abb2f9858c00c402e768178c858204b4a17421534912d0ee5c4026c684364aa4c4286d881d46de0d7ff49ad53e8e252f
+EBUILD gst-python-1.14.1.ebuild 2075 BLAKE2B cdff6abd60ae7bd5bcd1b1c44d67e6a3375484cd40a4b808965f09819e2242ec0ec59e86b774d3397822691d2a454fcaacf650ecd482ec3fe7bd19b778a3ad85 SHA512 fb7ed50de548f414dcd4dccaa47070241779a13fe1f33d2840758a798591e93b7577daeeb1128b7a9640295fff5b77a9da8ac57f99120e56919236b4cd104e9c
 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.ebuild
index 8fcc0e29741f..26e8c6c9be61 100644
--- a/dev-python/gst-python/gst-python-1.14.1.ebuild
+++ b/dev-python/gst-python/gst-python-1.14.1.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}
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
new file mode 100644
index 000000000000..214019978e3f
--- /dev/null
+++ b/dev-python/h11/Manifest
@@ -0,0 +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
+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
new file mode 100644
index 000000000000..6c6a5b9ba4ec
--- /dev/null
+++ b/dev-python/h11/h11-0.7.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=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
+HOMEPAGE="https://github.com/python-hyper/h11 https://pypi.python.org/pypi/h11"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Testing failed"
+}
diff --git a/dev-python/h11/h11-0.8.1.ebuild b/dev-python/h11/h11-0.8.1.ebuild
new file mode 100644
index 000000000000..42f5ff8794e1
--- /dev/null
+++ b/dev-python/h11/h11-0.8.1.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 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
+HOMEPAGE="https://github.com/python-hyper/h11 https://pypi.python.org/pypi/h11"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Testing failed"
+}
diff --git a/dev-python/h11/metadata.xml b/dev-python/h11/metadata.xml
new file mode 100644
index 000000000000..e7214b7e32c5
--- /dev/null
+++ b/dev-python/h11/metadata.xml
@@ -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/hgdistver/Manifest b/dev-python/hgdistver/Manifest
index c179b852bf49..d299c9b3a78d 100644
--- a/dev-python/hgdistver/Manifest
+++ b/dev-python/hgdistver/Manifest
@@ -1,3 +1,3 @@
 DIST hgdistver-0.25.tar.gz 9879 BLAKE2B 71caa059359b8ea1be58b6463b260741586ab81e6d8afac5dcadbb35604a564b947032ae645cec683a3c692de8307b23f7abea40d0a1f3802b5257870b7e3e02 SHA512 3fef872af3c8fffb3ba612d2505260468b510c17219257640a4bcf3dc6568fdf59eb3cc544ef41b7eab32ee6cedcd81bfffce753c98bbc7d1e538fe4937d039c
-EBUILD hgdistver-0.25.ebuild 819 BLAKE2B 027e3bf7d9d25fbf8f902b4f6df2846afac30e822b7f164d1f2d908216eda1396ecac1983b5e5cdb9f0e08152109fb584a405d7c44bfa222f3e41de54d331b2c SHA512 697b97467078246f97d5bceff40e0220237d55fa07d699320e3bc48173c4653f52dd07416a2da37aaca5dad651deedf345e52c6da59fd43c23ceb8cc705cc40e
+EBUILD hgdistver-0.25.ebuild 821 BLAKE2B f7b6069122674a697d92691d643441860d426f53f6e097fb8061068b61f4f6f6332f07c1ed5d9038538e9bddd85ed4f060199dac017bbbd41602e808e9c4ffb5 SHA512 23189bb79def5a068ce3c28c7225861712751bc176481b4c8f8de741ada9240db2af3e542ba9125e99fe6c7dd8ba7b0491164248193ac025fb26f13faf90fa9c
 MISC metadata.xml 394 BLAKE2B d2ea329a11dc2b88867e41b22717505a260db3715d8b254fd4fe51224541a428fe7d6b6180dff00ce82b74309f51fb5d8c3a47aa8664bb3492155e8282a112d7 SHA512 01c27a5f8d42a579acc1d21bd2f4b7a569183652c9637403b3efe7dfa515b9c86cee97f505ed909f0f34443cf2912cd1ae6b568a11954b6cf756815a5db82cc7
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
index 3ffdba231f01..af7ea79bd14d 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 79b48e492957..3e082f2fc2f1 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,5 +1,5 @@
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 EBUILD hpack-2.3.0-r1.ebuild 1038 BLAKE2B e97d4e530475ca6fea71a82f43a263430299d05f835e29c3c81b5f3fb0eb5cc6f61964399735c924ae55a5fb10987827da5507b45425512d8af7f9276ab99876 SHA512 9a62c4d1ed8669918aef7eb69eb30c9823cdd6155b3153705d2684cbea8baeebb947246e89612029105493ef62809b59be081d5a06c96675d27134e055a0408e
-EBUILD hpack-3.0.0.ebuild 1196 BLAKE2B cc038d197ee9e597859585c6ca32a9f0b173df78536b5f51c885b0da775f0f693f8f759b35864b3695870d2293e08518b943ffc6e4ca06b7d352a7dab57c754e SHA512 54fd91f2adb35e4f8a842db1ed0aece4e95cc5f47af8decc659616361a09dcbedcff428c08138429555827fae8d9d9eb89a3096362369167ab012643ab10b1c5
+EBUILD hpack-3.0.0.ebuild 1072 BLAKE2B 6cfc73b17dfe212a786fc1703ad9541d43632b66c522d55dcd9287dacf8c855defa2e09a4fe2f4dd30019346c788bea5ae67c3836313c807aec4d6d200cc3755 SHA512 a63f986eb54be14f41643ab1688fe8e892712ad5b46f18eeda11f950871f38febf3cfa7a0c57eb74d20220ceb8903bf8630bf63584219cfab9b6407ed8742e7c
 MISC metadata.xml 755 BLAKE2B 07d55adb82a465399ac181c0bc57d6e884acc171eaf00ae4b32b1c7df02082a80e1904cca1755f755fdf3d7dee3028dfba951d7799485f43657c0141bc12c002 SHA512 0941a33f24de0db1f466447ba36585cd3d5dfa70eade8d076089cbe2309a7ac5498b77a712dc237f335a27c954b7b57be7c951c5a3c052b648499dbb545375be
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 07eac8c2bbc1..ee4d15d69a51 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy)
 
 inherit distutils-r1
 
@@ -20,8 +20,6 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
 		!!dev-python/pytest-relaxed[${PYTHON_USEDEP}]
 	)
@@ -35,7 +33,5 @@ python_prepare_all() {
 }
 
 python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
-		py.test -v hpack test/|| die
-	cd test
+	py.test -vv hpack test || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index aa5a6bfdd35c..1344e953e1b5 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -3,5 +3,5 @@ DIST html2text-2017.10.4.tar.gz 50527 BLAKE2B 96b7060761a629cf4313104323517c4a90
 DIST html2text-2018.1.9-1.tar.gz 51173 BLAKE2B a21cd3e579d47081e669fda3f3147fc28d816478885942565a1b93b86292e2729e93bfea6b5326703e575f209f5bd7dd905d72011b8153b8c40d31c83acf9057 SHA512 773b508864a2fa31e961e132118702429f5b7836e90bd521db2ed6b4215de49d63991a99b7ad7d5aac3074a3c14e4d384557a4eb5b43c7e2aada46d5434ed229
 EBUILD html2text-2016.5.29.ebuild 956 BLAKE2B 8f5ecc90da362ffe92dfb35c52fb014bb8ee8a6696db88ab16ae61543262465f8b1b626e9af9b6e674fa2b6dbeadebcdcab66053b240a6007565f69ffec503be SHA512 5f5b945b776d75a4f75917a602f6f37fa319018ddb71047ece9d4fdeb1644455786f49925e09374c7808dac5ac04bc5c4b8b0ad8c3f7ddc5fe602cd8f64b2fb4
 EBUILD html2text-2017.10.4.ebuild 936 BLAKE2B 9fd46ee6b27a2e40019507f7457554f9082e3cf7c8449da24162b95b52c1dcdf4865c4313a9327708aa76c3e2b44fafdcbd5b43d0436515b2a5e8150a4eb8841 SHA512 716744ab73fd4f23da21884160884723a0d569f45dae67cc67f8df96bdd662b372e989e39cfe0e592010db3712fca561d43a4c31c6902a09ccc256b0ad7edbe7
-EBUILD html2text-2018.1.9.ebuild 937 BLAKE2B 0dc34dc30487349b0be775716c21d3e02b798bf992f53d4f2f5a66051aff0358d38d57ac88e6d415525bdbd28ef63cb552ebb870897a93ed0303b88110edbc5a SHA512 25bd131453d9184dd54c951c2dec84c83eda10604232b30082fe16e46e01599f8cc60fe0a8754d1685e8f67e4c5b0349f5269ad3fa2e372915ae4f6d95d6b7cf
+EBUILD html2text-2018.1.9.ebuild 936 BLAKE2B 41ce98603fbe59455035f6bf74ea129029794c9d59bff77ae233667ed126fb00a24f6e537b1d00e6a887f5c74b1abee413341dc89ad362d5186d8912f266fc7b SHA512 a55cae86fc37d8f06f121e2d384f35e4c6186c0fc5cb7324affe6b2c3aafc5be27b539874d20b43e089c46e2c6df56c94f1f71a4b6886a292c9da8fd6d6374f5
 MISC metadata.xml 332 BLAKE2B 2df3c377697f219f255f69968f31426f716334507a858fc4ea27f0dcb09ab1f7b2d98d4da2760c94ced1747ad908896a6c7c6cc1cd89fb5877707b14e37f825d SHA512 2fea207556f26e64296d5804463e561410aff69312cf947dfb2eceee8c664980d86cbdb6b062a0457953e16018cb0304771311a3313056efe0183a85c8b2d5fc
diff --git a/dev-python/html2text/html2text-2018.1.9.ebuild b/dev-python/html2text/html2text-2018.1.9.ebuild
index af6a64977547..b60edf459e13 100644
--- a/dev-python/html2text/html2text-2018.1.9.ebuild
+++ b/dev-python/html2text/html2text-2018.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index 3d7af42c6965..e735de3397ba 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 903 BLAKE2B f0164eb2731bcae07b5a04e8bacc67442a1c5283cb4777f99a284df2c1fe4cdd04dc2665232dcc9d7176231f9ca89790940fb19e7edc87a791b05dfa099448fe SHA512 8cfe02fb6da9678c475f3ea123f8038d3397b18d28b3dbd1a5384b79ed895633b44ef0fb4957e8dc8f9ba3029137593fa024050ec5cbd2c72560d302af015cf4
+EBUILD html5lib-1.0.1.ebuild 904 BLAKE2B ad5257da8b3a72454ea27509cd614d858966542f0991d6e61f7635a21b8e43728b3e53d7d4037e4d07979dbf70783d46fd5d7fcad7b5ba66dbc09bd39cd85dd7 SHA512 f3795b2939477f40af8b59e9e151de435fea314efdf9ea9857e5ea4416fd96fde2aa6c19bad7b244f19cceea5e75140c4538ed15c7e23eb527d898570fc7a1ea
 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 198ea67b7174..9b2968887cd4 100644
--- a/dev-python/html5lib/html5lib-1.0.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.0.1.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="xml(+)"
 
 inherit distutils-r1
@@ -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/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index e83f9b207e80..1f4203ddd33d 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,5 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
 DIST hyper-h2-3.0.1.tar.gz 2198911 BLAKE2B 453ce1bf8e6216e2852f49c5a22ec5cfa487a744a818e82929dd0c4f03280953c1f742890d74f771080987e2f70d9430e4d66481501357f0d4c5ec490fc5fbf7 SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c
 EBUILD hyper-h2-2.5.1.ebuild 965 BLAKE2B da23856993e63446974b55ac8f0686d7ac11757085ca28ec5fdc019f0ed38c8935d2e16638fd264af1e5a2bc36f7e595e45cd65d640b6e669e585b83b3761a6d SHA512 7b3c9e1f72905c6a2605343cfc641bed3675b758789d4dee6deabb47be17eea889e08fbe2a819f17f1ede066f3d24b3313c642d81003540f0cc31d52716e889b
-EBUILD hyper-h2-3.0.1.ebuild 915 BLAKE2B 92ffa2f1094299e7f876347747c3b2cef822ce1e1a86e11b094da88002c43ef4946603359b211ba6464119dd6d0c2726f1ce5072d878287979344934092404b8 SHA512 6f6ba1a3e146a73b723562dcdc9d104f475549533de7c32155cb7c4af35ee158e46cd599623e972d54e6cb729ead1a289b3daf7af79c8565f6a86570d4ff6119
+EBUILD hyper-h2-3.0.1.ebuild 1112 BLAKE2B b5040eaff4cc39e716dcdd0e6391b7088b38875b08c04adea64e0215cd307a57e8bf20d86034aa72b527e83a2f157e4941b1edf2c25416facb4358813d244810 SHA512 85f2b54186475634687d1b218a79a1bcd7316bbced2a7b0a37d48713fb6d814e1ce6448e36618d530544ba7b262e075479b69a694535ad89c1a1b3527925ca46
 MISC metadata.xml 747 BLAKE2B ca9107ee5025360a343d9ec92424ac6be517d1e45ffb2dab10f0c37c82ee30db30a0fa9eaf7bbd0066f0e772e47a09bb11e954afe3904bfad2f672961bb608f0 SHA512 5efdebf70cf061471f14af5941c609b31c75208bc4f632b05bf017e493d4a8091a3fba335c95efacb0a1271aaae6a54589032dfa393d2844053cb859fd6b0d38
diff --git a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
index 9bf1fd6ffd19..8a0281510fc9 100644
--- a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy)
 
 inherit distutils-r1
 
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
@@ -24,4 +25,12 @@ RDEPEND="
 	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
 "
+
+python_test() {
+	pytest -vv test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 6cbe59e85736..e6f8dfd9cbb0 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,5 +1,5 @@
 DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
 EBUILD hyperframe-4.0.1.ebuild 494 BLAKE2B 7e486d4219462bcb6f6002f40434109a95f9dc06a4de3a3fdb399abab7002d919aa10043d52c67b5c9aafbbaf016c934bd8af3678d9a054a0e654b7e4bfd3fad SHA512 e5d036fed607b1b3f5956ec97d174c2603763d3afd68b4b386e96288f4b6e14c2b04488b019f0d76613e274209c23d9ca3140ad2ac1ec3f9426fa50713f0dd84
-EBUILD hyperframe-5.1.0.ebuild 521 BLAKE2B 6749e6ac63dafb4f2f25baf9b33c2acc90d823cf6cca8a9066d452924f97a0321c85474452ff84ede6fadc98efad9d7e4dcabe93d130828f783f296bccd0b703 SHA512 47f161e9958dbce47684ee8c3ffecc61f59a75af31c8216db4c91610f2a51443540c7f211667d0fa09bb90b9b614a90597ef689abb2d3c426d206aca9ac2a176
+EBUILD hyperframe-5.1.0.ebuild 663 BLAKE2B 83dc32e5acb06c47d554537950ac5d572e7c2e2ee1eae454c014962d5d70777780227e6a36285aba4c68739ff10cd9c57b6264903755988bc104cf6224d0cbab SHA512 28f3faf902942b3a0b489f68b5e13b0d05e0d3b07deac5e8be9cdd01e1a84ae208c36deae36222d326cb55b5aa5beb7822728273ab3e3fe9bf071c68290102d3
 MISC metadata.xml 702 BLAKE2B 36daaf246eae4068fb2729e91e95865e831d1449f78f2c37061adff7530225c1dc7c68e245170acabc91178fc679116d5639d4779587f05a599566507b5da5a9 SHA512 4539720057ccf3c78a94dffea4f59f628a68e9f1d0dfd6ab987dd991f2b1b5e6d1b7b46c04fe1faf2249cdb481309b8a176c1947fc99801130a4c94f6a9a0032
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
index e25f36759814..4dcc777c6061 100644
--- a/dev-python/hyperframe/hyperframe-5.1.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy)
 
 inherit distutils-r1
 
@@ -13,7 +13,11 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -vv hyperframe test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 3d9bd08354d9..28fff6becdd2 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -3,5 +3,5 @@ DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218
 DIST hyperlink-18.0.0.tar.gz 97625 BLAKE2B d189445c7375657614c38db9045d96789b78a2d4ebe67e23b897a450588fbe1e3916707bb67916eb893e93a716125e606ff8be27e63f3db4e63b8bda1436fa59 SHA512 21b5f88f7aaa3f2b0b60566fdb0fefdf6d42866060606dac181c8e3d357c76a5c23fa5dc982812af2b7d49dc1f9d623bd5bea89bf2cf31916c855bc4ae85589d
 EBUILD hyperlink-17.1.1.ebuild 750 BLAKE2B 28e596497a229d3939e08be7a20b553abba25dd5fdbf13b5bc625105638c84766267be03b92c04d6963fc3f109a2fae5c25973ac125ed9a3722de9b5aab1e66c SHA512 bcfa4f179f4a37e05e3e9e28720847e0bffc2f384d950026ece4526590555582248ab2a41fe64cb810dbe000e4bf74747452de90ace91daa08df60b7d524e38f
 EBUILD hyperlink-17.3.1.ebuild 774 BLAKE2B 6c87c7db5fc0877cf222ed2a0479e8cc174a324cf8bc57e53e90a5c3a7726bfe8d15967ff414c3776ca3f8fc3c8bea86a62a36e91e7c295f0b2f8f4571a6317a SHA512 129da86ef743fa68c780b221cb0d24b9c27da4466420e40b5ad9f90627dbb361d656a55a5d1ddee2e6b346b8885f395a9c5532ac37a0ca4b5a4fc603f8360ac4
-EBUILD hyperlink-18.0.0.ebuild 700 BLAKE2B 1c02d4a03cbd77c65632bd6dfa8b7123064c1fbe800c3979cdb91de764bad9bc5200140b8eb72b1114890f40ca1e51532286919e215e4f252953bf980a98e462 SHA512 52057072fcd07cec7247a47bd927959b0830f6a810756d1691a9ba8eeb0a75d25b5975794c3f43f6fe96655cf7c273c1b125887d35aff2d34dadf35872e393e0
+EBUILD hyperlink-18.0.0.ebuild 702 BLAKE2B 2e9137f4fafcfab67286f29152442b02739b0e453f435c69d82e791170f7ee63e9860115e32fdeb0bb0e7db54790bc22a8fb6e3fda97ebc0440a8857a9a1f6cd SHA512 a88da7c500026fde7c628912219ac435d8b3d8e028c71674fca32cce26fabcebea48853d47ecdb1e99995c1ee82298679d2c1635be5df997c1731c008aaeb8b4
 MISC metadata.xml 751 BLAKE2B b9e49354e3472ca16622fd269867df7f0c5f372afa5f93c36c2646f35e0fe1e1fcd6b25c66ef73e13e442019be449ea72b26fda807e3d220fa254c4d7a691f21 SHA512 7cd14daa771935591e7a130d9dbcd20630074d49ffd738d964b631798a0466392e0b669cc009f3c769614d704925699f2bc3239bd5e78ba0c2cd629dccd72591
diff --git a/dev-python/hyperlink/hyperlink-18.0.0.ebuild b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
index 6eb930d31077..95b3122be4d8 100644
--- a/dev-python/hyperlink/hyperlink-18.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy)
 
 inherit distutils-r1
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 442cf33a6150..7bbdc0fa2272 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,5 @@
 DIST hypothesis-3.6.0.tar.gz 73586 BLAKE2B b0ec133e8c71f752114211061155c15a7d536e771ba85eab6489440b2063d3083018bf8502d9e9dbc73105ee5f03060e3189e64574a3dfa052b091040e7e7915 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389
 DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9fc7f96430c805dd4b3ec78fe927247d2c2ba4a216789a82f1e956b89d66c5ecdb2050a5f93467f2d557a05d1d48507fc06db SHA512 c3aad4cc54152963806e09af5f351e60e30cd64ad48ba3d922451b10dbb1747ea3e5d432ebc611dcb0646687d7e8755051b967304e74798d091be0b2901c832f
-EBUILD hypothesis-3.59.1.ebuild 1170 BLAKE2B c6326b9bb3bce4df347f2d7c789788eaf267fc6559d4c45384dd452a3eec796656fcaf31a5c31f5fca9ac07d5654bce887a4ffb291327456e6b33d6ab04c7478 SHA512 ef94db0bf5cb06cb388f666322a4f46185ba0a300b163341977919ace3cd4feaa2092d511180cd046e39aab6090d3f5d38f9791aab9d9414d825ec3bc94d1b21
+EBUILD hypothesis-3.59.1.ebuild 1172 BLAKE2B 828ffd82cb805fec872ce2d1c10fb4029d43591e3463736891967c7336b032c0eaccb6ac1eb73522d7243797eb50036712ff35c2169bb8f18a9e7b8994476467 SHA512 72d91a28763297a7082645f5aeabbbb43e76b1f1febdf6ee1ef1d43a9a75035f73aa462d9556dd7ead4eb41819c4c39a0e8313a638d5c839f905009ea1feb1ba
 EBUILD hypothesis-3.6.0-r1.ebuild 911 BLAKE2B 4107db5cf3dee7f521f54dbfe0488742ddf21876b88b5b637c361d8808fa09686252e5d464391adb3e2e45737c2e347eb963fc0e49c41a04c0ff84536a131885 SHA512 315866abf6fa890934c3125d86beba7c3bd799f1472c5661725418806f68f20c850b3204b687a03c1887ecdf6a535117446a049509050da5f9d6d93cb0f6cd0b
 MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
diff --git a/dev-python/hypothesis/hypothesis-3.59.1.ebuild b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
index fac7d09e539c..10b1353da66e 100644
--- a/dev-python/hypothesis/hypothesis-3.59.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.59.1.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(+),sqlite"
 
 inherit distutils-r1 eutils
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index b6d2872ae196..05653da72dec 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -3,5 +3,5 @@ DIST idna-2.6.tar.gz 135992 BLAKE2B 1397c93eae23a9ecbcc001205e83fd684cbdb4f0c916
 DIST idna-2.7.tar.gz 172698 BLAKE2B d0c92988d78629af3b87b8b4842757395c1f439f25d77614ba05d48e57d7d9a414c5be33e3fcf191f7dc8fea7325c801ff9c6f687204dec3735406f6e2342923 SHA512 34ba985862e386243f43616586e53830177cf4ba0925b6054198dfa63c085ec5c6c5b54c2b3c0989bc768aacceeef76b84471e58a16183b960dc4b8812cd1c61
 EBUILD idna-2.5.ebuild 603 BLAKE2B 383fd5b4146d19a72a999cab1726c412a072a728ca8151a94a2166705fb3c040c2e5df7afcd3788fc2caef209ac127b61b4ee901959236cd2d69a95faca1fd2a SHA512 a68e990ed5fed97171450408d19bdb0cccc90a58658eff9da40e3e0099716d44d238a22ef4e7ba832a2eb6fa69a7cb65408b09435935c1385cfe854bef95470e
 EBUILD idna-2.6.ebuild 668 BLAKE2B c12ff33bfa42471d9aaf9ebb063b51e47ec5c0d8cd9bcaf18230dd853a52d4f00ea4a2f27b985a84893d86863eb61ee239c32087b5d4de1688d2d7c7dd554c93 SHA512 bc90f9e990b558075d9c77663781d44b9ecd2571747be0b041b0f1b2bb171e8a32d247e8149a83a586f8297f0bbeb9c3f67c13bd6669d615f959a576211a765f
-EBUILD idna-2.7.ebuild 679 BLAKE2B 4600ecb28a73e4897d1ddf1349d6a1f93a8444a64be2ad1502a19ab2207e691ce50e8cc421d71a380fa1baa8a45f4979b3b11fb4957e1c79ab62d299e3a32343 SHA512 f7b8ddc3e2cf0420af099cbf647ae7eedb99254d8344a31c360249cbbc0fb651eb4b97cbb06013f33ce03d65ed9b2cd393cb11a46c515d8f7ba9c19bfacef14f
+EBUILD idna-2.7.ebuild 681 BLAKE2B 9e73ef5df6989bcfad803f370e994d5a133b50e6f07259843f23fd3f4db347b5dc8ba144746173bc8c38a7670ee75e7cb3026cc146bc013fa4d7efd63fed96bf SHA512 573029c824eb0414dda282136f54064bf17172e7bcb7ef9732fd44470c79f6757fdd302eda96a9552f9c2b7e95419fb4a7ba4c1233e9af41ef6554feb93b7a28
 MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
diff --git a/dev-python/idna/idna-2.7.ebuild b/dev-python/idna/idna-2.7.ebuild
index e02a3406f4b9..6929003e239a 100644
--- a/dev-python/idna/idna-2.7.ebuild
+++ b/dev-python/idna/idna-2.7.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index 0fe9e0b023ab..09e8b3a3ca67 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,3 +1,5 @@
 DIST imagesize-0.7.1.tar.gz 2871 BLAKE2B c458527576b9e55d7bb501667b1283a6362b408339c385c6dc1201538668d0c4708973c8b94faea7151195304eac78071770fc068a65f0b9565f50ea7808395e SHA512 61ff92167cc90bb1dcc78bb358419a526f09dc567709548bbe399694aa15dab63744f56c67bf33a940f5f443fd3a5ddc08ef9e17799b6fede1b11c0ad6a17f75
-EBUILD imagesize-0.7.1.ebuild 605 BLAKE2B 51b62a83e919d0b979c6d30faa83ef16ac27d44724fe012268033a02322137d19cd4c2879c79a956f22d236bd4b8d4dea30ae978ebaaa2c84a2e8b68f9f6a90a SHA512 2c24141cac26bf813f2aa7da306161280ed6fdf0e5970b30b8d350e53f568a8f4ea10d7d090017eee50a2172833038010d62ba5e704cd719eacf09f1e2d0c746
-MISC metadata.xml 313 BLAKE2B ce2d348631a435b89ca75a2279ac1bf07fc70d49caa064416b68acec2d7a07720a80683be2afdacfff28290f8a08428d650584562031059e345118775a72b07c SHA512 2d42588c1fced4bb920c8bcf5ac2f090c3ea55873f448a216bd4dc85882a861652f6fe8f8d230789f99e2e33efa854860b2b2e7cdf210dad3e1d60c3c46d7750
+DIST imagesize-1.0.0.tar.gz 465373 BLAKE2B aadb78abb6cdba8083c123313e4e35bc2d83cff4034357c6806c9231e6e0be570c871a5ed2e975337a91741aea6ac7643c4cfe3a19e12c184cab0b2f3f51fdd4 SHA512 1111d284cfdb8b14bc09dd0dd569434c62225f0b8da5ca5c00a740fce095c382efafcba73a4000e38b91418775518707693675c2d3c2dafb1036fc4aadb91e64
+EBUILD imagesize-0.7.1.ebuild 629 BLAKE2B 7f237c42ac6f8fdccaad059052d4a698770e87b4ae0683add2a0dbaba81b2a110f0e8303c911b5f8293368cc4d6d01231831a10883c7d2bff0c3acf7f223c848 SHA512 6d6ca990a1cab5cba1cbefa559aa7f6f7ccc6f291b9e85c0c1c8fdf9268275eaba7ba93f9f858501037602aca0466d6cbe566dc175270fd3014a720d209c4785
+EBUILD imagesize-1.0.0.ebuild 701 BLAKE2B d139af2b19762a2fc9c36452ebe46816b55e7e589b9bfa4ed97f2a5e4d5d98903908c181e76b8058433f6f22858b5a008fc57e0a2cde3ea0ca502a55b7f6fbbf SHA512 75d089e9deefa2cef4656e2398d17cc5871da1080745ef1b19328d6f951bf68f34304b1e39bc8eaac4cac0926a929876d1aace1c27cc24341cea1a5beb44b71c
+MISC metadata.xml 434 BLAKE2B 946bd353c48c258821176debdb575437e538092c2b0d618355ed90883cb5b6e91a6de1f9f842c0c6df002e69ed6bf37bf9a087ab4fab4c57ca36bb918f67d723 SHA512 3c4d3637bad987db6e9c46a46d51cf59cef4e067b5bc6b6e47ab5da5f257db8dc67c35c0f52f7f4ec0522acb527beaacd22bddc6c47282be6e1552bdac5003eb
diff --git a/dev-python/imagesize/imagesize-0.7.1.ebuild b/dev-python/imagesize/imagesize-0.7.1.ebuild
index b612ff39ade5..c4f69669e4c5 100644
--- a/dev-python/imagesize/imagesize-0.7.1.ebuild
+++ b/dev-python/imagesize/imagesize-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 
 inherit distutils-r1
 
-DESCRIPTION="Getting image size from png/jpeg/jpeg2000/gif file"
+DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
 HOMEPAGE="https://github.com/shibukawa/imagesize_py"
 SRC_URI="https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/${P}.tar.gz"
 
diff --git a/dev-python/imagesize/imagesize-1.0.0.ebuild b/dev-python/imagesize/imagesize-1.0.0.ebuild
new file mode 100644
index 000000000000..b24b21fe5370
--- /dev/null
+++ b/dev-python/imagesize/imagesize-1.0.0.ebuild
@@ -0,0 +1,27 @@
+# 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="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
+HOMEPAGE="https://github.com/shibukawa/imagesize_py"
+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-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+	py.test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/imagesize/metadata.xml b/dev-python/imagesize/metadata.xml
index 1d45d9286d9f..5a1a7480cf2a 100644
--- a/dev-python/imagesize/metadata.xml
+++ b/dev-python/imagesize/metadata.xml
@@ -5,6 +5,8 @@
     <email>python@gentoo.org</email>
   </maintainer>
   <upstream>
+    <remote-id type="pypi">imagesize</remote-id>
     <remote-id type="github">shibukawa/imagesize_py</remote-id>
+    <bugs-to>https://github.com/shibukawa/imagesize_py/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 892e96c29efc..5484803e8050 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,5 @@
 DIST incremental-16.10.1.tar.gz 16066 BLAKE2B 86bd85f9ea1ffe92a572b1744588f34f21e4bddc4aa80373dba47a59961183a77a338212500829440d216582ce15ab1412e9994f89486861297407f22eb989fa SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
 EBUILD incremental-16.10.1.ebuild 602 BLAKE2B c3d8b54ded986ad51df1e70b682f2845989f1a55f0ec5c756c03e4d2958939a9540147e7135bf689b04a02a8ee11b0828dc246c6e2f133898e1ba024329c143f SHA512 144d6217b9a965ca0574396b0e7ce64557c047571545ccf03740de92e11014929913a64a465ee48f2592e67de0e9c248f45d5eea42d48242cde6b1a2da0b0f38
-EBUILD incremental-17.5.0.ebuild 622 BLAKE2B 9cc055a1b87383b2192c6837b5ac46a612248e2751e51f3a8c5f675f5b0407d4fdab406541c1537cf231a0400743facf3958b4749bb49bcb129a52234b53231e SHA512 56b86fc61d2f3883c7ffe8c312d1fc1d37b50369061917028313b7c94f661ea0a90e1b8cc57b1c85b752c1e1f3794e65e79578ab1d3fa2725a0401459a1ec441
+EBUILD incremental-17.5.0.ebuild 624 BLAKE2B 7f32f04a60508edccd3dbe48c9888c124c3828bb36bc71e0ef87c1ae9fe397f69d09f75df596f8f13de3f5a11ad0c3dad6406d947a3d69e0f63ed6fe8935adbd SHA512 d2cc948375aac5b958bd4a9248b4fcba56478e2e6222fd6ffc3cffa1739317be95111b3f95ffaa9dc6b4d0ff756130a12502a8b187076ea868918defbd10420c
 MISC metadata.xml 554 BLAKE2B ab26ba9e5a69a853b0c0a167dfad54de819a17ad44a47a9987e8cb632bf1551151a208500f37c96543d7f577e99d6d47b4157c97b71d7ae60e88cc086a1ef1ba SHA512 a3bd82ee309e301f175da663ecda74af803631324b0d1097082ad04e6bd9e2537208fea8ebf753f38341429b1d2bfffc887ced6b707655ec862541ff93e83c6b
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 499a38b4d93a..804fc75c5dd9 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy)
 
 inherit distutils-r1
 
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index 19733ea066df..0aba2ce55305 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -3,5 +3,5 @@ DIST iso8601-0.1.11.tar.gz 8725 BLAKE2B 7eed190b8876ae86f8b551676ce69e8bd3a09156
 DIST iso8601-0.1.12.tar.gz 8868 BLAKE2B 5463af17cfaf2c1f256790ec11dc50f808857abdf0a341f2c88033e9e94f09069ed570223c3743007e0fff8fdd9a714bce0ef3e88a961c2bb131b79e88a1424f SHA512 d64f3a83fd3a678446e17fb35265c0487491a53a2ec306fe2332c59e9e471bfe8580b3280da7ae13664f07f7f29edb0347196351ab698849ccaefb52d6ce6613
 EBUILD iso8601-0.1.10.ebuild 755 BLAKE2B 29557ba50d8dc89fe1f04e5d250d347ce37c0c74ffd8b067c238743f865f18556375ceaaaa668a4e10a0c6405f66d1e2859358271b3cf7ebfae63cbafd73eab3 SHA512 685de874de85f1259c94445360a484458a8688c4ede8f2e634c2f523cd2c67818be4587f99790732b02a973c734a2124aabe5a8d90932505c375a148e96d77fb
 EBUILD iso8601-0.1.11.ebuild 765 BLAKE2B fd8db489bcad09e7d2182b725dd14f02dd0a648b9a8ee5f2864f8c8442091c6c4548260158c635f7812bb0eea9417ec36219df1d07115932b72ac53b1c60ebfa SHA512 dd37c0cfff09bdd6de5e61c562a58b02f9818dc32246d0561a2d3487ee1299c7b50be68de5bcc969284dbba9b6e205f8b4929f9044bc2ec264930a79c74163e6
-EBUILD iso8601-0.1.12.ebuild 767 BLAKE2B 3e6a28120fe944dd39f2aa7c83787b8e339a423f54f0d3ebcfbc1b2e09e93e9b8b3e50ccaad0819c3ab9661b40a40875f923b779c5e024cbf54bee4c9bf6ca34 SHA512 4b6a9018ed52d935b15c08d29565151e7adedf935dea0d035331a9983f9d2bfe9f57b76cf8dc055bdbc85c9bab45fb1102c7c9abe6af723d609b220a80c53592
+EBUILD iso8601-0.1.12.ebuild 769 BLAKE2B ef6296c059080111c8a989232369bc80b89d4a3201252fbc831285775ebb319c295a843ebbe1c58dfdfe54f9c7db936cf59deef2571669e271b2bffbffc1c805 SHA512 27a1be12f5edc8ca354afea3180a82f7c38e033f9e2f387cc969eaa1be03308974e2da3ba0fa5eca1ede05bc28bfd2769d018ca647a77aeacd303fdf240d6009
 MISC metadata.xml 334 BLAKE2B 5e73aa36a751a0547b8c8d39ef2a9cd3c9b4b5a41cda2e4ab47850fb4ef86fc4a9fa0f819329409b6fa34dcb031b38cf2532bdd33b59db85e61953e08b5f03de SHA512 70d83069bca1f66a6229800c51a0f8a5081a23072eb9d432e07c9945500899f769217ca989de90886896371d5f7d9a95cc976048035d1d6d615fe602ee471589
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index 56030ced21d4..87a0f320181d 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index e283ceb6136c..b6e00275f95b 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -2,6 +2,6 @@ DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945
 DIST jaraco.packaging-5.1.1.tar.gz 11056 BLAKE2B 6dcca468be3d960674c7de73af48ef78d96c80896a5f09aa99dad35c7dacb90700ce3cd74f59f4a437e26190091e12fb82f3285f30f99a83550a52424cfdebe9 SHA512 96ab954c7fe23632284c0493f749c5fda1368df0a5b60f5dc852aa4c47dadd1743a26772c783f0ec46109f166c9e26811324e2beeadb3e0cfdf9808091107032
 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 1414 BLAKE2B 4ad907a24973e7332078039b0cae0aaf33dc65bb2f6ef28897ef7e464d1bc07c666da8a7b85776259e7c229e59a07daf6b6c7ad64da93fbdf5d1f9428e61b92b SHA512 d2995ae41d4655a3d287ad242ddf65ad8b4a97279e8078bf13fc11320c0cff84db4259a525d34bf7f4bb0e5f935a29083b8e26f8b26dd02c462a9fbd99a20c13
+EBUILD jaraco-packaging-5.1.1.ebuild 1416 BLAKE2B 79f8de70973943aa46b009dff3f2751bac902da9e9f0c096b83440d565dc931394d7ea83f086c775d95397b5bcb6299272a278fb1823587ec2c3765861d62bb6 SHA512 2ca8b3bc5accca45f20c2d7efc20a304f4c6a3b3e7f59652496b5ef9313e1e3ef240f5410a345752d6a39d8ca54239314b75e9db71749d9af8de39b48c6d8404
 EBUILD jaraco-packaging-5.1.ebuild 1318 BLAKE2B 8ed7ef10e0a7d50b83f8cd436029f6390865212b6cd57fb1f9a58383429dec3bd5e46218c8ad57529fdbe473c7bf0450e88ece3cad7d65d5ccfe501c850a7195 SHA512 4afec51b661cf5435b5bd6ef0009e08263518e2fbb3b2e6f07b0977815051ab76068e6ee21ba479bc16335c7e26f5f4de78aeda4a3c41da698dc80775612b197
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild
index df3a7c77515f..6162f73c35f7 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1.1.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
 
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 963a9eff290e..27d6f6013ca0 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,5 @@
 DIST jinja-2.10.tar.gz 267508 BLAKE2B 3872a073bd3954a079aee74fb2f23815f75559a88a8ab6d849cc9855e158d096a1ac62c219ae7f48a54d082c3073e83749c8536439248c80494e882f6a18995f SHA512 bdfd3c4d01b39827c128cbd7f6ebc0ad1434748be41c5037ba1b23156eea1d28f805ffe2a051b4e9b5b38938615c35c8876095b0bf0bed2c139cf5ea49ae2420
 DIST jinja-2.9.5.tar.gz 486763 BLAKE2B 680b8d58056b180295b52998a573da2fe86ac8b117a942e647626aef16d42c7af89a0ba7f5ab098fcdb29bd18940e316144fea1882e15d71f67bda945b4a6ab8 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121
-EBUILD jinja-2.10.ebuild 1648 BLAKE2B 08525d2201474c12ef384f743ab57c7e1ba1532087234f34ca54aee585b2dc5a6a77185659363aed3227a27b1e3943f08dcb5ae54c683a63ae2430c5ccdbf3ad SHA512 2481a9362d6b4e69db1aed1a66710e8d5e1cd66b9b3e3995f24ba866d89f600bc79d453aca5f9bd5eb125f02e82f377b3b17b1451090453fc324b87b13406c35
+EBUILD jinja-2.10.ebuild 1650 BLAKE2B a1c96a2a7535c2a1bd2efcab34bb21da44f1d131c3792d093ed5079b6477c117b93a8ef9ce302836e4850fb4b83b81155c6439dbedd5eae5199a742c794f86bb SHA512 4d86856ed1576736b96e04897e7480a424156bd41255c254f3743162146532a399375bc8ec65273466f0495ddf5f2f048f14c2044c0fb901f8d38b84533e3b89
 EBUILD jinja-2.9.5.ebuild 1740 BLAKE2B d08759cb68d6a1b856138fd0c881c055ed54bb81d69e9e8ea478123fbe691b1e34051a4de95ba96381858f9a550ffa2c635d8f4f79ce7347bc319829bf656ba2 SHA512 94aa068503ab5f0fe4841da24888b1e8cd48b456a72c95a6f9cc61b40991801f24212ade37842366d7b4bfde7676af332c84549e2cad9fc82cc729a8ef18a97a
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.ebuild b/dev-python/jinja/jinja-2.10.ebuild
index abf3450a5297..7de9a1e577a9 100644
--- a/dev-python/jinja/jinja-2.10.ebuild
+++ b/dev-python/jinja/jinja-2.10.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 eutils distutils-r1
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 35a1c6336f0a..917b406d75f9 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -5,5 +5,5 @@ DIST jsonschema-2.6.0.tar.gz 53252 BLAKE2B 38d2d1d9f91e923e66aa44fede2597b129813
 EBUILD jsonschema-2.3.0.ebuild 674 BLAKE2B 51ab4373ccf5d384f24ab60f153751dfa2b2009a9e453a37e8bb3a78a41e1263c4430a489048a8ea3cd691e7c5381a6554f13405fed422deb273cd04d4f378a5 SHA512 095e3046f5b21461bb5f825b885ba2af2b9bcfa6d92c682d82fd64c696f331b09a5d73cd7f2d5e6e1bb60a3fff67d112ed9332e6a564d9b84524a90e4081ca9b
 EBUILD jsonschema-2.4.0.ebuild 548 BLAKE2B a2bd28b326d42cb6bf439971ecb61b78132d802c6314709bc7e50b0c8536522f316060d817862ce0b6438cde91b7b633e6222a9beba7c1afe5a2a6a8b3e70054 SHA512 dd110ba28e25694116bab2fa62c87534357a1a49b146b65b4d7b36c93bfc90511cd1ae37c652b58beaf28681b7be4beea6c8794a7e6e03de3f9af7c9bdf037e4
 EBUILD jsonschema-2.5.1-r2.ebuild 1011 BLAKE2B 4f4152510117cf23644d90efeebbd073e9002b567eefbc86074936056a57d52ba5b67d1340b5a7da020e42bc5cdecf4a59a9d4bc4e551a57f970df2a0377f283 SHA512 875f64196a720d8719cb2deb2b9321391441677bd74c9730394475bd857717af4bd3760fc5d2d320440a9d460a42be57c32cb83155a0af6e7fe4d2f6a50dc0b4
-EBUILD jsonschema-2.6.0.ebuild 1036 BLAKE2B 4f8fd63c36714a2050d22efd1c3bd007851a67f3ccca8c7b10994bb9f89e3e103c6920e0e17a9ca3bd766299134d9f9a931276d325960c1e5d2d48ab447d08fb SHA512 a0794b36278014fe69f4314696f432a6f9da611dd566477abbc5d4b386314e1f43c4e7aa93679bdd5487981f9cef24ea451c010b940804edd73d9edc5431c064
+EBUILD jsonschema-2.6.0.ebuild 1038 BLAKE2B 5761fca1f1e2ff387e3b22496a94738b67bce4142423ff0ef22759d13df82ebdad91b4d2fa80b236e5ec9c0f6da6ff2f9a19c1601081c888c2ca218a478d5be5 SHA512 727339af154311d0dc79865e8365184c11a458dec8837acf02ac04b20bcf3287e958d2329b03973bc5bba973e0cb812c3e098cab80125284268e64beebea11e7
 MISC metadata.xml 559 BLAKE2B dbfd5c0c2d3b9e3ea197db40ca1c1ea22e63e61bb540646a4b7dd711ed4e5a8a3bf5cc149a90e9911de76db8895f4a807b7ca1500d8a3937527902b0036a8360 SHA512 6824c104780402599891db143c021ecb833d2bca3dee97a6d12cc51f23856f6e9dcadd2a438ca8ad13a6e292048cb5bdbdf024665b06da547fff1c7b9f5090cc
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
index ad3256d658e4..db3ad75c68f9 100644
--- a/dev-python/jsonschema/jsonschema-2.6.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.6.0.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index d0e5e3a8ae07..162674d29348 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 768 BLAKE2B edd6d7da60f583edbd580f1aec4bf09261817be8b80afcc1707dc566fef3d58332a9315e3bf90d30f174573cc94cd122d1d8ae5e6f49055cd398d02c79de0b40 SHA512 63e44318732b8b1396e702601b9694c2dbf3f827e831d4b1bfa8ad5a1f62a5cf68edb42d2ae51265b60429c65d9467507224c14e349128c0ca706fb4b5036787
+EBUILD linecache2-1.0.0.ebuild 770 BLAKE2B 3e62a3ee37e59d0905a55e928119e1fd3b06f1664933c193685221c1ab0bf7b2551257870174d1e694af14d32193a1df99ec9d7ee64f5cd9c4b98c2e46bf1f0e SHA512 c2451cfc59a3c41cbbe9702982656d09f9a508e545a07129f05d51678f8b71e6b4c0fa5c9b7249dc0a717affa9d8e3f088e71fdd31ad342eac14c278ef95a823
 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 b252b5b73aac..c5e8a0382a7a 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index dc255ab33110..5c2af17cb2fb 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,12 +1,8 @@
 AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
 DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B ec9cfa554f44162c0d6e755628603c9afd85642998f56ed49c2ff29c3ef975ef4ce14c6555382ca282b70d71a1ff7347c0b773b339b14345e10d3b9ac96ac55e SHA512 c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764
-DIST llvmlite-0.21.0.tar.gz 96462 BLAKE2B 8458037ca49c2c7035cc65539c1dc933f26c694e07502bfb0f37adfa389c56d715b53310fa977461fa75d7f826384a9c408682bee942e7cda6a299b16192c183 SHA512 25fb0986faf558995e6405a77d675d1dfcda2f79f8e6f5183d66a16f7b1f323df7eefb54455d9a15412c4eb88cd2e160d9f45038b7d97da6fffe78d7adc0e296
 DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
-DIST llvmlite-0.23.2.gh.tar.gz 168206 BLAKE2B 8ed2c2a84cdad80bcdba95e4e2d0f15b8c0a6cab2114b4c5f6eb32a303e29a9185629cf692acaec1455ac059227a755f621147397ece59343347434572186dff SHA512 f5f0a27ff7d523d3ce9c183b60db1106ee89f2650dfaac9e745414dbf91e14cf3ba9056e694148d07f4caab4b9f9fdd1806aa67f580de1b8b317b906d2c4fe65
 DIST llvmlite-0.24.0.gh.tar.gz 169577 BLAKE2B 7fedf8b9ec49f537db27a77c5880fb3bb41d126c615e73a4fd503ff781dcd4745c4f708cccd31d9b5544609ab7821e8ef1299856ef13ec3912ad2341af12a3ce SHA512 14b8918f9f58a88596607e697212aa516a99c65f71257d22f09e6b735f517a38f11142a63bf2e8f117c6ceff97153a5e686fa322d62abd14000db7e9ae136900
 EBUILD llvmlite-0.20.0.ebuild 1286 BLAKE2B ba74befabce5dbf8a93148349e230788702f1372788f99f388c827700a2209c77b7a0ff80a0c728da14f11e6170658b0d87b6ed5ce28a1500c33f8a42adc8af5 SHA512 afeeea625207aaa2ed0a60ac07fb8546e513c21bd8f864d5b0e29570016b5a7431b21d4ba4beb23822cc6be38bce5d5c34604e544b900edba1b6b1cf57f7d600
-EBUILD llvmlite-0.21.0.ebuild 1286 BLAKE2B b182d554d988f63beddc4afee57d32047ec362beab482d1f51e69722563e2608e3668ee3b87050674446fa6d6a5c4a7853b0e6410a670934fa46a76f3e957ce1 SHA512 488fad8be499311fb676ae86194f5571d22ccc97ff397f240b232e13258f6cba15b0422e1b5df5e5ae2df8482382447bbac3ddec6ddf1f0bb90d3fcf1e3dd165
-EBUILD llvmlite-0.22.0.ebuild 1361 BLAKE2B 813dd1500b1ba283a70df5b081322450bd5b3f0e780a3a7e97e61177eaf975244ce71f3021339c42457d4db51acab7f09a8e9392d5a9de1eaff894ca9d22a47f SHA512 bb370aedf7600f0f5746131295f1ff71cb5aacaec3d3e8a7bfe69f9a876c06f8add0c0a38b9ad8b3b747f0a43426898dbd3b3578f38d7450fb8a8fe7f8c76306
-EBUILD llvmlite-0.23.2.ebuild 1373 BLAKE2B c9a3d565bf96d46f014d930e75367de160b262c7ef0ed628f67ecf20952e4de30a7cd107701697317f3f8c8eab391d19c3e586f18b7657d6a075a0be36e186e9 SHA512 1a3b72daca787f501e37489c6d207c53179314bf3aa71a9c3b6c895ba3f08ac603ffffc23847ff5e6644d162b126e08520a55c05d1375cbf1387905db1bc75bc
+EBUILD llvmlite-0.22.0.ebuild 1360 BLAKE2B 267e9ef9f11755fee54add20f9dcea37d9fc3b3379452fb8dc7a79175c6c17a2e138746c4383abd364e76f41c9cf3a2a1648a1e9647ee3a1e56b1c34552f1af9 SHA512 dba7536de56e1e34999c65045d1262eeff964b618653c17b12824e24a3bbe149b602ba4a6dbe442caffe6f671aee0a804fa160c21cc90beef4fdb911af5b20d3
 EBUILD llvmlite-0.24.0.ebuild 1373 BLAKE2B c9a3d565bf96d46f014d930e75367de160b262c7ef0ed628f67ecf20952e4de30a7cd107701697317f3f8c8eab391d19c3e586f18b7657d6a075a0be36e186e9 SHA512 1a3b72daca787f501e37489c6d207c53179314bf3aa71a9c3b6c895ba3f08ac603ffffc23847ff5e6644d162b126e08520a55c05d1375cbf1387905db1bc75bc
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.21.0.ebuild b/dev-python/llvmlite/llvmlite-0.21.0.ebuild
deleted file mode 100644
index 84e5156b8be7..000000000000
--- a/dev-python/llvmlite/llvmlite-0.21.0.ebuild
+++ /dev/null
@@ -1,54 +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 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=5
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_prepare_all() {
-	# disable -flto, we do not force it against user's wishes
-	# add -fPIC, needed to link against shared libraries
-	# plus use those vars to force our CXXFLAGS/LDFLAGS in...
-	export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
-	export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/llvmlite/llvmlite-0.22.0.ebuild b/dev-python/llvmlite/llvmlite-0.22.0.ebuild
index afdc32049ee4..da3e51a28a62 100644
--- a/dev-python/llvmlite/llvmlite-0.22.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.22.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/numba/llvmlite/archive/v${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LLVM_MAX_SLOT=5
diff --git a/dev-python/llvmlite/llvmlite-0.23.2.ebuild b/dev-python/llvmlite/llvmlite-0.23.2.ebuild
deleted file mode 100644
index e7d50fc0b39f..000000000000
--- a/dev-python/llvmlite/llvmlite-0.23.2.ebuild
+++ /dev/null
@@ -1,55 +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 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-# upstream slacks in making pypi releases
-SRC_URI="https://github.com/numba/llvmlite/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=6
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sys-devel/llvm-6.0.0-r1:${LLVM_MAX_SLOT}
-	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_prepare_all() {
-	# disable -flto, we do not force it against user's wishes
-	# add -fPIC, needed to link against shared libraries
-	# plus use those vars to force our CXXFLAGS/LDFLAGS in...
-	export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
-	export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index cc62c8002bc7..a88379020c16 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,3 +1,3 @@
 DIST lmdb-0.92.tar.gz 155720 BLAKE2B fa991dba144e636d395e264c70de61bf6e1391bed589b8e67075eb604ad3cde7bc1593f596f884e13ef4c744efddac93467eb0e9d7e79d445a71e21e1f5541f7 SHA512 5177abe0c441fb9067ad84de0cafda960113042404507eaf36194efe614fbc9fda37668b9d8a07d4a7f674b0c1a267194ddfb241834a3b1db0d8026f53841cf2
-EBUILD lmdb-0.92.ebuild 574 BLAKE2B 50f8352deb1ae4dc1e2ac6f9046de9b588c1d80688a1e98381bd1515be1c05f4cb02536eec29024a155bf1ed46182f121f25d21b2ad83007f9f4df980743afd8 SHA512 2b4e4c915c8bc21b484da58367b529e1a9dad55fb76b282069225f2fda632cc77eb52a8443bd02fa3cb931f198925c700712738ae502156b62d2320e0fa5fc4d
+EBUILD lmdb-0.92.ebuild 573 BLAKE2B 581343eb19010a82938fc75f317042027152646ccc3946ed2aae46e1bd308298e26ddd795c524474eb27905226a3f30a376cea0dccd7fb081d623f863f80c00e SHA512 59a74829e1f9d8476aea4063b30a9b280835274c3271402a5f15677d8c83dd8033971eb8e3af08fddee866f4ddea59d40bb3db21abeab968ce2bb72590ad1a5d
 MISC metadata.xml 369 BLAKE2B 753c2fcd809cb0b69b60f4581421e3d2abb40158dcf3931a70c2c2adaeaf22f5558707a6dc39ec2b9d8724d9fa3bbc370cf790a8bb550d00d59e10cda643ac88 SHA512 4b2ad4e50acca757e8a1ff4e659ae99c8c42788ba6cc1e1d503cb371cb897443e6fbe3b7c2f7f8ca0b6409da9e7a7961a644aaf615d306da8172687caddff3bd
diff --git a/dev-python/lmdb/lmdb-0.92.ebuild b/dev-python/lmdb/lmdb-0.92.ebuild
index 1fe97c27f8f4..ab434fcda0b7 100644
--- a/dev-python/lmdb/lmdb-0.92.ebuild
+++ b/dev-python/lmdb/lmdb-0.92.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-db/lmdb:="
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index e1df7d04cdb2..e4b156f49204 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -7,5 +7,5 @@ DIST lxml-4.2.2.tar.gz 4417798 BLAKE2B 9344e0d261d2d40d43e67d4f162ce7da466c924dc
 EBUILD lxml-3.8.0.ebuild 2251 BLAKE2B 7f1c829e269c81f869b58ecdbde614773eedbb7bb1a9fdf7954316890e643ab1c1afe6fbfe90fe1d46ba8d06a73e379067c0670a4fe6c34daaf777ad4f35a590 SHA512 5c7319a07e72d5f0b6299cb8b005d89dfadd056cf02cad9539a8e24cbc9f0de98f2d38bc8561dbe285fb76cff52c4dde87bf9166f3540a068590a78efd8f4678
 EBUILD lxml-4.1.1.ebuild 2255 BLAKE2B ac130330e175fc5639729716306218108619bf2e681e4f9338f08fee19a8687c76918a6cedfb967ba5279db1dd351b882c61a8785595e857eecfac7d4130211f SHA512 d46331d190b2a450a25f8049513b4eb949cefc664a432be3dbb3e9d1760706ce18ad3d6f59b858211be96cd022c1c31d5f434db5f34b8f20206403e41e2fbe1e
 EBUILD lxml-4.2.0.ebuild 2023 BLAKE2B cd8e6ffc8996b135e5dc32a50dcc9732c5f2f842c137efd277d01e690cbb0171d41122c5a437bd720663eb9708b7bccdf6a4bb176e9d568d88597497c2d768a1 SHA512 e9f906fd0c4f3b4e8b9e92a12d372bd9618a575bd0a33f94994cc30be4834b48ec68853ba5f85621e6b50bffbdbd17c758b90aa09a85b6a51ca76ea294ed5578
-EBUILD lxml-4.2.2.ebuild 2042 BLAKE2B 033e44fb889e4c192ea026a2e193b8471d9e6ff7ca43e297af1d850e05aecf61c9eeb108213b7db80bf77088b9280f85efd44daea62dc8a5fc5fa7dc7b71f5a6 SHA512 6ed96ee7688ffe9322e8f4d6a5aa9e20a267f66b69c11957920df4bfa1b7f2127b68b06332c11aaf83193efa33415da1fc3f1e0fd6b4361ce039a151fb07915c
+EBUILD lxml-4.2.2.ebuild 2354 BLAKE2B 8064c0091bd901fb47b59cc8b97c4dc98d745d9ac89ef0cf67938e7818bc80c5429de0ecdbb77c17352baf32d8dea5a7d19393ff9f2088196f7880b560fb78d9 SHA512 7f5cb380acf9026c542beef114fc3f00851aad1af3cac1456d0a64457d3379e5d83c592b7108bd017d371d7467a267d36253ce511f46cdca83726820e0d080c2
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.2.2.ebuild b/dev-python/lxml/lxml-4.2.2.ebuild
index f4a36d5d252e..7860a32aec44 100644
--- a/dev-python/lxml/lxml-4.2.2.ebuild
+++ b/dev-python/lxml/lxml-4.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1 eutils toolchain-funcs
 
@@ -34,7 +34,15 @@ PATCHES=(
 
 python_prepare_all() {
 	# avoid replacing PYTHONPATH in tests.
-	sed -i '/sys\.path/d' test.py || die
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# apparently logs have changed with libxslt upgrade
+	# https://bugs.launchpad.net/lxml/+bug/1782078
+	sed -i -e '/assertEqual(4, len(log)/d' src/lxml/tests/test_threading.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 3d94efa7877e..3f672d5480f8 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -6,7 +6,7 @@ DIST m2r-0.1.14.tar.gz 15926 BLAKE2B 48d8961b6ebf66d494511f6bf755ae2d2de0740aa27
 DIST m2r-0.1.5.tar.gz 13202 BLAKE2B dcfc5ecdcb2c696c1eec8fe3eca4cd7e238f605c399b750286d9eb18ecbda9d80b608fb362a85959769253c5f5bca7e392ed5b61a7804b25cab5e7bfb5edf574 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84
 DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044175f4ecbf885b80019d62f5fe80579420af373ea3d62fffdcc62344d1035d901208719be1cfd56654a01 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7
 EBUILD m2r-0.1.12.ebuild 1217 BLAKE2B 0a6da4c33c53373b70812432a66913de1c9ace0be460bf4d0494c4f60f7805735f910de7a8f7a743a67f1bfbd1fa9f16fcc9ad33bd343286da4f546bb35161cb SHA512 7e10284f97312290ac583fecdfaefc6fe775d8aac6ac1729120bfc4cb0e13d2532f1ef6e7f0a5428fbf339ae3d1e2325668ff3e8590fa81f4398167bc370d20b
-EBUILD m2r-0.1.14.ebuild 1260 BLAKE2B 5049199d746ae9d9b8147a6395af9d9da82835149ccb26e1d50171e3b10bad4624897dfd00e58b59a9ebd583e31d48a862e2079d41cd01a848def022f3633493 SHA512 4ef6b9953ffcaf1ccdeec0ebe4101c8c363c1774f32e33b7d6d2f61db52cd92dd4746364de4191744bc9a282895e520f2b7ee446cd40462e96f647d77f06df6a
+EBUILD m2r-0.1.14.ebuild 1262 BLAKE2B 0df69e11be5cb2871dd54067fc66174dc2ecc142973b60d1967e6a9fbc053e8b383f8258688d3898dd90d499c62a88849d077d7794b30aa3bb55f3b632428051 SHA512 07065bfabb29dc1a86d90a29141940bddaebf61a4850a74fff9462625748acf728aabcd6c4ed73a36b5a537f9b2e8b4620d9a527c51ef45eb43474fd6a0347ea
 EBUILD m2r-0.1.5.ebuild 1270 BLAKE2B e51f48528c81f598c5894c963a17fb71bb2df2c2d11b1bf01a36f35845685542493a9ab92602e5420c592d1c23822584d42e99b62131790606ee27ff3af0ec98 SHA512 7d85e5d432f2f0bec6c976812ce9362f7a7974e9a2866454286e96b704865732d9d1e124583d41de09ce0f7ba664306bbda53b62721796a6fccc2437496f96e8
 EBUILD m2r-0.1.6.ebuild 1270 BLAKE2B e51f48528c81f598c5894c963a17fb71bb2df2c2d11b1bf01a36f35845685542493a9ab92602e5420c592d1c23822584d42e99b62131790606ee27ff3af0ec98 SHA512 7d85e5d432f2f0bec6c976812ce9362f7a7974e9a2866454286e96b704865732d9d1e124583d41de09ce0f7ba664306bbda53b62721796a6fccc2437496f96e8
 MISC metadata.xml 554 BLAKE2B d275cbf42dd1621fd0dce4fdb85cf0832e3160cf7468e729d39f33afae099b354ccb21e6de312888ddb6d2e97a487a02cd9d97dee033eee960d0ffbeda70c704 SHA512 ff9d0efa78e4931a4f0ed8097cfdb1d32fb1a99f825199fae42838ee534c045c30c440e9f8bdc41639adfa99efb672a587d11f84f1bc7215f8e59655e1dcaa49
diff --git a/dev-python/m2r/m2r-0.1.14.ebuild b/dev-python/m2r/m2r-0.1.14.ebuild
index a357fc96bd11..2f613adae559 100644
--- a/dev-python/m2r/m2r-0.1.14.ebuild
+++ b/dev-python/m2r/m2r-0.1.14.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy)
 
 inherit distutils-r1
 
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index b076460e71eb..b8fbb87f58ac 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,6 +1,8 @@
 AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0ddc2cc70ac9ba05978beff8fcbf2bd3ea4627639247de5a2e343ee30144216d28b890414a50cfa54b9cd97a73c SHA512 c43f620fe52e1a69e52a14a4ef3a390ff38d6507a53a70b2da0625b3be1941a0f6b2cb23d2ee60a391e78d8062ba2a9c76d8c5ab0556e01c256867dede44ef61
 DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29 SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
 DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
+DIST Mako-1.0.7.tar.gz 564418 BLAKE2B c7ecad786213a8d3b77241955d5a825513f81bf66b705b6f54d6ff74a6513f7c8bacdc55fa8f21acb03e691900f45605da834a2b941bc65bddb177ce86dbe961 SHA512 d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571
 EBUILD mako-1.0.3.ebuild 1408 BLAKE2B 6ff326737561bfc128527020d21cb8ae0da47007e70d23606ffd0a8644a67b11aa6c0c7d0babc41c8b038d99fb3db28a899bcf04ab18873e7b2afeffd01e4c6c SHA512 9ffd33d5236948976f8b00f1b0d56c3904a19c90fd17d30ad965e450c6e170b5d285aaf2cc21d77564b8d19ff87a0c17010f52037d6dfb39f7d6d4691e904793
 EBUILD mako-1.0.6.ebuild 1477 BLAKE2B 83d366f715e9e6c1f2147e68bf721e1f19cae024eeebd7a83d18768d823add1269552689548a800c6a7719f0cceb9a4ecb54bbfb21efc6cf3af098ca5a6d5298 SHA512 4d41e035241253556f9e1a5c731160e33ce20d759afd739f2c488d67c2cc5a4ec506643f90e58a3f7fe503837af5e631d64e5b3a0fccb400e151426b5dbd834e
-MISC metadata.xml 317 BLAKE2B 1b8ed4d3958df0960dda7060ead69fff4ea6f0c6087d99af4ceeeb8d1fae9a88657aec6eb1695ec5f990e48f167e729ce65507080ef0ea5d23617d439621921d SHA512 5df2d87e902b439727d8be3861e626ff798a546f09dbfdd19ee7384dc1ca0474d1b3ff2f638d262217f0105fc2536a3ac2440cc5b1161cb510976bd2ca6d1da8
+EBUILD mako-1.0.7.ebuild 1163 BLAKE2B 2057e02ebc175e5e83d90afe4ab18768df57e39510de6c6affeb49c072e1d8d6cf4a5d46de7c6de139a0fb05593802f00605224a19c5c74f64ef34cd5c163105 SHA512 ad5140f79c7ea230e99a4b7377dd2d31dc74f983b3a423845a214bb55e2657a3c4b58a1bea72f3f8597ae3e231f61a9d0f91043affdfa9074090a64371c62422
+MISC metadata.xml 437 BLAKE2B 4dc2a160a2054ffe0bd59638a0170845b22d7eafeb77e94999ff239dac231e9b1a0c06b688da2c4699f73b99ae2c1306332cb0b5e91779da757bc048452c7c22 SHA512 ac01b2c4843ec9ab15f5b20677a003aa34fceeb2f1ad39a76e3782e077824f1d1103c831dd2f911ae5e64bb7530db2e87c2b1e5fde2fb77acf6d1df65f0e0b69
diff --git a/dev-python/mako/mako-1.0.7.ebuild b/dev-python/mako/mako-1.0.7.ebuild
new file mode 100644
index 000000000000..1614302d1fed
--- /dev/null
+++ b/dev-python/mako/mako-1.0.7.ebuild
@@ -0,0 +1,49 @@
+# 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 eutils
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' pypy python2_7)
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm -r doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "caching support" dev-python/beaker
+}
diff --git a/dev-python/mako/metadata.xml b/dev-python/mako/metadata.xml
index edcc780c70de..4e2283f56f3f 100644
--- a/dev-python/mako/metadata.xml
+++ b/dev-python/mako/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">mako</remote-id>
+    <remote-id type="bitbucket">zzzeek/mako</remote-id>
+    <bugs-to>https://bitbucket.org/zzzeek/mako/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 51c21ea196cf..59fe067935c1 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,5 +1,5 @@
 DIST MarkupSafe-0.23.tar.gz 13416 BLAKE2B f8ce67bab421447b201592bafce6a7ce58a827199ae45c585489165641c82dd3684810381654d3ac1325adaef3499665461d814cabf795eed9ed1dbb04632a52 SHA512 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28
 DIST MarkupSafe-1.0.tar.gz 14356 BLAKE2B d1ceeef939f4d4c31b871d8d1bbd78c72d72ff2e8c7109c9ab2b202e4b8272db25bc13210cfe2f442dbe2073963ec41f5924e4df9dc93a45ebe85fe9f0d9f12b SHA512 7437a02cb1b9c1d6d6c20b13d394f24a1cd1cb8c743f832d8b1cbb6ab8846f70f54d924dd693423b33c4d592e772983ae38fd4a35961e233457c48bd3584ecb8
 EBUILD markupsafe-0.23.ebuild 928 BLAKE2B 25b5cdb1a93797217638d280567dac1d6e397c61fd3fb5e9c4f722b01d9392566fa5d5cabef3145f0da5e9d2056d2fc05affb3052a8a42f10534edc53440d46d SHA512 fbd81412aa19d308397c3428b93cd7a8365edd5e142522721dba64156a2eaaacc3eb176542f7f25ef27c6b87bb32b5867802e7d0075bd43befde316bfd1e18fb
-EBUILD markupsafe-1.0.ebuild 790 BLAKE2B 5f53152b877680f0e645efa50b5583d33431cdaba8a8ffe398f8b455d4660276bc2c104b402e5318bd9e7083ac2b9e98b9329f143eda5d3dc027dd8e6249d47c SHA512 9e66b83438c40c0f44f5fd0162f64cec096ec98146d70fb8625663778103e97d25e9181d90e1797fd8b106b1e8637aabd16e6ec191a91b60d6d532fdf347a402
+EBUILD markupsafe-1.0.ebuild 792 BLAKE2B 6e19032e4eb81ee52cb9a38af5aaed2ac38935c2bbccfd3e590a78fde1ad0124892c2074749ee77d2dd5994107538dc0422aba211948528024f89104c0810811 SHA512 a8ccca28af850ecd1cf452c9210eefbe0c312927078191dd3448e9a53ba2a8a686f882ff23baa4f947e1b59f96df8c6288d0cc8aeae821e48588e0eb29665a04
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-1.0.ebuild b/dev-python/markupsafe/markupsafe-1.0.ebuild
index c134189e63fc..d7b0e8590161 100644
--- a/dev-python/markupsafe/markupsafe-1.0.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index b4187e159f3d..2a3934b0f14f 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,3 +1,5 @@
+DIST marshmallow-3.0.0b12.tar.gz 153870 BLAKE2B 4279bb477861cbcef219a7442ffa29cb1f5bb084b08a9812256898771560add3d8e5dbcd2348d8734c1701131e02f33c69ca17f2d1d9010712e11ada96e0374f SHA512 3155503630b2a85eeb4b04769de79346b334975ab3611695806e799a76dfca78cc3c7d490b18158c757dd15d550fa408b651fa4c69b3e5eb147c4cf38613e2ab
 DIST marshmallow-3.0.0b8.tar.gz 148882 BLAKE2B a83e9cb2ff7d5786e5a0d5c947e578f81d7d2ab008257df195096e06031b100cd6d31bdab3df63b6ab6704268b1915827dd89f7e5fce6a638d136686fc9ebc07 SHA512 34f7a974872d0cdad828e342788269ab19194e17f30716dc8db21bc3b86ab3f1be6bd5e31c7bcbeaad7b8c70acc39eab256eb938060eff42067f5f1b3ba51c1c
+EBUILD marshmallow-3.0.0_beta12.ebuild 826 BLAKE2B 1ef671583bf696aef8441aafd5ce82cb6db7b1487263a231c4bf47dd84b0e0c0e12c567fa865de4402c85d17870a0fdc943d810f40de226ff0460fb3c1159815 SHA512 6843b3f4e527001ac81f145c97746311ffde388967e4197d33d5e2b58e23531b4ab10a9d659365b68f18be261cc797a947e990322d75b7ee4bec17a7ef7b0c51
 EBUILD marshmallow-3.0.0_beta8.ebuild 826 BLAKE2B 1ef671583bf696aef8441aafd5ce82cb6db7b1487263a231c4bf47dd84b0e0c0e12c567fa865de4402c85d17870a0fdc943d810f40de226ff0460fb3c1159815 SHA512 6843b3f4e527001ac81f145c97746311ffde388967e4197d33d5e2b58e23531b4ab10a9d659365b68f18be261cc797a947e990322d75b7ee4bec17a7ef7b0c51
 MISC metadata.xml 360 BLAKE2B ed1f62630b417aaefbfc1ce52c275f16187a1fac9ee46e7172c4b703452329b64de253eed111bde2e7bcb4b85e7806d8423fd5d80899f93b23e7c3da61030a2d SHA512 51665fe5adb03e70bb1582f393b95783c9e4956c24f664c09d08017663bc8373b07080c142f714fd4c93381cbd5c55bec2b58ca412df6aa55980f9a61abebc54
diff --git a/dev-python/marshmallow/marshmallow-3.0.0_beta12.ebuild b/dev-python/marshmallow/marshmallow-3.0.0_beta12.ebuild
new file mode 100644
index 000000000000..630eff899b7f
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.0.0_beta12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_P=${P/_beta/b}
+DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	rm tests/test_py3/test_utils.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/mecab-python/Manifest b/dev-python/mecab-python/Manifest
index 99728d1343e0..06ec4128de62 100644
--- a/dev-python/mecab-python/Manifest
+++ b/dev-python/mecab-python/Manifest
@@ -1,4 +1,4 @@
-AUX mecab-python-py3.diff 253 BLAKE2B 979ef7ea020bfb405faa366a2b87a42d5c5e03e6b49b04ffc4ac0586e4e09912e6afe333072a47d676c4c3e7829ae336e61c402da280b6fffca80fc89323c00f SHA512 7937766e44c014149c64a3ad4226110f83868df330e5c0b22b65ce4624d3e6b710db972e18d446e535a76e0b0c763b2245d50280567e1ceebed15bd20c351695
+AUX mecab-python-python3.patch 253 BLAKE2B 979ef7ea020bfb405faa366a2b87a42d5c5e03e6b49b04ffc4ac0586e4e09912e6afe333072a47d676c4c3e7829ae336e61c402da280b6fffca80fc89323c00f SHA512 7937766e44c014149c64a3ad4226110f83868df330e5c0b22b65ce4624d3e6b710db972e18d446e535a76e0b0c763b2245d50280567e1ceebed15bd20c351695
 DIST mecab-python-0.996.tar.gz 62338 BLAKE2B d2f8749bf4ea0b30b9f7ee68a4210a3af600803296197f48091d1c9fe90f5baaff3eb94ecb3aa04d994771512c1ef5b68a62e0a045da95992bffd1710725e832 SHA512 08954ed801419fd7f65d055244227364bc37b063f8d21babb6ceeb02ca40e0146fa4401d1426255f3656ac1a5e51439bde981414613153dca5972f624289447e
-EBUILD mecab-python-0.996.ebuild 545 BLAKE2B ec5e164d09064280ed5cffc816c515c60b34674cce1504c06ff8503e2daca29af25fd39fa539312f206d77783227042a3bb8ca717956d7eb9861621e403b9594 SHA512 58c52b80c70c647e9a0c4063e2310c7131f6fe976939a96bece742e3d32d49ed652c9989b3c7a2d0817b23298d0faa70b893072f8ca858486956175b5813be0c
-MISC metadata.xml 359 BLAKE2B de31f469c45b9e95fd1cb0ae1d255977d78a8c96ca3bdea624eac82653e390f89972f2e680ea27a46d49909e185da8f70b51f7471974c7ad3f2947a425481da7 SHA512 26564a01d9ab28904670979d1961ab53dff53842e73ddb00f7d28f40c63ee0550daa6d48e44ea7e8a9ba04fe6852f61fae99612f111c0aef96d7422b21818c87
+EBUILD mecab-python-0.996.ebuild 619 BLAKE2B c6961b5f06cc629f160e13638ec7ff3af7972414456b41d12ecc32140f37566589f4f7383301c07333a7d02227f209350f5ae24a4af8fa7d6b57320813c05916 SHA512 0414df4ba70f8632179d7a37a8d1cc1735c84b1a42e89fa319b9bc11cbddea0315fb113feacb2a5e551cd7249d1caf627910e9331fa9633fe74c2fa4eb322ebc
+MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/dev-python/mecab-python/files/mecab-python-py3.diff b/dev-python/mecab-python/files/mecab-python-python3.patch
index 33c8d97ebb2b..33c8d97ebb2b 100644
--- a/dev-python/mecab-python/files/mecab-python-py3.diff
+++ b/dev-python/mecab-python/files/mecab-python-python3.patch
diff --git a/dev-python/mecab-python/mecab-python-0.996.ebuild b/dev-python/mecab-python/mecab-python-0.996.ebuild
index 6e9a28c9f18a..00f94ba5cc75 100644
--- a/dev-python/mecab-python/mecab-python-0.996.ebuild
+++ b/dev-python/mecab-python/mecab-python-0.996.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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,5,6}} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python binding for MeCab"
-HOMEPAGE="http://mecab.sourceforge.net/"
-SRC_URI="https://mecab.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="http://taku910.github.io/mecab/"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN%-*}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
 SLOT="0"
@@ -18,6 +18,6 @@ IUSE=""
 DEPEND="~app-text/mecab-${PV}"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-py3.diff" )
-DOCS=( test.py )
+PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
+DOCS=( AUTHORS README test.py )
 HTML_DOCS=( bindings.html )
diff --git a/dev-python/mecab-python/metadata.xml b/dev-python/mecab-python/metadata.xml
index 367494a8fef2..82adca0f7b81 100644
--- a/dev-python/mecab-python/metadata.xml
+++ b/dev-python/mecab-python/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Cjk</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">taku910/mecab</remote-id>
 		<remote-id type="google-code">mecab</remote-id>
 		<remote-id type="sourceforge">mecab</remote-id>
 	</upstream>
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
index 77e9c784a953..9d96668704de 100644
--- a/dev-python/mimeparse/Manifest
+++ b/dev-python/mimeparse/Manifest
@@ -1,5 +1,5 @@
 DIST python-mimeparse-0.1.4.tar.gz 5228 BLAKE2B f98cdea21ad015e65f638cf5828dffb006ab2f142c266b54f851faa3b38885fcd29ef8717d62235e675a8ca3fcc91fdc8d8e594be2c6404a45c3dc09b5401f1c SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
 EBUILD mimeparse-0.1.4-r1.ebuild 1119 BLAKE2B 2c26e6d8196ea644409696a5714c100c048a86b7c6973ef8982fef229a6a140ab22148cb5b3d6660616c57d097ef04d1c8f6b5bd4aba13805dbdcb91554802d0 SHA512 5b70dabb5a426dd16b2159fd36dd3f024400724a30c5c264340d2b6c88a5c046e93c540fd06e452fdf9249d16cb888210944dccff00f364080b543c4cfc45152
-EBUILD mimeparse-1.6.0.ebuild 1153 BLAKE2B 9d9e83aee8bdf1fe3052a452f19419039aeb74cfe88d4ac1043cd650db9faf8a02fb6ec256c9c66aa021de84c348d4c9a2d6da42ff88e941a698c73ae6184445 SHA512 74d035c3c87d6865e3f0109b872a28482a31ed6e49174b66816013fb7ff39283fe74b6fe98f3175d193102a806e77d069394fa0f58496aa4eb3d1c0d2863dd79
+EBUILD mimeparse-1.6.0.ebuild 1155 BLAKE2B 1422be82d7718070aa04dd437343c1c02fca0e267ffbc82c333b4444cc0e2344989b4ded00c4f2e0e902e7e009d0de106f2fe03f9eb6dc4d2451228f67d6b750 SHA512 cf1f693035d63732eafc70d342b319db9ae7979b4c279a07324c38c44bf65130feb600f06bef4fad401de5c795abe1c5a2c38791ca3fe1b6429f76217f754c14
 MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
diff --git a/dev-python/mimeparse/mimeparse-1.6.0.ebuild b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
index d882f1bbcb2f..4304ed8854ec 100644
--- a/dev-python/mimeparse/mimeparse-1.6.0.ebuild
+++ b/dev-python/mimeparse/mimeparse-1.6.0.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index d7d27a9741da..0b2664f520fc 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,5 +1,4 @@
-DIST minidb-2.0.1.tar.gz 13848 BLAKE2B 4aeea547693ccb8a67fba147b640535952402dce8b97c6aa1a78ce92997ddfbfc34ecbc4d444eedfd7b3ddcfe71841777eba0bb2fbdeba49114032baaea9c0a6 SHA512 98be264ba669ef08f180c469ca8375540436244228ee4e0c4e4b0511425b909eb4c64dc812a27d0b490af5972e0897538f905590b7d2dd19f6fdd160280a6b4b
 DIST minidb-2.0.2.tar.gz 13928 BLAKE2B 7b6997bd0ed852561c1a45e1d8f63030798c59ebbe67ba3e9f38c08eddcf22028756b17c5ce8aa460e5d3113ef54cdafe782cb471aabfe208b093af702694cb7 SHA512 92879d6df61b0f9f72f9fe8f1cf38d559477983c6bba8c88ed02289570daff02f6f8d7010c0a95ffce049ab67be69323c47caefdfe3a8b008038377235ed9a5f
-EBUILD minidb-2.0.1-r1.ebuild 563 BLAKE2B 9e01a62bafb71239cbb8aa6217cce89cade482f102fff3b5c92f5523cf6923714221ddaafee8fa0be4fcfaebdde0b3d0e18026892c5899d8c39607c841f6114b SHA512 571131713ccadc1210ac7a23e6df6432577293d106a2691a25174002f0b3dffd2a885d0d16940532567ac365cab11498ec4df9970e5b28d662a800e9e6fabea5
+EBUILD minidb-2.0.2-r1.ebuild 568 BLAKE2B d895747dd77351a1a8bccd6950f3b9bcf951ac96bfb3ab4082276c2781423a573812795013d94ae44089f3d589454f0f6e0546af8436ccb8e7aefe53fefedaa0 SHA512 8227e076c1a88c47fed7d5793bb8c5043e07f6358c32f346ebabc6a51f2c5f0a686d654e8da3ec136f83a1f9c779710d284e9927d71fac232cb66023a97709fa
 EBUILD minidb-2.0.2.ebuild 563 BLAKE2B 858035f5a1ada7d6a387cf9c3735a45cd6527b30845777187757a77998bc7a5ec9ba8d5b795e04c28138708b79c0270dee42f0e677e0743257f33aefe681e25d SHA512 b7c99fb50d1041497ce832053e7cee1c9af0527f536b7868d94b6d29d675c2e0089bbbf1c35b9a6477bb8138bd1f4918b4677d530259b98f5e3d214ef25885a6
 MISC metadata.xml 422 BLAKE2B b5d93a5b4470c716205ec803434d612c404f45c9b6ee708a56d57ea120c423cfa86f008bc47ef0690836b3cc92c6eae56c3b97959671d6ea72ad751868d3d94c SHA512 c2b0dbbbabedccc7036eecfd09f403f9a5848c6f71d09a12e5be773506c6ec5a5290f459e8cea9505abcd438e47ff84f8c32ffacf6a62be365bbf8c92f6c64d0
diff --git a/dev-python/minidb/minidb-2.0.1-r1.ebuild b/dev-python/minidb/minidb-2.0.2-r1.ebuild
index 33437a219865..51dff2891b1d 100644
--- a/dev-python/minidb/minidb-2.0.1-r1.ebuild
+++ b/dev-python/minidb/minidb-2.0.2-r1.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{3_4,3_5} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -14,10 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index d7a1250a16ca..e7580b04dc06 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,5 +1,5 @@
 DIST mistune-0.7.2.tar.gz 48887 BLAKE2B 4ff0286483e593fcf5183bfed18b90c39b93dacdec3bba474d6959ec1da162dd75820707a8ed9985fff4c15fe88a12df6fb6af20b9a40de173acd7c0a6e02893 SHA512 9002bf83a368671389f05928f4f689064a1e415e54309259b6bbb7781b4bfddbbf834e2c63ed3271e1e6ec7b78c1665c7708177b9723433d1e2ad4b13ad903ca
 DIST mistune-0.7.4.tar.gz 49304 BLAKE2B 9426007f618e645832d4d73db29cdda63e8426c9e52bda06935b0003b3c4f0122b14ca893ef4adad96c7d2f4b8be777efb6862f5370bdb9b08394129fd22e7d0 SHA512 d300bec23f5482396c6f282ee3d773461c162791e4605ca40141eb9487c8b158ac7f47f6338f7c3bf27bc614292ecc61dfbf419d47eab817821f18cf80103802
 EBUILD mistune-0.7.2.ebuild 713 BLAKE2B 7abb083a85460c32d7afef94ebef618546a519d842723c849ac77d8a8e61a66d94d677e1d5420052877e71beb4686b6c3295ec54282962125c624a10290161df SHA512 0dcf967246ab78ddff86fc8421cee3aa2cbfdd43a95c62d0495e18af00bf769978d9fea7dcd2cefc4ab1eaca58cd94d6891a085c0d1f445b225274df6a78f5f8
-EBUILD mistune-0.7.4.ebuild 732 BLAKE2B 973c19251996b630a47bdb74eee5a35c3d6f0b6aa412a15d96366d025f6b5117c788668c62412751d2095b273cd2e7af26a683cf28e66cea77404298623c667e SHA512 d8eb181163d8e2aa7e1634f163deeef9e77caa395ba9ceef983e429efbb0731c13acb3f044aa76a462a8b7f74c45ce4d43cfe61702e8bc5e822c3cd4d366742e
+EBUILD mistune-0.7.4.ebuild 734 BLAKE2B 71262dd27bc3c6c54243b7ba015555c923bffe38a13821a48601995ca30e60a5b7c8887468152db1a4a8b5e791f401b46a0cbe5b87e20bb225709f080fcbf510 SHA512 30cf1ae2ed3e5ffa2093f1db15618ce7c0b43ef70b2be23548ab69377ca7e0cacc983a05c34e7d13a6d1e707a47b68c6a2213f8e4e1dfd0e3616bfe8d3bc6bf8
 MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
diff --git a/dev-python/mistune/mistune-0.7.4.ebuild b/dev-python/mistune/mistune-0.7.4.ebuild
index fc1aca516b8b..761ebf00d087 100644
--- a/dev-python/mistune/mistune-0.7.4.ebuild
+++ b/dev-python/mistune/mistune-0.7.4.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index b1f8bdd39a06..89651aaa1cbe 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -4,5 +4,5 @@ DIST mock-1.3.0.tar.gz 70908 BLAKE2B 4df669c5d54fc835c70d6190362d4dea9cc0d2e7ca4
 DIST mock-2.0.0.tar.gz 73684 BLAKE2B 970bebe72b6969b58acdc2856b53054f992d01f9f3ca5f91b73073d0a1c9ec89a5c94fd66eab85b258f23f33326825ff6598bb2ba8e07eded1e6540a26ac5fa3 SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238
 EBUILD mock-1.0.1-r2.ebuild 1122 BLAKE2B 0666590c8f88b75fa42b639d6a62bfe728eddac03a8960c9e6e3c0ffbfa4c5ca38ed16a4225a8e88773bc7f41f9a0e25bfdcfc25c1e6af93717d48b09c81770d SHA512 910319a9736fdbe3797ba3dbf8131bcb40f3b7a22e532c70f1e68797e948c4dc37aded8bbf726e9cb4b404e655b12cf4c6e66b34cbe3abc8c04998f9e96810d5
 EBUILD mock-1.3.0-r2.ebuild 1073 BLAKE2B 04e814e0e3babe2b9bc187d0a30d0e81f0292306fe05f370b4203d152f10d251ec36a79c139722395e020c17c7f7d267a2f219779d85f9b7ac16ee58d89ec837 SHA512 601b41f1e291903f62a786900aef41e815396c21c2536ea1d9d0acfb27b305765bc3ee7ec2fa8270f14d6f70f76361cc007cd9cc926fc072b1cbcee145913e39
-EBUILD mock-2.0.0.ebuild 1080 BLAKE2B b8ad29322db0f8e3c1a9199ae9e94b1fed7b5df7ff743509e4de0adb96053209d2adf0d3f55813f6a4ac0913cdc2d06ffb5c067f780dd7f8d97784a1d068929d SHA512 28d07b10d9ccb4491f0cf16bbde62ba9503af0ae08975b33e6dad7b63742d0ba95bf6f514d49ef34a275e4e799e412ce13fafb86e7611cd82e0cddfc5bc21543
+EBUILD mock-2.0.0.ebuild 1082 BLAKE2B 416a2cea273ef1ffcf86f1f87215a9deb3ce9238975357f508aa93df267263e1ea956482bad7aa123d9167c1a15c624afe4c3a1dc0245f149b493949161caa35 SHA512 200ad946a324e9cda164183cf3f0547aa6fa481f4bd66f0538758362ba27c23a142a99b9c7fd83e88f1b3cd0695c7fafd67f51308d2abf70f08899d27ce572f2
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index b4d88b3e0c2c..dc4cd3d8d32e 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index d8a54bc82c73..02dd3f6d9e7b 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 930 BLAKE2B 16438ec83b002d3587536080422cba907b362f85e0eab06b27712bfbceab011fc98aac1f98113a98f80df3f0b0e26ce642743f917123d9ed51b24527c4c9edf3 SHA512 7a359972927b8be3025844157816985d381d8b4b9c092c9b26d37281e8392b11d2795e9636c45b81c497bec74e5bfad4005f3b7f056f7d9fe293e163dea9e737
+EBUILD more-itertools-4.2.0.ebuild 1039 BLAKE2B 5981d50ea36df00dbefec87c7843aa018d367372c0360c4f817200b9d220ec1668fd379e82b41251f479459d6e6889aae92e6079e139c0f2446a8f6d3dc39a9a SHA512 87162055d2ca7300038147ac40f6ca89088635fb1a225b22a8643718b757b4b3a48de65f62c4fe9230a197be672da324796c288f17b41205f49637ba05dc9cbd
 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.ebuild
index 06885c59e628..fc733c79dd01 100644
--- a/dev-python/more-itertools/more-itertools-4.2.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0.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
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
@@ -36,6 +36,8 @@ python_compile_all() {
 }
 
 python_test() {
+	# Avoid ImportMismatchError, see https://bugs.gentoo.org/661412
+	cd "${BUILD_DIR}/lib" || die
 	py.test --doctest-modules more_itertools \
 		|| die "tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 9fa5153e66a2..6f9944639f42 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,6 +1,4 @@
-DIST mysql-connector-python-2.1.4.tar.gz 11766506 BLAKE2B 41ba6a4515e20de6cfc876ec770b382347881fbd521ed68f09e287be91ababd06544edde7302fa6ab1e9b0f05dd04d2bfe06c5d2c9cb00c8c2f262a4d73a67e2 SHA512 1071c4b3d0e30dd90cb1ed7d6376a7dd688f16b285ab28c26eccd182a3b3c5bb3c36890aec38b037ccf70e2c2ae24a9013139c7ca71e69ae8e9e29f2c15204d9
 DIST mysql-connector-python-2.1.7.tar.gz 11781659 BLAKE2B 332092059a32249e449f99540beb9eebf80e9381cef4560208412a19385894eb2193f02d5a20aceafe9644b8a225926a02d57c3acc89ba7d321b6d0f9c7c4d76 SHA512 f88c3a6dd3c3c1cd5c16165daef801dbcc7ea9163406273dd751e25687a57dcdf4ffbcdb65bb107e8cd9d7c91029823f625dc19ab34116398263fa074598880a
-EBUILD mysql-connector-python-2.1.4.ebuild 974 BLAKE2B a148e95f3388e98a072b7088af9da7ec43716de92106cb315e1b0aee81654ad236a6c4afa008358a880fcb7ac21ec38bbf3c83b564b4361652a75e9758e84889 SHA512 7e4fe486d550b2e6f94e596784690f1e4ec6c3113a8e6ca967c593a64310dba67073e272e6b0efc8e232e382da16ef1c9bd04951af1bc141cb4ddcc6cce29235
 EBUILD mysql-connector-python-2.1.7-r1.ebuild 998 BLAKE2B 1d20c7310fafac0ed7afa9ae13509da7bcdda58fe1a435d22de4c86a797ff9d0bcdae5874167622263078199b63169c92034ad9b0a056c0dfc7b875ff5e57cff SHA512 d29a7dac07978fff4439a479dc382da3e6631d20bc0d4cc6a8cd36ff4eb89a20758797ac1528a013cea96c52bde4b03ee38684fcb8f608f69d58adff142a5191
 EBUILD mysql-connector-python-2.1.7.ebuild 976 BLAKE2B 0cc28ba8d002c25ed7842ee06641c865aa83a84ebf64cdcc7b7136941d8210a70e4ae58b55b3a3af4b1d30f9abeb1d8911d2ebb3466b285b5ec4c5b5706f0f89 SHA512 29612cba2cb0dbd93750dfe3929b0418dd81f488d61829937700e5a2aad429dfa60db9ce1c7ad88d001dc756594c054de8eed1b2a26e821b9b9044e9e9f6d561
 MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.4.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.4.ebuild
deleted file mode 100644
index 06dbeacf045e..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-2.1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="Python client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples test"
-
-# tests/mysqld.py does not like MariaDB version strings.
-# See the regex MySQLServerBase._get_version.
-DEPEND="test? ( dev-db/mysql[server(+)] )"
-
-# Tests currently fail.
-# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
-RESTRICT="test"
-
-DOCS=( README.txt CHANGES.txt docs/README_DOCS.txt )
-
-python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}"
-}
-
-python_install_all(){
-	distutils-r1_python_install_all
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index 764a023ed7b0..cb439f67a315 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,5 +1,3 @@
-DIST nagiosplugin-1.2.3.tar.gz 37570 BLAKE2B a6862bde2215c624642a21886eda993f6d3a471bd10ed7c27374617adf7e5ca9d6f82890d21d432018234fe2d803bd01f6e5abf0fc02764f73564a74262eaad8 SHA512 3f3045db181acc144cb41871f2f67090a7b096d600c9cda7e4f9b86648d47319dca7c42b74670ba307c0bc60955eb33aefcde9c895e544bbb4c7ca1f80e8919d
 DIST nagiosplugin-1.2.4.tar.gz 38290 BLAKE2B 4ebf230122a68919f82da7519e920b485075530cbde235d9f0d7a0f22e65a37c85f3ffe84af100f94ba8cee0a8e350b848d2e35606616808baada75c5abfddd2 SHA512 42c7823445c0dc1f5fedc6b8bed6c5be4e2b5e4c14cfa2cfbd158ae43485baa0fc74b80f9dcbb89bfdb27b984d72201c8a7c330c71d837c0f822603a5f8f7ae3
-EBUILD nagiosplugin-1.2.3.ebuild 662 BLAKE2B 94d743f05c369efbbf26b78af3d44d63a4cf11ddf6a731f79517a6e2a6c86f6f1ec66ac9281c43b995ccbaded1120dfef405d32e7d262e99374d587b466a0943 SHA512 1fbc28e9c04f45744b000764571c85bb2bfac923f68df5fcd571ec7fd9af25480ccd614bc895985dc1751bb9d932877b25e74dfdaa0b028c0cd3a22b85b64dd1
-EBUILD nagiosplugin-1.2.4.ebuild 667 BLAKE2B b1a34aba501b963d9838054024b893bb203e1d2839f36b7959836970328ef008fa42ae14f995b063f1c4067d5034b37214a38cd42ec8a24cfe746af3eb3cf54f SHA512 cdba0c309f38289ca1c40e4a659fba19f8735d660b42d71aa60168130ca562032f883a7c3c9377aab12b2bd4266ad3a47e83afe036d43830502eb6b11a4f8518
+EBUILD nagiosplugin-1.2.4.ebuild 542 BLAKE2B bd81ad81f37265ddc6aa667c604251d1d9898816512aeae96b913aeaaff9a3175b58dbe6b0358fcfda1f2fec7fd9e2a928a6254657f957e31bae1f3e39712c5c SHA512 0fbd72a1e88838d0f13e4e6f7cab67e5df3d061a0e391e6b23ef9c996bc0facd301881b5e71cef08dfd7df4a1471ef716e7054c9a85fff1cca91b078a6a5b9e6
 MISC metadata.xml 464 BLAKE2B b132f31c8611ba39b42c068d1efce0230f73aca04382ba1089bba09fa03e5f8c83ef8eebbbd74be55d113ece21890d93fdc07b211b538430a154169abe7edef8 SHA512 1476a7d2df7b50e0e908f970fdcfb7a63fa04f2014414e16c4dfa39659846fba26a6808949a741a1cc112edbaa500783db325b2ec5ab66ac72dc2e6152466c75
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
deleted file mode 100644
index 4b912f0d2fd0..000000000000
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A class library for writing nagios-compatible plugins"
-HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.org/project/nagiosplugin/"
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/flyingcircus/nagiosplugin/"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="ZPL"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
index d605b5b04959..4afa3c4e1d13 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.2.4.ebuild
@@ -3,24 +3,19 @@
 
 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
 
 DESCRIPTION="A class library for writing nagios-compatible plugins"
 HOMEPAGE="https://bitbucket.org/flyingcircus/nagiosplugin/ https://pypi.org/project/nagiosplugin/"
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/flyingcircus/nagiosplugin/"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="ZPL"
 SLOT="0"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
 	esetup.py test
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index 53b7682d68a5..ba8a4e66bb41 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-jaraco-1.ebuild 896 BLAKE2B 99c7404ea4dba6c69b0c356c09ea07078053aa205701c11261348391a6d27fc6871456abb487fe6142177c5e35c908498ee513c80e8762bf4f526588a2fbf643 SHA512 4d5a6abf848d0fe47bf8f67d32012df68b34e4bf63415125e5c56d06a7a755a20a8c76753cc7c67d59696bd4e37e9bf38e53f41d744f2f556383ff6d2bac85a8
+EBUILD namespace-jaraco-1.ebuild 898 BLAKE2B da619d8907576a7770cacb75006284d725fe2c42e96ca3e4841e9e0e6d586a5882d2df93f0d5965a7ef8c5caaec33f45438ef41eb5fa442d226226184cad8756 SHA512 406e230e7c032da541237f6cda7211f077201ea6184d2c6d73c0b653d1175ddffbd08ff63d8515295b0748df01d6215fb68963a2d2ebe7e9da09c0422a7c4e0d
 MISC metadata.xml 346 BLAKE2B bf549c97be0470c6694566c73fb27eda911bd1c7e38641ccfc90e0cbf33717499177dcd4d6b6ce475d430a04ba395500d41aa5cf7d7938ae8bdd1c0840e0a6e0 SHA512 747d2fe0daa0213a7f9d737cc8c5037438ef9262ba049a7a687e944cb1251b9b3dc39ea03a810b5ca61c7b95c7f1360bc397c4d75fc26746cab5029f7736efdf
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
index a7aaa56fef50..e4437161bef9 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-1.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 python-r1
 
 DESCRIPTION="Namespace package declaration for jaraco"
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index c4ef4766ffde..55d07264edb8 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 985 BLAKE2B 0aec7b21ec6a1a5a8e05c64ebe38538df57d97124be011cc19ce125c4bfd9ff256837225d8d34d4cd1646e48180d0deac216e79a345745ed36713464ea56d71c SHA512 d92d7f8b16d0e6cb1e1ad59a0d3be30da8ef9afd3653dbfd29de77c549cc8e5d80e8abfb7f39d833538957c97faf9c6e63f1b02d55679647fc3a2cb4addd79f2
+EBUILD namespace-sphinxcontrib-1.0.ebuild 987 BLAKE2B 6bdfd39b8cb18bfb9656c4587ad8924b802dfc7f3994cdbda0b0666c3bf408895706171932971eeacc7a4a668d9cb161d50d41d0cbf99405b3e1fbdd92b027b4 SHA512 d1c36a28cab8549de17df791d09a6434b4609f6dc4eb0201f38774e0482e8db694dc419e8243f6b5fb82f6a370a423ab33157e0ffd59da3b407d2d48b15820b4
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index bc7c30e349da..4b3f31512b2e 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for sphinxcontrib"
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index a9dec58ecdb7..f26c6577a07f 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 933 BLAKE2B 3cc06b4b6b68a87dd26e4a426bc47ca1701a5e2ee856fa8215b896ee6db535dd8295e75783cfe34b085ee25171845a753076bb08ff92e99ccffc4bce40082c88 SHA512 aca792174acc631888a014dacc1114a38347ecd72d0e716b5c7b2bf6cf1b185aeb9ed73fbdc84a07425a838cfb553bcce96b759f344987bed8dde93629cecd94
+EBUILD namespace-zope-1.ebuild 935 BLAKE2B 18a83d574c23f2df917df6ef33ad4b423822080e1d717d9c98bb894bfe96ea1228277b7fec0a75dc8387108c8f67da0236524701f8aec62e23ca586ee8fd1dd0 SHA512 bedbd85002adcb99946fa0d5f46faa43c20fe7c494fb407c4054ba18881635fa80b6169a945600d81aaf122c404c5795203dc468cd608649e4771e21b6810ae6
 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 e66b36adb721..af97e2ae2e9f 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for zope"
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 944d1e9f3926..b410cfd49a97 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,7 @@
 AUX 1.11-sphinx-pngmath.patch 361 BLAKE2B 1cc9c5d7ac8cf426656565df9afba6e4c75459550daafbaf98f4dbaa0814deb711963a3c7fee33537143e3f45bf7367b6a7c5213f72873f9ec5a47e7ebfa2807 SHA512 2db58b8f6067ccbe66bcdb3f39a80d126bd549c6838a34907b01360b5441f8b122632f1863b51142cba8688f4705697b9cd15d8fb6534ded8a9613e374edea4e
 DIST networkx-1.11.tar.gz 1315737 BLAKE2B 9f6556af1a4e23bf7fcf51fcbc753a08f2616dfe63c7b05fbe20ad7532580bf566c44ddc5db0c0d89626a17fd2029485583b513f44688e8033ca83cb36f28315 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
+DIST networkx-2.1.zip 1612593 BLAKE2B 0a603617105bb1efa3711f81a468520eef5f56438bf6e730091a43b628d04fdd22e8b62de671dbe98be180bff68b3ea4af61e475fcc1f274537ccd1e74fcdff5 SHA512 61b819ccfdd38e009e5b363f4bf551f2924bbf751b078aab1b41da9faf4c6b0841f38750b96bd359d3aebefef01e65e88b4c43a378ec25bbd45283d92bdae678
 EBUILD networkx-1.11-r1.ebuild 1929 BLAKE2B 7852413061c7b9aa3960b9263a9d372e4ea343d0cf90a9e2113150eca7fd5b2ad3c5930e3cd66e90503da639c275ca198c48cfbcabafe99d795e60db687306ae SHA512 bbe4384d6ed6dbe201840f5bbd4d44cdbc1b89e4100f8c0045cdaf45c1ace297573221fcba6b6527ca261c25e4f466acbd81bf9f3a6613ce21e27e03d0547d9c
 EBUILD networkx-1.11.ebuild 1905 BLAKE2B 2ff9b91b619fc0846a90bf0388148398e295de9095e8fe973fbcb53a45650b84b845b67633951d2e45963d6d9e45e05a7bca82ad9c91cddec91ed61a24edc7b6 SHA512 4cb7100d2083b3dcf4c4d829ae30da9d9e4632bb7117f3255f3a3af4f74e8fc1515680cde0cf27d12c2e975e540a8ac32e95549de0c2c4a3bf6e280dd8423a6b
-MISC metadata.xml 1131 BLAKE2B 59e8dfa70e76d2084bc9bf4cdaeaeee7844ed7cd58b096d840ca266b10ca5213899717f60e416f336a288ae5fcdfc764c28e3a0376388c290c42f2ca924c9f34 SHA512 d91220a26181e850a8ddb2a4cc31105bc01cac62e88ab9d76757cf0732cd680aa1568a671902790893f08508072fac160093457f3d09b670ea704d38afe49e1c
+EBUILD networkx-2.1.ebuild 1493 BLAKE2B 1fc5b26fa405d5a48ae84b67897c1a88e21f0ab5c8e4dd1a667534c84dee876e6a62e5c56c7d5b6427898741850d5ad3582b01b4865f8962278791b99858dfa6 SHA512 56683a5cb53de30b85d8501aa55f5a2aef176baf8aed0ee797fbcea75d0e5b4dd64031b9aef546722aa41309485491d6de46cf79105ea2b35abdf17ed946318c
+MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index dff6872815b0..9b4b8c4f40d2 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -21,6 +21,9 @@
     <remote-id type="github">networkx/networkx</remote-id>
   </upstream>
   <use>
+    <flag name="extras">Provide graph drawing and graph layout algorithms along with shapefile format reading and writing</flag>
+    <flag name="pandas">Provides a DataFrame, which is a tabular data structure with labeled axes</flag>
     <flag name="scipy">Enables scipy backend</flag>
+    <flag name="yaml">Provides YAML format reading and writing</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-python/networkx/networkx-2.1.ebuild b/dev-python/networkx/networkx-2.1.ebuild
new file mode 100644
index 000000000000..0dbd8fe24418
--- /dev/null
+++ b/dev-python/networkx/networkx-2.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples extras pandas scipy test xml yaml"
+
+REQUIRED_USE="
+	test? ( extras pandas scipy xml yaml )"
+
+COMMON_DEPEND="
+	>=dev-python/matplotlib-2.0.2[${PYTHON_USEDEP}]
+	extras? (
+		>=dev-python/pydot-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
+	)
+	pandas? ( >=dev-python/pandas-0.20.1[${PYTHON_USEDEP}] )
+	scipy? ( >=sci-libs/scipy-0.19[${PYTHON_USEDEP}] )
+	xml? ( >=dev-python/lxml-3.7.3[${PYTHON_USEDEP}] )
+	yaml? ( >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}
+	examples? (
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+)
+
+python_test() {
+	virtx nosetests -vv || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
index 6104502925c7..d7891091b21b 100644
--- a/dev-python/nose-show-skipped/Manifest
+++ b/dev-python/nose-show-skipped/Manifest
@@ -1,3 +1,3 @@
 DIST nose-show-skipped-0.1.tar.gz 1768 BLAKE2B d79272ac7fd065fe28b589b3234abf527911326d1fea1c23ba0840650d2741846b188788fa9cbeec4a56a78737ccaf8c781ff1f9ac97a5b1d1d79161ba3ab0dc SHA512 b6f3cbc8fdc6af7f6298ad54a5b06bd053d27197368eef1e006aff438d517dba549154eb3be35996b0bd1c291537729438f52709b76c507e20c496b6e504f5df
-EBUILD nose-show-skipped-0.1.ebuild 631 BLAKE2B 575069cff3aa99bca54a898e11d0c6f4ef8a581061dc009fe1e4a026317de1a8ca47c5eb1df3d29cc488ad26190f3e1c73858d3c0e93a64c46d1167bbc8fa793 SHA512 a029c875d04a7b132502ae88d7e616984ba9078059539a56ff015713b6d1590e839f14d94aeb541e2c8735efe42d86abe4efad3249298c91a262afad0b561fe3
+EBUILD nose-show-skipped-0.1.ebuild 633 BLAKE2B 4662cd8d2cc32f4aba39de63eafde0f67c74d49b645c4df8fbb4ef850b4b5d5cd7a35f191d1a991e0d5fe4c8aa78ef6f946e7ca026a3525f823a277719e9b21a SHA512 5ee14bb695efc2ee03fd1f8f555fbf51d3604cbb03faf32e06287989ffa9153d9fb19b6d59547e792702150ee059b6f20f2e53fd1639e4fb40829a6adcd83246
 MISC metadata.xml 521 BLAKE2B fe86fa52febb5f3de9c44e66437ce7c0f05d88dceb9708cf7f316d6e4002dbdc53496d2bf0f568fbc67a92f01a0f439b4e9f0b561cd49cf16e0591034b3bdecd SHA512 de78277716b856994885a2eb0d7906f3643e1b76ad263385063770581c8c11cdea081cdcd1724182ddef0c799438f5bf94b7de885b4a3f314df6efc935aae2a4
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
index 05bd248f2231..e05014376fab 100644
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 5c8826c42911..86b7c84df5ea 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -3,6 +3,6 @@ AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd6
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
 EBUILD nose-1.3.7-r1.ebuild 2470 BLAKE2B fa467c94ff2c2a656d6c44cb90f4741feabeb146e46fe93657ba6d12258fae1f68d0d0f5130bc04a2ceadca42c3c7efacaa40dd8356239cc495c9477a44155c4 SHA512 651f41e8f6fc187365d768b90ec6419e5ca76510eb74075feef9bc30ecf7a8cf7cdcc40ede65bda7b8241760ef1c706f4c9a6f2dee25d75cff13107e300d0bbf
-EBUILD nose-1.3.7-r3.ebuild 2775 BLAKE2B d729bfe30ad056a39ee79dac8b2f7a8294c708d65c952008f1bf78256d2f91f8ea39067ede85e1b8565361cc4ba302dae905f4d2d6427395d5fce9f357ec1376 SHA512 803b7d3b4b2a801ce5ea9f96e4fabd26f5a503577be141b523a9a89b1017c49489ef605fa0557cc6aa70879cecb0e73b8c24320e6d24afee5c065d657f16f624
-EBUILD nose-9999.ebuild 2234 BLAKE2B 098036df8fa1c951ccd5936f411c1b9d9334cc2dc9713bd7450cca44b1f35f225111d663481697db34a4f36ca6ad5d13740d020afb7852d168c77e84eaa295df SHA512 77b669442f6589d63af0c3927e4e6c120667d42717fcff6b835de1abd46a26415e622f265b17bb64da0381bd2c49bf9c9bd0443b0d83ea61ee2f01d942599f6f
+EBUILD nose-1.3.7-r3.ebuild 2777 BLAKE2B 30d7284dac4b6eb1111f31fcf513101656a8c0c78192bf45d816aaf1328b0a125b6b7e835c69e898a1816c03510cfb244a728f24d55ff0fdedeb0e38cea9485e SHA512 12069e188bb81fa0ba1bbcf1bd0b0ef59a2d3be912c9ce6c2a1be897a3de15a066ac5c8507231f03d9edcb83892d7785f39de317d22bbde3aca610a015ef9ab2
+EBUILD nose-9999.ebuild 2236 BLAKE2B 010771ca72f74afccb6d76a1257fdf0002dcf572c09521df9a3d06f51b25de80cbd473efb82084b4edea607e3426803999a30a860ae5eb376a2b206081be9261 SHA512 97a5fd10b20cfcfe536bbb9977ffc8f9703ba7d879b5981396d667c29d8501c280c366d274278a959c28f2bf23072782f4debbd4ae4434a56edd2ac08161162f
 MISC metadata.xml 432 BLAKE2B d2e71400e1d6c6fd0f03ffe106d6c5c7e6ee4b657a2958b4dcc8749fc475bed1b0f44279a557b27451ef5fb31363bac7c5cf5d6433c1ac1901eace3a66bfd826 SHA512 d4ff137034358979e2b59fa11e18ff17ade90c1c2127f5c769a58c8867a5de1a4736c2d22cad063b9119067578feb6401305f6acfd3e05d897b3f01f273e5530
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index 130b3d368d81..14a35ee036cc 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.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
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index d3f5375f2559..e0c3121817e3 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.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 git-r3
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index 3f4689718719..ec638f6f301a 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -5,5 +5,5 @@ DIST numba-0.35.0.tar.gz 1647189 BLAKE2B f0dfd6fe03e1a60b4d19f0f4d1b158d41868637
 DIST numba-0.37.0.tar.gz 1734667 BLAKE2B 20fd765d226e6e71a0e94bbf8c6a605ef7b4cf8ba6e39667001051c642fb9b872540482e710e020c0fca6653d9ca4518ce82e48681613f28ac5b9e2346bece4f SHA512 83a4e5a28a43ed1cd6584ccd63aac38a928af48c424ed119bc86487f0a2bfb9875c34f6fe0a03446d8c8e9179be81f831200c12ff31edc22bc4741789095f861
 EBUILD numba-0.27.0.ebuild 1759 BLAKE2B f87f21eda9ac38fb775130111a909a6bce7c031eba7aafa27beb5e5ad539f143af64b21edd15d42b58dcb882cbe3f0a3a994c920d2c24661850cd4ad116f2b0b SHA512 3acf059c075b8bc167cb5c65dc21254955dd11d1daecca2d54ba2134808a68d0a629730c96c42a0efc8708c90c289ec6dbfc7b8bd3c269b8f5283e72de789a5b
 EBUILD numba-0.35.0.ebuild 1068 BLAKE2B d1c67dd7a72d0db5ec13ee7903f24c56c77d66beb3d9b92596db9f3311d7468bce2a1cdc7534b90ce5ef88ee9731c19ecabe1334701e7d5dd2966b73955a7c8f SHA512 e2a10a4926cdddcc017bb1a00c0bab5b5e29abcffe10fb404bdc3f65351441b9990911a4f29cab5b4258c44d3475a73ad5180e0e43e9a86404f4e79c352c602d
-EBUILD numba-0.37.0.ebuild 1108 BLAKE2B 2c813a307f84a911d6b662bde123a26aa1352e3daa9a6c4bb56c52872f736189d3d475025f37462cb5030246953de3494f069a3686a8239fea94894f4682b87b SHA512 4f5129794e9da4dedb0d4ba8b972610b0d7efa127f88d2cd48e37ac6775dec84785d8d20d36fc36c11859e5ad5f72045eaca007f18a0fcd1ee29d5015e2b49e1
+EBUILD numba-0.37.0.ebuild 1107 BLAKE2B 14c645faa7dfe49ee75b62c338910ac712654c053edb7cfa25a087746ec74bd988e7ad84aeede4e873f56b1803938cf18f57b21a33a11b699598a0c98a3efe42 SHA512 23faace50b80212c182229a2262386cdb0690b485fe9d087dfa4c40cb3fb62eda7a75cb3f62371f1ce682eb5a0593c9786bff55bb31267a0b809d836da2b737c
 MISC metadata.xml 817 BLAKE2B 38ad9b5ea5c0882357115f2e0e10747e482de1f49deb0185a258172d520b4304334834ca3a78a3b2360aff8336a29cc248e7478a0bfc6e0833e3f9ea8d2865e8 SHA512 16271bf2dba4edb77e4cf05f95e9bea6c5534890c1303f6d10b9b7449a26b05ab43acc28fd5691d1433ce15ee87214c5a414dc652eb019bb1fb87acfa37150e6
diff --git a/dev-python/numba/numba-0.37.0.ebuild b/dev-python/numba/numba-0.37.0.ebuild
index 05826b7b088a..c75c20a13565 100644
--- a/dev-python/numba/numba-0.37.0.ebuild
+++ b/dev-python/numba/numba-0.37.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 060d62c13ae0..b02ed455618e 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,26 +1,33 @@
 AUX numpy-1.10.2-no-hardcode-blas.patch 3295 BLAKE2B 300b64a2867cb55fef23aff58069187c1c743740fff75442f56da9e817adc4a857a29dccf5c543ff4c63da5d5618a34fdc1f640b65d8f8f23dcaa96c6334baa2 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd
 AUX numpy-1.12.1-no-hardcode-blas.patch 3473 BLAKE2B 442b505aa6a09aece4e3e48c43fffcbb35e129f99097233d7387ea41bf3926ed72be4666025d4c4bbac7a5e9e557e54cc0c439d748cbbbff6ca075e7a1969c56 SHA512 0066fdc822151b13a4f91cab522000ab43bea52539100070949d08e0baf6bd35e9c32e13e877e22c40041c3fa0e8d716d802087b3c9016d6c1e05edd0e48fd6a
+AUX numpy-1.14.5-no-hardcode-blas.patch 3767 BLAKE2B f580a067b9c91a53f99daffd33f38306abb3d2852f4d513152531fb0796f50371c9031b7c685fd35801afbe2a5b649efd4d2cdca9c239f119893b1fde19bda3b SHA512 66a7d9988ab3e6f5b1788df7db9d81719c43ba641edc3450a4912c46aaf0ffb3ba6030dc458182adfb11eafac91f2ba6e1c5aa9b8eb077d6d8c776b2ec5ad2fc
+AUX numpy-1.14.5-py37.patch 5417 BLAKE2B a6660b06a6f5ebc436b8bef4f53934892384889304f3b48ed1e9e84298deb78528e431e2102856fe1bc44b5e9a472b3a0b51401ad824b7072465d8c54f6aa939 SHA512 78b6a1640cf51e9b58478fd9ad5044bec2efc1319cc050f0a1345fc367b57b9170954ce25b88b2851007b438a00ac380eab48f6b699fed1115d109972ec553ad
 AUX numpy-1.8.0-no-hardcode-blas.patch 1153 BLAKE2B d812ddc3069d23f211026c14ca36aa907c254b5e5305e720bc87bb5fbd51dd032f93eecd245c222ae8fa81dbe1541a2ffb1524e685a05f238758b4487e3532b9 SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3
 AUX numpy-1.9.2-no-hardcode-blas.patch 1821 BLAKE2B bba698b76576a29c24f69a5aaf92173065d11d2e01ae8e76a66650484f18761b62cb49d348e97a62350cf74d9c728f2d26e94b903b62c59c903e7022c31fefc5 SHA512 59d498f7b0a1e6f4bc37e0eb7121812e1fe974e06176c7b80e99e41c49067a618bc98d925bcb667607462f5e7823f0f55235c8ddd685e318dfb3385b7eb7dad6
 DIST numpy-1.10.4.tar.gz 4069996 BLAKE2B 9f315d1fca4415b148d4b3bff6f223930bab3d0cb9e19fc5790d71218549c9f0031355e8a95eae9c866ceaf6391a3aa41206bf3f48477b6cabbbc52e0287c246 SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79
 DIST numpy-1.13.3.zip 5021189 BLAKE2B 5a2890a8e08425a2d537667cb2c621a57e1d442951d0b06aee2a9a153bf76652e9c4cbaa11716697a85c580e1f30043d5eef10fc24245074e6431a873ff80c34 SHA512 b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737
+DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
 DIST numpy-1.9.2.tar.gz 3986067 BLAKE2B e5ae6717badac01186a5b0f36729c1c01dda1fb4238978858c778f08f17512c5d1f3902d551cb0c67a77c1246ce238e588556188e7e6466c27ebdde09879782d SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9
 DIST numpy-html-1.10.1.zip 9663942 BLAKE2B 436ab4185212f8eeaa3d61e29c2c547c9f24bf0869984cc674e66a7360177e999cc70a6573316711e478db62057d5cee90f85b978d095c6b47f1dc3832ffbdf7 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9
 DIST numpy-html-1.13.0.zip 10324817 BLAKE2B e16357e615b30249a4c41582b46b194e2c3113996260f0ff60e5b64ce9b344a05a5f372095a9f1187e8474bda4078f41ad8372c801637278d3478176de455eaa SHA512 2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542
+DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370 SHA512 578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
 DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071
 DIST numpy-html-1.9.1.zip 9839137 BLAKE2B 84b4c15ee20d8a1e6514baf47b96ac770690357278ff22b48c427509534c41df9e14165483f625955a7c6c087b0b5e13e68bf3d06951352a8511d6e03cc65d9f SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4
 DIST numpy-ref-1.10.1.pdf 5382006 BLAKE2B c360d40c6ac3d2975a760dcf32ed312f30e9ee6b096020e0513bb22af600de62f5f72309603414b3bbcaf02a1aacd79e84545a6e5d50611bfdabafa9f6441a10 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c
 DIST numpy-ref-1.13.0.pdf 5047809 BLAKE2B c7e2734311918c6faa46b008c4802bb090a728ca22337695755e885a7d7d341ba76d5e489c9c56cf89a9d0545bc9b24787e193c4bc1af2631a368b812fe74083 SHA512 0fe28be029602f8b8dc12987da273581b42f123a9d605321084d4c05233cd31ccff0efb17b99c3e8cbfec5f8de11252a99c1ee5c43d37aa5fa57d712f4bb4aca
+DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a00007f2 SHA512 717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746
 DIST numpy-ref-1.8.1.pdf 5348248 BLAKE2B f087fbbd3c789adebd2902db0a2acc8a8748ccbb5a1e7e064effdc91e92c7dcf087ae36436fc52d7afa12a12ca2fc0f5f5617177bcd8b9745a7155acd10d71fc SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5
 DIST numpy-ref-1.9.1.pdf 5318122 BLAKE2B a893be075c823ab1a6ad3b2e38e8c05aad20cc2abf9307af9dac87b12f029fe07b535b1f385a4315bcc9590fedb79e25bc5e1659885ad61cf010d2f45ae6edf5 SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba
 DIST numpy-user-1.10.1.pdf 406114 BLAKE2B 88d43e87071eb88223c84720001671677c6f8c1e745b4434331434a9c48cee4591e67740ef102e49e839e4b2aa690798a5415fa25eaa79d823dbcfa29780fa85 SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4
 DIST numpy-user-1.13.0.pdf 580593 BLAKE2B dcf86d0a87ceb7062b8fb339d37bfe3c3fd5e166f3079a079d50f6afb51bde9754d050c97b3e4aec237aaf797d70a2458fe0f26beeeeaf1594330e08c07e181a SHA512 d3891d449b72c2d97af28182e0bcb12559abc114f8dbf0e0c68362c1af50e6aeab565b31b4aa44ab079e8d47f550081a79a4066c37fc52a1c70c05be45eb5c11
+DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e0b03fe1428d0b3497466fa1164ccbad84969cb7bc8daebb5525094f0d0c7710e1d661b1c6bbaca0669bfcbf875 SHA512 fb00305408c56ee203ed71ac042474592e7e933f14a639f6dce0f6dc80206c13b844c2425a919f9072a114c7af2c2f9f85b78a07ba3874259e5d173290e51a13
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
 EBUILD numpy-1.10.4.ebuild 4069 BLAKE2B 04336f313395a4c4243aceea1d52592d7fd77cfc4c854362acfd2923dd9b2b6cc652a90745b122e0c31399508aac4ed4f6977e1a0d1a4050952a6dbd3b8a532a SHA512 4fb21dfcdc22b27caddea047b658a4824c31dc431c5dae420213a1c13d09e10503c504f8ea1898667cf52fb7933c5a7ee5ddcecc12aa55afc2e8bf67f74e331a
 EBUILD numpy-1.13.3.ebuild 4621 BLAKE2B e54d42c776130b90df8b2e6c4774e09aab63b04ade5bf012a2c66b59fa37a5cece84e0b64f1e8bb8263faf69017608ec3ab0e3551fbd67c9bd63bf14791439f7 SHA512 b9ec2d0df263574051d23b2c28635c4c1bce6d28acd7d35548d8ed4362d6ac4cf1c3c5d9e52c16a4ea10efa29bd58641045a97a39813fbe661d529de07b2dce3
+EBUILD numpy-1.14.5.ebuild 4046 BLAKE2B d7cdc4a2cae8bcf0a5700f07bd30149f2e669c4c6660766e8ebe88708bf37c2162d2c61ed567de20ddf65584b426eef069df72edf42c41c3b2297d05332fa6e6 SHA512 c77d5ce9c0f572434c00f4225f112a81c7ad25306130bc0ef1ad4d6a580188eb98bdd4019ecdd14b39ea10aeb5ca224b01c6ba9d1c6d5e0a15e76518f9e4dbbb
 EBUILD numpy-1.8.2.ebuild 3956 BLAKE2B 6d8d06a5e42f73b1b6d76f42587d2cb266157385a2fadca2da36814b7255162409bcced3b7b5e1f710244bd8ca6d4198c96d01c7b611ed2e577947c052057b9b SHA512 c28b06e01227eaa18312671e13177b3c92931f3ac21209865e03d0f583eccaa88b7c2571140fa0fdbd56d55934b745f72507f5d764728647903f9f8d6954eefc
 EBUILD numpy-1.9.2.ebuild 3969 BLAKE2B d394ff79c26ac65cf029b107dea4e2822f7035743d3ce3e79b9f8bc1d8ec6d55c28600134c5efbc073a6b03c61b341a89bbd333328794d4779c3824d564b7146 SHA512 13787d361d2a065a676fd55f96dea96c49272ddbef88d89391a4250cf305d39e293db203c6be3e3de9fcb6f0aff5b38fc97ad344a34f91d1a60d507df9e347e4
-EBUILD numpy-9999.ebuild 3317 BLAKE2B a6d96463d4718d3395224936a7f2781a21bcc52a385c895e07b2f9987e60c1d8f0de8acda781125841c3ded5a1c4ae417d151c973ce1549a6376c0c9b973f12a SHA512 04e2469daea40a304d1477f267b0b789a9ebc1b27fec9355e2b7e657193fccd041541a95218af85efd7d83bc471e3c544216f4414b0818a9e83a06c2f2699638
+EBUILD numpy-9999.ebuild 3319 BLAKE2B 77a7f1d045e0111a1da7ac555ba27eff63b79b2c1e611a1837da323d5e9142309378dec07e693b72588f4bd6618de107cf111e2769cb965857c8c668ec733b8b SHA512 a7af8f6ebdc80db8506bfeb513513af91b107a93fb1cc9d223a6c872e5839a4f314086d6c4a7a39b8e86fe6c42f7ccee85fc8b3a3a5600c84ac8e0ece623c1e8
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/files/numpy-1.14.5-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.14.5-no-hardcode-blas.patch
new file mode 100644
index 000000000000..39777ec55afb
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.14.5-no-hardcode-blas.patch
@@ -0,0 +1,75 @@
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index 93a8e6f..df3f3f8 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -364,28 +364,7 @@ def get_info(name, notfound_action=0):
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
+-          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
+-          'atlas_3_10_blas': atlas_3_10_blas_info,
+-          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+-          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
+-          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
+-          'mkl': mkl_info,
+-          # openblas which may or may not have embedded lapack
+-          'openblas': openblas_info,          # use blas_opt instead
+-          # openblas with embedded lapack
+-          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
+-          'blis': blis_info,                  # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
+-          'x11': x11_info,
++    cl = {'x11': x11_info,
+           'fft_opt': fft_opt_info,
+           'fftw': fftw_info,
+           'fftw2': fftw2_info,
+@@ -730,10 +709,7 @@ class system_info(object):
+         return [b for b in [a.strip() for a in libs.split(',')] if b]
+ 
+     def get_libraries(self, key='libraries'):
+-        if hasattr(self, '_lib_names'):
+-            return self.get_libs(key, default=self._lib_names)
+-        else:
+-            return self.get_libs(key, '')
++        return self.get_libs(key, '')
+ 
+     def library_extensions(self):
+         c = customized_ccompiler()
+@@ -1740,7 +1716,7 @@ class blas_info(system_info):
+             lib = self.has_cblas(info)
+             if lib is not None:
+                 info['language'] = 'c'
+-                info['libraries'] = [lib]
++                info['libraries'] = lib
+                 info['define_macros'] = [('HAVE_CBLAS', None)]
+         self.set_info(**info)
+ 
+@@ -1772,16 +1748,16 @@ class blas_info(system_info):
+                 # check for cblas lib, and if not present check for blas lib.
+                 try:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+-                                      libraries=["cblas"],
++                                      libraries=info["libraries"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "cblas"
++                    res = info["libraries"]
+                 except distutils.ccompiler.LinkError:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+                                       libraries=["blas"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "blas"
++                    res = ["blas"]
+             except distutils.ccompiler.CompileError:
+                 res = None
+         finally:
diff --git a/dev-python/numpy/files/numpy-1.14.5-py37.patch b/dev-python/numpy/files/numpy-1.14.5-py37.patch
new file mode 100644
index 000000000000..c53b3acf6966
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.14.5-py37.patch
@@ -0,0 +1,135 @@
+From dce7f20e95e6bd3fc07517c0b2daf3942a34ddf7 Mon Sep 17 00:00:00 2001
+From: Charles Harris <charlesr.harris@gmail.com>
+Date: Wed, 14 Mar 2018 12:52:26 -0600
+Subject: [PATCH] MAINT: Fix test_utils.py for Python 3.7.
+
+The contents of the module warnings registries was made more module
+specific in Python 3.7 and consequently the tests of the context
+managers clear_and_catch_warnings and suppress_warnings need updating.
+---
+ numpy/testing/tests/test_utils.py | 43 +++++++++++++++++++++----------
+ 1 file changed, 29 insertions(+), 14 deletions(-)
+
+diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py
+index a97b627f9..33b3555b0 100644
+--- a/numpy/testing/tests/test_utils.py
++++ b/numpy/testing/tests/test_utils.py
+@@ -1114,18 +1114,28 @@ class TestStringEqual(unittest.TestCase):
+                           lambda: assert_string_equal("foo", "hello"))
+ 
+ 
+-def assert_warn_len_equal(mod, n_in_context, py3_n_in_context=None):
++def assert_warn_len_equal(mod, n_in_context, py34=None, py37=None):
+     mod_warns = mod.__warningregistry__
++    num_warns = len(mod_warns)
+     # Python 3.4 appears to clear any pre-existing warnings of the same type,
+     # when raising warnings inside a catch_warnings block. So, there is a
+     # warning generated by the tests within the context manager, but no
+     # previous warnings.
+     if 'version' in mod_warns:
+-        if py3_n_in_context is None:
+-            py3_n_in_context = n_in_context
+-        assert_equal(len(mod_warns) - 1, py3_n_in_context)
+-    else:
+-        assert_equal(len(mod_warns), n_in_context)
++        # Python 3 adds a 'version' entry to the registry,
++        # do not count it.
++        num_warns -= 1
++
++        # Behavior of warnings is Python version dependent. Adjust the
++        # expected result to compensate. In particular, Python 3.7 does
++        # not make an entry for ignored warnings.
++        if sys.version_info[:2] >= (3, 7):
++            if py37 is not None:
++                n_in_context = py37
++        elif sys.version_info[:2] >= (3, 4):
++            if py34 is not None:
++                n_in_context = py34
++    assert_equal(num_warns, n_in_context)
+ 
+ 
+ def _get_fresh_mod():
+@@ -1134,6 +1144,8 @@ def _get_fresh_mod():
+     try:
+         my_mod.__warningregistry__.clear()
+     except AttributeError:
++        # will not have a __warningregistry__ unless warning has been
++        # raised in the module at some point
+         pass
+     return my_mod
+ 
+@@ -1147,21 +1159,23 @@ def test_clear_and_catch_warnings():
+         warnings.warn('Some warning')
+     assert_equal(my_mod.__warningregistry__, {})
+     # Without specified modules, don't clear warnings during context
++    # Python 3.7 catch_warnings doesn't make an entry for 'ignore'.
+     with clear_and_catch_warnings():
+         warnings.simplefilter('ignore')
+         warnings.warn('Some warning')
+-    assert_warn_len_equal(my_mod, 1)
++    assert_warn_len_equal(my_mod, 1, py37=0)
+     # Confirm that specifying module keeps old warning, does not add new
+     with clear_and_catch_warnings(modules=[my_mod]):
+         warnings.simplefilter('ignore')
+         warnings.warn('Another warning')
+-    assert_warn_len_equal(my_mod, 1)
++    assert_warn_len_equal(my_mod, 1, py37=0)
+     # Another warning, no module spec does add to warnings dict, except on
+     # Python 3.4 (see comments in `assert_warn_len_equal`)
++    # Python 3.7 catch_warnings doesn't make an entry for 'ignore'.
+     with clear_and_catch_warnings():
+         warnings.simplefilter('ignore')
+         warnings.warn('Another warning')
+-    assert_warn_len_equal(my_mod, 2, 1)
++    assert_warn_len_equal(my_mod, 2, py34=1, py37=0)
+ 
+ 
+ def test_suppress_warnings_module():
+@@ -1178,6 +1192,7 @@ def test_suppress_warnings_module():
+         np.apply_along_axis(warn, 0, [0])
+ 
+     # Test module based warning suppression:
++    assert_warn_len_equal(my_mod, 0)
+     with suppress_warnings() as sup:
+         sup.record(UserWarning)
+         # suppress warning from other module (may have .pyc ending),
+@@ -1189,8 +1204,7 @@ def test_suppress_warnings_module():
+     # got filtered)
+     assert_(len(sup.log) == 1)
+     assert_(sup.log[0].message.args[0] == "Some warning")
+-
+-    assert_warn_len_equal(my_mod, 0)
++    assert_warn_len_equal(my_mod, 0, py37=0)
+     sup = suppress_warnings()
+     # Will have to be changed if apply_along_axis is moved:
+     sup.filter(module=my_mod)
+@@ -1204,11 +1218,11 @@ def test_suppress_warnings_module():
+     assert_warn_len_equal(my_mod, 0)
+ 
+     # Without specified modules, don't clear warnings during context
++    # Python 3.7 does not add ignored warnings.
+     with suppress_warnings():
+         warnings.simplefilter('ignore')
+         warnings.warn('Some warning')
+-    assert_warn_len_equal(my_mod, 1)
+-
++    assert_warn_len_equal(my_mod, 1, py37=0)
+ 
+ def test_suppress_warnings_type():
+     # Initial state of module, no warnings
+@@ -1232,10 +1246,11 @@ def test_suppress_warnings_type():
+     assert_warn_len_equal(my_mod, 0)
+ 
+     # Without specified modules, don't clear warnings during context
++    # Python 3.7 does not add ignored warnings.
+     with suppress_warnings():
+         warnings.simplefilter('ignore')
+         warnings.warn('Some warning')
+-    assert_warn_len_equal(my_mod, 1)
++    assert_warn_len_equal(my_mod, 1, py37=0)
+ 
+ 
+ def test_suppress_warnings_decorate_no_record():
+-- 
+2.18.0
+
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
new file mode 100644
index 000000000000..69028b40de6f
--- /dev/null
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -0,0 +1,148 @@
+# 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(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV="${PV}"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://www.numpy.org"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.5-no-hardcode-blas.patch
+	# backport a fix for py3.7 test failures
+	"${FILESDIR}"/numpy-1.14.5-py37.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# we don't have f2py-3.3
+	sed \
+		-e 's:test_f2py:_&:g' \
+		-i numpy/tests/test_scripts.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local python_makeopts_jobs=""
+	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
+	distutils-r1_python_compile \
+		${python_makeopts_jobs} \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	local DOCS=( THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-9999.ebuild b/dev-python/numpy/numpy-9999.ebuild
index a930c5a32ab4..aa2a3abfa0ef 100644
--- a/dev-python/numpy/numpy-9999.ebuild
+++ b/dev-python/numpy/numpy-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/odo/Manifest b/dev-python/odo/Manifest
index 05e30af8859a..b315fe7af282 100644
--- a/dev-python/odo/Manifest
+++ b/dev-python/odo/Manifest
@@ -1,4 +1,4 @@
 DIST odo-0.5.0.tar.gz 129977 BLAKE2B 48a9306e959329d31a9ecec9d46323563336b1523f0e4c9e4c99395f6310f957f8af0965fe41102b5e73963a2cece0545c39bf5d9ff3b20f061153207cdf7e2a SHA512 699ec7a3640f319d428854c784bac7747b5c50a8d3f1cad9caa02048a012b51e0da655989b749d84b52b9cb23ad26e6c218aac1d36a0966087238f60874f41f3
-EBUILD odo-0.5.0-r1.ebuild 1271 BLAKE2B 5882a3cad578b78a137f549c7cc3c372e75a61b9166f9ffa8e403bed5bb65e03cae2b1bb3d72d30dd2685d749eab1255e4c21236151d623b6dfcae9bbff954d4 SHA512 14abefe9ffa902b307dca60baab513586fa43c04e2f00eaa2577d6f07fae1d2a6543053b70f953415c6de17f008f8447183ef92562ed36a0b5c0882b2bfd30fe
+EBUILD odo-0.5.0-r1.ebuild 1270 BLAKE2B 6b94b159d9d2c01d98389e097a58533de6e67e0eba79779f91e743ab9de694269d4337fede42aed848ae7d2bfcf349a4ae10861fc178ebf8d1471e0fa4c7009c SHA512 98a05a56549c17736647d94e315f2b85ae9bd3c54b1f3ff891afb8e2219adb89c14e99fbd213a0cde527ec1ccea4fb4df0002928763e784c1322a899eb5f2313
 EBUILD odo-0.5.0.ebuild 1139 BLAKE2B 5bb5e3e1ba0cdf93675daf6b136b7b049f22c69fd93b4b49ecebe470e1b4c9f4bb0f2a5dac8b67220ecbae26e4bea97b852d623a342760bfc825f6a74d6e306a SHA512 7810de367c232b0fd7807e5ab574ec77dfcc315246979992ecbb85ef752e67b0823e30754865cfc0cf2c556bdd43250d8f60dc444d00d381782af7d421910bf0
 MISC metadata.xml 373 BLAKE2B e75a0397cb96adb5db1a0ca803d712c459493a9566d0d95cf2088b8b2c1aea074341591afc343022fb68e80e909370b58864becc09c07d9f8dd365e36c7a5cde SHA512 1b6f87d7aafc773ab3004adc75b4449a3b90386470ec6f47e1e7c3fde5d54cde883f4e6728b083c2706e4ecc0a76845d28d4f721d653cb8d16dce9687b0d478f
diff --git a/dev-python/odo/odo-0.5.0-r1.ebuild b/dev-python/odo/odo-0.5.0-r1.ebuild
index 4b747366ab18..e7b4e0365155 100644
--- a/dev-python/odo/odo-0.5.0-r1.ebuild
+++ b/dev-python/odo/odo-0.5.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 839bfd688aad..5b8a76623f26 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,3 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
-EBUILD olefile-0.44.ebuild 657 BLAKE2B 8b9ff06c3663fda8a54ff71532f2474735ad865932bdf8dcc3c845c4c83e3de5a6104392fa769b527a800a073b983f5025c9da0d9494a8232dd4863db6899237 SHA512 381e50fa88eeb074309b33359b1b24b863dc8aef1392bf7b8b69cf26dd2ebfc4a736ba6b2d219d11bcd230598ddb8ca5848efee92e03f9e03c7613a278fde862
+EBUILD olefile-0.44.ebuild 656 BLAKE2B a007182e3bea9a28a280b96febdb4fcad524f230c1ae96894cd93c181c2556b9259f60f026fa2aa99ac6ac2f75c1a83ba9bab58dfe3a813809da73c40e1859da SHA512 d3345f66d82734d7537cb02f5ebfdcf78a90239d13aa11468a853e029cfc43751cb729ce2387a475b2f48c5d7b1e7a2e62431c55923164f85d111284d67ac01f
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
index 05685dafb901..38302eb2bd37 100644
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ b/dev-python/olefile/olefile-0.44.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index c7fb3d5ac542..5fc00316f179 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -2,5 +2,5 @@ AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e
 DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac12498be4d15cd0f5c52c80435f8ea513589e8aec671cf88b10cc8c98555e7cac7fe9a1e0c67f4625fce83f80f SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb
 DIST packaging-17.1.tar.gz 49849 BLAKE2B ceea74025c55c832cdd36b8464bb15862d8ee60387de973d7453d5cb8ec0b430d1e49a1b13c9dccb8b9c4c898cb07829f6fd04ca700d8cb2c5ba2b7abc0d160e SHA512 52d2f482ae5cd0f8e7b3ac35c4b270ca736bc4f7ebaa569631d1dcb8ea024ee6f75127ca2aa3c95e686ebbd427de2ef4bc01bcd839591f7b4c1e26f9b8d9acb0
 EBUILD packaging-16.8.ebuild 1446 BLAKE2B dcc951ac9f4946e32193b32b6b9f109015012cb58fcf168189a60798981ea9426aba1d2f0e4865e260113e40494b49d17c39ed58b42c488473d27312ee952576 SHA512 3782fa57184fb01bd4ff84f6714c09cee68027342ec545e77391eca79c60628e781e12664fc61a92ba405176daa5c0b963fead74f9d2a76542f9e71f38f371de
-EBUILD packaging-17.1.ebuild 1459 BLAKE2B 22037b5a09efb95b1f74e7eb2bd41577832b2bc034f7343fd0f3c76ac2f47d79f2e6be339264c3f131e884b0513cc9cda5c8b7cb6d70e29cfe6843556688f132 SHA512 f6b1d5a0ed53d4677982954e8ebacfeaa95076d4aaa8e3dc8fa12d843a417adb4ca428637e49e2969edd74e926c88a35831fcc924b750b3030ab4ac575280187
+EBUILD packaging-17.1.ebuild 1461 BLAKE2B f006371d47627641631c2c12d04e1170e412ec9080f1bca46f623bf73f678e27a1c8a7eb0fc7596cca8f7ff66a23a8b7ea7a32ba9824858a2f6dd87c3e741c83 SHA512 bf24befeca19aefdaf39fc3ba55c6962286295c91b1e92ce6278eb24a2a9781d5604d88f52ad06835a0adf7a3bd0c39e45dd38390a2751253ed85a218aa6817e
 MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
diff --git a/dev-python/packaging/packaging-17.1.ebuild b/dev-python/packaging/packaging-17.1.ebuild
index 7f08aa333c6b..4210ececaadb 100644
--- a/dev-python/packaging/packaging-17.1.ebuild
+++ b/dev-python/packaging/packaging-17.1.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  )
 
 inherit distutils-r1
 
diff --git a/dev-python/partd/Manifest b/dev-python/partd/Manifest
index 89f0268d2b83..51e5082d21d1 100644
--- a/dev-python/partd/Manifest
+++ b/dev-python/partd/Manifest
@@ -1,5 +1,5 @@
 DIST partd-0.3.2.tar.gz 17097 BLAKE2B 7ab5175f3df7a550d107d19d07f6a0810dbac8d393e66b25ac9f7f17b4f1f0f3209140e05798369d7e3178ca4556a05b356db399f23da5591f3829d6631cadad SHA512 7d48af79d6a42d7adbca85df1199d266ae115b4160fcaa9ba6a026b92ae813d9a37594dfab06f969a38799f13f23c80bbcd89be4ec4fdd8ad9f85718598707de
 DIST partd-0.3.8.tar.gz 19171 BLAKE2B 1c96a3771ba8866ec1f8e8536909c433bc2cf914d0eee9ae01bd7d1255b44caed59b1dd71ff4f7c433c3429a86381757be1202dadd01cd65282687ddd0c1ad62 SHA512 3b7c642f7452a409eece356d2fe2e9430f6c5859b685c2ebe3d4cd8fbaa1c86e370174454f31b264ff8866ca9a9ab3bc0ca288f7ed123d8233ea3332f373d01d
 EBUILD partd-0.3.2.ebuild 803 BLAKE2B 94066240d5dd88c03c09ddc85ea5b72be80f98e03043aa87d654d5433fcb4dcf2685f815344fe10c10682e8b126f84d7c7e3540f789d4bd38d7f9a3d6ba53d35 SHA512 c6c4ca3983a766fb2f5bfddcfc5e4477592523817f34745e9d00ac87b11627d765704d47a80b83f37af02525aabee2f971d5424e95f05fe1c0c26ff55d4df63e
-EBUILD partd-0.3.8.ebuild 807 BLAKE2B 9047f104586289d8566b5054cfc06ab3de6b629fa3aab24abcbd9e800311bc0e7b6ea843f8fdad269ac65dcac0406770417e0ec7d21b7106e0dba8f418247404 SHA512 dad8915f82ccb32689b55f21ac027889d22e59b8965ff21eecd4ea1e6874fb8949bd9dc900aa461887eec6b2abde3e3a513be6e32241d89a6cdc8049f69b0643
+EBUILD partd-0.3.8.ebuild 806 BLAKE2B c0c4d3960717f1185e17a5076fc6ef2b12ee2ad1b8891474ed7b99690660b24f0ed8ad0fc110dacefbe371d4a54bcb195608fa642e93c9458849e911f81c2049 SHA512 33db4280ca99f632ad5a308e5608d8297a8d1baa8f6dc2958ecb882d41bc9d76a2e560460f58166cb3ae97c04146daea9b7ea0ac0bf75ec78b9ecfb86fc93aec
 MISC metadata.xml 668 BLAKE2B 5bee3dfee36d41021686daf6f8449311089503fafc31e9bc7a998bda70a5301e144fcb47925339f268f2caa27bfba06f3cea1e614d8d97b08ad611982ce712ec SHA512 30f9fb68a75ecadd72d03b01be181cc661ddc70b595fcef8cc5d9a98de089d585e2baa9615e9989af68cc4f1e520c8862b41ac769568c8a29a3c8877330fc52f
diff --git a/dev-python/partd/partd-0.3.8.ebuild b/dev-python/partd/partd-0.3.8.ebuild
index 4bd9e33998ed..6542114fed31 100644
--- a/dev-python/partd/partd-0.3.8.ebuild
+++ b/dev-python/partd/partd-0.3.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 96790b23b01b..a7b53a253f7e 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -2,6 +2,6 @@ DIST path.py-10.3.1.tar.gz 35871 BLAKE2B 94e45372ad39f9c5dfe4167f5d1fd58e1e50127
 DIST path.py-11.0.1.tar.gz 38348 BLAKE2B 80bfc308c72f0e2867ce1811709e3d2ff63888be53814e026ee221c381387a581f8e0f8da05e5c1fade2e0d6b93ba930dc9b1f38117667239174a3acc85d76f0 SHA512 48bc8352af74e70e702e712f35f08a0bf05713b2de5f2eb617f8ef2f9138344cf74fab453aff6cbd38bd88f5c3612c39b3605e0d3899c2ab1c667662558a8651
 DIST path.py-8.1.2.tar.gz 33437 BLAKE2B 0033b64e9d0f4c719414e5345989308a113c9e23f99fb46722ee7d7de85c7bb4b471f5416d646d943771cdd369ac2d8f23f925660d4212b18acf7b82daaa76c0 SHA512 639b6247d99bd7c88e7505f5f41a5896266f23c0517b470ea5c1ec90ca76e87f1971babee623bbd7bea57bbef5f7677a7163bc51bae78c3c54e978eaf7f122d1
 EBUILD path-py-10.3.1.ebuild 878 BLAKE2B ee49a850a73fa248593bf72366aa34ea38e4f8b85491115ce0f2144733484dcbf8cabd575c7898fa02de6c3a62223a8ddc2765446e3d4203c47b33d0d2ec8f48 SHA512 bbcdcfb827463d74c182ce3cf893a35a9f74fa12791866a47c22d4d3ca9a1b8133268b3deee89df05a4713505fd3d55ed95e98473f39382c16293e8b916e4ef7
-EBUILD path-py-11.0.1.ebuild 1000 BLAKE2B 8e995dfcd9d3ab9ead60ab69483a64c551ef2f22800b0a479a3fe8c5ce071f0e8115c6bb30cfa6992c530545e95d7cdcc840fff2fbf4f1da510c960826547ee7 SHA512 06a36a0c98184e7150b00bacc93b314c8a4f5a8e8466a3b9d40bc5d94e87157b88c2551ef9763150e0bf5af74c3e9d44f148f195264fd6d2e819f0465818f88d
+EBUILD path-py-11.0.1.ebuild 1002 BLAKE2B 08135647a4b8bb7aa4f6c44219ddc2e98ca300e2ad9b46b9b28a387479b6bff70d884a3095e58bf8d644589db8978b456595258777144a538f7dde1c385fdc79 SHA512 a9676613cda5fb361c956bee5e7064cb9d6b1fa5f88ea5e3e6415678d7497c8495a98013d7681d62fa8428a830d4ab67ac47fac05cc5b9bfe1144c4eaee1e257
 EBUILD path-py-8.1.2.ebuild 949 BLAKE2B 663e4ef7db574777b5a8cc7d17b001b734456a85d6a10f56ef4c4f708d68b7de4865dadcc5e32b992db8fbd1af9401f935961a8427d28c8b1b621c5ac7397bce SHA512 1ecad967d6583ec90a8b3fa3616334c072b61b28a6b15af240489a60c19e2fa477bb7f5eb2537e950ed434d7c30507f7f8ca88ac79df7cccc42599c10b29aaf6
 MISC metadata.xml 376 BLAKE2B a0c037397a1f2315bfbe646c139a2c565b028d0d440e4b830550a6a32fcd78415d4e9c3d4cbc0f80e5b3914dc85b1268cf101b55c7eb1eeecee004322d402340 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd
diff --git a/dev-python/path-py/path-py-11.0.1.ebuild b/dev-python/path-py/path-py-11.0.1.ebuild
index 8fe229445c49..d6ed404efe02 100644
--- a/dev-python/path-py/path-py-11.0.1.ebuild
+++ b/dev-python/path-py/path-py-11.0.1.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 723deed3afea..01e4339782b3 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -4,12 +4,12 @@ DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116
 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.0.tar.gz 110896 BLAKE2B 140b682fffe5c3d4773a1aec8729cfe980ce5e0de6f0d3bb3f5cbea8f5274d1a77338ea3f24504995cd1dfc51e08a26b686a65b040b2389cc432ae132fb3eef1 SHA512 5f4dcbe3e7a339cdfcab24453fae82e16118be97061c3c5f4f13db76f404f8fcb2c6b3c0351ffa5022c01b15325ddf94aac1ebd06271fe1d4bb21bdf80ae10e6
+DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 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.0.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
+EBUILD pbr-4.1.1.ebuild 2601 BLAKE2B a2945d95e1ba37c28d86fdd0bff32f0a880c801eeddb2f3f70f6b21fbac7c0bb869021ccb389888c146f5920b7350af1d0c53d34784f9dd0e0934eb937ff1f55 SHA512 c71925bd2db17d18a625ea6510f589c8bf7df9f10031659f7a6c4a63432826639ba6a93c99be229b5f62933051fc00532d53bb0660f89e0d0c804b8bc7af44dc
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-4.1.0.ebuild b/dev-python/pbr/pbr-4.1.1.ebuild
index 229da21adf65..dfd91eb1302c 100644
--- a/dev-python/pbr/pbr-4.1.0.ebuild
+++ b/dev-python/pbr/pbr-4.1.1.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
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index e789e76f1903..6c9aad215d3b 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,7 +1,9 @@
 DIST pep8-1.5.6.tar.gz 66944 BLAKE2B 5875895eb21c771d21cb1c415dc9f85737ae18ab10cb9ab64c758cc0fb834387b6815751cdebefeef9ea2d9a17f7c67d54d4f435a64a005213f3406d11e0e1a8 SHA512 9de60df0f56eeb28be835b3f11d060150e08c19403552b769abe0794a1aca65e3a17fd8b45f35b34b11593f527c2f4521ab72823aa1475963b1281c044c71ec1
 DIST pep8-1.5.7.tar.gz 67302 BLAKE2B 714ecb7f21c457aca1a2465319c3f202d13b5cfe067418eb2e3e6f21b25dffbab891a05f5b145264e484c180b67e1fc8c4ad1cf47f1413ebeaff2bb858f9858e SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb
 DIST pep8-1.7.0.tar.gz 79704 BLAKE2B f2e3585bdb3732f9be7f77b1cbf065c0938c1847a5caeb493e3cd62e6a5e19713779a087ffdc9c627481fb10e13d3ed53b3bc368182c2442f24ad57d1d2e96d3 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a
+DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
 EBUILD pep8-1.5.6.ebuild 908 BLAKE2B eeda92db0bd488f491c9fbe448b65c9ca190dcdfec5c047180cce204bb60f61c4d810dc10fdb4bdb87a13fb204cd049abd7bf122172d77b89b83f2fc9eb5cd67 SHA512 58cd06ce19da3eb1d4aabaf3d464dd50f0f1ad5fabb49ec004d43b66e10f9ea58b7f164e334e0dac6375f73be23474445e23b13f392f9e84c8ea0ffe7e71acd9
 EBUILD pep8-1.5.7.ebuild 918 BLAKE2B 6f5d7b424309bcfae81d4bd38b66ea6a15a98ff83c6d5d48354b90333b535f90c17b38e9735868b72b788a1859b3de859162119920b41e34679ef0125b54222d SHA512 35dedd1331978c86db6ad816b0d2bbfc8aecebab42153bd4c222c9cafdef1ead08e30560003fa9ef70709f3f38294e70c891008bef9b202d80c392d9784ac383
 EBUILD pep8-1.7.0.ebuild 1091 BLAKE2B 2a67e9bd86f9d18e52b1ae76917db1e2626bd9f1473e30f934e29fa08928f6ce218ee7659f362515754ba3d422eb04d4c444658a46b5ea298c3b155492508559 SHA512 356f81210890645d8c2b563b7068f3cf0692e2239ad9676a8d00c484f8fa6735a896e4307b15da9e3d12dd3fe93a42f33f81b08655a7429db4b44622181a6288
+EBUILD pep8-1.7.1.ebuild 1094 BLAKE2B 6ce4be7aee635054a51860ad312163e770fb9819dc441d6f985d684b4ad47ba46c90697ca33f3978bf349e9ec02f2d3bea4f2c69f75166675332ed6b12188298 SHA512 2e9e690e0e4de9087a5adb12321f63ac0c53e86ffab78d4e34b931fb551d7b6afe033d0992de21e626015e7a6135cb388cfa847248b9e58d9aa1a7390b200291
 MISC metadata.xml 373 BLAKE2B c13332bbd6ab86ea6a6c9d6cd0dadde195528493cc7984e31416b833906e692cbadd18f4185b6cdfce0e2847750ce05a12f70d29d4fa98d3932654b73aeaa9ca SHA512 0c3ea303192c4b56bd910168dbac81284231291053b5fbca4a5a0700cb40ae8646f1b201fddc76dfeab52979c4c5944a67a2b0c62cfdf5c020c23e09e034056c
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
new file mode 100644
index 000000000000..65635dc47208
--- /dev/null
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --statistics pep8.py || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 7886a976cce0..37e0fbef0d59 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -5,6 +5,6 @@ DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14d
 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 2256 BLAKE2B d38a92c2b4f098eeedb771f3aa9e404128ff9ffbd13c8414f108d57dc3e48229f874ae2ac537dd36227c903243025dd9d869b932582be0c26204c17c6657d89c SHA512 475463912b12ed9f26c5ec4a54f74e3fd41b9aa3b20904f4ceb5f9d67f2bb1a6f4c659b086216bde866f96ed83aebeb6de178efe0bcf815331fbfc7becbe70e1
-EBUILD pillow-5.2.0.ebuild 2035 BLAKE2B beafb6859cd02e821c74faf53833c57241645aea0feb2001e4bd7ca775e4f3d9294282b13be94bbfa0b6833f64dd7769c744566d0ff69d573c2419fd0b139a68 SHA512 059645930443a373cacf0d5b5d5d88cc664e8a2d73c014940f3875d5d370e31751ed4b6ecf0218a9775b185b195617cdcd2ae68c4f1e01feb55766e2d2178a31
+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
diff --git a/dev-python/pillow/pillow-4.3.0-r2.ebuild b/dev-python/pillow/pillow-4.3.0-r2.ebuild
index 803aa344a807..25dddfce611f 100644
--- a/dev-python/pillow/pillow-4.3.0-r2.ebuild
+++ b/dev-python/pillow/pillow-4.3.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
@@ -52,10 +52,11 @@ PATCHES=(
 	"${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
 )
 
-python_compile() {
-	# raqm not in portage yet
-	local args=(
-		--disable-raqm
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
 		--disable-platform-guessing
 		$(use_enable truetype freetype)
 		$(use_enable jpeg)
@@ -67,7 +68,6 @@ python_compile() {
 		$(use_enable webp webpmux)
 		$(use_enable zlib)
 	)
-	distutils-r1_python_compile build_ext "${args[@]}"
 }
 
 python_compile_all() {
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index ad0c8bde22b6..1476c3915c58 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -46,8 +46,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-python_compile() {
-	local args=(
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
 		--disable-platform-guessing
 		$(use_enable truetype freetype)
 		$(use_enable jpeg)
@@ -59,7 +62,6 @@ python_compile() {
 		$(use_enable webp webpmux)
 		$(use_enable zlib)
 	)
-	distutils-r1_python_compile build_ext "${args[@]}"
 }
 
 python_compile_all() {
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 9a9d65ad4380..4551fef24272 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -8,7 +8,7 @@ AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9
 DIST pip-10.0.1.tar.gz 1246072 BLAKE2B e08607be43e1d7b9c7bbc12dff73bc3170953f48f8f7439a0b27b9d540f23eb3bca7873211a5f1448b5cedd6e8e12983af6fa4666bba3ac4700059d170036733 SHA512 983cce8375ff0304263209c69be16e5be7a58af340b8c3ffddd64fcea130b2f8f8a98305ab31e9c3eed9a0d039c73777c88bde3bf2ea1e184fa3e0a2faa97fd4
 DIST pip-7.1.2.tar.gz 1049170 BLAKE2B 1461abba4cb80a9a4e806675ca2d996dedeeb8fb38f05b618f98f400475405da018ea6e75663c21b7b7eb5091408d602a3127afeea9a4bd29f075e5eb8042ad0 SHA512 78082afe6b559bf87f91ae9b6d304cfbfce00206e09be42fdae9d449a55cd8d968df6873e834191d0b0e6baae29e72eb3eee42386ff7c5dc9c29b6c28b754449
 DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
-EBUILD pip-10.0.1.ebuild 1373 BLAKE2B 2eae86d891da493950bb1361207eecb2eb43812fda1b1740f14b40c986c62cd31dd4476ccef0c6c0da0f6df1424a2833dbf97050bad65bc30a7265f8568b4813 SHA512 0410d35d1eb37d6b72d15e6fc824b817cdff232c5742c0abec2e591a7a693531f7c13277f9facbf7a9e10cb5f5580ef04b3d6feb7d0088267978f87de96e9bee
+EBUILD pip-10.0.1.ebuild 1375 BLAKE2B f789a85e9e9ce3fe276a03ef97fe3830a18247a0579fdb67adbdf675bc4e241434be9edaa7fbc44b6663e567a9fa20fc14d59a7505dda37576429323b6e6971a SHA512 6143f11b2134613d66ed44bbbf799cdd84b90955594bca9551a9722c26be4f301c8039997b023f1283e58da7ff6b00b72368ff80b1e90fc60da432d726a63653
 EBUILD pip-7.1.2.ebuild 1954 BLAKE2B 2184816bd4e57b368ff1263d76d28c9a7fd191477050482823136c64bfb17c27324ebb0ca3975c6ecc8728de2b5cdcac9379ae8d569786c2859d9aa530d1be38 SHA512 d8a43060130717e744e23c98160fad30073c381ee3c9eeaae97cd9ec09d51f28d988415648ca9fc62771d2f44671b0f33c82dfc794739c1c45d063426c2a82ce
 EBUILD pip-9.0.1-r1.ebuild 2336 BLAKE2B b0f124285dba096dce9151ad1818429c67c37d7e1ef919d1293c2fd1b19b85e4b56e0f4a228c8d627dda776eceaa26f0c47a7a71e71f71bd9cb8e45523e5e5ff SHA512 74934b66b094369a35ec4bde39ef12b64edc2a8256947ff418f6a01d59d248fef2fc90a7b15c804817d2ae9fcb10a3908aa41884befad5d63cc48806b75738dc
 EBUILD pip-9.0.1-r2.ebuild 2491 BLAKE2B bd84c826290e1c46b821da2126ee36c60025f60c0b2c33fc45d61cc3b7ae9e4588b90906fbffd8173fadc0a44b5ccdd1084d7ffe95919b0a01fe1af0194762a5 SHA512 adb1f526753d2a08fde8e1d89f56b5fe03928f31168a8a8e8cebc6bef9efa8378c266299ef96240b83619f78062c3ed49fcf572aa90c62ca8146fe929b282250
diff --git a/dev-python/pip/pip-10.0.1.ebuild b/dev-python/pip/pip-10.0.1.ebuild
index 1c8ccb3f9a7f..2b05309d5ca7 100644
--- a/dev-python/pip/pip-10.0.1.ebuild
+++ b/dev-python/pip/pip-10.0.1.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="ssl(+),threads(+)"
 
 inherit eutils bash-completion-r1 distutils-r1
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index d4e10441344b..abeaf8baca52 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,5 +1,5 @@
 DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
 DIST pluggy-0.6.0.tar.gz 19678 BLAKE2B 79db59c5f0ce0dd157630d039ec50643f615789b6b993d84e9ab1bdc9ce04b32df336d88df13f13a16a1f0bd4acb7b900208e98c84f007bdc3654f9a1d5f19a2 SHA512 dd58dabe2e65eee64d62c8748c2bbd99457288e99b819eb12312f2acdb0740ac46fd08f83522bc992297b9f14eec14c216c2c9688580f68393bf6fc609e65812
 EBUILD pluggy-0.5.2.ebuild 745 BLAKE2B aa43219d6e90d1705dbdcbd11b7ee7a2a1c186ed08d4832b9f9fc041e74c5bcae34d30c83584e77c020aa50db404788eb1f36c091f24573ecc45eb47ddcff162 SHA512 bd9af6d41e67f3c15204c41b4ec9bdad66a820bd463dfb28cfd6a96d47530f8bd942e31f707b56781e2da61643a9067b3463ef347ed78a1a35f3daa6cd8af651
-EBUILD pluggy-0.6.0.ebuild 762 BLAKE2B d53e3c80c9bb12d3e2fea4118d9212cf7007c5bbe00733ee42a0abcc5eb95ed62b745d98a724bdeef0f3a76200a58c3819d31b7ac4ca91e5563ba62e41f7824d SHA512 b063a43e5262bf900ce905d7c375e5130d447a6e9d435ac087b49fe7477e9195aa5061a083ce6d26ce02e8cf7e549cdb0bb361466be30230f3a04ad427cacdf7
+EBUILD pluggy-0.6.0.ebuild 764 BLAKE2B 065f0c1910c845e4de6bcf9460002a7472d0c9d5942ed24401f4f598663226a6a9eacabcd9fdec926a1d3ce467885628779acd78bad6c8367db75f7d690125f0 SHA512 c24f563a5ccee000a379c767f4e58e670c2d41ab6c0585eebebfd80cce9f93a2e51fcc2a4e17ddf0c63b3e74d392202996b0516b1c501a653d8afdbfc77a44fb
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.6.0.ebuild b/dev-python/pluggy/pluggy-0.6.0.ebuild
index b594318c978d..bdfc8e64c140 100644
--- a/dev-python/pluggy/pluggy-0.6.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 19a2d477f1bf..dd18ae68586c 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -5,7 +5,7 @@ DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33
 DIST ply-3.6.tar.gz 281690 BLAKE2B 1a8e9e925c1a70832e3312208470a3bc4831b7ba18a0c2eb3a8b31fc9a850ae192809b9dec098f8479f2060e63ae781063b362227db2c6080aad85a2fb8648a2 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55
 DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e65def16f4c354643dc3e467f7c482dfc5b7f62cfb367945632e346b6e02e16cc79a91bb6f9241e315eb1 SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641
 EBUILD ply-3.10.ebuild 1143 BLAKE2B 8338bef39aa812414d6a9405735716c4719d0e2bda61a9b15d30beeddfbc2f51c5d22fc8e7ee5fc3b12177008e8d4536ff3c042b6042cc2b21c7155407fe90c6 SHA512 3df256e8a340609e7c326ca85ac96bb034ba1ae6f27313a6fac05270395cfe29fe9776072e3ae22f0781d73ef6c8bb76f88050920bf6e7b7752fd9e6fcfa6ca8
-EBUILD ply-3.11.ebuild 1143 BLAKE2B 3a519f0a254e936f9319abe93632e238c4d7af833146d412df8f2c3be9bfb73605f7f3df6d47090bf175d8d9ae6784486030e390d88dea6429e8ba7dbfef888e SHA512 caf4c5ed9bf8f4e2e692860a2d49e4ab9ba6ee45143e97b65f511e526d5285f22547eeee88135f53805421883e5fe18368cd67e422e779bb8184480ac15abf64
+EBUILD ply-3.11.ebuild 1145 BLAKE2B 9eadf44e588ac5cae21519c598f80ebf63bba0d4b5091749a21050180d6ab6094586c8e875171bfbe8ce60506790e906da4d019a741ae220a9245a283e628b74 SHA512 1ef9d5ffa2c259836d3725762af2e9f8c5f1969eb80dd3569cba0d98d4cf9214d37c765f43fc72cee3651f30a5095fc973d166163427b1b21c350b8e7e9e238d
 EBUILD ply-3.6-r1.ebuild 1144 BLAKE2B d84fdd2687434f3d7ab84b680b2fd798327165612453568344d734a879a625b10fdd2c4c7e5387a0b274176e2056a5e1444cbf420e3920daf0edea396b7a3cf4 SHA512 24730bb33a83ebc834096c680f55590ce65fd8d6f2e9b699703ae03787d44efc8592f60608e8b393115ffd72f0eb826cb6be8c3127680e46a847ca4d4e40fef7
 EBUILD ply-3.9.ebuild 1109 BLAKE2B 2b977f3c9439f4de810c2e57bc18e6dece21bbef2d436bc7df420fa94a447f1d1feec0e7ca96660aca8420b77c362cecf34ee96736d0131233d0fb0cb374d414 SHA512 4bb9afbca93e4fc1ea9bc14d67c0c0a3eb2d9e5a71f110fe8242968a71ef8de93712c89afe59dce7eedab1a651c99268d2eafcef1b65675f5a420942501b9844
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index 80f5cbb26b22..de6fe89f4dd9 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index ed4188ca046b..6f6263c680e1 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,5 +1,5 @@
-DIST plyvel-0.9.tar.gz 121513 BLAKE2B 78aa0dc3565a9e2298978ea4f2014670cbaa376e35f21be6b3c26a39db2c560d08667c385894bc3df6ae33da266eabf9cf72b81156759a28d75856760ca7cf73 SHA512 21a3bf0bff075e429fef63418c2a2578b22a4904cc2f4f66fc5fbccec22c762d918bea0622a22dcbeee2e60f8d35210ae8f1e63b6d37405f0fdf29ca2fe80586
 DIST plyvel-1.0.4.tar.gz 338470 BLAKE2B dbc33ac9962ed3b74d83158e973ac956bd9fa81c7e1980c1d79187f6e629d0605d821debe4bfd4532120f343b87ee3acd825514884d78b471d3717364837ce42 SHA512 ee397d4f7e2dac4e7b382841559895184dc0356b84da4ff4ccdad43c32aebcb1dcc5020230a5564c875ed5d4401cc8b009438ca3b2e0b50e6467e384f0366171
-EBUILD plyvel-0.9-r1.ebuild 1163 BLAKE2B 2930ec4acb47dd811537d8f36d9edc3d0a35b87674fc20910ec0f243312e7f5ae8c4ed35f4cadee9fe8decc78097fca42d6752bef5df86f1f4bfb5a3b685eef2 SHA512 d9a3c3a9d590982348a73268b45850763b1ea533bc6e8a622813615da7e75edc3c96de5b8f3d7a986cbfd7d47c272550121f8e557df6ab1018d5e87f6ebf2c95
+DIST plyvel-1.0.5.tar.gz 143728 BLAKE2B 2eac687e6901381b62df5278abe00684c8e5a9ac162596a1a1a0e620536155b5e5c0ba0ab9bb32c1d3a6467d997cfdf530e9275024f8caba3323728f3f3aba67 SHA512 d2a7fe9d49b377135ece03292f366423e9550d3440689a99246d8c5ddc38e474c2b05c709655c6bf74a1d04f742a23dfb8841b51698c2adb062418577b28c4b4
 EBUILD plyvel-1.0.4.ebuild 1226 BLAKE2B 3bbb26f07c2cae603e43beb8ee741c48a0152c89008100884ab94243503d7236725bca9b09431a7f261ac21107a32069a927ccc867771ffbf4d83c0fb400edc0 SHA512 285b230436f95578cbe53119ff5c32e58cc332641e567bb485b7f259543b89f3b22c8708954e7a8dacf6de93999df0f9ca1363b95963c295017007d9c8f7e597
+EBUILD plyvel-1.0.5.ebuild 1228 BLAKE2B 0012ecb226142c9dd40142868fdacf14d1d64a96e371d04d2643f2b43d30ce4089fa10e131efdd4384eddb24c933611fa7f6c22f1b418c399bd212c6cae6b2bb SHA512 e0a6ea8442d4b5022db955a1eb26c8efb001acd4e0e62d7045bbc278f7b7cf5bb6246fb269cad09bf09b99034b392618a195c705f63c7a669dea4c133cab60cb
 MISC metadata.xml 432 BLAKE2B 5ff794b8cd6bb312ed6fc0a3ef74ab6a89be65b45d90fee726ec4350f702b45e46da69c35ac2fea606bdd2b7cc87a9d360ce03d101b4243950cbd54567a772d7 SHA512 fbd7143b819341c3d6686e6861b5c8642b6e18f3e0c73b0ab0221dae9f074fba26d7792f41a23a67074679594ed2739a9a6926124365c1fab88765e51915f288
diff --git a/dev-python/plyvel/plyvel-0.9-r1.ebuild b/dev-python/plyvel/plyvel-1.0.5.ebuild
index 8cd881d28601..ca014328f19e 100644
--- a/dev-python/plyvel/plyvel-0.9-r1.ebuild
+++ b/dev-python/plyvel/plyvel-1.0.5.ebuild
@@ -1,52 +1,49 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+# Tests fail with PyPy: https://github.com/wbolster/plyvel/issues/38
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
-MY_PN="${PN/-/.}"
 DESCRIPTION="Python interface to LevelDB"
 HOMEPAGE="https://github.com/wbolster/plyvel"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND="dev-libs/leveldb:="
+RDEPEND=">=dev-libs/leveldb-1.20:="
 DEPEND="
 	${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 python_compile() {
+	# https://wiki.gentoo.org/wiki/Project:Python/Strict_aliasing
 	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile
 }
 
 python_compile_all() {
-	use doc && emake doc
+	if use doc; then
+		sphinx-build doc doc/_build/html || die
+		HTML_DOCS=( doc/_build/html/. )
+	fi
 }
 
 python_test() {
-	local lib="$(ls "${BUILD_DIR}/lib/${PN}/"*.so | head -n1)"
-	ln -s "${lib}" "${PN}" || die
+	# We need to copy the extension to the package folder
+	local ext="$(ls "${BUILD_DIR}/lib/${PN}/"*.so | head -n1 || die)"
+	ln -s "${ext}" "${PN}" || die
 	py.test || die "tests failed with ${EPYTHON}"
-	rm "${PN}/$(basename "${lib}")" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build//html/. )
-	distutils-r1_python_install_all
+	rm "${PN}/$(basename "${ext}")" || die
 }
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
index 2daf7b92299c..604181a4d8e4 100644
--- a/dev-python/pretend/Manifest
+++ b/dev-python/pretend/Manifest
@@ -3,5 +3,5 @@ DIST pretend-1.0.8.tar.gz 4848 BLAKE2B 396fae55208e39eadceaff92890b48d63b79a24e0
 DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
 EBUILD pretend-1.0.8-r1.ebuild 773 BLAKE2B 9b677206b525abafbda87c878856b3f5e5c8f557a80b51f87e142dbab614e07a4ec79cd71f80d0a5a124f90fd91c3ca54392ddf69b0c1b6212c6b842b6452fab SHA512 0becbdb8dc5d907a0f66b7cb035497ef3983eaaa35284b67e58f158496643f7c5f78b3ebdfd6b314cf5e5d8b115e6a2718ed257a5ab3ebdf71b91f0f5737bddf
 EBUILD pretend-1.0.8.ebuild 642 BLAKE2B 971870cd43562d42ed3d02eb28dff49c46662b89b051c1ed27d44ee27aae03ac2c4ea0cb2aca6dc6d1563dd86aa0541b6faa18130f011fe4447b324601d39183 SHA512 27819bd897f9134c3dee0c8622aa5387bf4a0eec2432993ef82fa582022593c686217e365bddc83e4eccc2b086dc3ea983dee80ddab576f2019c91aef0193d74
-EBUILD pretend-1.0.9.ebuild 774 BLAKE2B 3a0f03706c4d2b9c9fe5aec21ffa499cf2c8bfb2197030c92d82f5875bb5bd00100ee3b2cdd82bde630955505bda9511b3f348fc771ae18aea57a4ab57ae6f9a SHA512 16ae86c23a6ef138c6e3e90ba708c3a2b9fdb62f88d21f4d0b4ffa6e3455917d56f6b9a9e79c02daae2334a2c220c66eff21b18e07c8001c75d830977b2b15ee
+EBUILD pretend-1.0.9.ebuild 776 BLAKE2B b5e64c1351aae6086c6e31baf29bfee7a53b310e577489c898c1a4ea71f3a681c6ed08da62a5538eeed29afd3183d9fb12ad066985e8c7e1c15007a60e7a9e2d SHA512 dc76721b265201997c43852e51b0fccb564a7075ea4941a2115a2017ecebdf1c7c60d45e426e2a68fb5c2c7461c23894fb0055bc42ba3bb679fb7b6305bb4c17
 MISC metadata.xml 374 BLAKE2B 4f62dba0b0933a47aec8c86fffefdb9a50d31fd76424e268adbb0f7f6902556366e9b71fbf2ec2b652e8114f310f15060de015f753aedea9ac727ce9a884e1ab SHA512 8241b20ba14badb91e36edb5070339dfcea6902e0f192dd1bc066698cc9c87370fbe0f16f61173e207766b84a65193f12ca3d9e1a16f467411762fbe52cc906d
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9.ebuild
index 3204641875df..84719ff95e54 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index d98e28a1853e..05fd5ca8b505 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,3 +1,3 @@
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 955 BLAKE2B 8b9be21d00c4630abfb5357586453b865519909c3145152f61aa4c964d7ffe097f89e36850385a91ffc242cc0340a38636a78de3f3db07aa93f6790522c14201 SHA512 9b45ee55b881f212c2ab67ce3d34b080ce5eaef253f080ee31205be90dbbbc90e9c9d62c9ba6916dcb5a9bdccc37a605df99fb93cf2f6da110201ae46fb578e5
+EBUILD priority-1.3.0.ebuild 806 BLAKE2B 06cb1481f35ba8a0b079dd70aaba873fa97867f26ff6e22e2b0ee9c927370839bccfb4de3e75cad7c038eec2595bab0f4970830a9e091da0c12e387d61643d92 SHA512 136a7efacb4954660d51e01706d010ed49d9a83b8b9760499fd2ce8bb5400a36549994f303443f4392dce77189b5fb28ebc1ff10eef0c693efe3119fd3260e92
 MISC metadata.xml 917 BLAKE2B c92ee27c2cdaadab26b9d68451c0b7ee055e26ba9457e5fa8dcbf2f9b4add141d07e85344d7de536db6a4a40da92d79c67862da2bb381f0bf1b384f90565f2a8 SHA512 e5daf360e9d2c4efeae4084d9a72ac975acc09f95d0064f4d2c3759ba00a080ea5a2f689f74ce666633fae26d1afa095f29b209912fcae0ba38d9fc1231b74e0
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 39cb4d69564a..5dc7399f6128 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy)
 
 inherit distutils-r1
 
@@ -23,13 +23,10 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
 	)
 "
 
 python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
-	cd test
+	py.test -vv || die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index b3b2846d0023..cf9bfaeb746c 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,3 @@
 DIST process-tests-1.2.0.tar.gz 5478 BLAKE2B e210945253e0a5437b68b47f3621b82642379f8ead297cb63b76fb010f8276a5e3d007435c4f837c7ff0ce83ba38cf57dd8963eaa480219e34fcbce9f8cc22b6 SHA512 b5cbe96dbeb6421b26f5a50cfe91bcac2f5d527830dad678df5e0ed1b2019483eab6102ba548483dd6695c881f29380ead2a8b6851c40119815363549ecf5bb6
-EBUILD process-tests-1.2.0.ebuild 619 BLAKE2B 8ce02085c9c1d722f2964b4fd722ad706e338f527484b7d26eb60f564e202aa27f7bca32efea627cc1fdc380a67a6008e2c2df5439bfb67028c1dae49c80f7fd SHA512 141c39df6912948776d653deeee731f81ac7302c8c61367acb7e2a35cbb9d2041bc88df4aab6b61aa39f9715f90acad6304c23c0fcb9a8caab5112ca64d03e53
+EBUILD process-tests-1.2.0.ebuild 621 BLAKE2B cf11dbe77e7c53833918aaafca873da13535342ce9408c2e9b45a82cb825673f279c49251f7e4ce2e5f6823702e9302c13b84f0cb020b1007eb6b9a54774343a SHA512 9a3cfa14bfd6b44278e4d524d915010f629b342319f1208a177fe83800d84cad57e8e13dbfd3554730891c973cc5fb60acab7520d60c22ce48120cf67981d61b
 MISC metadata.xml 363 BLAKE2B a98b0d8b713b641ed26c4dd10207b0b9c76c6068e30d3e212cd76eb6d51e74edc032803f937f63fe10e676b61028fb95600fe322addffb7d9fe7936c988ad929 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6
diff --git a/dev-python/process-tests/process-tests-1.2.0.ebuild b/dev-python/process-tests/process-tests-1.2.0.ebuild
index f33e3132c13d..638db217ef7b 100644
--- a/dev-python/process-tests/process-tests-1.2.0.ebuild
+++ b/dev-python/process-tests/process-tests-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 6367afcc7bc1..3709b490879e 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 1563 BLAKE2B d738118105fc0e96eb3035ee68de880a5d8853495c77ba00499d75075c5bd873693722e3a5c3a74bf7b55b8946ba2a2395d9179e35e7e8b43a3e19c183a056e2 SHA512 6d303d53f407afb6cd2664444f96f9b99ce0692d352ea74a71d543501b26c1e539f175deb2cd46ebf8645afc12394c7483194e28ea65d714dd6b807af9f08c74
+EBUILD psycopg-2.7.4.ebuild 1562 BLAKE2B b83a09920c98a2a094751d215d095d3200cfbe3146e33568e83e2c2c693e2045ae9a00c1a13ff510ce1f8c47f2a2d7cbecd689ec568c438fd64c00d60454e741 SHA512 414c68ec903f18ea0c49f64911900494d817890ce84eab112bb86271b76320175452ab08113022f027e2dcf0834746caffc6b986608a563aa2283ea2543ad10d
 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 afb10bbc3834..343fae0913bd 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/ptpython/Manifest b/dev-python/ptpython/Manifest
index 95466d67e25a..601feece626d 100644
--- a/dev-python/ptpython/Manifest
+++ b/dev-python/ptpython/Manifest
@@ -1,4 +1,4 @@
 DIST ptpython-0.33.tar.gz 43295 BLAKE2B 96df547c3a231124e2e34e5dd6d6a2fe661883d8c8f88a25d955c46b250b86319e343adc0a2265841ca69f115e9b0787a431c49db9de2de362cd5d0c4334ae1f SHA512 fce9379e4522b2b644e6159c73e3eff2d0ced8de65462d4ad622f91feb46fa80a9e01a2c7aef1832b4fcf69de5c0c7d229c731149af7029eec46f88a0506ad71
-EBUILD ptpython-0.33-r1.ebuild 802 BLAKE2B fb6b4bb8ecfff858e8d3b6b69eedc2e43d77d690294249a8456413a919aad0615c798db7d30a8183fc9c3a5399a1d36958bce70bf01d79c3e7f588e192063d56 SHA512 6ce437e160e5ecd66bb69d41aa3e15fcbab5df4b92ee5291ea51ffa602bdf33b44192ef5fd06c79fde68a3bbd8fcba87806a9e5fca6e5bd3c979cc8ce11ab7fc
+EBUILD ptpython-0.33-r1.ebuild 801 BLAKE2B 103acdc68f31006d43e2bcfedc1d5ffbc4e3c21a8c28f67160c721f8aab8479f470c28b34e24518e2be0f83c4f6d34dfebe5e4941f13ef87a8d4e8ebf1e56e7a SHA512 49ca8d195b8ad6dcfa5d9acfd1d6e5d44eac73d296cedc9d2cf26d35b91fa1da8925490b51769a1221b1e5578c27448a2e9959c47af49795a57cbe488081ccb0
 EBUILD ptpython-0.33.ebuild 799 BLAKE2B 99519bb7f134f5f4c3deb61932fda9f8172840822efcf9f60a6971fdbdcdf8a3e7cdc9264d4ecbcbbd1e1413144530363add904a50b13b2cd521b01ff40a7571 SHA512 b25e1544c7e5bdae4a26441bfd9082d7634aec58aa824717e8add52c2b3f263d43b5b731ce9240357349450f48e2f28c4a1195e43f811c18a85facf367b4bd3b
 MISC metadata.xml 388 BLAKE2B eaff78614b0ada3d98f6f4e2ac1d4043845c62fb879fa894ae07f9b36a51b8226e541fba946757a6d34874ead2622b9fe0a726a6e12388579ba107f30d8282e8 SHA512 c64bb500332e8c5efffaa07034a3a86e0b5ca167a42fc030662562fce80ea69c53f4fe9b4a12a192d2faf693747c981500d4950cbb68fbc069050a5f61c9aa83
diff --git a/dev-python/ptpython/ptpython-0.33-r1.ebuild b/dev-python/ptpython/ptpython-0.33-r1.ebuild
index 72e732eec88a..40ce47986bf6 100644
--- a/dev-python/ptpython/ptpython-0.33-r1.ebuild
+++ b/dev-python/ptpython/ptpython-0.33-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index f6d55a8dbe3b..8da34d137d34 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -7,5 +7,5 @@ DIST py-1.5.3.tar.gz 202335 BLAKE2B 6a7ef206bddd641cb5e2fe04966ae93db96a7ff757fc
 EBUILD py-1.4.30.ebuild 1274 BLAKE2B d1caf17f0e92b002bc8626b9aef00a0b6e60c9172b664ddf182849d01208a10184a042cc02f0e7ca085a3b8cf2601a8aa15d1f0da8a530145f9699b9e179a1cf SHA512 50ff67c63fe685cc9a242ba246e25ce107da52722bb38a961c2fb1064cc3e63fad2ac3dcfe34cc9a55076cb9d2cb921aa62e746171505f99075588017bf67cb7
 EBUILD py-1.4.34.ebuild 1342 BLAKE2B a10c42e96d96e05c966e438d4c34d1ee1958e4f1480762b4046a56da6838a11787b6600198967adadafd0a88d1d7cf5d07b8d42a38741320ac074b9c4a3dbafa SHA512 2ec30f5f6b4db6abedd335511154dde8f57a3530628bf515e18c0e9f12e0de91cd2efab6a6a25065c4694e649c6551d38df00e7fa1f4f510952533bc6c6ad4ac
 EBUILD py-1.5.2.ebuild 1347 BLAKE2B 1ae248e72c3a599004712f0dc6f91553d5fd22b9d0e62f79459a2dd0ca557fd1aef853c7c3c56f10cfe5761e6d9d99bff9a00d4983e125f34f96cb7394311dff SHA512 be0354d8358ed8f05725c475426c9c94772e089d293c88c541b8403c754a9b8942b189b5b51836711a8ef235fab79e38103bb61b422fb4d000ee5f41f9c18df7
-EBUILD py-1.5.3.ebuild 1354 BLAKE2B fbf3245fe4ec16bbc37776c9ed1ee06f4ef445de70b11bd4a737d8315f3bbe9517ceff92b32411b8ae96d9c567793f06c96090273ebf4133d17fec280ba82cc1 SHA512 9fd4e23a5b168e1db088413a5aec53af46c02a9a87a5e17c6a8a19862fda8ebcfc4d13e66acf18267776fb5203fa5833aed2738851ff42a464b5c288e13587bd
+EBUILD py-1.5.3.ebuild 1356 BLAKE2B 3c8ec2d4c181f2a09e56e3bb2d31a95b79bf2ecfb7f173ea20627224b4409175ecaaace93e9d126083e83a1136e32cf74d9774682e012296dcc19b4884b71f42 SHA512 9ee8c305b5b36781d2ac28456cc7cc24949ace90901cac9b04b087c78a414db662b623a16c9893f70ce9553a91560d01a52b6fd11f9f0ac11fd29bf5dc4fae79
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/py-1.5.3.ebuild b/dev-python/py/py-1.5.3.ebuild
index fe04a533a82b..8cdf3d6fe761 100644
--- a/dev-python/py/py-1.5.3.ebuild
+++ b/dev-python/py/py-1.5.3.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index da6f54f6b292..68193c292d18 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -9,5 +9,5 @@ EBUILD pyasn1-modules-0.0.5-r1.ebuild 908 BLAKE2B 488da022066fcf25cab9df7333b0e9
 EBUILD pyasn1-modules-0.0.8.ebuild 892 BLAKE2B 299cebff6027f0ba5caa5648d238b8ed5feb3217eb9e301c3e0ceb22b2fac18d6b1c355732b484d06c542abb1a5ad87ff95739037d2be8588a41eba3105d81f9 SHA512 abb1072d75da7f8fd1dfdb2301c21cdc1dcd21fba2ff40cb79bbbc69cd42317750e44ba6f06a0ca8c330a57d76e54f51e418463d34d7d5f0f17b0ab22cd072e5
 EBUILD pyasn1-modules-0.1.4.ebuild 902 BLAKE2B 5a44907b5239bd3676fd814731eaa09330f7532bd3239232aa58d34f5078e27702d945f41042362698a24c2917a80397ca12e0087ba803de7daa7738749955b8 SHA512 b908c7f48e77f9cfd8a3e29a25b3de450fb052ea96829abaf8185e63380d53cf578a0f4099e9614e348a9c071daa393e567f5d4159b2502725cb28ddfc57e895
 EBUILD pyasn1-modules-0.1.5.ebuild 822 BLAKE2B 78239b7086acf41aaf807817296d0b8765718647d01b0312eac03da80814c90c48616a7a9a64288181a0461e6c3754fa892027513a457f8d42aba34796819497 SHA512 d32d9b4015ccaa10d311e333e61b9d92886a003d71e7aebc8e369e6c7f60fee32e389eb7efb28cfeb519667e18373db4e78d11675ce914bf3fab1adcf98abe0e
-EBUILD pyasn1-modules-0.2.1.ebuild 823 BLAKE2B 5d2c5f920bf9a30c55e69c04443807ff69c45af10cfad69f063ec4569d65ac656dbf5106fcfc5ac971043772befd646b7c6c7b3f34d480766a304b16b6979df3 SHA512 29bb5cc5e821c3296f358189b000f0617534f1115efb7e5f39a50b56d09194832017e7c96bc4f6a9de2ecbf868bdd63df66df5e9548a7d71a4d8066d1505575b
+EBUILD pyasn1-modules-0.2.1.ebuild 825 BLAKE2B 9ef4dd0dbd5fd6bb174c0cabed179becc413d74e68def0b20e67aa999acde17e8cf3e17f89557373eda6dd1026492b3e42ed710f2dfff9e07d32b737398cbfd8 SHA512 8b102a1ce434d1076d3f10f73359e9c8dda7bf87fa991dc3b3d30205674e4e4a94c151eae7a5cfe42e44788e8f81af423cdca30dc09ba49b73a8d0c3e5078fb7
 MISC metadata.xml 380 BLAKE2B 0f3336d6484687fbe0a61cc0c88110e51ae40a8905bb0d5d5b166ed6f8c49964f9abedeb7539cea85118a3d2ab548444680bb89ea57d5e44ff52298e95f557e3 SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
index 1a6083076c7d..6b49035a1059 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index 6afa62a61fc3..a4e462b620dd 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -3,5 +3,5 @@ DIST pyasn1-0.3.7.tar.gz 117643 BLAKE2B 66e4987a63139c7af06d6bcdb125ef6f0f46ea58
 DIST pyasn1-0.4.2.tar.gz 118404 BLAKE2B b96135b10eb9b79ac02b21d35df19ee1078a51586eb37832004a1891db0cce305fe3fb65c34f4b05fd1c854f1d708aa59b3e85908df39d54ebb051a2f021ca60 SHA512 30e7cdfd2f7b182081f951bd94169a300a577f95fbfcb4ddb6dc288617b2776265018d246ae0adb649650ee94aab9122a428313d7a61559f97ed7f02b9670709
 EBUILD pyasn1-0.2.3.ebuild 1133 BLAKE2B a1a9ed96972d7cfc37943a5ed9a51ce8dd3196244170ad65045037352384c09704f8ba5f03bcd31edda719589517bbfcf7ed0793e4e3a2b8a4458536410be3f4 SHA512 0a296f4f058aff4f2aa40c50a1f0343af2cb3d073b689ec680e6241170ec9f960bcf35789b885b2437f586c313fe74256576c35c024efe79ee1f3522bd859a46
 EBUILD pyasn1-0.3.7.ebuild 1159 BLAKE2B 3ad0a6f5d46c42055b3bb83e3f8e0b5eca5c96fcfae004d39d4173ab7de0a6d9064f03410ce1b9bf42049ca2a4d170ab8ce999b5de0f8a46728b274cf8bbebb8 SHA512 aff7e3a767503d7c1d499f9b1221fece180f23a5719d70d1175428f73fca1e161197c32251738c7ca9a7ddb49305048a5be216b360255a45844c81ba522b0973
-EBUILD pyasn1-0.4.2.ebuild 932 BLAKE2B 1a374927d61dc9b6721b5347fa05d3ace35da52b582e9c3922aff8627a30868c67a9915eb30e03c66829a8599f498d5d4b8412b126a7ab5feab7759f69c416aa SHA512 e5ec86881d261711fe8169b1bdbfa6f6e05bba496137a94690fea636df99610b1bfbca6592d0c104f6e79c4e7fba8e8e29cdbfead016aaef59f5800fdb585c74
+EBUILD pyasn1-0.4.2.ebuild 934 BLAKE2B 5749d52813cf8b8d3d54c57f4530b4cebfa2dd7194d5db6ad0347857e777c390e9202cee7c9158e352cd3b386a0fef919f7047ea07c49884d80101c08bcec9b0 SHA512 5412c7a1654dff11db4984caeddeb505e2319d08a30264acd99cec9e61dbc9b71b732692913cef8728e8ac6dbe6a4d3621cdc2d99e8045580d042b4841438e7e
 MISC metadata.xml 428 BLAKE2B d98ed2c4f984efff51e45c7b57c7decacbde65d59311776fa432b1e771f1bfb97abc6b588b75fd4faca7a3a0bd93aac3504532ef0b4569f8cf9099fa1f69b548 SHA512 b2d4bf181128f2724c450387fd51d971f85fc25ca293b8ebe4029e0559f660a5f5d207db40d683b8d80a6233986a885069ae4e7d82507901151a71f19c6a75ee
diff --git a/dev-python/pyasn1/pyasn1-0.4.2.ebuild b/dev-python/pyasn1/pyasn1-0.4.2.ebuild
index b5db7d606457..2091976973fa 100644
--- a/dev-python/pyasn1/pyasn1-0.4.2.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.2.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index e07cdd5437a9..3a79b9559ddb 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 860 BLAKE2B 248827c9fd719f7565df3775e159d2f25bd25871398e2bddb889862b6398aa26e695ec58f1e5c205d196b11015a7499153ba6e3c16c91e4c0c3d849731b245aa SHA512 8bbe8bffb2fa0e0d0f9d8e6fc1639ad6374e4a2b954212a4c938e65f57332fcc9d923a6d161a4c52c7a05d652138ca7d8596fe9b750a744e1213bc033e78ea4d
+EBUILD pyblake2-1.1.2.ebuild 864 BLAKE2B 7862b6775b353602492f92b78b5fc3fd3dd474c7c2df11896ce17203e4d1f21ff4a44f34fe7df566e7449980b7d644cc1f85f86732cb821a267befd3e33934b4 SHA512 e1f0a119b6d296cfb6d47b3fd37f4435033cf4f7f94ae4a7e3ee04c015b35fd4dc863edd22c05b6b681c2fd3b6eb0924e6f0985b6aca204fd235776f3a041be2
 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 2b2d75afadf5..490edf11796a 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="BLAKE2 hash function extension module"
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index a276c450ac50..0b7007559c07 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,5 +1,5 @@
 DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db
 DIST pycairo-1.17.0.tar.gz 192182 BLAKE2B b7a4db8258b03b89878fca6b5e27bb9037b74b1792ded23edfe38a0aa5e9ba5003bbac2c8623a6ace8033960c3199b307dcb689650e21ba2df0d81a36a71b6cf SHA512 c073f04d92c9a577f7dcea8d46335751ebd896a65e682e99e4453877d8ba2cadad4437f4ceb1ce8c05eb87d5757a2bd78ac2549e63e38720f4c9276e6f70bdd5
 EBUILD pycairo-1.16.3-r1.ebuild 1096 BLAKE2B 18cd313244c6e1799b84553c4a37790b33eadf874cba77de87df54034868fb83ac7e46111cfc973d8dfea8f7c22f1319c17a50a0efb6c63e936a1ad73892d42f SHA512 23c35bbb1575b6d40a7885ac18da4881930440c2c3760d3d48a5ede7db4a84d37c8f3362de45fbca9caa8edfdbb2807635943644f241f53429498727c97896a9
-EBUILD pycairo-1.17.0.ebuild 1105 BLAKE2B 374130298e8dff7eec60c10aca71d1ffa100b5f257dfd4c78a07af3030b15c34d16dc25b160feb02569bbecdf8e92bc0af16ecf3b13ef6858ddf3afedfa67744 SHA512 a2766f7af185c6e51c4a04df7b27050f7f1b592f94f5b6788973d89f2be47266dedd675f9e35a824f0ddf1b6496d87ec1b220da6b6e669bfe749f36a5c09276a
+EBUILD pycairo-1.17.0.ebuild 1107 BLAKE2B 8eba2cdda75db82159fabe1dab3b4918f1936faa6298510169e40d3658d412d138d5568ca93be262eb00b5c0da5004452d6f1a52b417142d3368fb9b99db8823 SHA512 07fdafe3bad55ca27e57c04ca0824ece886453b282f506efebedeed8f03eb8a680d206eced00e0442f45513494c6cb81e71f33c73f4563a12e83f33429e2e9ac
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.17.0.ebuild b/dev-python/pycairo/pycairo-1.17.0.ebuild
index 8c80861142db..65751904ec19 100644
--- a/dev-python/pycairo/pycairo-1.17.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.17.0.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
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 57af872bc614..dc46ede422ff 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -4,5 +4,5 @@ DIST pycparser-2.17.tar.gz 231163 BLAKE2B b264fbdf235f63559c96d103ca42fd0faf2c5e
 DIST pycparser-2.18.tar.gz 245897 BLAKE2B 2f47263c73763f9d76edcb0d90aacd2e6cf0a68ed2e8c5825a0788a5ccb6574167220a5bb7605b2c11dda8956ce8fb1ad28eeb8e91fed7aa0282191b11478b63 SHA512 4754e4e7556d21da328bf7dbabf72f940c9b18f1457260d48208033b05e576919f45ab399e86ea49e82120116980d7d6f53e8b959d21b7b03a3b5bbea3672f13
 EBUILD pycparser-2.14.ebuild 933 BLAKE2B d8d4b0647e4418b862c156d09fda502480147bc080b85ec45aec4e13e816b79b0868dafab2eccf4c31eb1a18bfcf5f0da67fc7504b647f0761a1c132959659dd SHA512 ba616d6faf9e158c3df3754dfad56cc596f56613cd44f05f9da7b8779b7a8508956852729ad586d47ff33ed77d38eef030ded8be6affa9179ccd080a17cdc9d7
 EBUILD pycparser-2.17.ebuild 1262 BLAKE2B 6ed786693227a34be8c60abbd17d6c6b7c95c539e5d1d4161fd3b5d53b20fb8c7e5a50237afafb33a0305e1f7048d1a69a209300ee44978bdcdf80c4d16b2de8 SHA512 2308dc89f2e277ba7195b892258ba82075365caa7f774f92ed89ab78152b856a83c6d17c473a1162a1d48312164dfdaac7afa1e1f4a47e3ce03bc9e87914e80f
-EBUILD pycparser-2.18-r1.ebuild 1521 BLAKE2B c3beefe7dd127a091ef540b99ed1f5b66203347d410756407c67deb9b86e64e605ac8b7c216e873d3fa2b7bd53c740287d853a7b93bca0224f210605251280f6 SHA512 c4440190d9b81180275d2a43d44a61f2668f4599e55c2ed7ab80534cf2e947751e17d4075688b246195ca6434d3efe9e755e0c056dfe2767975bf35cf4a08449
+EBUILD pycparser-2.18-r1.ebuild 1523 BLAKE2B c2430ab4e04b77d6e6de031d94ee01f67367b59901da669ee223e9da1680aea3b15522f6e8260503ada6d304cef6d6b4cd16ae9faf143ec78f5c9988e7e2d9ff SHA512 2f138b6f0d539a0b313ca1885e72c03f4bc72931e3529e86b3d0b21ea313b12e569c9be3b4bb8f75891518bb488ad036dee56abc4d69972177c4b3d74c1fc8f1
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.18-r1.ebuild b/dev-python/pycparser/pycparser-2.18-r1.ebuild
index 2d84ac8f8c77..84a6436fe58e 100644
--- a/dev-python/pycparser/pycparser-2.18-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.18-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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 6e3d26c1a670..5a27f829dc98 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,3 +1,5 @@
+DIST pycurl-7.43.0.2.tar.gz 214212 BLAKE2B dae74be194334809048782de6a1adef8405e123464ffb0cad02d998d82fb59579d54bb7c5150895224d7622edfe4375f7b2336abd381270b5f64f44b09c8612f SHA512 8635fb33107c9351b7527036b8ab16d76aad72c2170643928034641770d07ab1507a8b2adc8b1a1dcfff29272f55cb00fee65abfcc0c639db14fdc20fc3a0fd0
 DIST pycurl-7.43.0.tar.gz 182522 BLAKE2B af6c85934565d851ea2280253ec6c61ab85f2dea047c83fc5ad65a6f05d3b8bf97932a161ae171c573a7333a99f2a25d4280c70be7ed3aef5eae19b5c392f5c7 SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5
+EBUILD pycurl-7.43.0.2.ebuild 2594 BLAKE2B 0c2c520918cdc0de363b1ab1dc2311b9077e45f912e49bcb5aae49ecec94cd34a7cc159c2bf0d50e1fdff403152ace447cb7746a4ba506d27a23319d92af6522 SHA512 b7311ac82877f56abca7a620610fdc3a141d4127725401ac2870d60715f9fd542795713f86f9ec878c1bd97823b48eb509039276ee46710f6d3f65254100ab46
 EBUILD pycurl-7.43.0.ebuild 2539 BLAKE2B 7899ee6b5c2f66dce55058480a38f87d55bb60ffabb63461a3b2e078566e1c3a930e34b4c5745bf3e839e5e204177623df460d3515295c0027e06d7ed99d90a3 SHA512 a17ede29527bce67fc7389cf59cda1de096103646366b79b4b9098eb9a96ccc6b147a6f724c868f3f6f9df98591ebf3563ca96fa0d2c813d4563126d902625e8
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.2.ebuild b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
new file mode 100644
index 000000000000..7c4064cdbc84
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.43.0.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="
+	https://github.com/pycurl/pycurl
+	https://pypi.org/project/pycurl/
+	http://pycurl.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
+	)"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+	)"
+# Needed for individual runs of testsuite by python impls.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
index d53072781361..dab87c7c8967 100644
--- a/dev-python/pyfits/Manifest
+++ b/dev-python/pyfits/Manifest
@@ -5,5 +5,5 @@ AUX pyfits-3.2.1-unbundle-cfitsio.patch 2676 BLAKE2B 741df2cbceae943cda462db93d8
 DIST pyfits-3.3.tar.gz 1646403 BLAKE2B 6d97198353c93e8d40545bba2677a9f3be5a810c68ddb8b6243debee82fc6ba256ed1a314a42a1c18eb4a2e037f191709bdf17fc08256256d797d7524c84a7f2 SHA512 561fe61050e61745054e0e4712c4413e129293b062d2020219b61d648d7093ce6952e1f26da955a1bf570f76ba7eddeb1805c99f679300b072ef6bacc2e4c90a
 DIST pyfits-3.4.tar.gz 1692414 BLAKE2B d3bcd3ce992c63e3a9e520c1bba56bd908590fddc0bfbb35941c7cdf8ff98c384bf5631fe86f8c6c8f292df9a38f299edde431d37a85dce0db1b869b92965bd7 SHA512 b569f871f26dcd9cb2fbe9d823d55c525e8101b0fcf83fff4bc3f3ec4bc7f680953a29634518ea19383f533f5e23b3703fffdb4e0d577b1023b4323254ef3a7e
 EBUILD pyfits-3.3-r1.ebuild 1872 BLAKE2B 32afe64d0aaa3c5ffdaac0ac559f0f367ce389686e254a6e723b5aa61fe69d5c01396967e13a2931c5ecf1f94917b4fad0e6c60b7756ac246929db6f484860c9 SHA512 fd1982762c5240caea18c0fc4230ddda4fc2b020ad13631a1e06506c3021e82a61411a94e567cae8298cf29e81a20f1b55fbfcb2d15c957c8d7c13b7327f7ab4
-EBUILD pyfits-3.4-r1.ebuild 1953 BLAKE2B 3ddbf7e4964f6dea87a69e3eda6f16e986ceb2807eebdf8f7ea90aa29fe8a87c5d7b2e173d8407742d472b67abcb40733ac5c51dcd106375fda90ca20dcb7672 SHA512 2cf6243926d07c1e4af1951afc9b33e566382aaa3390f9af8da1eebde59c172415af20926b8383d83894db09f88c5078b665787c407c3249e5ff9bcea603e5d3
+EBUILD pyfits-3.4-r1.ebuild 1952 BLAKE2B aaf169efde10324758d2dab22ede4d2f45290d3331d408e041dafdebf211b2179c1bb8b5c8247848a3474101d06c08efc83f966f2a07273c86f6f7893409a807 SHA512 978d1f5a321375f603dea55ad40b647cfdcd17470c6200e275fb536cde7777697bd070de05e5e07f473e562c49312193c176cb3679eb21bbd6373e4255884473
 MISC metadata.xml 642 BLAKE2B 553c94afc0e02b2f208c2936603f49777405e08a99b45b254857a960c5d5a8ace8995941603a7069216a93ca2787f681f7a656f3028f987d576a344779eb01e3 SHA512 fd07a54d6f8273f7e16358da22be2f8484f74bacdeb78c35980046256800701b7fc53e7261074fb84651384f2e821ef3fbe62ba3674ca5fc6cd2fc176335da7c
diff --git a/dev-python/pyfits/pyfits-3.4-r1.ebuild b/dev-python/pyfits/pyfits-3.4-r1.ebuild
index beb1907949d4..e6cdde8d3ec3 100644
--- a/dev-python/pyfits/pyfits-3.4-r1.ebuild
+++ b/dev-python/pyfits/pyfits-3.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 8fd0857c50ab..1d1bc62d0046 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -3,8 +3,10 @@ DIST pyflakes-0.8.1.tar.gz 32981 BLAKE2B a4d02202e5cc9e1174d9296834edae7bc2c3d66
 DIST pyflakes-1.0.0.tar.gz 35365 BLAKE2B 7b0f676fcb1f77f85a4fa85f02dd26f181f7d8085ef3226cd06b3f1d33b9b235384c7da835b07b8128ac5ba56e8b5e4f0cb5736b25e18bd50c76c6ace9491368 SHA512 89a9ee2e5be87d32d5c259c0cb88bbeadb96d27a3bc5eb3cf6f86afa51907ea01107a5336decbf003679b7de65ed9a16d7fbf55a457e0c9bbb1b53500f719bcb
 DIST pyflakes-1.2.3.tar.gz 44776 BLAKE2B 9effec80b58ebac140a6a8b2f5f31a32c4fdf9e842d3fbd2858a3e74f33920925f10b6377300d962d1e2b1931efe8bb5318b97ef51c99aeb003a3434d08810db SHA512 e0b49b4cd388b39c4f4f5ab836520cfc2ee940ce24de084fbeca0a2f13beca23b3ca89741e297a6f450d211ec27ebd91a7d23a80105e50d14960a3888d7693f2
 DIST pyflakes-1.6.0.tar.gz 48184 BLAKE2B a5762c23521aa68ea92537fbc2903bb7af64faf8d1fafc97e48e003f529f8c16ae8dca444c9122fc5c50618fec7120b2f2b2e6682e1d86e502ab49096cb42bfc SHA512 7e9c2aad6ebed638a1354cef51c7e1f68b25e59f8caf4694997a9afecd7cd8baa629a9363297ac0d961430f007fd22dcae7dae1bcbd7838a3b5d4285063bc7c5
+DIST pyflakes-2.0.0.tar.gz 49002 BLAKE2B 146d1108b7cf9aca3316d33ad2ac3a0d1627af525b5def8c6140787fb4d1f47bb45c3c9ec9cb755e51e7ca4e947346e5e9de9b4a1b461389ff1bc4521371a684 SHA512 4961ebb8372f51783416681e79342d6be94318ecd007190e5c27f46c48f8f163c7a5f49cbe3025789ff1d9cd37c465b2f3baa219059779163545f9828a766f71
 EBUILD pyflakes-0.8.1.ebuild 733 BLAKE2B 88b338be8ff4743e188990da8e456ab7adf8bfa40fa7c8f467214fa42ef758e92ccbc0973983e003e53ca68fde27a2193e9cb7fb0c4e686d53c60add16c13467 SHA512 0d0ea37fd024b21aa38065b0d682664d33da561f06a6797c27b3a3caf8fc090e9d05c07ec291fb65e6f471530bcec7eb2144b4f79dfa465b9a28a5701d6fb87b
 EBUILD pyflakes-1.0.0.ebuild 764 BLAKE2B 81c0ec78d4e7db2587867db1c605a490612155bacb4eaf43c89d23d4197fb73816d9971b1542f53bdb5f37d77bcf0a1d9da3b1b516bc9308351b7b74895cc53e SHA512 bd4cd95c8a301a3fefe8d40b449418959c013bacd868db124b2edfe42b718466fc8775c19935d131866b2fc13f76917ed48027cee6e58bd171932cef4c1910e4
 EBUILD pyflakes-1.2.3.ebuild 706 BLAKE2B c19ab4a3313f35ac831055dcc0ce04e42010bf994aae67e962ef958a5552d37ce65fc5d49c159382ccfc71669392d63a5223055be6a1ba9222ab4f9bc66b41c9 SHA512 14e083390f0369ee84183348f53943d0c34fce941d457eec707cf72b5846355f1648237b01c609ffd02daf1cad991ef7c7d55d0d0795e187c33f29efa601be9f
-EBUILD pyflakes-1.6.0.ebuild 719 BLAKE2B 12e8081864a189db55053eaeebf11da4dd73f589ceb672f884219960ce97d906b93f1cbc178e966b29e486ac524fbf84d6dd6ed5838c344a3c911f3c928bd961 SHA512 69e73ec2b4d8856db0d03d36e6488dff3814bba1bfcc40eddc2924cc7307f2961cc4ffff49c9d79d84533d1846c3912c7455718a4b56a55a016eba18e868fbb5
+EBUILD pyflakes-1.6.0.ebuild 713 BLAKE2B 608ac341ceefbf9f2d9d4e8a665fd7da020377f30366f1f413b6197d1c9e90e703f5104485fc3cec46d617448df5377481bca88c5fcc083fe566a64d7cfa55a6 SHA512 42b5aa1257479d7c18ca8686cb10b69b823c15ce89eea2a62d2ef6681a7e8f59b3563887084417cbabb94bb8091c710e452d4ab413559ebfd6f55d7582ddab6a
+EBUILD pyflakes-2.0.0.ebuild 723 BLAKE2B 05a1abd03d468d68ea46ad3577b201711428bee22553cbaf0a51dce40f8682594cd9ca7cafcca2b6557004a6c360bbe9a90776c985ed85b0ede78afc7b88bca3 SHA512 cdb0934f741a86189b835e7c7d0dc4b904fb5cd5906454df83fbf767f64f6860ae1278e610c5da93219e17a1a089569740a98ff7d0319e2a2b217a2e0fd10515
 MISC metadata.xml 738 BLAKE2B 5c1e0cb1452f9aebbefe7edd7a054cad85373344f834fb88ea37414ef69b12a36f774e6da05e73b898d6300a56189ec80891eca7a3c225c95b0fc8755daf18b6 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
index 608ab744407e..258cbf022e4a 100644
--- a/dev-python/pyflakes/pyflakes-1.6.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
@@ -2,7 +2,7 @@
 # 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
 
@@ -18,5 +18,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 python_test() {
-	esetup.py test --quiet
+	esetup.py test
 }
diff --git a/dev-python/pyflakes/pyflakes-2.0.0.ebuild b/dev-python/pyflakes/pyflakes-2.0.0.ebuild
new file mode 100644
index 000000000000..ebe2d1c01c34
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-2.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index 6248e86aaa45..6f89b75b5895 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -2,5 +2,5 @@ DIST pygal-2.1.1.tar.gz 69757 BLAKE2B d79e65c374e9d191a8e6671fd3bebfee4680c46b54
 DIST pygal-2.4.0.tar.gz 4554802 BLAKE2B 9627558e734420bfb3137989d0cc1978a0a06a597d3d5d071e13653876a4bb3266f12f1a8a358076619d997998754c29ee75058356ba66da64b112a24c2cbe2a SHA512 d69fbcff3792cb0b952addc3bfbaea76628d5546482c291ef217c592a820a73a65b1eb522c5d7877e7a794d19b74636126d99a4ff280e8467ab07a95000ba823
 EBUILD pygal-2.1.1-r1.ebuild 487 BLAKE2B c2fd226428b2a13c0e0b2d2a492a5b02a7ff85c103208b5edd69dc87a9f1788c9d648d2f08987de797ed29105ad66318a3772ed0dfecd1aec04fd11ec9a7f38e SHA512 edc14a7550530cb29d528f90ad430561cb5c5459c74db0bd88a4208a2bacceaba758a85720a2475dfa0e9541ce53f1cc938e65e1c7bbb18a72176cf4f5d51889
 EBUILD pygal-2.1.1.ebuild 481 BLAKE2B ef050cec1114c73e14c289a0df95385e407790c1c67b7999be1e0f04f42ea0af8bc980bccb0819533decfc1119ec356f2ad05f57a7784bd8b40b3fcd9abe83c9 SHA512 55d66d7997e72dcdf25b77616d2c817c65e7b488d206b772d6bc8f71e259c2b19031c9011a229bf0795c22d1edf0da16f272c6ea60e988812e5d5ac040adc1bc
-EBUILD pygal-2.4.0.ebuild 1553 BLAKE2B 416a88e70b1f716aa36d48d269f1045cc560f26438388c784d209e4deec8a227d9f56f6284c715214e84bd6bbfec727fb4baafce24aa3a929c72cadf35cca470 SHA512 77a06025f87ad271f9b06a79d04d271497d8a5eefc4944383e584c965aa8d22928d3891c4f26c46d3ff29d7ff8304dcd584ee529dcbce1d4ded74b52f2a1f0f4
+EBUILD pygal-2.4.0.ebuild 1552 BLAKE2B 60a174a2c012715f0dbe93e5265017ad4c6161579ef5b44783411f2fcabac815797d654b7ccd59bc00f27ae90f35bb92c91ece48d45c0fdb910c9af80cae3236 SHA512 ac94fdcb0ad5e5718e793fc3daed0bc81d8873838412bc69fe1525ff6aa790bb43dae6350fced2da2fbd4c371ebef3e7d942975f0e655bc5d48a5497177141cf
 MISC metadata.xml 432 BLAKE2B 935ce59a5a29aecbe4015fc52312fb03be02821a20863d20171378a68ced0aadfb43f7d1898fe52b8159cc0cd5a78ae0daedb97b730fd864de39abf3a617cd92 SHA512 1d2e68e4622a235b6df15390271b1f331b366a2ad1432740de81de20b494ccfc9e5f0e94f8b63acee67679e10267c0f21c66b58514e72f32d0fa3b5b262640d3
diff --git a/dev-python/pygal/pygal-2.4.0.ebuild b/dev-python/pygal/pygal-2.4.0.ebuild
index 17ea7a3d5c38..8015cc57fae9 100644
--- a/dev-python/pygal/pygal-2.4.0.ebuild
+++ b/dev-python/pygal/pygal-2.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 45f628ae42a6..ee050b1059a6 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 1779 BLAKE2B 711ddaeb02124e70c093782c6062383478fb8994c112a265a2a809f41e33b29de45654f668593a4d47e9c9d4f726bc35412d6f90bd0bbf31fdc21f3622a80192 SHA512 d69e584ceead31b9c1107c56dccbcbdb04c2f70c4da2f8309d03bc137ac3efc011c14d9ab22a6be2613038a4f27b2e8e432974b86d922347a3a3753955932872
+EBUILD pygame-1.9.3.ebuild 1778 BLAKE2B 8ebd7270f9511af61a02dbd05fef7b1ae5e83e2afbc074fc2d498a7e6f07527e5cdbb8eb12e18218345b10c3d0b67be33d33a53a2284a7fedd282d953463d702 SHA512 91b598cd68787be953cddf0e8ae6f04893e87064d48d051c4958e9db0d5e73612e526e38dc30519dc32e70bf5e64f273a9bbdfaff56b468f1b6f46ed6d7acafb
 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 cfdfcfc38e4b..d7ad93fa8093 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/pygit2/Manifest b/dev-python/pygit2/Manifest
index fd2f830101ff..a3a09227239c 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,9 +1,5 @@
-DIST pygit2-0.26.3.tar.gz 462080 BLAKE2B b3c4b9b8a6aeba22a70a8d2ef1393dace3a065a3625ee3574058e333bca4ba1d60223939f412eecf5ae9d93a81fb81c4a536af46aa047c2c82a48bd81afe4cf9 SHA512 6f727686221d4e8c348f836b7ad278b48a4b971a121b9953c2cf7163bf093936d838aaf83e9edb8628757624ab27e8345a2fb29eb1a79a30e06c0ab0a77e4cc6
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
-DIST pygit2-0.27.0.tar.gz 477427 BLAKE2B b12924a36ebbcd269e5acbba193b734cc5e6a804fc71c0b322503ecdc6628059cf0f12db867f2e335026bb0f4edd089e9a46896049027c9514b0e555f6e2a881 SHA512 e19363cc8135b3f538748f07ec937dae6668f22e5881f914e9406dcdabee65ed546caba27703d19fffb146083e492e51837fa93af414a35006cf1c81c36d9356
 DIST pygit2-0.27.1.tar.gz 477820 BLAKE2B e4db7bfa484c28130ce48a2b23a0af26a715d15a789998001182f7d5c426a7f0d432d8e6f598346ce417b2c3532eb2a3407ebcfd9d48723a1e6359a30574d46c SHA512 9d889c13ad55e6c65e24b334f114f7d23b90961ae21c5b1f7bd8d85d44686f7ee8e98c13026c612c9a5feb500a54cf77bfa1e2bd165c657b58d879511622e6f7
-EBUILD pygit2-0.26.3.ebuild 626 BLAKE2B a077ae59833c4adb59a9a2c8eb7c37cc091478d31867e09cf3ae4949231b7f30c0dd605d47009fa40098a8b58277bdd74a744d46f5a38a08a5e2ed0e6e991cf6 SHA512 3c04ded6c6012968dfcf4a36e4c3ac5eec95cab7f558c0fc9574bc1a4ced5b93b1287291bdd84b36c8071ec2394593f70091978eed20091787ec2f53dee15a75
 EBUILD pygit2-0.26.4.ebuild 626 BLAKE2B a077ae59833c4adb59a9a2c8eb7c37cc091478d31867e09cf3ae4949231b7f30c0dd605d47009fa40098a8b58277bdd74a744d46f5a38a08a5e2ed0e6e991cf6 SHA512 3c04ded6c6012968dfcf4a36e4c3ac5eec95cab7f558c0fc9574bc1a4ced5b93b1287291bdd84b36c8071ec2394593f70091978eed20091787ec2f53dee15a75
-EBUILD pygit2-0.27.0.ebuild 628 BLAKE2B dbc768de68924ff24ccf542585022bfaf5e4dcd1231d04606ce63c9dbb290b34c9b4e70ad8f774ddf2db2b7c819c0d67b08a52ea0ebca1bb1505467937624a58 SHA512 4171a4371ef61ae42ee0fab24c775193ad5761ee35f460fbcc05a5049d4801b102a8360b3bbaae033fb2fbe65102515f9c362a06881b625e1cdb0940b482ec74
-EBUILD pygit2-0.27.1.ebuild 628 BLAKE2B dbc768de68924ff24ccf542585022bfaf5e4dcd1231d04606ce63c9dbb290b34c9b4e70ad8f774ddf2db2b7c819c0d67b08a52ea0ebca1bb1505467937624a58 SHA512 4171a4371ef61ae42ee0fab24c775193ad5761ee35f460fbcc05a5049d4801b102a8360b3bbaae033fb2fbe65102515f9c362a06881b625e1cdb0940b482ec74
+EBUILD pygit2-0.27.1.ebuild 630 BLAKE2B 414ed5be58f09b29a1948e1d9dd6d13e85a202f1b1187f714aa81cd92ae08ea0611419bf12b3dbd48d375d9f248ea3eaea793464e0724be957ce7a0842669e6f SHA512 bc4509411610f5e03f0ded91332cd5dae987b446bf7ff5346bacb37a2ca5c02a7e868db5b13be7bcd2656585c24dd890e1306cc41d429b82e2772793cea3e213
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.26.3.ebuild b/dev-python/pygit2/pygit2-0.26.3.ebuild
deleted file mode 100644
index bfbe4773f7f9..000000000000
--- a/dev-python/pygit2/pygit2-0.26.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pygit2/pygit2-0.27.0.ebuild b/dev-python/pygit2/pygit2-0.27.0.ebuild
deleted file mode 100644
index aaf291a7b44b..000000000000
--- a/dev-python/pygit2/pygit2-0.27.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pygit2/pygit2-0.27.1.ebuild b/dev-python/pygit2/pygit2-0.27.1.ebuild
index aaf291a7b44b..5cbd6a17c976 100644
--- a/dev-python/pygit2/pygit2-0.27.1.ebuild
+++ b/dev-python/pygit2/pygit2-0.27.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1 eapi7-ver
 
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index f4ccd08183e6..7334cac03ab2 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -2,5 +2,5 @@ AUX pygments-2.2.0-pep479.patch 1669 BLAKE2B c39e582d85d5903831749ccf563b13a88f6
 DIST Pygments-2.1.1.tar.gz 2114190 BLAKE2B b0e5d5a62849c97aaac6f0edf26230d5573715fb759667ca888372666634ab68da4580b1337ec4ada013b643411c221c572651c6fca6745b976794d5c6246e5d SHA512 7eb35865074f573ef7d41a1f1ee7576a83c32855018d03570eb70fd6864ddfbbc3f93ae082c4ac7e4a274a0ef387ea4ccb0909423e01efb6bb8e4fefea8f2807
 DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23b72f8da49b4f8ce9b892d54ffbc1b490e87e87efe8d727dab297f775d0d8abfc4a31a734c5a7f8df885e5eda82f SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29
 EBUILD pygments-2.1.1.ebuild 1670 BLAKE2B 646364f36a2c9b8a3a9f09d32c77d42f79f403ae6af47b88ae8254ccaf825cc8d99e77b26ff6f3262f559b08204e02772f603f8a7451e887206495ba2b167c18 SHA512 70f3d14b209d32bf5732cd1d1087ce539958a06ec1938335796208687adb1ed488c9f9a1e93c66fd346df5b51f186727b33c7ac4d24be6ffbad0d4db9dabc713
-EBUILD pygments-2.2.0.ebuild 1771 BLAKE2B 4e979054554dc59cf36f7c1e6fae1116ba1196b2a0ad368e2047ea7c29e7ae7596c8ac39e4f84d815437a96d8f386e8c60f183e1cc0c38be0e08939c2b7823a9 SHA512 0d9caf422b91f933c4c7322fa44269d9ac0cc158fd9947493e563d12b617c660b06c869d2bfe044029cf40ba682f9f6d617193a0c3b087ed0c4e26199daa7fb3
+EBUILD pygments-2.2.0.ebuild 1773 BLAKE2B 4994e4e0f2e0f98e2900ce3d2e39f9b14f82d1b357fa4a530f59ffc4b73d744288d3d7a55cacbfb58248f5fe754d0840b0bc82c2ab6138bfa540c78383cbca6a SHA512 58ed43530ae8ce8da04a04a7d38a09b1ec43fb0237eef446a6050ab480a584ae0c4805fab8dbe24694469372426358c434941117a0eed33d49e773b306161e5d
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
index d9da923f8cdf..d9d833c9c0b3 100644
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ b/dev-python/pygments/pygments-2.2.0.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 )
 
 inherit distutils-r1 bash-completion-r1 vcs-snapshot
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 5bb39ed5da2a..78f1c547f4e2 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,5 +11,5 @@ DIST pygobject-3.22.0.tar.xz 756820 BLAKE2B 2030b9106c082bbec4418c97945df68e20f4
 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.ebuild 3164 BLAKE2B f015df355bc0b6e9918c0a42964b539d213259a31540a335bf97620edaba6f4234867a1cb558c427782970f2360dc0090bfc2b8f0a4f70820eb80604178f6287 SHA512 d21334795c93a90bb32c4ebf67c4ffe9d14d2d30add10ab87f4feaaf661e21dbfd9eee1d4ad5d258ed41bd0e5fd8ba13e4c6764260b523594947ec5896f26e7d
+EBUILD pygobject-3.24.1.ebuild 3131 BLAKE2B a74721fa26e50e78f187df86035836dbb3b33fa821e2d57ca3d7b6d78f3372392896f317fbff0d174c3c4246a0c2a0ce004b94ce955c9f9a2c8ee5c87f870083 SHA512 1b3e0ab754e3b1b1825828b717abec7b2253d2378db5ece4b2829bb5f17eea36fb3cc6a60b5de0ffe5016836218d5ee63fed3104d39fe4ec613d14cf1fb86ea5
 MISC metadata.xml 353 BLAKE2B 20a18942138d7ceab468b01a639f92248bf94f0e6a015a0c6c34872cf60ab56ef91d9b36eebc74b3d3133ecbc6cfbf2aedbc24369165d0fe9a4e832394beb022 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc
diff --git a/dev-python/pygobject/pygobject-3.24.1.ebuild b/dev-python/pygobject/pygobject-3.24.1.ebuild
index 0eae8c8d7504..1013f9e4392f 100644
--- a/dev-python/pygobject/pygobject-3.24.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.24.1.ebuild
@@ -90,17 +90,15 @@ src_compile() {
 }
 
 src_test() {
-	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-	export SKIP_PEP8="yes"
+	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() {
-		export XDG_CACHE_HOME="${T}/${EPYTHON}"
-		run_in_build_dir virtx emake check
-		unset XDG_CACHE_HOME
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		emake -C "${BUILD_DIR}" check
 	}
-	python_foreach_impl testing
-	unset GIO_USE_VFS
+	virtx python_foreach_impl testing
 }
 
 src_install() {
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 165c61418366..b6787daf8393 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,3 +1,5 @@
+DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
 DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
+EBUILD pyhamcrest-1.9.0-r1.ebuild 1305 BLAKE2B f0e3442a34033acc4269fd99f31c30970562a1be310ddeec79100b3b98e02201034c5007a14cf933c62402491bc7b52e70f86bd6f1a1d3dbfb304796ae00d6e6 SHA512 951545d5bba89d4a64620bc06346427643575ca0985d48d5594343be19e2383bb3bb391b3ffd303b39cf96128428ec19dbfb9d74a7fecfac93c05df3fc011b22
 EBUILD pyhamcrest-1.9.0.ebuild 1227 BLAKE2B 173ad0e42c44e083043203c40435865697bf5222e7bd4fe907db296fbea627aa06de8a99dd8842f259073ecedbd902a4bc7c9eaf7b74540e1afe53d85832612d SHA512 4bca028ef12f224a122978f6ca9ed259306b7817f5f6182cd462d366b944458bf2657ff7a25f2993582d69cd9e5780004b65702062c2f6cbe429f6c39eefb81d
 MISC metadata.xml 271 BLAKE2B c9035b9fb7a0fca1355aeda317feceecac5790bb6723360063b236d6633a040a594eea8f304c3b5bc8e918b1781f0e5e887ec15225d51a021592391195b7e8ff SHA512 89f447b79dadbb441c4c51527f486fcf7110b67c0a86c9fe6413c563463be57089faa1ddb36701080c368ff0a8442532bc774602e0120cd5466a4d7fb6bb6e0d
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..772b9f693b9e
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -0,0 +1,54 @@
+# 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="PyHamcrest"
+
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
+SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-fbsd"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	# enables coverage testing which we don't want
+	rm pytest.ini || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	py.test -vv || die "Tests failed under ${EPYTHON}"
+	"${PYTHON}" tests/object_import.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 2b96de0c201b..839aba71281f 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,3 +1,3 @@
 DIST PyJWT-1.5.3.tar.gz 73044 BLAKE2B ae2e3caec52ddd768d573e0398bbc355c6eedca238db9b1808ff1d723b9fdee0845cf119d78e561833fe770e5ec39000905cec43a5e96102865f60e204c72c22 SHA512 b25a9f6a04bd072020fcf00bb559b7560902adb79746fb880432c01fa356748238432f53f6b9a21db50ece3e59ed4c45ca3f48ecec0ca3c4095e6a739a5c150c
-EBUILD pyjwt-1.5.3.ebuild 1265 BLAKE2B b0288608cf84527d858af2f5313198807cf7fe6189a9d7e0c20335adc8aab0566ff8c4c11f12677f5a37ad02841e3fe6e27438be115720c40f015e3826622efd SHA512 f560fc4f5764cb250e5e055df542ee1d518bc15737cd6304720db3500a78a971bd3fb0a3005d0b2c3307485f6df5154f40875467512be0f03ab8932b36c12327
+EBUILD pyjwt-1.5.3.ebuild 1274 BLAKE2B aca14ed6abc283ac649ec62cf7eaff6cd1324cc2bf191d67ee67e8eea6a7ebcaa793756f1d1758d68a2f2ec2273640bca630cd27707abfd2bfa88c2e54a8a53f SHA512 76a505fe837f0d199960b90f699483b24c9a5da67c5632875f0a28090615e332a34a06c125cd0dfcb048c5355ed1ef45eff063433f76de0b1a4a2d81e965fbcd
 MISC metadata.xml 374 BLAKE2B 29e7fb2995367400d4f8d836cda63346441ff6008ac4554cd06859827d92924d3c34f2fb9763291766014a364d1e02af1ae6412fb02d316c775c3c0c13dcb22e SHA512 87a019a49c2e355d19148214f8ac7212758f7a36f77e7b959d32df1146c145b764f93707fd7b45a8c5276209a66380c888670181bf78bc4d241d5a7294a032b4
diff --git a/dev-python/pyjwt/pyjwt-1.5.3.ebuild b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
index ae1f2157dead..4f508b7efe49 100644
--- a/dev-python/pyjwt/pyjwt-1.5.3.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.5.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=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
 
 inherit distutils-r1 eutils
 
@@ -24,8 +24,6 @@ DEPEND="
 	test? (
 		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)"
 
 S="${WORKDIR}"/${MY_PN}-${PV}
@@ -34,11 +32,14 @@ python_prepare_all() {
 	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
 	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
 
+	# enables coverage, we don't need that
+	rm setup.cfg || die
+
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	esetup.py test
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
 
 pkg_postinst() {
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index f8a029fe1e14..6e846c4531e6 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,5 +1,5 @@
 DIST pykerberos-1.1.7.tar.gz 35439 BLAKE2B ca732440de2b1d282255d3024228a742becd1fce7340ffc8be7ceabe1a4630e74a83d2b6f1d15e1e754308fca82de754a795dcde2f25f6fe3384d8043d33de9c SHA512 ad5882b7e962509af97cc67b118e50fa94fab6848e8121e2b7d40029d27987c8812eed9feb1687ddbb03dc95ef0724f585fc6c7f273c7cb85621e06ecb7ec7bd
 DIST pykerberos-1.1.9.tar.gz 35788 BLAKE2B 19fb084e10bba3b002e7ac919590d7249acb76909abd5c9634302ddc52e8b09bc6f80b7d51c069e584d481740ccf3a4932518bb7efad82fcceac1bb61d094b51 SHA512 1bf912628b7f069f15a67fa99489eab010dac8af6d42357ee2740a82808a5a3bf9fd29ae8d91571e4fe3069cf70530c98093857df63264b26881542598613323
 EBUILD pykerberos-1.1.7.ebuild 553 BLAKE2B 2c15e111aa69af62588584d8c4b99d47ed92f088b268b34ba91dd035cd104b011b47f725d7fca08e561ec3dcb5524d712e10abedd07ae3f49b0ee047a882217b SHA512 486753621c5e9f0ba9257d2b6a79b6161d1ac2004f3ceb7922edbdc93432c58c2b335811fcc44ccb920c6e8227aeecd8255ac45a3bba11d75fbe9a276326b436
-EBUILD pykerberos-1.1.9.ebuild 541 BLAKE2B a0142b843d03c97bc1ba56365db2e39a5a1d4a308ce7db4d2f717a4321c7c8377233766249c36f30cb8b01a56271d14b7a17882de5014cd6f90f189601fb4b03 SHA512 97b57d78357a2b0392d4f4efd79c9f7c4716ffc82dc95d3bfe4feaf51824591cc890b408ecdbbeedcca5c17440573141d0ed680cdac8ffddbaef588f9a861b93
+EBUILD pykerberos-1.1.9.ebuild 548 BLAKE2B f066b523374a7ef7ac13798a97bd62e9c66a256c347a1bda1f39ed970ee69940d887796987637dbb9bee90d2b42f3523fb67c96e08476580fe92934c3fa09d1e SHA512 0dcbee7e02e356cd7eb3fda70dd2cecb578748adeced39cc0d4e85878d4fbd457dddf1d0fadb6878030d1bffd441cde61fee96b7bcdd150ee5ee4d88162741d2
 MISC metadata.xml 332 BLAKE2B c6badaa93a0f9f3000d4865e58d38f56d57ebf51fd4ee4f8d6d6bbf3926dd4b0b7c97e46df5206622579a788c86e12de778f2207da80ba97814ff16dc8d04d38 SHA512 a3246676e0c2f0430c285ae4f58b5ca754376936860c9d04d9ef46ce111bafbfebcd25e8dc28f1abfeca92dcbc6a329f711272ad7dd501bc9a1c7b34876cbbca
diff --git a/dev-python/pykerberos/pykerberos-1.1.9.ebuild b/dev-python/pykerberos/pykerberos-1.1.9.ebuild
index 0b94196ee2b0..6e334a3c3f6d 100644
--- a/dev-python/pykerberos/pykerberos-1.1.9.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.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="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index ee577fe1c6e4..0d0de2d19950 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,5 @@
 DIST pymediainfo-2.2.0.tar.gz 421683 BLAKE2B da7145bc0ccb4dbd227ae1b28691d6b7c85bcfa604568624b233e7aa219429b1678c7247e142b72fc1bbe99eefada929f8ccc50984fab033e179f2d97bf86839 SHA512 70081c0d7f952433dd706296b4d564004b8c28af431871388d5fe2fafddbec9e2035d8bc50df170e3761bb258b113a42bf2dc13ce3b4663f724ee08cd4136cc9
 DIST pymediainfo-2.3.0.tar.gz 423912 BLAKE2B 2108627d7eb661a4329b46abdf6821c7f9af6d3817455edf884d3d96af534424ae434e28c061deca699e967913c40b609f72ffe38316811d4c7b09008de0bde2 SHA512 6ca616ac92f4e8ab71d8edcdd1208dc3dcf9a13f7c3dd2d401a4997c95222b4e559786678826f75b631c4c46913c9cb390126a5468714a7c417638d3a4468d32
 EBUILD pymediainfo-2.2.0.ebuild 965 BLAKE2B 3ca559ad788ba79d963687c62eb0ab088f2cd6a942dbc7c5a960ebf6940f6e0f6f144132bfef1d2e77d73f0638d17978e80b20355b63c1abdd01e28535bc7bcd SHA512 c0c09a5ba066fefff04598a6bcd0ac3693d83086a1521a598b7a83523e061a4bb1c9c9febc64693820ecf28c329997d0d7b4356460c7c79bf1d1e528adb20dea
-EBUILD pymediainfo-2.3.0-r1.ebuild 1077 BLAKE2B c25945eb0107cd0f3e52e955e54f2a4cedc1154afba25e4e50a269aac7d5df522635d8f32dbbb0cc546eb5adea08c8ae943e43d3be526456342d4e16d5af9b78 SHA512 8daa87bc6c0c536b0c2c40ffbf45bce969f21534dcd0d8ddf8b137017fb06f50ca6ff7e185a29b7f0779e3fee4ad1499e17bd8d0dd87576233db5570b8791742
+EBUILD pymediainfo-2.3.0-r1.ebuild 1079 BLAKE2B d727c3741fdcd0f581abe20f3bfc4dff3fa47b6880ddc33dd3e64211f98dae8789b6d62d2d32772593331d8877f84c009382fb8655b7ca372de1f4d7bf9d3ca1 SHA512 534a061468a4cf27a504b54f566d37e2a8e357d54c07644c2582d94033953d88e0c5182bd2a501096b36c9f4e14fd557eb3ad81ef8b3ee265cd8a2a068787577
 MISC metadata.xml 441 BLAKE2B 6dcb65038010218beb340daaab820392fa857e77a417aa8957f678983f0b56fbb878c508790f9c7f33b6acd8eeaab2320c7b0ca2d2533e112ccb984f9ec7d3c0 SHA512 a5052eb10a6672d924cd1a09505d2eccb26187cc11a16b2ab30dcf7e1ebf1e59e12e10f5b35426eebbe9c74a74611b25ea70464e661e9abaf22fee3ed361fea3
diff --git a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
index bbd536829e6b..ffd76f0cf136 100644
--- a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.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}} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
index 76402ad679cb..c81a68a56559 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
-EBUILD pyodbc-4.0.16.ebuild 625 BLAKE2B 52ffb09c6f280a906132a1d67fed9af4692fe58135ef6e14fdd21d9177cac2bb6ed5b9e3147a2ef6cd7cccaef31f6b682fa0ea888065b7716f6deb639f27f1e7 SHA512 f92b732d18ba596dda142862d54fd48b6a72a34de9dd1f9671737365fc0f29120818a0bea4ec368dd78eda5c22ff0a503bd1a7af05abfe337b5347fee87fb2fc
+EBUILD pyodbc-4.0.16.ebuild 624 BLAKE2B 5067e82181b60d8029486e0c81c72b2de6bf4726b64f942b8d47403dbf38acfadd7ea510c4a3680d2fef905819584a04ae5af3d5fc0de3b90f89b562188d45d9 SHA512 97d85889ded31c344c0c4177fef9912b38e42ffdbd29654674c01663b20a533ed018d00a0262b56fd9373ac57062d70548be0c2dc2577462ac15149e13fbe151
 MISC metadata.xml 367 BLAKE2B 530fc01148229a40c7c1e062f3c277b8812a5c434b1a96112425906c6976aac3b4396c42faff69b2cd03a1ed1e5990453cee9d8f1eb8e355f9dde2d0b4f4d42a SHA512 4e776353a7d6e61d0572fe852830214d0ee0eafbd9bad6ba19851e093f413e7d5fcd7f8d33c7c75be107b98a3003ddf8432390694c7372b5bf7eae05379ea38f
diff --git a/dev-python/pyodbc/pyodbc-4.0.16.ebuild b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
index e2b470cf3986..6bc56558d2a3 100644
--- a/dev-python/pyodbc/pyodbc-4.0.16.ebuild
+++ b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
@@ -13,7 +13,7 @@ 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
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index e86bb8ed1750..7ebf6168adef 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,3 +1,3 @@
 DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db359af79e1718bad85149440cff543c501ee23eb369270d2c539a9e3f4e13165ea87b858ef6916ee79ca6e49f6e5370 SHA512 f194662b5842f1e3a4fcb910b9f2e6482d1dcdf834f306acc3dd6d9723f65038f7bff550248fa6268d90c839c9d9e8248bb6c7d399495fe6aed25291b93ece86
-EBUILD pyopenssl-17.5.0.ebuild 1668 BLAKE2B 0ebcafb540139e3831e9be00922411aa5722f925c976577428e026cfcc3ad457e853a9fb851dcb2f9ff0a621f3f5ecf4dcec12391a582f8e213a5ab6458c1c38 SHA512 42d968cbf25d851ad9e4d2534d2880ca1447bcc6eb9db0d947e32d09f7353d9be9b9f80ec606164883ef2e9dd951a1c06eaee87d69560cf4904e871592edb064
+EBUILD pyopenssl-17.5.0.ebuild 1670 BLAKE2B f7fa0d89dcc9f7c8f2b657e57d93cd82273cd0a652847ae17c70d2714cc2f17e6a5df3ccfdc5c3222e5750c417418a919f3c96004387698f72b91071b325e01f SHA512 b3cd21ef300e6d9c7cb61b3a956bb86842ca97a525a328ff8ae5c99b7105e26291d813d7ad381fd43a6fb34ed4eabc60afc29e54caf85e5bedb0fab7ea727e12
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index 5321b415db30..dc7acd5a6cbb 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.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
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index b93a6f7abc14..c093db630e2a 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,4 +1,4 @@
 AUX pyparsing-2.2.0-distutils.patch 496 BLAKE2B 7bd4f362839ed9fa61eebbad786c9b373b8a6f7c762e6b63a44ab4ec7295a7925a15bb66a003259d3c608b763445680b9466a0bfc88818cc2c78d232829f897e SHA512 0fa30bfa6fbf08b4723e80d4f688daea62589c1aaf6ced8bbe56c1edfb438882a7b0e68969b69e5d2da59b0bbd5f2eba051423b011c1bb01c1d74e2254e66090
 DIST pyparsing-2.2.0.tar.gz 1232522 BLAKE2B 59420548fcee047e2b385d76b8ce034807eb3ac0fcdc9929f656cf4b81436c96c37d206b5d6b90ee6892e402df6b939fe9e793384d4cbe0618c8d06d5197586d SHA512 6a409f429d40a5ac202d144e4150de2c80d7c7120147f603f72a4a99797d48c50822a6437f590ec5ae4418d51aa1f6b1d4e5d95a57e19bec0a127b04e4937008
-EBUILD pyparsing-2.2.0.ebuild 1325 BLAKE2B 78b2227cb0058a28f31789e5854a798e00a8e393a3f340dd6224e4a7af7c23ba6e05fe7e1185c5c48d7f2ed2a6dba64af0368129d47fceab4e27b9dd412e1aa8 SHA512 ddec8897ba52241562378210aec8ca5f4671cb12a818616e0ccc2ba6d113e094855a6d1a326baa1db5359cd933e43dab6c447227ca2dd77e275dc125b7d69396
+EBUILD pyparsing-2.2.0.ebuild 1327 BLAKE2B 3d0ebd9515c50ddeb36275a1d68b2598e16f05cd375774483746f2a67b5f5d9cd466d821aad9e10e6b17cc0d9d610935d5d4d6470a0e307169f868c25a4a453b SHA512 b06c25f684600d222beb8cb7ab095c778833d8ea81dec25a6cea511252ce12992c3141b6521d858f10901fc02a48ece807e0096eccf1fe1d6dfeca1574376f9e
 MISC metadata.xml 737 BLAKE2B 4b4199e79bc2e92c175ce249cc395d2324cdc3a3df25bb36db5884b79057ec04c63b2cef7ef27e9f656a58e0fd5aa162b8eebe076f6e673b227659a3e013df08 SHA512 2cab4251c3444c6479b4d5ff92221399e01ea5e4a6af96631ccf81cdce5f3f9cc2ab06993c9636f36469acb5b28660c41e594d0d7315c6cd9b5dbaec0deda7cf
diff --git a/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
index 02856e79e946..a77d5c127e1d 100644
--- a/dev-python/pyparsing/pyparsing-2.2.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
@@ -2,7 +2,7 @@
 # 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
 
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 9a5b3b2cf3d3..e01036e355d6 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 925 BLAKE2B 2c7d38be832ab926dea0ce0573febf6d87f5f4790598a9dd6f6e5a41299c3936a557927fd4d8d211d49f5d1a1ee922ac10da619956714249320f252ede1681b6 SHA512 575e71d529fe1af0893029f5f37cace3eab07afdfbe627b3400a6c07feb3b5900acdfe5e8e0d74917363b75659760ea90090e2c12fe7fe27780bcafb2aa84b6e
-EBUILD pyrsistent-0.14.4.ebuild 931 BLAKE2B 6e0436b31f8df489d3bf63350d6eae814f8ad66e7a11c66a44e2ca201ebe8a586bc732928605e3eb9f0e1eda32e4021963e05112470861d26acf1fcc1672ee7e SHA512 1f49d9cf6ec6aefdc6bc9804eef53655255ad187d9f4245a996738beed321de84d1c0a342276bad4ccfbbc9861ef40412a24eef2c6bdccc55378ee496daa1f00
+EBUILD pyrsistent-0.14.2.ebuild 922 BLAKE2B 2cb6994b9f0ed1da61c7a512b5e0ff3369a374eee3b391ef66ea79c88690b6a59d49a9b36f2e92f5ced46ccd375ce99a6ee0b19287d5a5ee1dab3e63ee8f33a4 SHA512 45e6df28127e381ac9d9c6ec560d75b433e8ec22c460d440b6f053dc9f738241154a0650d35d7d2411d9ae38b9e89d1f4ba2e7b7b75a5dba1dbbdc3c2363786b
+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 b1560efd1c2b..d42860840717 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/pyrsistent/pyrsistent-0.14.4.ebuild b/dev-python/pyrsistent/pyrsistent-0.14.4.ebuild
index 8ad89c3eb6a4..58f39877e4d9 100644
--- a/dev-python/pyrsistent/pyrsistent-0.14.4.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.14.4.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 1fd5ce5432da..eaebd771522a 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,6 +1,6 @@
 AUX mapping.patch 495 BLAKE2B f9a2493c2ed0f522000b2ddc774c931138adda0c7d6f8d53875532fed631936436f5ec8cd572e8fc47bf5d9ada2663efdd315d6102cc5ec873d198a53c75a604 SHA512 2a0a86462291ecd78d06c9b88e8971502a58efa61ad9d47f0df2c94240245a41e7bbf9bfbd93e7761560a16fe15203cf8c5c52eaf3eb24e1499b00dfec3808f8
 DIST pyserial-3.2.1.tar.gz 147338 BLAKE2B 6c377d1527183fc48e1369f206f409d312e4488bdb15ae1d1ed93249073ffc56529a9e6059ef57c8f2ebb867cb6d9c0b7dc3a74eafbf653463a05e603b25d69c SHA512 8d3e580cc7781fc6549ab6e408642f4321eb90aafbe593f5dcf953001730f89ee32ce6592728764027a7944bfe4a0ebe2cfac1fce071777aac7c4f27ac94ab7f
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-EBUILD pyserial-3.2.1.ebuild 1144 BLAKE2B c1ee920456d77e28b0be2e4f1adcfefb4cbea7c0963177732c1df3f586df73e28f3146530a7ea435998c293554f62b4e0b7618ad632bda369d0f704592371511 SHA512 2392ef4e6f1aee5ad8af6437ce55630f7417d8b4ef451689cabfa7b32807dba408e144b5f6d79c1fb21a3a1d0b85d9a463ed173fc6cff1013b10095f5c558c58
-EBUILD pyserial-3.4.ebuild 1154 BLAKE2B 90ae23c7cb0bc31f47e2e53210d3e77c1aa4631933863331b8515a66ecf4abef59fbdfcd651872bbf6674758c9f6f0ad0029fbb73afa084738ec277b5b5d4975 SHA512 b0a70078aba35ffa82c1237e2c0cfeab6b980ac9187ce91bb6efd47143af02424f86ab34ecb214e4904a0a9aaeeadb3acf4a051a162916c448b68077cbb90eea
+EBUILD pyserial-3.2.1.ebuild 1143 BLAKE2B f59770dff0863754af9152194370a9ffa0c4792654349927e4bf490ba27e7f3cbb4fd925904ebdc30bba06e741147ed52a5e5200492c694378e546c0ec5b98f4 SHA512 876cbbebab8726b32ccee943f64825441092c382ee4efd67c4bda102a31f2ca93830611cc46db203699a212926adc986f1545cb64dd298ceec24ff5832d1e2ce
+EBUILD pyserial-3.4.ebuild 1156 BLAKE2B 1759fb742ad7e374e34d1b69069ec4ea002c475fd4ba9a4a518bdefe31d2b1f03ccf32a4661a7975f88248b5296047f5c57fa54f5874661e3f1950a289f5ac19 SHA512 6a0a0c1b7527ad184ae2ff08db93554444523bd3d3228526905e843222f1e48898f157bcdabe62cd2fc90944fe47fe0fd76765beda2e0ec7e198612ffd6fce2d
 MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/pyserial-3.2.1.ebuild b/dev-python/pyserial/pyserial-3.2.1.ebuild
index bcab615ab74a..7cc47ed7da1f 100644
--- a/dev-python/pyserial/pyserial-3.2.1.ebuild
+++ b/dev-python/pyserial/pyserial-3.2.1.ebuild
@@ -12,7 +12,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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
index 8d1e734f73a4..6783caf54951 100644
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ b/dev-python/pyserial/pyserial-3.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index d1f00f2ac8fc..d5f1112062d2 100644
--- a/dev-python/pysha3/Manifest
+++ b/dev-python/pysha3/Manifest
@@ -1,3 +1,3 @@
 DIST pysha3-1.0.2.tar.gz 829192 BLAKE2B ff0c0e1cc35f5e2efc0a7d3074022aaa1e05fa72cc151560180fe08958c8f83ec2b0f50f9e1bf772fd386647f3d44e8b4139f5593f6d0d678412eabe4829e939 SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720
-EBUILD pysha3-1.0.2-r1.ebuild 1015 BLAKE2B 1bcec331184664cad1e43d1b175851dcad6c5c71d2d194706db0827d1054ab397548efa235de531fbefaebbbaf70a943f0c38211af1e794dd1c0906420ed48d7 SHA512 2cd6ee494cdbc2cf92e422ba0d0910ec480b933dde998e53d36a5590beffc23cbd214105e78dbf54267e622ce09cac45fb9825b8a0b65639aca2d88dae96aca7
+EBUILD pysha3-1.0.2-r1.ebuild 1019 BLAKE2B 16e2f3a1cbd3b7988643c7e731cec80bcdc2dcb94a0e13a4ed1a4cfaf3a7e567ad31802092bae36914238b5e30b100e8b1f3122efd77e7935b9709f79110d423 SHA512 eb0cf06342ca570a1aebb25796a7f7e11c292ae16a6ddb66924defb7f978832c89680c20d50a6f0fe17d4ad070f8ca824d13eb6a7190ae07087f3a7be1ac5169
 MISC metadata.xml 447 BLAKE2B b29243faa53b7068fce5b86ff8ffeaef920340c92bee35620fb2977b02a1f543fb6cfbd5509fbe784753d9e1b123bb1ed594dfd59e2ba611b9ce0e1df6319174 SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
index f73124da954d..eb7479230d3e 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 inherit distutils-r1
 
 DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index 44cbc9711b9d..e5774bfc70fc 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 704 BLAKE2B 67625c57bc3f522f950473f274836a0e09d74582756b76847407c2a0ac97909554d1a511b67ba8d1167299255ccb85dc235aef54ce1399e1f67b8817dd270838 SHA512 46da9def6c4eb3fc11de441753f836dd99707341e13ab118c42f330c93b5a2096b39e47bb353e24b9db14b671e13ccb0a1c218d831357c0107ca54d08d0a75ab
+EBUILD pytest-expect-1.1.0.ebuild 703 BLAKE2B 46bff612ad0a69a2866400a792ed9bd0607b50824b8a4387a51041120b2a5fe155aa2075577744222d47d554f767806574d953865aae7642102bd5e3671fe289 SHA512 2b91aeea37c5fe09d1e63b580b6a61e829de58ea2571f8bb1daa990719f90f57b243f2167ae3f53fbed3ddc2233bb13e0ec08bdc408c78ae78c8414e8aeefc16
 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 601781104143..190383ebc5b5 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # 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
 
@@ -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-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index 5f412ed8673e..4564155c862e 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-fixture-config-1.2.11.tar.gz 6525 BLAKE2B cae41f542fedfcc8587dd5a4cc117480f22fc8abd6f5b85b38451e8199c52d2cb20c4a44fd014504fdc6835be940b4935c95e73dd16cd42049a0e01737a65f6b SHA512 9d335621c7aec41ce769f450fb618ca1611a0e97bf3bd3bdaf43bb827dde62af28fb255a36643c4e6e9c958e7f7efe3f4fc308b3129fe7625c0504c0c46f1518
 DIST pytest-fixture-config-1.2.2.tar.gz 4995 BLAKE2B fee7acb10140320b2ae14968fd99bb11f6c23f54cc86fc74a52855b58071c8deaefb1343c4d92726f7fad5e873c25c426f04d8ced3ecece3d953dee4c7693b7c SHA512 c2d2346c50c8a73e37ce217e240eabdecf872700c9f4b020f1ca7532a06e6a5dc6b140356d96b1bf8c83f1cf737d95775abaa206c3dcf7e02555b26aa995f12d
-EBUILD pytest-fixture-config-1.2.11.ebuild 752 BLAKE2B a1b4f5b11fbe192374bbcaca503ad4e5e4876045b182f408e2f43d0ebb5862fe1b278c719a803fcf68050ac20b122790396dbf2842068541c228ac83dc75f049 SHA512 fc745e6f270bb1a8e767dd3aabdd24a5ee1829ffc52a2a09d1d010511cda2b232e7ad422aad7815888da94a37c22bce3b1a80a945f55501dc99552027f8c7c90
+EBUILD pytest-fixture-config-1.2.11.ebuild 754 BLAKE2B 2cbbe10e1b6cd17a04e684db5690cbf0e01f4af8b65386d2b6e4963eb01e6616dfbe4b4a782c9203a675c2fab70d48b6539f6e753b0cb11f4e050e9c6203343e SHA512 e450b6dbfc354c34eb71c3c7d5d6c646d63b1142f77d9464805c4c642a3b401346246527f29b971a7e1e2663f10df8d254a331e1b0d707c3e98025f2c6bcd119
 EBUILD pytest-fixture-config-1.2.2.ebuild 704 BLAKE2B 3af1cf4112f040be56782ab80a28c979efd1cb239625ec353e1dc686c25c9ede55f474a2594863fa9fbb2f36eaaeb1ba7b255f15c58ea504ec054de7a38aacfe SHA512 a56a05d20304efc43657e640a2f4d51cbd5ffa93338290b3a5786883833e133f551857a01d05f356378277fb12bc35a2fdce59c7bfc0ad6af53cc0a4dbf278c4
 MISC metadata.xml 628 BLAKE2B 925ae819fcb1ec9d45dd67640954152313f84eab26d5ee055d8589e29062ee275f61f828dec879fded534bd3db0c89580fbe6e16b5ebca4c2f5547bbbeaf365f SHA512 a11640b82dcc479a13ab8eed44d7a543e8594c6f829ef64855d02a750ce605181e6503d5d8dc2d95c8740fb70f86e0c95467d9df81b7bd2702e3658572035af6
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
index b8031b9b891a..5bfbff283eaa 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index 6539af7c09ba..8eeaa80c90a2 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-forked-0.2.tar.gz 9617 BLAKE2B f306c968447b73ddd606f7929b730d222f30640544ff89f6e3e2171ec3b0e98877e0263fea6564d943789de6daa1c344022f001ef80ca37b2467c1b9c360eed7 SHA512 5e84fcaceed46ee9da8eec051e72acb46f09e2df3458511651604c35d68e3ad06fc41d52578127fd29f0c216dcb5fce1844c614f10501727cbf8fa8f2316f231
-EBUILD pytest-forked-0.2.ebuild 910 BLAKE2B ed9207a1c9875ebef26498dea3c14018331f6764f9cf3a12724279602239043b48ecee6d2572be827d24cc30ad0893273cf4df4cdb3c2c75b5b16a8b33cd05c4 SHA512 ae097c676492ffe6989953725e4aaa09ea2e9af88c8ba3ce32820f7c89ac59d3c2b025dee594b89aecb9cfbd9c6011a290e9599e8d3767d2d31d5ee3c1d04144
+EBUILD pytest-forked-0.2.ebuild 912 BLAKE2B 743d8e31ad273a36e15e601ec24f9d511591ab8fe89219352f0497c7fb4229b7dfcc5def9b4868c25a341a6b3d42881f5fdf0d5e9e49b1ceb9777eef70fc35c9 SHA512 be3760a032433d2b2586ef6402466939f9d189d309c9666089b5ab5d72e01a5a92f8ac00eb3e6ee5519323fc8de28757fa4c15508db20add2ec57b7c051064bd
 MISC metadata.xml 380 BLAKE2B 6cb0f7646f94dcda5b7adcd074d83ece86cf7827a69ecbc87adcd273289b777cb12acf856f7068b10b9b3ff7a0eb5746c7cd8f7d8acebbd4cbe9cd1c5efd4ca7 SHA512 9106660bbd3a3197a9beb92d5309d3b1be687cd30f81753364556b2db1aa19e94237c30f2e31a5517097595033fd80b774ceac44cb09c7850a1f6a1eee6325c8
diff --git a/dev-python/pytest-forked/pytest-forked-0.2.ebuild b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
index ca671b48d93a..ffb369e51442 100644
--- a/dev-python/pytest-forked/pytest-forked-0.2.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-0.2.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index ea404980750f..4e807224393b 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,5 +1,7 @@
+DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05f5e2360945aa86ff6de02fc6a01f1e6715cbb61ced0c1e737c300965835fb08727b926852c5b71c0cc3d56c1171f1 SHA512 b8afba13da3e598b6493459298e395c0ecc06538733916659191bd5c5c22f40b0e296853ad940c16a6d492fcf46b2daf490ee589661d391e2c7cd1deb84da756
 DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591fe368bd42544eb1d0379adcb3d0e10b223ab044956e4003aac88665b3132dcb9d167442d6d85a5be79edea36881ca SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
+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 1070 BLAKE2B 950a7986e97c5e2444b67503a86d268bcba7550bd3f73a488137d16ba5760d1b561053e9a7074217d8c32c8f8aa6fc20b5f0cea1bec684551eac84b0a0625222 SHA512 1b21e9b8689b143c966b9feb4fcb1ca3d086709c13c3bfa374ba859f1fdaf33046abfd630dfc39e5f9b6b6fcb12c434b45e79d61d5fcb29f5a1350fc3cb980d5
+EBUILD pytest-mock-1.6.3.ebuild 1028 BLAKE2B cbd60a3bcee5a94bd6d665b10e6652dec896ee8b678f07d0e8dcc2629447646a3f2c5ab3607b0b00c023b5f49eebb1825f7e49455280e84921f98400558260ac SHA512 cbbc0dd41de2e126585dec4d5033192e42ea151906dfb05043eb0af54e663134e4b1d62ac455119eb802b7361bb8b7c8c975da028a7e1ea9765971d195c7d8ac
 MISC metadata.xml 354 BLAKE2B eeb8bdbdcc7cebcb451e7c40a2ed5d0136d35e6b6a63e79e1df73762b40302e16abb4263e8c4cae8f1cf5849377cf6ea12c7ccb042737d63ec75252ca99f511e SHA512 83a168d22f4d604827aa42966ccd1b99d53f069cdfffe69b29fad8f13c4959ff287915c0fdc29e53ce2c3d5625b4f4620861b927571dc91c93ac199a5985a3da
diff --git a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
new file mode 100644
index 000000000000..ca329f1b7442
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH}
+	py.test -vv test_pytest_mock.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
index 4d4ced48dfbc..ca329f1b7442 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.3.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,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -16,12 +16,7 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		>=dev-python/mock-2[python_targets_python2_7]
-	)
-	python_targets_pypy? (
-		>=dev-python/mock-2[python_targets_pypy]
-	)"
+	$(python_gen_cond_dep '>=dev-python/mock-2[${PYTHON_USEDEP}]' -2)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
@@ -35,6 +30,6 @@ src_prepare() {
 }
 
 python_test() {
-	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
-		py.test test_pytest_mock.py || die
+	local -x PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH}
+	py.test -vv test_pytest_mock.py || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index fbe363f7777b..f05bdba0d714 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-rerunfailures-2.1.0.tar.gz 7687 BLAKE2B 1c5ba90ab2b67c6a7b58d0569ef46847594dd6dcd5224050537fe3d645d131c2b450aa14a032151a81c6ff2c8b56d4355d03dd33a0e0f998e31a5df94df44c3a SHA512 9c3da462df07f334dcab865bf7f828f75bc611c93dfeb2306a802f2e6ef973332ef502d97dc8d676e09330ad77c227bc6a20ae67ff31f1446a5fb1d608d638cc
-EBUILD pytest-rerunfailures-2.1.0.ebuild 546 BLAKE2B 67043a3d3da1392fa84159f0d3a96522b38238b71b813fa18e513d221c503183908d900654aee502c9a9ac88524508dc1ecd858840e77db52b348b7cea0e76df SHA512 2ebaaa6fa7be7107359f3e1cfd496072a156d36fc4ec2af95d3c8ca6b00958c2c83f48b4ec65e3d45f9bdfdb69f161931b3f699e509713b0ace658a761518dca
+EBUILD pytest-rerunfailures-2.1.0.ebuild 545 BLAKE2B d8e661dcc5dfe8a0d746116fedb2d8c1964e35e3d6595b1fa2d65f410d35c497a18eeb39f4e287abd4d14a4d4d841d4699a7d4717652cfbe4df37bb372bfbdc7 SHA512 cd0c2c93ebb8d376e82ac878f2b97511e08960433d8f5f1f6c54811ea2cb66f3816c3d771b2f3c3801e776bf34f9bff382127648ef337037f71692f9761b3502
 MISC metadata.xml 333 BLAKE2B 73b35ed1679008982384ced1ded01ba9a61c4b82a6646f7f4a1ad318690d3ffdf3752d438a7ca4064e1a39855a353e3f928329f0759f7f7dfb8ba45b01667a40 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
index d75a7270341e..0d2780824399 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/pytest"
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 8b30b6c0f8cf..23c1949cafb2 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,7 +1,7 @@
 DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
 DIST pytest-shutil-1.2.4.tar.gz 16327 BLAKE2B eb5bb96c78be5b91de29f6c30634cb56a69e30b5ebee9b43a0e970691a7094dfefb83ea741650e0732ff60b9d08cc8ad94d80bb95f1222ba8670402c1fb1d5ab SHA512 9ec6baa3cf53bb80103b1dfbf6c26794090c26dd74b29cd19e76b1037c6939538c7b05ea16368a76cce6969216c291e27b00833a990268239bfd2222f69ddfb4
 DIST pytest-shutil-1.2.8.tar.gz 17051 BLAKE2B 9006ccd51bce6e5035ed93a330e460666bd0782fe56ef400f66de174914aa89b49d6684d1a3a2d2d69b308c4d8466db83eb0865ad20649106dac735b9d1e6772 SHA512 de73b2c350709e356810f58d2a8a4c7668144701639c45a0690081e707e7147762f650af2e9f826429d0488655dae0e3366611da5e8e3ecd0c6382e215170b2d
-EBUILD pytest-shutil-1.2.11.ebuild 1029 BLAKE2B 53006c6ec5891cf7f13631bedd3eae011d151fb8174a140fbdb36a9a2b1799173ff81832157ecf68ff452f632946ab5cf408d850335ae8b954abc9eb7a39b78c SHA512 34fdaf7f338cf6181da8e16b400886e516e76780900544735faca71e474b8e74b8ff737c5ecf9ff267890785b3c019f0145e9b1de71c5fffe4324c452d226326
+EBUILD pytest-shutil-1.2.11.ebuild 1031 BLAKE2B 77e6d679db275d70b16b56e8d709a44f5b805733a26ad037c50f8154dbac159177faf7fc855dc89e15b1240f0523a8d6d2c175661f8a03fef7ab794d6956a74e SHA512 195e526028d00a7ab2c69ff5eca7efca29262f319b5f172f922c64a7edefefb63fe7ee8425b646e7d5c8c49fe3f6b1eba263ca130a8a57a873ef842f0f6d9efa
 EBUILD pytest-shutil-1.2.4.ebuild 869 BLAKE2B f6771062db81adfe92c4136be4701ab7cee4ab1d532f30529c5eaad26a260b0f8eb31cfc18aa82f9295556c7414bbb770553bc92dae8947567c127a4b4e42d94 SHA512 32ab5e8737b27f70f7b3e38a4d86061c55c637799b7f9910234f89d21b9a688e42e77bb4a51a008abe84abde8c2dbb60fcf89e1a3f3c06615d46a27461540bf2
 EBUILD pytest-shutil-1.2.8.ebuild 869 BLAKE2B f6771062db81adfe92c4136be4701ab7cee4ab1d532f30529c5eaad26a260b0f8eb31cfc18aa82f9295556c7414bbb770553bc92dae8947567c127a4b4e42d94 SHA512 32ab5e8737b27f70f7b3e38a4d86061c55c637799b7f9910234f89d21b9a688e42e77bb4a51a008abe84abde8c2dbb60fcf89e1a3f3c06615d46a27461540bf2
 MISC metadata.xml 682 BLAKE2B 97ec2b3653d0946043034e72566860dc77fd2f063ea2242dabcbca2ae6f1c3b4052c2f0c24b9f981fde07c00b35da0f1ed7322964dfd3b9f4f7d3645de9a6ac1 SHA512 34b80ff399184f3335a694bd0ed0d073450a498b355749271b0d8e9c92673134d908c822be6684773a175bc3650dfa894bcaa73e47da70e92d503f602d515d19
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index b32bb9d1ca44..19306f8a7121 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 7b72d6d962a3..d81883622bc2 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
-EBUILD pytest-virtualenv-1.2.11.ebuild 886 BLAKE2B 719c2c93d1ed5f218d8918350a467934897c76d66c90edc74981a5199dbf3d9075871fa26158e7c3eda323359821b24d32af9595a2cd435906757ccff6176983 SHA512 4ae29368db5ccf5bae730863d6e4a7b48b1e09042ae0fa586abe8ab2c831b98c2831e39cf5eac30ac1ebdf3967c8b2a5f3db2c4f31dc8225373dff0a5d3c1785
+EBUILD pytest-virtualenv-1.2.11.ebuild 888 BLAKE2B 431a2f60d88e0d8c1b882d115bb705eba8bb49f105c0394a25b5f059a2893ab5531899f016d0ff1e7736be4b4b1a55f7945a82ff01d17df7b4f195394763ade3 SHA512 9a75c4d795c31c4f98ad2a598704fc649055dcf547c44dfb70336981ff70f0f530c81d555c85b74c4f20ef7d253fb030ff0a560b1d4e52a7746d15b86d26fa31
 MISC metadata.xml 656 BLAKE2B f7895bc4cad2dd72b92dd5661a4e92abdd4f71e379fe23b9ef168a0cc3776a58c2027b137d07e1f2847408e107b7727f4ccf888d2b2dab8faebb0b7a503f6c18 SHA512 ce02a53faa9fea4fd118e39f0dd8d28f9fcffc39aaa269e4b353a78b2833365718691d257fa4018e94b69829d19d58a21052a8e66a5312f6b29761aa8b8b9570
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index 30f7b7192260..9cf8dec13a95 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index de0375d081ae..fb89cf4143e2 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -4,5 +4,5 @@ DIST pytest-xdist-1.20.1.tar.gz 57076 BLAKE2B efac9a0d96b2d4e28b078a7a88ba8df197
 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 1104 BLAKE2B 7bf7a0afd2473586dceacd6532f91e5c001f70cdfd91732363bf67e48ae273b65a38f9044b7c2dfa9d7c8808dbc97f00f42ffe65ff0ca33fb65463813bcedb15 SHA512 5f39700f85d36cf9bf6c39ea6b337c482c1ef283677e9fdf30193762be3bb643b88d87a97095f839f9aad363308a2af195b31d5a49e8304cad41e49897ebde11
+EBUILD pytest-xdist-1.22.2.ebuild 1106 BLAKE2B efcc17939cd2b3c43963c0c32660477169bcf967feeb361afe2d0961d195d693926f9c801e3018bd364bf35c4aac1384a730e261b82652b1752cb74da6f56237 SHA512 ff2d9282352be3e6707c6b9c0c23ce2a557fcbbdf9c2118473a4584c0b9414617ca34e05094da8c5e787047b834f6bcaba078f99462f1bb08a55f707979203b7
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
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 6a47c7fc1e4b..b2b5fa2fb32b 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.22.2.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.22.2.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index cdf778329c96..d943eedb105c 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,10 +1,13 @@
 AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
+AUX pytest-3.6.3-pypy-syntaxerror-offset.patch 1055 BLAKE2B 8a92e1300052ed7f178252489d4b687d9d58d5fa9067a1f17a20ddbd698843a5614e7dd729670920a447e189b0e40ed2ae26fd13ad7d9cfebc59889c8cc50d87 SHA512 fa2600e320a74eca59004953aea0ac7607e6b7fcbcb702a5ac709dfcf73d036f47c5a79b01e56061ed6776ccaddd7a261162848218969fd1b462c5e1dd615ad3
 DIST pytest-3.0.3.tar.gz 731934 BLAKE2B 7fb57d75bd54eb8a31d9701fdf739119715c475eaaacae3cd038057c1d2bf43fa86ccdc45b3c84962708ef606976ab39ad41e0c3690c8b5f4c04d870579a384e SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.1.tar.gz 812928 BLAKE2B 27b25fcc5a268b1c92188c01bf16bf1eb4b8ced7d1a3c8095350ec55b1f1845a5d54bd6bd169142ca0d327f2f8d193774643174a356dd95fa07b3195bc1e8713 SHA512 75f728840cde6512619a03ce75fd0b04cb9d57a99f381366a0f9c10ffa3210448e7e85505357bfa9bfb0cca11cdedda2c0e091e5473ed82707a2597f234e659a
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
+DIST pytest-3.6.3.tar.gz 830949 BLAKE2B 4c0df5d157b8bb0ac6261a793aac2a8074c869b1a7cbda3eda600c79648b3722eaf2a57514c1fece60e0aac324b8ed09e8e889dda268619204e9e1f1637e1c9b SHA512 e18d8e972cb1b05b037b9441eea5981ce036d8e2c2bab80f6e50f283df9bd08740296133990424cf78449f6d3d2fbd1d59709770aa972af99fe061583f2d79a7
 EBUILD pytest-3.0.3.ebuild 1966 BLAKE2B 50b123408a85c5b283fe1653444472fd467272d99dc944bdf876556fe5e9aa1208e32efbc119cc95ca834bb66a50f195199efd4d04054cf3cc98530eccda710c SHA512 2d6713c361334f2af886827a0918f574512e885fe77cc5a4595ca47d31b37d32f5768989a6bb5447666c8850ca15bca73e7641414d724bb9512d70abb5ea0eba
 EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
 EBUILD pytest-3.4.1-r1.ebuild 2297 BLAKE2B 52af333554c85fff95f0bffe2246cd7e88a6446ddbe8dc4829600d1a018da613c4aed06e039fbd54d621ca45a3dcf454d24ae9bbe302d97c6084ea37d6641945 SHA512 5c06bedcf6b6f8df4f6bba8f5aace83a72ff530f1f0368a0a5b76f0380d02c55cf64e8645362c63f7f6efef5d49eefcdfff2423734a62acb23799a9e3c567200
-EBUILD pytest-3.4.2.ebuild 2395 BLAKE2B 4d93a78c6c42ec6bd54ebdd224a75254806df6ad8f8be32b268ba9a83ec2063cfe69b9bccb6b899980ec6a77cbb980852d03a833ef65fb4d5eb8e021d15ca590 SHA512 45857fee572e5016dc90e012ff70df9c749592b4695738c5bca8ad100f70d34bb2f1e2b608af712c2c40d27035fed7edc43cf657f1d8a7b0e0b1103596ac0cff
+EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
+EBUILD pytest-3.6.3.ebuild 2393 BLAKE2B 1f641e44a4a807a43b46b6669c69ce6959218b6715bd0f8eaf4b7e71b92ad1e08fc297ff2bb4664b830c0c019a880a65209a2f0537cf814983bb26fd475467bf SHA512 f4327b5dde5ee14bf4c693fb760f36a8246b42d54fb229154f63eacdf1fa4157a9dfbf54c8842469d9f269de1375e59687229740dde41fc2c496af223b1c05e9
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch b/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch
new file mode 100644
index 000000000000..31dd00546761
--- /dev/null
+++ b/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch
@@ -0,0 +1,29 @@
+https://salsa.debian.org/python-team/modules/pytest/commit/405c05a0827592515de76e23c94de1f7773273e6.patch
+
+(updated by mgorny for 3.6.3 -- upstream quoting changes)
+
+From 405c05a0827592515de76e23c94de1f7773273e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
+Date: Thu, 10 May 2018 11:42:56 +0200
+Subject: [PATCH] Fix PyPy SyntaxError offset in tests
+
+---
+ testing/code/test_source.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/code/test_source.py b/testing/code/test_source.py
+index fcce3fa..22278d8 100644
+--- a/testing/code/test_source.py
++++ b/testing/code/test_source.py
+@@ -117,7 +117,7 @@ def test_source_strip_multiline():
+ def test_syntaxerror_rerepresentation():
+     ex = pytest.raises(SyntaxError, _pytest._code.compile, "xyz xyz")
+     assert ex.value.lineno == 1
+-    assert ex.value.offset in (4, 7)  # XXX pypy/jython versus cpython?
++    assert ex.value.offset in (4, 5, 7)  # XXX pypy/jython versus cpython?
+     assert ex.value.text.strip(), "x x"
+ 
+ 
+-- 
+2.18.0
+
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index 1c215e18c9cd..b7ebb1cbf03f 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.2.ebuild
@@ -30,6 +30,7 @@ COMMON_DEPEND="
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)"
 
+# flake & pytest-capturelog cause a number of tests to fail
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
@@ -38,6 +39,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-capturelog
 	)"
 
 RDEPEND="
diff --git a/dev-python/pytest/pytest-3.6.3.ebuild b/dev-python/pytest/pytest-3.6.3.ebuild
new file mode 100644
index 000000000000..51f3d8c2149a
--- /dev/null
+++ b/dev-python/pytest/pytest-3.6.3.ebuild
@@ -0,0 +1,85 @@
+# 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{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd"
+# doc apparently requires sphinxcontrib_trio, not yet packaged
+IUSE="test" # doc
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+COMMON_DEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+#	doc? (
+#		dev-python/pyyaml[${PYTHON_USEDEP}]
+#		dev-python/sphinx[${PYTHON_USEDEP}]
+#	)"
+
+# flake & pytest-capturelog cause a number of tests to fail
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-capturelog
+	)"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!<dev-python/logilab-common-1.3.0"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/pytest-3.6.3-pypy-syntaxerror-offset.patch
+	)
+
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	# those tests appear to hang with python3.5+;  TODO: investigate why
+	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
+		testing/test_terminal.py || die
+	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		-vv testing || die "tests failed with ${EPYTHON}"
+}
+
+#python_compile_all() {
+#	use doc && emake -C doc/en html
+#}
+#
+#python_install_all() {
+#	use doc && HTML_DOCS=( doc/en/_build/html/. )
+#	distutils-r1_python_install_all
+#}
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index f25a148b31fd..f487743061bc 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,5 +1,5 @@
 DIST python-bugzilla-1.2.2.tar.gz 76026 BLAKE2B 1c5cba3e5abf517779d3db2e3b503a38190ec71455e23e8813ee7f495f1a3df117653141728a53781c1acebadc1781614937413d13698eda289f59e5738647c2 SHA512 bb4ce43ffbf054097bd537404861848dd4ff5883fa63f156dfa90bea9f2e89cfaf0670980ec290a3d9c90cee268709b914e8bd5bd38b7f2e29c8d7fbd0215ac2
 DIST python-bugzilla-2.1.0.tar.gz 78791 BLAKE2B 31819e04ea5627b5513c22e9cb963cdea4d1ef8d6d4db78d14bf08b8b5fb373afaad4bddb2bc0b05d4637f966bf8b4f3699ace58ceff8ea226d9ffd4aacc7f61 SHA512 40dd331e2dbb4d70ce6d356eb800d6242ef9878112310087761c8dccb7f05b259f0f5fdee6821713a84c68f1e5f9e0bb6ee45542bc385f00822b97344371239e
 EBUILD python-bugzilla-1.2.2.ebuild 626 BLAKE2B 8ed24f398c3ec0d325ddae32f1304d6bffc0fb808badb344c09bf1557b931bda824cde73a5ac9d6b864628fd28df63027194ca2ddbfdd6ca6ba0ea0256cd1db4 SHA512 626627e1b879f6d83b248769d09443ea26d86de6ef99c3740d96be08b5c53651e6b9e1fb746ae1402ac71d8bf1f260250f60ca883f758e8fe1b5986aecdd94f1
-EBUILD python-bugzilla-2.1.0.ebuild 733 BLAKE2B bba29c906683600d0de716d0c276c4318b09f27d8772959e87fd0c9c7500aeca00c5e91da5146beec076ef01ed939067afdbd73d05c575c38d829bb00ca53aa2 SHA512 d0bbb64d1d2d22b2bf7e890a5409af3501f4dec6f4d2d486ec82c4b3997537d8dc552bbe1f5e035f25b1bbe43cf52b136715b1766efa000b4524d8e44b8f9e28
+EBUILD python-bugzilla-2.1.0.ebuild 720 BLAKE2B a9d946b7c139ee6b3b23e4948445851742a765414ef35195466f6045309b77bd5ae3d0a61efc630490fe2f0825b78ce041b32069e1eb9d60eb6d78934c451f16 SHA512 5b2aedcf4fea11ba905df4038eed14ec4c401bb7be4c7a3724c7e1474a8b3b85cb5dd0ebb3bad9f75e1635a8aa567f273ee2f82a660cfd7fb6e418b42f09e20d
 MISC metadata.xml 415 BLAKE2B 37720f51243092b0e7a73a1489d43df6f089a95fea6a406d277fa2874d852b5768fb504a0886a424ba555e09c250342108353599f6302350ad17f3fddbe1f7e0 SHA512 fe000f7f78ed2ddc76c496368d7697bb36b0984d7d7d0729af9cb0fbec90e2d27eca777dd43d13f41a3f6b14b6a9fd735ebd777e30b6a6943f0af735f9ca9daa
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
index 05c40aa71118..5fc5e08dc559 100644
--- a/dev-python/python-bugzilla/python-bugzilla-2.1.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-2.1.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
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 RDEPEND="
@@ -21,12 +21,8 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage
-		dev-python/pep8
-	)
 "
 
 python_test() {
-	"${EPYTHON}" ./setup.py test
+	"${EPYTHON}" ./setup.py test || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 110a133d38f3..03bfbf4f4d5a 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 1219 BLAKE2B f385a16ba791d1b415c58ffd51feb9485dbe3fe7e9249ed76f2683b918e0a4b56fd51d461cb3ef55f4bc76f522e2d63ca5acd0d5735c18e2737ef045ae615e36 SHA512 ecac221f4b8e889c766c0f9f999d336b3f5b07f530d0e223690a1104973a3a3bcc04338ec32a8e1451444b587319c4e3cb57e599702eb22662649a92d6dcd634
+EBUILD python-dateutil-2.7.2-r1.ebuild 1220 BLAKE2B 666671e9869f1ac4c8fd9be7a03c5319dac66f8ce44ed18b38f4158ad87257fd8da0eb0f5f99be57ac0b978909043abc2084e8fce548ce09fb5df914c59ff533 SHA512 9463f26b25984f8860c9bb38dc7fd344d9a448018d05fe2cbbf9c39c77d56ab3736034f9c1cac156c9598bdad79406165f0260871792511c43237b1468b30000
 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 e7fa0e0fe5d5..5a50def515a7 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
@@ -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 )
 
 inherit distutils-r1
 
@@ -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-docs/Manifest b/dev-python/python-docs/Manifest
index 049875e0dc15..51a7cea55d2d 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -4,10 +4,12 @@ DIST python-3.4.6-docs-html.tar.bz2 5517260 BLAKE2B c8e605a3b27358c22e2047241a4b
 DIST python-3.5.4-docs-html.tar.bz2 5747840 BLAKE2B 013791c8d0023ffa3d3e07ecfbb82dd36d2fc3e14514f4e14ba90e3d65d05aa4c3ec7cf7c86fe88090dfa0323c444acdefafa36aa315c98db1b5f7af9c0bd5fe SHA512 b1c6028e91bdb0a85a6765ab66c50574804f0aa799c6d13ed4163e6aaba98eeecfacd8576fbb6a721028fe84049ac1718497ad491f993973e3e410a660a10084
 DIST python-3.6.3-docs-html.tar.bz2 5945784 BLAKE2B 88473f63c6a0d533d568184b8459353bea3bc49c24a0a0e5f3ea240556971f3a76018f08f18371b8c7cdeaee93c4cf466fb20eb774db96ad4e63fb45ce730e26 SHA512 ffd6ea459ba36b19c788638f7e2f72ecd286218ed7eb29493819137c4bc25c02714128f07b781ad642eb08826d00924bd1b90a236ba46107bbe17de6633fa1ad
 DIST python-3.6.4-docs-html.tar.bz2 5955729 BLAKE2B 71e6e198069297860ac84be125586cb5757a34e2b342358517d62656734545fc221812f3c54cdbdb877188648551c3e1cc9331f159d011ca2b0bef587847a471 SHA512 a4cf51ec0e7127f417b066e2727258395954dfc5f1aaa0ad1d25e81dae40ace0d51b18413600fce0f5b1002e4b130a3914b7c9244025375e8fe5332c8d86635d
+DIST python-3.7.0-docs-html.tar.bz2 6222504 BLAKE2B 150382e6ce9c241bf8654efc2c7515e1399291eca38b91c44c51d24302fc239a764af7d22dcc69378338cb3c0f7e2d7e517af238f8c38f32be8a76037880206c SHA512 f5583e8d2792932ff3c90575ce98446f0f11eab3a78a1ea8df0203f29583ff9c2831879817ae5fb23cfdb32238d385361b7956c352c6431e9801e6509d3c5f09
 EBUILD python-docs-2.7.14.ebuild 707 BLAKE2B e304a34e57eb6a688e1b263a04638c740b59bf242389ef495c8fd02ccc0bcea14ab5c194b9ff2944157d82885324d2c445292244fd3fe82d55e93e46db2db2b0 SHA512 0b89cd37eb48a503b365f4691c60155b00735d92ae9dc9f137051f640e7a57d1983505c9675f2a6eeb486c5a91c3115d2fbc44ba07a357ec0e5a0977c38dcd59
 EBUILD python-docs-3.4.5.ebuild 707 BLAKE2B e304a34e57eb6a688e1b263a04638c740b59bf242389ef495c8fd02ccc0bcea14ab5c194b9ff2944157d82885324d2c445292244fd3fe82d55e93e46db2db2b0 SHA512 0b89cd37eb48a503b365f4691c60155b00735d92ae9dc9f137051f640e7a57d1983505c9675f2a6eeb486c5a91c3115d2fbc44ba07a357ec0e5a0977c38dcd59
 EBUILD python-docs-3.4.6.ebuild 720 BLAKE2B 34c99f8347cf43e0ae636ceb61ba8f693baffa3bf0008609ad630b7ee2851a2944ce38f8b1a3ff7356fb58c22d1021f7def5000eea1ffd8e260e88dfe093f4a4 SHA512 8e5ed3fa70c0e7fe9b1dc82a72a9789d793207d01d913f7993bfe6b7ec743a3378b8e4c111ea4d287203aff0f2311cdd7ee6a2ad5c3807630207897bdc474a80
 EBUILD python-docs-3.5.4.ebuild 710 BLAKE2B 1840f937188bcca2fa283e7ed73033105c7e11d0fdd6ef9c72b422ccc52f901702e8c7feb5c3adf3159757e16d43014484b88cdc39e16e202fc54a11ea92f931 SHA512 5582746adb5d6e47f7d285c606effbb40bf00a4bdb96af89f3133348c01ec9513de8ca8659415fb0212e6d3f1213d37604e3e2e5ec664b309c0629d17c22105f
 EBUILD python-docs-3.6.3.ebuild 711 BLAKE2B 0876fd40cbaf7e49edfc731ef3f6e2cc5c4f615c8a049e4b6f09b23ef27451b16bfa0c4adb897a2143c0bbaca329e385526b8274dcbd5e8d46b201258f6348e7 SHA512 5aa90db93197423cf6e9ea158f00dd51d385ca847ade0807f8f500718d7ef68077cb90b1cfbb9869ce3e83b2ebc816a8f6d607fb491d1319aa2695bc6914bbc7
 EBUILD python-docs-3.6.4.ebuild 720 BLAKE2B 34c99f8347cf43e0ae636ceb61ba8f693baffa3bf0008609ad630b7ee2851a2944ce38f8b1a3ff7356fb58c22d1021f7def5000eea1ffd8e260e88dfe093f4a4 SHA512 8e5ed3fa70c0e7fe9b1dc82a72a9789d793207d01d913f7993bfe6b7ec743a3378b8e4c111ea4d287203aff0f2311cdd7ee6a2ad5c3807630207897bdc474a80
+EBUILD python-docs-3.7.0.ebuild 720 BLAKE2B 34c99f8347cf43e0ae636ceb61ba8f693baffa3bf0008609ad630b7ee2851a2944ce38f8b1a3ff7356fb58c22d1021f7def5000eea1ffd8e260e88dfe093f4a4 SHA512 8e5ed3fa70c0e7fe9b1dc82a72a9789d793207d01d913f7993bfe6b7ec743a3378b8e4c111ea4d287203aff0f2311cdd7ee6a2ad5c3807630207897bdc474a80
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.7.0.ebuild b/dev-python/python-docs/python-docs-3.7.0.ebuild
new file mode 100644
index 000000000000..065d7091d1dc
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/python-${PV}-docs-html"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}" || die
+	doenvd "60python-docs-${SLOT}"
+}
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index a4076c001dea..9431f385d056 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,5 +1,5 @@
 DIST python-magic-0.4.10.tar.gz 3950 BLAKE2B f672b95082a68ff8fb2c4b50da0d22316456cda4b72b92d4244fdcd47c43bf599821a9577c76d99bc2a3ae578f4ff05aa76efcfcde684f27a06b90e28d58235e SHA512 8dadfd069bbca574a159dc034fca84fb110a3015ba54fa62c715006b586a5fd10373a5108a4847887bd86c6b7f2c4da90dfb7041cd5e4d51829ac1b94b8e1a03
-DIST python-magic-0.4.15.tar.gz 73194 BLAKE2B 578056caa69dc617135336d00ac7b2da45f56f48e9cf99e9fe71c4ceb6b8432927c90d1aa84516564b3ead63d501789a22f89ac681950dea0bf9735aef263625 SHA512 df028669209e02cde06f4db0481d84c316cefc191273ab3c749e88a23c92cb79a703077f601a0cc194fccbbcf62b38de8bab79290827a8505bc06e2f4aa0c2bb
+DIST python-magic-0.4.15.gh.tar.gz 75476 BLAKE2B dad4973f69a21d08972e1e29bc92a51bc92f405907cc28f18eb9357029afdf9f1ba68010ce651acd821140d60dc10eb2e04138627fb19d132f185a2831fcea28 SHA512 004d6bfde52d58a9d3019ef4ff8c5b18b6a4206bf89820d3a0ae0ed78813f80dfba422aee9685528f88c990526ba65fa2153ac3b95b8863ce6cb3ebe925bd780
 EBUILD python-magic-0.4.10.ebuild 610 BLAKE2B 091ab80438f8026e27a429a92a784455448332bae07ab2a30ca2a368ef196569ac8d75165b32caa12514685f85b6d9282cad4788ccd04499bbbc33efe72ecca6 SHA512 58275f8d490033b415fd2e95caeffbe04ea76bcf39186d33ea830e1f7c8a42bc7996286d7ce4cc8b2f18198325603b3c9f429d2ba91ee0c5041f099384177efb
-EBUILD python-magic-0.4.15.ebuild 602 BLAKE2B be54731b1d008d43dd036857d8aafb521a637641515624563a75c316594de8c2d79397d9231e39a707225afc7778f1ce19de2b08728773aa049ebadb56fa2cd9 SHA512 524f2953ec4bdc39f5f10bac892c4e9d477be7be8a14d489ea51efeeb60b47d418585b05a107127308de66e0c54d6bdd9905b4acd1e63d24677bdf1f944ecfca
+EBUILD python-magic-0.4.15.ebuild 629 BLAKE2B 3a38065ed1794fd461531a44929040290a0709cff97649ee0de85fa43c7222381a5bd4169eaa775c3f4f50f5977dfd7c6993ab2f56f12c76082da2380ec336b0 SHA512 6ecb50b3293079258c4678e1d8bc315be14d35610b984ae2abc662fe067285fd2f3be75bd5b8a06cb29788b053bbe0abd168d06e17026e4658160f9588857761
 MISC metadata.xml 495 BLAKE2B 416789755f00235cc92891f85c214cd6f21751fd4c65df5d73199aac39b73245505b5fbba4b151bc03e92967859facaf8875aa4431e77af8cc9766bb2bec67af SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa
diff --git a/dev-python/python-magic/python-magic-0.4.15.ebuild b/dev-python/python-magic/python-magic-0.4.15.ebuild
index 272c99c42619..1abf74ba9369 100644
--- a/dev-python/python-magic/python-magic-0.4.15.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Access the libmagic file type identification library"
 HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -20,9 +20,6 @@ RDEPEND="sys-apps/file[-python]"
 DEPEND="${DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-# Needs MacOS python module, bug #659102
-RESTRICT="test"
-
 python_test() {
-	esetup.py test
+	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 405035e4cb60..93c2d190451c 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 1032 BLAKE2B 379d13968e5fe4765e6cc8f9f2e7d3548c871827a0da44fa33d1872ac6aede5da1c4e2fec166d8a44704d085e1962d28fa43736a64c1ac64d900b13aeff1654c SHA512 5b305ffef1bfa8df3519ebe67d08c26d282f18cfd1897424a38edceb741137ad72b2e7a197833d19d253808d4401e6b066721ab1781e1c1409ee149522f00fba
+EBUILD pytz-2018.4.ebuild 1033 BLAKE2B 8e02771270dc879e153ce718b562a807fffe5af0993d8dd7f707b338c01644194dfa6ca4d72a32542a0bfddfee724230b78c47985129c0b6c2b4b8955f7dfffa SHA512 8c708d09a34247c0b45709c2dfe61cc53ecad2d4313a436d9dbae91db289b1fde914202d118a9584af3b76d05211fde18d80ba26e1152ad5adf88a0a02fc0c57
 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 18ae3c855054..341567f1db8d 100644
--- a/dev-python/pytz/pytz-2018.4.ebuild
+++ b/dev-python/pytz/pytz-2018.4.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,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 c1200acfc073..68aeabbfa9bb 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -2,6 +2,6 @@ AUX pyxattr-0.6.0-xattr_header.patch 1780 BLAKE2B 43244b281bec7166d539155c66e604
 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
-EBUILD pyxattr-0.6.0-r1.ebuild 1969 BLAKE2B 5d317733affbf17303f534f80c0d0b0518171f7ae2121c42f55aa5612bd0d13fa8f751cb7b386535a35eda4f5239e670a82fa62b5d39c76a8fbc3091030e2114 SHA512 244661b68f85b4db0b913f9449a50de9b7b43b52f1d641807ea0d6d946728aa871a0751f8e865c2eec0e38b1a9fd44bf9846a875c1d0b524e2f21dc39365c724
+EBUILD pyxattr-0.6.0-r1.ebuild 1971 BLAKE2B 1fc033ef38e9b0e0b2000138709504bbcc9b5b1d9ef2db2c719718046ac302384b71307b6283809cfd40c1755a3c34f902bcfd204c6ff88c11d97bdb8b86394b SHA512 46ef19addc2a7639ddcd56104228f2e9f26efc3397b4420bd7ec96d17493622c4a38f2d637452a5c9cbf8b56686b7f6696c266e5940be9c6d98b4fd0e4824200
 EBUILD pyxattr-0.6.0.ebuild 1453 BLAKE2B a5eeb237b3d96522ae101d2616b04848ff215ab02f2598d9af348f6f10a47c3a8b6493173c9a2ba7474f74b7fdd255f840aafc7342c608f931e8c74152b0ef1e SHA512 f8a07d34395d66ac643a66360fc2bf28506b62f2be62ab4bdcb8514f81c3831987740a646a384c520e2468f75a06b46a279db7a64ce39eff9dceab4ebe27f369
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
index 0830703a29fd..7a678f05e293 100644
--- a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index ce2c30b175f0..7f024914268e 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,3 +1,5 @@
 DIST PyYAML-3.12.tar.gz 253011 BLAKE2B 530f2910acb757af9e2a738d93ace45daee3fc5764f19fbc758508e873f05ebfa2486c4f82800540e5e405e7f114f06f963e5011908fd15014ca8b8afb3a76aa SHA512 e16d8b7f4f026b6a95b11fb59c54ec5f114f6f516294eaa95e718abdf5d37c17a9c4b5e0a0a61fca04e801792d9b7fb801087cf849ff22b9581f6af204b1883a
+DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052abd88ea434137a4eb8a4c1e08f9ee1982a30df1934dadb615145f4af8fcff577d3d4e52058e7a8843aa8604 SHA512 93642286d0317e2fe970632c36d38ce6030f7cabcf971f28e3a1054f07390fcee5baaf7f167e7c9690dbd7b2adc61f5b7d75a218ace0abca34ff8815486cfdd7
 EBUILD pyyaml-3.12.ebuild 1073 BLAKE2B 8a1992c113a9a66e28e4e97f30592be2a497bb6f4bae4c1e117b8cd8ced8cfaaf8d1c310bd54f532ee4bd73631d541eac1bc3acb43a9dd648b2a906df06f40ca SHA512 410a29da66428ef4877bb9f6fec1f7a9ae48b079a87f26a2aa70d669eeab2c1dd1ba2a066414e89728dd457c355c8e27beffcd553e2f2108a31493c67b52a986
+EBUILD pyyaml-3.13.ebuild 1088 BLAKE2B 33c5d9e5adeb96f272534d8077cba3654de24353f63237f124b8bf2431fec1202e69d6c3877d354b6e89f58291c03172b9516458106ab709d0f83d31908eb3d9 SHA512 afdee0a0948acd140e24569721f0d1e5c86a79327abe13f8d8128b6c1910ddf43c45f8e1e248146b42d5b7eff5e3e3c739ecb01f1d61353b8251195263460d8c
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-3.13.ebuild b/dev-python/pyyaml/pyyaml-3.13.ebuild
new file mode 100644
index 000000000000..b54ee04ff335
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-3.13.ebuild
@@ -0,0 +1,41 @@
+# 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
+
+MY_P="PyYAML-${PV}"
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/"
+SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="examples libyaml"
+
+RDEPEND="libyaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}
+	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_configure_all() {
+	mydistutilsargs=( $(use_with libyaml) )
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 8b031af3fd05..373551548247 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,3 +1,3 @@
 DIST regex-2017.04.05.tar.gz 601638 BLAKE2B a7c094887b602f24e68c51c92098604c462d506b13f064beaebdec081fd28d39dac9934fface0de0444dc6145af5f4c0e8ab2cd3b65ecfc2c1ca522682b3bf95 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49
-EBUILD regex-2017.04.05.ebuild 1213 BLAKE2B cdaf15318c99a8b8bcb3f288f5e62aebf6ce4835d1086a05cfa1e90874aa51e7a01df68b06c8519ea7cbc749da6f523118e8b5653d4461d09345d06522351175 SHA512 862d5f08a3a19d6bf23a5302ce9e1412e86a07b567b3ddfdce80c8dcbe17f0a409f76cbe9d1219f417a249a3c1abf732df01491c130caeff7761d4e6b84a4dbb
+EBUILD regex-2017.04.05.ebuild 1215 BLAKE2B 56f7410004a7a3798dccf5b5c06630acbc4665e9cc164eaf65b474cc494c672752ea7bab3ed295d5324a0eca706111ba5fcee6c2fd7f70ff6ddc467fbe5f7fc3 SHA512 1611d6b3b476f2ecc39d08024bb06b305b8ede16fa7652650409efdbf5d7c7a17744b686f788e484f7cf406631aab62dbe6d2ccbe25b2979eb452aae406ffb14
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild
index bde151338bb2..96cc953514e0 100644
--- a/dev-python/regex/regex-2017.04.05.ebuild
+++ b/dev-python/regex/regex-2017.04.05.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index a11345460264..280a4ea24a25 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -13,5 +13,5 @@ EBUILD requests-2.12.5.ebuild 1475 BLAKE2B 5617a514692bd66533127dbfd47d37e5fc209
 EBUILD requests-2.14.2.ebuild 1448 BLAKE2B 0dc3294238a801d2dd7d46abecc6a75983bbfcd60773615c61230b95e4e451d518bf2fff0d65b91cf0585588169524138e1e5b88239d68b33e4a8836dfb7bd9b SHA512 60cd358cd4be16b2e4a05c8bb29ed3f744832c783f864dab82ec83e2f44dd06d78db0b4af47d9da50b9b5ed5d3ac4b828d8f423fb007131dd7994f943f0f46b0
 EBUILD requests-2.18.2-r2.ebuild 1350 BLAKE2B 4ad48f663937b14e616ce3925c9d088b8c5666da8c977f6ac134d701029d7682bf4cb009f4da8c2f6d0d52bc34db0e3d85d21a3e3dd233b3e1d3a637d4501927 SHA512 8519166f7c084749fefd781612992847dbc0cb727b85167b1e745bfd5ee39e41c33a2a30c79bb22f57ca465895ecb5284add682aa0a268fbe4fe136f089088fd
 EBUILD requests-2.18.4-r1.ebuild 1410 BLAKE2B fcb5b635943e9a458e75a7fbb67c20eaf25eb2b26b5ab184b5d9ef928e5ee4b99b1e968fbcd6cc1597b0ca5ba9153e75ca0e1e42560ea42251b10e223ee10273 SHA512 87896952b23e4c151a00f5e636a1260dce944b1a67b00a7cf8bc285869608e399eb3a4aad842a79f44ceb5aa095f3cab26679dfec66efca99963a78347dba1e4
-EBUILD requests-2.19.1-r1.ebuild 1423 BLAKE2B 1b9449e177a6d9ba22aab74ff6ea05c8c43c7212de205b6eff766b136c430567985fae8ebc878eb5a3beb97a58b8fc5418906edaec11b01780ed7fecf562452f SHA512 ea50faa61195483885cc9ed517f8d68f1b3e67bd71fa7070026c71a2b4cc537e2a4822a7c9e7f4cc7da58336d8fef0617d689e88ce5ac5e3c33e3303a6966b38
+EBUILD requests-2.19.1-r1.ebuild 1425 BLAKE2B 04be7607fd99a9ba3e7597432ae81fb67cce32567706edd2abd7995ce45b2677b8c054e9fb466782052c05418938ce8419b2ceb751aba880322907363bb8d44b SHA512 48d9e316bb6ac62ac98e047bf896e577dcb90bd66db48b0aa9aee0e5bd30873aa0589a29732ea1e9a462b5a6d705ffaf1c74e32b198ffbffa1e37aeab13bc665
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/requests-2.19.1-r1.ebuild b/dev-python/requests/requests-2.19.1-r1.ebuild
index a614579b5a94..0d6c239ab99a 100644
--- a/dev-python/requests/requests-2.19.1-r1.ebuild
+++ b/dev-python/requests/requests-2.19.1-r1.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
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index ece20de5a831..416ae5535a3c 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.7.tar.gz 20701 BLAKE2B 234f3dc60d83e5615ae9fbbc14d063f9a993a532f5e7042144a8f5e995d44a27d88c284f7e12ff1f3f92d2440333438b3e1a0804ab43ca229305ce20ec4cb4f2 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518
-EBUILD rfc3987-1.3.7.ebuild 791 BLAKE2B 5a3405705ad526281842a83974146c7edd9f41c3bca4d4b8bc7528ddd0b280d4e700142aa97e49127a2d6e4506221653da2cde081870f661150b6fa5bc48f9d2 SHA512 b5faae4e208053829208f4530246f23f5df83d596758da42e9c31ddf9d3c763c1b11b5f97e2247157012bf216e50011cde41d6b5317dad120690ebe54482652f
+EBUILD rfc3987-1.3.7.ebuild 793 BLAKE2B 8890f2ea4a28da08ce7deb5e8157a6a073596a0e1011103b908c2d3255240cd23ff5e02c0cc656f13ac4c5f240e8f2215c053b4ab21683971e7508b972865d6e SHA512 26446e29f66c6202a0a7124f2cb7994a35f7d9f0d95b94a531893b8877eb645e88a9bf2e3dcefc0098e24cd89ebdfc81ce31e15f2f5cde1c764fd8cf362285d3
 MISC metadata.xml 571 BLAKE2B c366d3c4f3cb52d43bf469e77610cb6cfdd57b82ef0f46e8f1dbc739637bae6805edf5086deb4779738be7d29c4c73f7d658050112e9f5be62debc22a735f61c SHA512 2ced33f8245fc320ca1795072d9e63b5cc910b90f368306112316dcb444ee24f292e39ff76dfb027edcaf2c7a6dbfa636414ab8f9cfe777b0a2aeed17143e8c0
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index 1a78ecb2298b..73b26df62213 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 9c96fa881218..925a430ab9bc 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,7 +1,7 @@
 DIST rst.linker-1.10.tar.gz 8820 BLAKE2B 3615353dcce16652aa3528985997467e1501161b012fad44203fd98cc5e91dc32acf6c8492f0797ae748a87c008e5f3437833b435c5cbd85845340b91665e664 SHA512 5541d0ba5299a6efee444ed3c4fb4f108bcdd7c84e4be0b0a44f71c9f13e18d5b5c4c38328a542fe5666d435e1e04c35c0db5535706a45932dc01590813a85cc
 DIST rst.linker-1.7.tar.gz 6798 BLAKE2B d4d5129bd79534cbc58f287a60876153325cde3142b3e516e3a75f22827f78c85edbd8eb2777263e6bf3c04f6ebabc78441647df3ed23950982ebd7ebe156632 SHA512 380cd1b36a1153a6512144b7c83be75dfa95ce397437d34cb76c4c41de6266c77cf1f811f4fb0576838e10bd78e1f46394df11b0f7dc5e3fafeef36b6e8c9ba0
 DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
-EBUILD rst-linker-1.10.ebuild 1453 BLAKE2B 2414fc1baa6db23ee38993b08335ba0fa53ed684b957ad37b200b68d631c9ff4b77afaa7fc16f7a5a7faa1947036a4fe620ac168e789fdf9f5740e3f7cdc4138 SHA512 e45ee2f71b14afe087ec26f72e8895d33c658605129fe76e1d69d0fd0888b2cbf64cdbf4a6ea50e1878d8aeb68ab10b7ebb48833e2b3b1c56093479145d6efac
+EBUILD rst-linker-1.10.ebuild 1455 BLAKE2B 1de3dcf9472375c39e444e0a412738e4f2d0ddfc01ef1b44db89c3d83b8408cafdab9e3dd5582b34101b54123a6fe59f95f6c8c9302e36581b3e0c5251db6f95 SHA512 f562e5e3574acb39df617d6f09ff604c1e32ecbadaeb088e6ad9948867fc7bb4bd59031a6bbc2c3d95c40edd795710f9aa0205accbe837214508ee37935a85a5
 EBUILD rst-linker-1.7.ebuild 1200 BLAKE2B ca7f649fd76bb08cc7122d237cae9f977f415ecc03028bbf200fe40d37082b30c65a8a98581ed97f525ac8df39949779c67e7f62f1f027925021832b146ced7f SHA512 e0946205ec855c47207e25223cd60b8b41545a22cc57ff1db55c2a06d3bcc68e4435ce142836dd4c270761cf3e829a108b81e7d2d454312b40934d68d150fed4
 EBUILD rst-linker-1.9-r1.ebuild 1392 BLAKE2B 62cb6cf86773b9dcca055e7fd8cfac09b5adf7331b140d927343694721ae665c1bee4ccd32267ccab4bb3e82a718602d6763d30cdad85d98a9ff039dc32fa070 SHA512 1f38d45756cb1c817654dc5d0bcc2f1523e651d4e88a2b30db543b538242d7640be54ba9c6650f268f1ab344d87490a84cf09718a3825ee101233638c5de2427
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.10.ebuild b/dev-python/rst-linker/rst-linker-1.10.ebuild
index b7092a31a41b..7f6b47ddcc56 100644
--- a/dev-python/rst-linker/rst-linker-1.10.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.10.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
 
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index 12e091242a49..d53e543c8e6b 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,3 +1,3 @@
 DIST s3fs-0.1.2.tar.gz 24574 BLAKE2B 2b62202d8ceec078ca93c6da895a81648c83e0fbd764dbcf4cb1a0ce2c2a8a7cd16a3cc5162d095ec1272b52c9da743d8c8d21f5b351e6a4f3d63cbd77d9b43c SHA512 52be23ccb2dd8c63675287895d00fda94adf010ac878ca12e5c8eefa25c7076c000b53bb4d2bb7886550cdd0d226cdf51aeee12f2ad7bac46537f190ba72ec2f
-EBUILD s3fs-0.1.2.ebuild 644 BLAKE2B 9c9bb9b21f260f2ee497824be404576d87ed009bc4a35c660da98d644c11d3d389d20af5eb08d950bb8501dc81bc0d637b0e3433f03974b43652510c0eb139fc SHA512 a61cda8095b7dd38166eb7ba532a492810b24a325beb71d46f4d0ac70cd56e59c7108850d21e2b18d6185b80013b19e09b98e4892e6b3e015e4835fc17da79da
+EBUILD s3fs-0.1.2.ebuild 643 BLAKE2B 4ce4203792d09869c8ecebae5315d4055ac8debf442ddcf8208ab78c4ced6b9bae989c6bfa4e760b71d9da1e2648168cec30cd734e047a2ee5455b94d1063ef1 SHA512 c73aa52b2f5648444e0c741f94dfe8863176d6932c00e21752a7e4941c5f242b0694dac51dfc2dbca69f3f708ee21425215175baacb659f12c05a367206c6cc4
 MISC metadata.xml 519 BLAKE2B c4ab17bb17c687ac00bf13ae441685f6484334dc588f65138dc616f7cd8a49debe0eac5ec11c2d7485eb48855238ffcb25612d687b75ca52d58a921b311e455d SHA512 f8c6696ea3f62243be9f39ea56dafe0bdf137b49aaa3ac2bd793301c043645d2ce63c6cd7cc1a476a8f554317ce518f501ce0775f89f8bebb66e3d3d806f4926
diff --git a/dev-python/s3fs/s3fs-0.1.2.ebuild b/dev-python/s3fs/s3fs-0.1.2.ebuild
index 08cb5d147ece..e4fd7d8ab7ed 100644
--- a/dev-python/s3fs/s3fs-0.1.2.ebuild
+++ b/dev-python/s3fs/s3fs-0.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/boto3[${PYTHON_USEDEP}]"
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 46c3a0c7d32c..44b064ba110f 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -4,6 +4,6 @@ DIST service_identity-17.0.0.gh.tar.gz 29078 BLAKE2B 4fcf8ab697d87c13268da880f8d
 DIST service_identity-17.0.0.tar.gz 23502 BLAKE2B 49218eb0c4021d7a69b09ca79d60b3f421c3c35b606de9bb47812e949b0f1284f0fed5bd9e18615bd569ea31b426339fb8ecacaa7e30cca0cb0abf488bea02f7 SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec
 EBUILD service_identity-14.0.0.ebuild 1164 BLAKE2B ce97b9cde0e64e37df5cb5b1c8ee2489e4b00c5de3fa758e8833c0b26933aea5aa8fd35a104a99e2764017e7eea9f0d7a6d18bf007f564643aa87f409db12cdf SHA512 9735ba2957261e86dee390d68a85c5c6d37eecdf156de79917120c52640d0ed2776ee2c1ac92bd92cda3d69ea84b2d2e6740b497c7064f201e47e923aab32874
 EBUILD service_identity-16.0.0.ebuild 1157 BLAKE2B 32ef676006c92ca615a9322347fd64f3110d91061766d6e7f707fc1f86cf08ac0d3286549ec26cf96d3881702a68368d5dbeea0adf4ca6772212e7775266680d SHA512 06697914c452714a91711325e8d84cf47331a9b460db5b1728e733556047244292b99cbd5d075cb73662f261842871d731341a684c381d8bee7fcb123ec14b5b
-EBUILD service_identity-17.0.0-r1.ebuild 1236 BLAKE2B 186234051cd439627adec23dfe736ecee36f297ebc183f26eb549e95e0e3f935f1b98c775b0bbe95927dc575ac4693c7263a2bc7d7db4207a2ba46b34a5915f2 SHA512 4ec2d8acbd29fe5c3202da7aa5f62bbae237833ac8f51528c1aa1fd6abc0cd21eb407347464d7d02c05fe2d952deffc201d75d6a6ed7b6ed635e9369c0df45bc
+EBUILD service_identity-17.0.0-r1.ebuild 1238 BLAKE2B bf6ba94988f9bc65ece69a78cdb3dfad67e47c16808a1f63c292f6e9d7915e94ae4530c08a0da79111bff7548c21bc4936d2676d249b9ff629d6135313b8017e SHA512 7ffb97a701af65fff5757920fbb1ca44e731b988d73d5340627a42af41bc63d285333ee5e292fd7b0c3f21b1780035eeeb79bf0a39afe866ac5152c6c55e87d0
 EBUILD service_identity-17.0.0.ebuild 1234 BLAKE2B 0a2bc5d9c0339d4b74edde232bf2a6ced0dcb202d8c64a7c91565175590f55aa49e4e223c3c77281dda8c1256813e54f1019c474f4e6fa270da5a9006fa75570 SHA512 320ac5f0e16c46d10d1951336df79667830214d176cb22f8474b008593a453885cca4e26d54f85912b9e1703688c1c9b777397d4e13862804768079f6b6ffb93
 MISC metadata.xml 392 BLAKE2B eb095e560878b45595b6b82e8acd6e07c89e68af20840190b09acfcc03191167f3efccace6debad6187c64a204191ab5036f40a4c47cee8a38727b24f9115057 SHA512 2140a0ffee3fee440a0ed3846b557ed7be08e4bf37be391ab3c3b7e6823e1f3a44dd30f143927e4fb75b50b029413dce3a69ff1cbaf640f6e5563fc65d9cb5e8
diff --git a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
index cea820ab0688..81c6dab953db 100644
--- a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
+++ b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index e46b5f0a8e7f..6ebb84e43bbd 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
-EBUILD setuptools-git-1.2.ebuild 705 BLAKE2B 1fbcf23d46ab79e241b670053545fc079b31c7142aefce785e0efeeb53a2892d35c307dac3c802003f2236bd5f78447b61161e71f2ec04721e7591154135df6d SHA512 120a4af44ceafb265f7624f1a961c8486659d054441fece914046c7133b398e76b01a2ad6d0e3cbd7bab45e7733411383cfb08043e6bcad1c98d2591c945011f
+EBUILD setuptools-git-1.2.ebuild 707 BLAKE2B b1120ab4a0c35adc92cc5c592a2f652cd8f9ec595709ec42718027faab9a23895d2fafc13f807c8d1aecdaa20049990aa9c2f0924f4052c6030f2bf01a9730c9 SHA512 6d7b035fea0a731050ddca1b7ef5de8d9ae5dcb5ed00bb25520d6ca5bbe16f925eb746dc0a418838c11d482da72b4d05ff35b424fe869b7cc90e3384c237d6ff
 MISC metadata.xml 617 BLAKE2B 6a8553d2d3deaa7eedae6706e516b6cab014df33acf8a4589084ce2ddc8b3bdc619253ccc176cfa28a7092efe9044ab171b585fc87d933ec5e833303ad2b6dc1 SHA512 057677807a316be80d26eb8aa9b07a87a60251a6185c85ac1042db7040849ef4e9554be1d9ac15d1b8ff212df2f39446f3c56208fe83d12581fb0ba283d1ebff
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
index d7a9ff85c1a4..eb3ce82083c3 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 0e9df239c02f..e59330502c75 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -9,6 +9,6 @@ EBUILD setuptools-36.0.1.ebuild 1887 BLAKE2B 33e7e517efc5f69334e07b0c527612dc37e
 EBUILD setuptools-36.7.2.ebuild 1868 BLAKE2B f8361288674316f54cd585e17f95d0de8f234e9972f5acd0c90577f4e9db75b6dd0060b1784606690adea38d9f0875969ac34953730e45d1ae9b479f34a73773 SHA512 0fd94afe8e16ce92fa4582b202aefbc903092491652f231f9b8ca7a36eeadb21d7d183802bf76ab3cfee30892eaa757630e5fbfe4d9e05845afa9d1bcf8eed18
 EBUILD setuptools-38.5.1.ebuild 1893 BLAKE2B 18d3856d1e16abde3eb23375af872cc964bddbd3158cc665be9daca3821cf3f60b044d954a51e7268e6f83cb49b892020724e09073fb47ce2b6ac80f3874b31f SHA512 19073095b6c7b23f274a78c589403d60e768e5f72ec01217b66eb2fcae068acec6b4612ea3f079acc020f8ee0a83e9ca5d03dab781508db40d423ef0aa5e1f7f
 EBUILD setuptools-38.6.1.ebuild 1893 BLAKE2B 18d3856d1e16abde3eb23375af872cc964bddbd3158cc665be9daca3821cf3f60b044d954a51e7268e6f83cb49b892020724e09073fb47ce2b6ac80f3874b31f SHA512 19073095b6c7b23f274a78c589403d60e768e5f72ec01217b66eb2fcae068acec6b4612ea3f079acc020f8ee0a83e9ca5d03dab781508db40d423ef0aa5e1f7f
-EBUILD setuptools-40.0.0.ebuild 1893 BLAKE2B 18d3856d1e16abde3eb23375af872cc964bddbd3158cc665be9daca3821cf3f60b044d954a51e7268e6f83cb49b892020724e09073fb47ce2b6ac80f3874b31f SHA512 19073095b6c7b23f274a78c589403d60e768e5f72ec01217b66eb2fcae068acec6b4612ea3f079acc020f8ee0a83e9ca5d03dab781508db40d423ef0aa5e1f7f
-EBUILD setuptools-9999.ebuild 1825 BLAKE2B f7118e32909781ba818a73e51559cac9cb7ee8cbb44ddccd285718b101220bdfb9c599de9fd3d716184079b336b5ddef9b18895182921cad33ca55700fe2d356 SHA512 e558d7bfe3fb99b81d24a31c9489fcaf9dfca06327a62bd869fcdad1ff62801fec93df300580ceef6f5c172799f806c9f196bf97b89906ae44cd96c1498bcde6
+EBUILD setuptools-40.0.0.ebuild 1895 BLAKE2B e35457ba8381ebba333b4210ebdbf8cbb39c2c16bffcfccee70db6ab27241dd0f42aa98d94472089f86eb517932422fedc053e5b97f6b2d16f0023a8bc922236 SHA512 23d1aeb1be3481995e86dc89a1b29544c2754a87e2e0c978c3d7b295688bef8ebebe7642c6f2e6cb4f99eb605e9c799f8af09fe84fe27e505dc9e5e880fec3ee
+EBUILD setuptools-9999.ebuild 1827 BLAKE2B 7b9ecf3287c8896addeaa7b6dce9843ad7ef4df490cb152457213fe82c82955bc7048c32618490ba0532f8d5ca1229444cf333216bc5284c4229aabc93a7a7a5 SHA512 cd1d8b0c15dbea82e728fefd7cf75bc604fd8201e1874c0ddfb8b4e144ca670c86a2ccbef8c455a40faffbb4809179791038af289eacb0cd4823e25d6ce030ea
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-40.0.0.ebuild b/dev-python/setuptools/setuptools-40.0.0.ebuild
index 60944fe53622..25ed8958758d 100644
--- a/dev-python/setuptools/setuptools-40.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-40.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 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="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
index 28829b6f5f08..ffd124714700 100644
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 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="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index d57f310d395f..a9080359f893 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -5,5 +5,5 @@ DIST setuptools_scm-2.1.0.tar.gz 32776 BLAKE2B 7a141f3fa826a82931b6c33afd19d3185
 EBUILD setuptools_scm-1.15.6-r1.ebuild 1359 BLAKE2B 17342f793101a84d1b931b31a7e3e0a24f55efd7f19cfbe1a2eee899ee6771a729ad38f1b5c5b2c90548bd2fc9680bbc12c783553a9df629da158b41785bb937 SHA512 d68a939338f4a84bfd4638f3d48e93ec0462e996c473637e125911b512f2710f73850d69141f6c59431cbab77d51fcb6f61dc0952df81e6b08d60d21d3af4fd0
 EBUILD setuptools_scm-1.15.7.ebuild 1483 BLAKE2B f64003059ecd5ef861c7f8cec1429b877771f294daacda979cbaf42b5370a07a3453a9d59337c4656f319ee73ae090eed1bb6eafdb817d6ed0a53d7af97dff11 SHA512 8ba4dd34a36d82ebbb3ab3cbc62e35e6fbe6a7129723335d14d28aa0132101e715b4c9d07ec7f5093bfd8b8e3878e75b775ed24e963485b78b2b3011c418b69e
 EBUILD setuptools_scm-1.16.1.ebuild 1372 BLAKE2B f5503bb6c971ba9790136baa90cf49830be228a37a018f170ff92e464a65f135c76f15eeaeebe09c055b63166c2eb27bd87653de67939dd2d6a11fc487dafad1 SHA512 0943416aea652899892f6aef88ffc2db6828d41f2c647a3251960fe60126689e26f5b9b829ba50dc7a4829acb3eb929885d705fae19ac88ba8e083e7300151dc
-EBUILD setuptools_scm-2.1.0.ebuild 1071 BLAKE2B 6f4336d527bdb0cab205de47235bb0ee91172bc0738f9531c1182159736bdd0de086675e3ba92227c9452e79de218c98b4e8563867845eee5b148dc1c9cab044 SHA512 6208e0b111cd46594978b2d75bc34d948540b9240b9e63ac96c8b8c8817151f8b4f7d0acdeb7be0195b0f39b11c02497f97a6195ef6fb29072cfdeaa0c5bcffb
+EBUILD setuptools_scm-2.1.0.ebuild 1073 BLAKE2B d7809dff4fbfed38ea8802e06ba5b262e41fdde30f3880c64374a40336b5efa4e6073814e5e66629c507bf8b07f0865b133c1244eac8ecba3121f66cfa5ed83c SHA512 e3bf8a2e849e49806405fe5c1688403581db804b51ba0ffac15b27bd4bcb5aa47577094a8c023b8238e643b0511c089d319107a0aa0396eab12a55e01075d421
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild
index 82df58170f34..0eb45511bd88 100644
--- a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-2.1.0.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 )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 6986f6b0b1ce..3e14b055b2a2 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -3,5 +3,5 @@ DIST simplejson-3.14.0.tar.gz 80112 BLAKE2B 5866adeba886b4b4f526d4d7fb7ac65f12fa
 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.14.0.ebuild 881 BLAKE2B 58e8e1b64333e861bfebef33ef1134f8cbb66cb82e724b489cb72b0b1771c9c5641f5b87b34bd3a346f6ef14905f02cadc6e5cd877d474959ad002f051158a52 SHA512 d1b7cdca473cbfebae39f4b88b52f462cb035fb9a3e7c69fa821158b12eed9515b6fb2ac26f0dc678f57ec24535796300b33ad26ed982c176f512bddce2348cd
-EBUILD simplejson-3.15.0.ebuild 881 BLAKE2B b8cc3a04d58387e66e56381e380fa302b72b60b58e0cda3fc31e6c7596d005012064251a638dd326b879e0d83864e4658f5d59b8ea053a6f85718ad11de85909 SHA512 f7d798b70bb20d290531d97d98e250d10c8b7f01a04edf647e6beabbb203397975bdd71934694b2c8b2b1f049423580743d097a190ae48af863a1a74bc1efadc
+EBUILD simplejson-3.15.0.ebuild 883 BLAKE2B 5b760a55ffd121a4dbe0be090f2014bc8002a04c0cb2190568a136e23107909496c8293578f3b9f64c655c006b2e92d4dc40fda084a72dd37b38eb26b942fed2 SHA512 0ab879fbbb03f21ef12185002daa81b3db93e32841222e8fdebb6b420c791c7834f24cffcc784bfab64eec0e97f3bd2982384a44062b9e19279f04e88295189a
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.15.0.ebuild b/dev-python/simplejson/simplejson-3.15.0.ebuild
index becb68edb09f..df7af5af1964 100644
--- a/dev-python/simplejson/simplejson-3.15.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.15.0.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 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
index f91736dadfda..686d883c99e9 100644
--- a/dev-python/simplekv/Manifest
+++ b/dev-python/simplekv/Manifest
@@ -1,9 +1,7 @@
-DIST simplekv-0.11.5.tar.gz 19225 BLAKE2B feb9ce889576aa45e3915442c23a1c488ef4218c2eaa1ac39cb6ed97c909ca97e1e1e8cd6ba4ae7971c88e2a1feb892987ce3b2995e2e5532a866f6318bb45f0 SHA512 68aa5340fbce187776e0228d5fc9ff6414d2f3049cd9fcef4b92c8d9a7107145d28fb8a30a37d075aadc74975bd355dcab9d8ff87880965ea4c42b41f909eef7
-DIST simplekv-0.11.7.tar.gz 19333 BLAKE2B e9ad1aa038354b2d61f067096a1c165b7e200adfb1e75a17eaf69cff2336afc2caca464534ab26e32a2f919106dd2da94e79b9314bb4967bd98313000cc1f8f8 SHA512 8589f4437a11c200cecc2574e238d3686d81fdb27de451ed5c90f150ff8c1e3d56d729679b0cfac63ded2651e9657e1c90d99ceb9abe156a21eb043edd7520fd
+DIST simplekv-0.11.10.tar.gz 19711 BLAKE2B 9de8e7be32bf5322a93a49240b4ad99e294d3296af4ba67454805e1a4dcf2dd6c0f5afa092949d7061003c8c877c153502db714de310d06eee10d6530e2485af SHA512 96936bcd6c2717412f5076326a87be1a37bf8cc7cf95adf412bf3a1874edaacb7b3a86759c2729a2fb2d126735fb87cbb569d42a015c0b5c697a09dd362f413b
 DIST simplekv-0.11.8.tar.gz 19387 BLAKE2B 6df2a6288173e6e0faf4081e0e8f1ff7453bf8348e9a6525729c4f0536b6043047a1743f01a0485f1a893b22888c981ca0bcf859aa1aa6d24456c35ac4ee651f SHA512 df3a02752c796d8567937701b39a3747e042260744d92c985bf84885147800a1a9aed7615c3f29b807717be15f838498a23c730804cd4bcf4ddca56ead57923e
 DIST simplekv-0.9.2.tar.gz 13750 BLAKE2B b3e64064ee8326a3e168cbb0ff7196e2b82ffd38c0388ca42d63c5f5ddf3078c071bf9ae2cb5b94bf7ef05a338800d567c9e61a4d560eb11f0e95b7eed8b1f9d SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045
-EBUILD simplekv-0.11.5.ebuild 458 BLAKE2B 399c97df83c5746658b30b8b6cb62995c61149955121a0e5531f546a52871dc9d6c2f519ff5492e15e084693cb24d4526d3b45bbc72b9fea170e77204133ca17 SHA512 8ae712b169076f2b5878ef5b956438916e31d5ee4c2ca7860996df9ff71cb6d022764de3034d0ec432c2cec7b84501c4a58734065eacec15454039817285954d
-EBUILD simplekv-0.11.7.ebuild 458 BLAKE2B 35c0fb91ecadbb594bc53baba06ce08c00808fc9d222194e3919785104590cf31b13661703c59942886a35e6b90be2e3ec28c599a9309d1212d52ba92625f15e SHA512 3902a83394f230b85f2a726cc9ff0b2fc8f8bdb594905b41efcf8844f32fa7132ba0df8362f825d20bfc34164979ed7d2892d11b8aa63ca008ed56de0c0915b4
+EBUILD simplekv-0.11.10.ebuild 465 BLAKE2B b91cf3f94a680d5666bef2a36fb036d79e39ec53a345c5bb43614fedd8f6946bb40a27fdc23bed0ebe58abc383c40f160ba5e44fe932f46167d96b9e9ca247ec SHA512 d4fa14680273e2295b93c0fff18c6f7bae7dd8787641312e94e0b271d52d127855f4ae8e0ebd20ee18032e6f1be2355fb1050fbda1b3d5fa6d7073b0705583b4
 EBUILD simplekv-0.11.8.ebuild 467 BLAKE2B fa741bf309b24427588da282869ee676f1f4477e22ccd92441b09e575809af0c8745e22c5569bbfe34cb284072bf627a47f83e45b074774a5369cecac50e67d7 SHA512 b39a83f5105d1b0714ea7653e6f11d880009b1b377b8cc3a253591da01c263e7881352353118e6285e7608053d6bfbf662f4b2887d2245e8ab263734e8e4a97e
 EBUILD simplekv-0.9.2.ebuild 443 BLAKE2B 59f5f15afcbda168898aacb1ca94b24ac3c7c4585f908c9dd53ba8a97d35371fc206e183689644ee67cf3ee1b82566b0559ef2b761f6378ffe7b5f6345814f32 SHA512 2fa65c4e2bd44404c5b094d7a681077aea5a194e829146b303aef86dc58398580ce6c8f26bb4c05046d9a2421d4201dd8c6b8800b43da5832776cda3df1d4ff1
 MISC metadata.xml 569 BLAKE2B 5d890f0ff8aedca1963530773432220abf8c88fbbd14283dc112b5060c7aabb4d00f8b74d53eea766e84cc01875425142c775326047536a0715b69bf7d344f16 SHA512 15775631b85b66248deed75545717ef7ccc4c2426851d651ddf29fc8fa9a225bd139415a43ce068510c323c143c1fac64e8ee143a0fa3a4e53827f7c6b82f7c6
diff --git a/dev-python/simplekv/simplekv-0.11.7.ebuild b/dev-python/simplekv/simplekv-0.11.10.ebuild
index 59f6f809ed9f..f785f789dc9f 100644
--- a/dev-python/simplekv/simplekv-0.11.7.ebuild
+++ b/dev-python/simplekv/simplekv-0.11.10.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=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplekv/simplekv-0.11.5.ebuild b/dev-python/simplekv/simplekv-0.11.5.ebuild
deleted file mode 100644
index eaead6e46b58..000000000000
--- a/dev-python/simplekv/simplekv-0.11.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 02b845643d7c..a983e59f505b 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -3,5 +3,5 @@ AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb
 DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
 DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
 EBUILD six-1.10.0.ebuild 1817 BLAKE2B cf11b48d603e01500cb2147756d7197bd5fad06de42ed91c0ecbb967f36f22fcf0e9d9d33a552dce6e0cd05cf0634d266c41aebd4cd4bfec6acc9960401d0729 SHA512 4a33dd217477d6c2a5488970cad9481c929fa4996d386d203caf3a3abb7e545a90f9df13e068a96d9040cc3d65c4305eff5f52bb51cc4743bbc1791500968a73
-EBUILD six-1.11.0.ebuild 1079 BLAKE2B 2bc9b79a728a733a5e51cc5ca118b5c9960774b18fdea64c9ee8d172aa0a0d48965a30c193050d403dd4b3d0d38da9d4d883a1e9a1b45430b8a733742ae4f415 SHA512 33562079526f6eaa36a8e129d876d4700256ee37dc076567307827abd6de62b231312827ad8e6d67751ed4ead33676dd85abb3d774627ca2b1577b357ccbc48e
+EBUILD six-1.11.0.ebuild 1081 BLAKE2B 8d9c1cb48fd3121c9de1d8a24f78906353791ca235b23b703304cf824ed10c162d2e7fc2e5a99705f65ef6faeccd4b2b47d6c5446bb845734d78bf7601d3618c SHA512 c79cc674deff03aaafc12d6933888b599e06dbde98bde748a94f3485fdbfe6085e73ce3b6e2927d0fce6c3bbac3fe912f5960277a19c6e6051059dc83c7341ee
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild
index 7965dfe23b2d..a44341fb7d29 100644
--- a/dev-python/six/six-1.11.0.ebuild
+++ b/dev-python/six/six-1.11.0.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index e8ece3e01b7e..e4c181c088da 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,5 +1,5 @@
 DIST snowballstemmer-1.2.0.tar.gz 49639 BLAKE2B d53682e63ee1ab2776ca6869e109f364e4651be182908968c72db143a739fa43bfe387147cb9381b68057d9870eaaaad46720954458938ae83d15d544e820d84 SHA512 3359657867b9478bb58e6cc67a08212a490d5af07fed7098871b1e6a59def0031bd0c2a846cc9a0d70c94c64ba4d2ccb2f41afedde61d4a7235d26f68374bd02
 DIST snowballstemmer-1.2.1.tar.gz 49626 BLAKE2B c9967c45b008808bf9f5a12a4dbfcfc970c5878d9b10b37b4e5f1a4bca56ed6efd72ae4395b6a4d1a19d642786b6ccd1d01ec6e99b104a8237935ec8e64c1ee3 SHA512 09f860f383d84d12a83c87ef6654fba4ac10bca07e8d2ce88dd428c72754110d56a4b698e125a18818699a289455bf61cf67ea68e349ee8a12d6dfff0a3fbed9
 EBUILD snowballstemmer-1.2.0.ebuild 525 BLAKE2B 34f659dc5978356ea7c5cffcca0f2d24a8141adbd69a54631c2f72077af1ef671ebab81d7a2e6bc96539bb1cc88ea9aa666d7e1ef1045ce9e2fb490f75bf2291 SHA512 4715ee71ae558d4d336a41577b88171ec2a550ca23a10ec07f135866f876f9191f9a29eb3fc60bfc5d8d5edf91cd18a5b61adc26a627ba0a1e8bc1b762518d99
-EBUILD snowballstemmer-1.2.1.ebuild 550 BLAKE2B 86a999f0d157bb008405e5805497b6f0bdc6ec4e0bb60e8c61ac7c8129f6a760c705d418183ef79316bf4ed4de6f55ce5af96c4d4268d053c0bc3e9e354d971f SHA512 03cc637db3d6593bd0ba511af9029fc9a6ff3b5092c02dd60d5fcce2138cfabd1a504253e5bf853cdf03370dc3c80c0e73cafb915648a05441f45d31b5d62346
+EBUILD snowballstemmer-1.2.1.ebuild 552 BLAKE2B c514abe1ea7da3f147a21a3fecb53eff52033c2cc4d8a57e782e94f62a72440d301985aeec5565b9c0ef90210ea5105bf44c1fafcb46a20bb3d25221f282e57d SHA512 f2fa0b6137cd34c084abfdae8e6965ce81565d1ec8399c269788ad35db0e671f73faec2654e6b3704dd99e8ac557163ef0b270d7371b9457b06c28d76a5913dd
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
index 540cfb090851..cb4f6dbe2179 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
index 3543936f5079..db3ad0cac378 100644
--- a/dev-python/sortedcollections/Manifest
+++ b/dev-python/sortedcollections/Manifest
@@ -1,3 +1,3 @@
 DIST sortedcollections-0.5.3.tar.gz 7021 BLAKE2B fdef18b938502f0fc7ce1683977b0982c23aa915d79b6bac30cf9cd74aa19af695f2aacb658a8411304497f28d270e9ba95bbdbcc47220f0302cd376edf312d9 SHA512 e0076017d1a97d7dc18b02bc4e3739c535ab001260be739fab2784cb58deac4323957fe21b4c679f55a790d864ca696695a603298709225b04eae740d859ab28
-EBUILD sortedcollections-0.5.3.ebuild 572 BLAKE2B c96c38362bec78d965b3a094de305b3db9b79b0fd859b96121811693674958163c2f61809cbae9bb2dda9d5feca33c57bbb5fda3d6f1852d5fd4a1120555c009 SHA512 c164b32b7e4754f37037bc57e5f6ca61b9ae5573a4075bd4c7c97985704da1de6a2258b96fa690ff02a37835500dad3346146a6890b933c0868f56588fb32839
+EBUILD sortedcollections-0.5.3.ebuild 571 BLAKE2B 0b21237791a48e3d64367f65a6f395804495b743b507b994df43e58e3f1273428161ef13e5858c1a82720dce89f0b5c3fc8aee0c7cc74a29ba4ec435b6e47247 SHA512 a1740fb8fc51ad2c1a3207627755a228f8ec843c59e17a5b34540eacb1f6137d2537fce403cc95413c64649f0f1db6d3795f60df8b606b96eba47aa1fdbbb530
 MISC metadata.xml 498 BLAKE2B 5638984052d38b48773ba3efad23de34d7d22e5de6ab570a0f1c8494918b0f331b2a3f7cd72d976de9d1d24ae623af07370bf9daf6833792019472a1a23c2fc0 SHA512 d332e588cdf6194708c1e3f00e9e8159669eb36cb21b4c6eed8e5af44f09f7e71f12fe437ce889b96599994f7a9c9d7c4fa6642c2ab74cedb0490d21a3165d21
diff --git a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
index f979144c81c0..118582c3e92b 100644
--- a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
+++ b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index c8c885bf9d61..5ab1684d0974 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -14,5 +14,5 @@ EBUILD sphinx-1.3.5-r1.ebuild 3577 BLAKE2B 2cb4707c8bb3e1dfec094b359cefd4d03fc2a
 EBUILD sphinx-1.6.3-r4.ebuild 3426 BLAKE2B 0dcfb96abd86c6b0439250adc8004894fd653c5070a0e3a425cbaf063c6dae7da3a48d0280a2efcbd65a7d17114f2dcff27d4d970b37af8bdd498db2a79822fd SHA512 70209e8e3c8c5b463ff5320e00efd7b1761dd7e270d4991c9e43b9a360dec966a94dd83dd65ea3d0d01eb9289a4658492809109917c4490124f1822ebb7ca217
 EBUILD sphinx-1.6.5-r1.ebuild 3496 BLAKE2B 61d468b87a23ec4d6247a4ee553d3ae94060e77f7fc4caec8b009cf43ec8849cb4cad2ac43b17ea46daa2b0bc313ee16df571660c1f6015b3173cff28c54774f SHA512 bb3cbc542479b8dbd418af82b935e389fac07d19ded44fa64251c17ef26c4e5500c97aedfcac52ad341195fa278d9235874dba18044c0feb1cbe10069a86d149
 EBUILD sphinx-1.6.7-r1.ebuild 3513 BLAKE2B 60d8965d972f777f87a25fc6b458f987da321dec1dd749d8faf7d5d875ae388d00d071d0b00b09f9e5738b5b938640e2a80f0e3ecb078efebd3c9439edf9246d SHA512 a39cfc9fe463d9100c13beefc0025d8d4cdd1f23509571ad5bd867d86cd469342aa7b66a5c350cbbf7904611369868191f31239726b48af5133f7abf31028c9b
-EBUILD sphinx-1.7.5-r1.ebuild 3128 BLAKE2B 8dde52ec7e56639d79a556e715f388a393e475972307432a14417e3b7fcdeacaeda04bda5381c50f3998456431a85c777e88e88da72ac94898f9ec5784a55826 SHA512 836ee537507dae750388d14063b09ba83bf775135fe528a7bfe7e27bd20afa0f42d65cbae8777a7c756a9481a68b2af8cdbdb94ac79ef19b152a5afa48c3d816
+EBUILD sphinx-1.7.5-r1.ebuild 3130 BLAKE2B 53e026c5b06f96260cca61aebf6bf64b95c412111174afcce0322bd47961e35bdab380473557001dde488a864bbd44d9cfe2e217ecac0c7bcbb6ddcdbc54268d SHA512 4c169d583d4ef1ed05dd2713a60f2fd912265e4e912d7138aaafd63daac9e043081fa466304fb9f78fd0f9d0fae6e2748a6ae508cdb8d350579d5397649ecd98
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index 130b1d14f223..68cbe615c4e2 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.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
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index f9d738e6dfe7..06e4b30fd3ba 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.2.4.ebuild 571 BLAKE2B afe79c67cb6dd9a99284f7a393d4ed934c09163b189122395a6f2508216da7550035a64df6061ddd914e0d9022b318e6b76f5976cb10036500496e3e0c89ea1c SHA512 b8c8de2b64a5bfe57cf0bf75e36568f223e736fb8e5698f28a334d59c0063ea9e638606645350062ef6eb8e6f407cf9358c9feb207c2e2cf218cb5b46ea04aa7
+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.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
index e232f33fca6b..9eeeca3b4a5c 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
@@ -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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index d56db8464bf7..e8e8c3b38671 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-programoutput-0.11.tar.gz 18267 BLAKE2B 790483b09a00199e4f6a4bb723827001e3dc252b294244ddb5ed3edc78cd8dde41fd0c5cab6d4fb715c85f8c447bf25d690b4f921341769de6d7d1c9dc7f4a71 SHA512 4aa655f8632093035de986fa31291f95e95c4c0f4d1458bb8c8cc077cca73d579b16a8bf103d7b34faafb2171c617c40200008d89186f8ed37a812459f0376cf
 DIST sphinxcontrib-programoutput-0.8.tar.gz 14419 BLAKE2B ab902026ffbf4b590a5ff2617a609bff3adbefb9ef76982b6ecbbc34b7393f154db36e893b85e6316506142038f2b67f96c08e2158180164692bdbc28186dbcc SHA512 9ab769f794cf8c47f2d755b343c1326b8335c1f8161294727abada81af189545d549350536d28ac2c5f27cc309330f875b7affef6f997651e3a9f9dfbe6bd174
-EBUILD sphinxcontrib-programoutput-0.11.ebuild 987 BLAKE2B 8c8a9a5e2b9419c1f4e3014895f45efa66f1f1b6742e834d65cba8c9435dcf14d600f2234f0c65b892b025b3af03db130296b4443ae582a8e4e874cb5308e8dd SHA512 2775c0017953d6a1e181936f60dc1500b1a13eb6aea09e1112d1196388608c84f04abfe2c2498dca3b190fa1710e1c5269e2d9953f52c0f546000de3664e080d
+EBUILD sphinxcontrib-programoutput-0.11.ebuild 986 BLAKE2B ae71cdfa730bae4523861620fa5fc35b65a2396ef4bacf33c231401bdc5b01e44568391383c4c1470d145062f353804270d759f665439d927a044b7e9eabedcf SHA512 4caf6979f7260bf3ed0610a7394bea4a3d1a157f198a7d5e9b94959213e0ca4b044e207f34037b2495cca90b81100c7c4b0146d5c685d981637ff9c3fb25136b
 EBUILD sphinxcontrib-programoutput-0.8.ebuild 863 BLAKE2B f6dacd16e613a4a85020c98faa97ce5b8f94a61d6dc990a5888dbee3f36bb198fcf2f840d78f61a9c82908c2c0f56a8a8fadd8e7ab607696fc0680615acc89f3 SHA512 0fa63d7886d795a2807447b8c76522cf34a8399147e78dc942547e4d69ffef0dd465d0a6980ab9069624b2a80e4959867476c1ec8eb3a46c1e128cba87facb6b
 MISC metadata.xml 527 BLAKE2B 6a601963d2cf81b69cbfdfbb3190e6a9b497ed48d08127d41ef6643cd4501028ac8163efe34dd3587e3ef19ef579c98d0d3dffedb065ff26909aaf1854af76ef SHA512 27ca1eab6719f5d577938ea7c105fd2aec99fd94d80b8d1beb14f18233ee3290a5c9a3046314c07645306a7967e14d6dff269cc377c0bbac72e309a5d669d181
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
index 3a96759fffa9..9b3dd3d4442f 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc test"
 
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index b9d4df64be31..04c91177b986 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-websupport-1.0.1.tar.gz 590480 BLAKE2B 1be40595094233ca2ddb1a367039320fe6655b1a6bbf251d7722b60efe0d0cfbe1cdb38455f47f4fb6810500e0e4923f5a9a74df4f79d1544261c4706a59e8fb SHA512 67807b2505e063639163b020f0e62469b0c2838c303516cce9a8d90181cc7b8a10d76532adb1267556d40f95966efc20ec9f8ee1a6731056bda827a6f97f40ec
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
 EBUILD sphinxcontrib-websupport-1.0.1-r1.ebuild 1156 BLAKE2B 00ee805df4ad56c92db8915d108723903c353ea59e5456d8dd79ee2789420cf6927c1bd5cb221b65c44e4d2a252c922ee93e8cdb464217dd24deacf444e9343a SHA512 c945062bd412b2e91df3f26cc362109c63973f8f87ba25f409896433e53b943c36e3900333fba5000299228f5eda997aab7d4139d73fa77bda098a1b48698d37
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1118 BLAKE2B f304a77363ff04cbf2ece74b5fbc598bb39897cc50cb469428823c15557764db1ef6f7495d12a9415e8323345fd0f4fc158706b032324ad9bf23064649447a97 SHA512 ff2d6deb2785e330f3552bcbc32cb2a45115595efdbdf5ad2b801e7b959a68a21eb7882f7da3154252595895253d87c24afbee525b7cd68ab12bf446b9b25df2
+EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1170 BLAKE2B 79a2ae5c6a31c14a9d78edb459adbf12d5e78926eb9ee70d7f495f5ce385123a4555b57b228b11e8c070aabf536f1b7893a8e9fd3c727e54149bfc927778d0b3 SHA512 d7756f95e32588800d771a6d3bde9dc2b398f40818f01597d7a41cdaa4a4f73efaa839c4d1a9fc93f7842df29c35d27b7eeeee0b0993d65ead90ea94824fbdb6
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
index 36f4308b2e8e..ac62b3309fa2 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -37,6 +37,11 @@ python_install_all() {
 	find "${ED}" -name '*.pth' -delete || die
 }
 
+src_test() {
+	cd tests || die
+	distutils-r1_src_test
+}
+
 python_test() {
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index bf6395a0a289..44ecb8fff29a 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -21,6 +21,6 @@ EBUILD sqlalchemy-1.1.18.ebuild 2181 BLAKE2B 3d34528e9252bf66f56fd162503d35d8264
 EBUILD sqlalchemy-1.2.0.ebuild 2155 BLAKE2B c4fa48856128d226d496998ddfe18aca58a8e8d8a49ab3f7ebb8c1534b880d12e37a7bcceb97f52abf045ad77cc37082e6226d6615ce5e6cb00c278ee4562c3c SHA512 f470d206e752de77545452f0bd1f2ba5ee34d637b5d22da9dac16cafee17e248366357fe943a4a94420f4a00e7d917f572a7a3864d91a167c1f5358c0b6b444f
 EBUILD sqlalchemy-1.2.2.ebuild 2172 BLAKE2B 6c6e47e4d87e01e4a5c16671d826172c0e672d9b97e2878fe157673238c238cb2f047a441db55167841e4fb68f4dc9feace089e536b4691ab4509d051508703d SHA512 9e5bc879a87d7ed0f201c7d7747ac8d2322937880f50b176c7bbd3c78c4deb098f300a5d5e9aff971690356425abc7887897a40255deaa594d27eb89ea7a41e6
 EBUILD sqlalchemy-1.2.4.ebuild 2205 BLAKE2B c02b00eef5ff4289b74dd1ada0efc98a3739cb5cc0326f14c55197e7b257c3cd1f96b975ec9a94098cff01908c6d87f1acfc244bc94deaf8ccf2b8b5b20e4f8e SHA512 da638532674c839393b7c4af35a2d3bd0b5beab8ec28dd0142f64617e961ab3db6e53e82ac4bfd8e2e8db6c83f7d09f1db3dcf7084033b6be42de11e244d72c3
-EBUILD sqlalchemy-1.2.7.ebuild 2208 BLAKE2B 127338ba650840a0b99e57cbd41d261ae195d32395aa6b03bc16dd105f9f2ac156e4813e8508abd9d06f7ee2f2f994ac5d05726597a500192c4a7be7c8c2e94e SHA512 911d22c550de6e37ec025dd54d2034ab224fdbb664c4ab7c569444ef5fca699ec70809131905653be0094b062d9bd42ae27831431cd18b8a4e1c98d3ab9a3345
-EBUILD sqlalchemy-1.2.9.ebuild 1755 BLAKE2B f24d82f5bd0358b7adc72384acade88ee113b698fbcb4909da9e548462ec992067a576a8351f9e56c10149b783e58d53125f6a719272f5d88b5d5037173c71f6 SHA512 721591adb9b9d6081de47f9d26baa7d565b64c5b2c0cfac3a4badc4682c8a6ecaece85214a6313665c207e912210ac92e49259bad0836d9a19e37d9573d6d4df
+EBUILD sqlalchemy-1.2.7.ebuild 2207 BLAKE2B 2d8b33881c2db9bda24b9d5208102ff0a6be1da8953a8b9e52bed3ebd77a50ae61d90b17b0cf933698292c32cd0162d71c6d7bba2cd0cafdedded3662802f746 SHA512 a3ca1282f2fe6badd95965aca39d2e9b133d68a4cad66a39dc728d031ec424df71cdcbde7423dd4575596b588da9a1a7aab1b4afdb4ed46a5c662a1388617c86
+EBUILD sqlalchemy-1.2.9.ebuild 1757 BLAKE2B d2c091976ec01e2ce3ef14052a9c644191ec83e42b7c5046eb3a2f8abdcf834131479bc9786c980c981f64b8cf6ee1dcb3dbb04b952b9048615ede3930851c41 SHA512 888b9816a2d0fcb1af8101847777cb3de968396b634de5b3017aa179da1013ce4a6e7ccbdcdadd6a9e904bace381f17719203c7e3314142b7028e51360678490
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.7.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.7.ebuild
index 1fc4b9cd597e..aacb0c07a098 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.7.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.9.ebuild
index 4a8b2a2bac4f..4cba6e968aab 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.9.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.9.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="sqlite?"
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
index cec93d544232..d07a5c03796b 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,5 +1,5 @@
 DIST strict-rfc3339-0.6.tar.gz 16856 BLAKE2B 635da447439282ec64dc7c27a2602d35b28f0a02fb36c16b622b38e73f907e9a39b709c5d87319269ef1357d5716a1d92de7f205f66b2aa77339d63aabdb21df SHA512 7f1e15d60c2295c00647af84b31a1836b6c3994fadbb2695f5709861caae543ae69a3199dffd6dcf7e0768eadf39e496a5e600e291dd0befbe8fc35fa60897af
 DIST strict-rfc3339-0.7.tar.gz 17552 BLAKE2B 74370e28134ee22545c536d9eab383c0de6bba66d1440a77d020c7dc754699c32072300f380bf044e5283ca663beb370a587ea9d111dbdeb46985f76b5c9dfda SHA512 94a2992a9ea41b75527348f0f8dae1d118d57b0764122f874baa85f5e3b523beb219ed83c2d7224725e504cd3737a6bde485957135856dcde470f32675e44e77
 EBUILD strict-rfc3339-0.6.ebuild 640 BLAKE2B 63317a491cd491dfadfc4b803b1b8acf94e80c42e32b9a5b3c6fdfc8dbd26a601d45f8dde3f014ea4063da5ca0e9f97daaa4f0d5ea735575a898439aa21d0eda SHA512 52549671ba0698695201d7dfeac64ecc8b6e84796d76e9d12cc28fb2aee2c3e43f60058189696098b1fdb898a4bfd0ef6e6607e19a5eec3e55ea9a3a557eebe8
-EBUILD strict-rfc3339-0.7.ebuild 660 BLAKE2B b55f47153b34fefc46e1b98d0644cd7d3db8227a394997c43131b29f6a1ad3f120e1a1fd806fa43bd22d96dfa6bc2c75f862d58048162bfcdd7071c53c8b400b SHA512 ab48ea05a89e474b72ad6357bd6e4d890cc0a9f4f94342ea55972652c462097b9628c14241ceab74f5a9f169ed0126058da6ebb8f96d82df445cb27c514b1dc0
+EBUILD strict-rfc3339-0.7.ebuild 662 BLAKE2B 7a4472610a75324bc3fc0797d3ae1e1ab26fab4ee54c8dad4b875dda128d7553f2bb0d83a3cef62bd0f61a5443b4babbac330b887693cc9f2830c39cb636853c SHA512 f94bf475b117cb53cbf3a30c5508361573c9e225802f604a7e588aac3e0d522271f646c91c985fd355ba82770721b9741168f558aebbe838362dd7b3e7c9d0ff
 MISC metadata.xml 385 BLAKE2B 3b51a7f471d2ff03a26cf4c129dd6ef190101b5312d21b303226a7c2c65b06d4910959581c413675030804904029931004edb3a005c47a0bc6caf11761f9928e SHA512 c825fc57c6aad0acc8775432fe511055f26a7bb453628340e56c1615b777cac4ae43dafe6d648a7ded7dd4138ebccc3e5620ec9c5f947f2f491d544d2c69ccaa
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
index 8bd2ac3c3e0f..c41e48cd5c24 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 24c2946feb60..dd8b4b230265 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.0-tests.patch 1058 BLAKE2B 4373418085d6382351a99bc6cee59ad8c65b4048ce83df2abf3b4c895976d52de658cd98dd9e3c971d96c185f0e9e82f12c42e6bea7193fd7a960193ebe89cd8 SHA512 b1accf4434415357a8c235c6b660cec440096616887e62fb45a2d15e314a3abb9be825bf4e8ec8d4b18d7ab08197cacd6916bbde87dc5b88c6f3e80ca89b1de0
 DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c
-EBUILD subunit-1.2.0-r1.ebuild 2655 BLAKE2B de890e7defa47e60771a8111b477cc9768a99c92007e3a70c2d8c57ab6600858ecd7a6d7f3ef2e8b39747e3eccc7507c90ceb23f2ae48f375f6f2d6b54b1bcbf SHA512 ab2f59113e8ce23fa13ba2b86cd1353bdd3de61edc0a001fb972991402238f889d9c279fb53f009fbae8c51e4b17dc607f4728fc89f82e012095d0676921864b
+EBUILD subunit-1.2.0-r1.ebuild 2657 BLAKE2B 872501252c8f4563f5ad7072cd7dd41d04028b7b9e8fe69e7dc409a92a5e5693a883de5cc7f523197230d3de7df5516e15b9d8fbc03a598d70bd842e2fb775cb SHA512 d10db815366ec4f3117b6091139d6cb8bdb8b40e6b2cfe8add37fafd5093d14bcc386ffd7156f4ddf8bff4783e798eb6c5025216f6cc212357802184b746aed1
 MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
index 4212993688a8..a09ccadcf785 100644
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1 eutils multilib-minimal versionator
 
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index 1e4a102a60ad..e27787b8193e 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,3 +1,3 @@
 DIST tblib-1.3.2.tar.gz 26958 BLAKE2B 5c50f6b63b45f34f35843d9e39f03493715e19304804d38e134cd63621d1b72116a84d1403e25a4681d84568dfb87cba2874eaa10fccff6054e121aea86f88cd SHA512 c04d204e8dc53c87fecdb484162488ca10b509341ad030e67300d9c3ac61d298888dd56c1cef8318bcf13d90ccd5633520d75ab45dd0aea8de29ba7317adacce
-EBUILD tblib-1.3.2.ebuild 445 BLAKE2B 6808ff3b07bd4e36a81d94915f154ddf8986a5ea1c07361f22cf6bed85bde7c95684a8d637eb51613aa01e33029e08d5a16f75a9d614ea9e3d1724965405a7bd SHA512 dec036db4ff480e883a215030a4fd7472e07613ff7ce831f6af5064901db1c07ea74b4e63b3b34ac988cbb035ea4c7fa21a18c7e00a5343e467b0ad6c71a6a8d
+EBUILD tblib-1.3.2.ebuild 444 BLAKE2B 27af4d3e5d8a9be0004077cd5328dd423480bfcf2359da01c6b1eb5552c089d5b40b66915de8c11f89632d84ac24f587e024f0aca8018d0922a3de6cffbb084b SHA512 6ddf7268fd335bd17890bd13d6c64aba63c03fd09bf8146cf7f21ac2d8de5201754d47a17c8ff61e680a93412667ce3c1c4067109a97bf645c142110bc37edea
 MISC metadata.xml 380 BLAKE2B 2d2d82601724f6960ddd56f2c45b5e85c30bf1366c6bcfb6b6810e885c87bf974c7dae1cf0a4d01a5bbfcfa9c5b2bb8aca6460047f549786527b5d1742b315c2 SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40
diff --git a/dev-python/tblib/tblib-1.3.2.ebuild b/dev-python/tblib/tblib-1.3.2.ebuild
index 42354d8d885e..40e25f6d4f81 100644
--- a/dev-python/tblib/tblib-1.3.2.ebuild
+++ b/dev-python/tblib/tblib-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
index d5caf33e5a32..f5f40efafe69 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -5,5 +5,5 @@ AUX testrepository-0.0.20-test-backport2.patch 2270 BLAKE2B a34bf9c2ca3f0ad81958
 DIST testrepository-0.0.18.tar.gz 84886 BLAKE2B b6c0161c55271722644eddd5d620ea67b67774e92d2de0117f645fc1016c9de209de6a9557862a27e08850a3ade5a2406ea5eaa410a2ce4d44fc26c8121ddecf SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92
 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
 EBUILD testrepository-0.0.18-r1.ebuild 1264 BLAKE2B 3c5a2f064654840ca87db24932e4cb5b1bef6e2a485a030d2ce84e21cd444ebb4cc6832c5ad8426c1b373c883e011844910158652be220a51359fff143ca8f68 SHA512 8c6d2b3a20fb4c58a78e466c61a153fbfeb663425978facd849987e6c8b994a9e95c944787cfb40acd88a3f46dde12609ce8610242c790e8e9169e36526c8153
-EBUILD testrepository-0.0.20.ebuild 1309 BLAKE2B 064838697748958b25bf67d29352f324e1662a499c296f0250c460200808a300b03cd6297230fbfe47f902195847f5c42d8c90884eb5e0fab342a1292d54115f SHA512 1ae2041ecddd638188afa59de7c329d465c4e55a763985c165223faa3a115feee25d5b97718b1241343879a2ee95a0f6e72521121a786f0ad19db57ebeb64726
+EBUILD testrepository-0.0.20.ebuild 1311 BLAKE2B 0437e9e974722cf10e76582e1c5c7e3682bb306ffad399a4180f40fc4ce14f1629fef3f29984993b75abba240566e34e6542ae2fec4e96504bdb4a6469e10d5f SHA512 f72503e471b31d583e170e5434c679fe2696d369442ff3b32729cc926388e6f61bc488ba7b6dcde8ed362ef24894deffb9cf8cf0aac6e135176b7df3e396422f
 MISC metadata.xml 575 BLAKE2B 7a1c9930c814a2bd60788a38d12909871d068def9c39041ac346466bb2d3940a3df3dc771fac6b2bad39e2a85b20f2b4fb8dc269af4e7853f02206eac9044e22 SHA512 36f0681e6b41a80ee0f3cdbac0520640c67a5612e73baae30b0b5917576d343db3327e03a40e20b23f23b0c76ca797d5ccd09d8dd339dfdb5af6029a4f4d79f9
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index 2c7ffaca0ffe..43149204533a 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-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
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index 8e459746c960..fb40113ab177 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -3,5 +3,5 @@ DIST testresources-1.0.0.tar.gz 44501 BLAKE2B a10cbf562241ee2a756a5de6a9334ff664
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
 EBUILD testresources-0.2.7-r2.ebuild 954 BLAKE2B 68f44e4a075a0a4590bf8103e8b3f39be78beaad78620b04572f9f5760f2147597b38c4322c371d267e167ccaba72e33aedfdb9caf4de176ec4fb47a13b6c20f SHA512 3de787fc7370be231f24129457eb4bbec638daa164cf5cf38b9f1515b333537735c43904ff06ebd70d04c5fc1600450d35aa910e84e235480eb618d39cbc7b98
 EBUILD testresources-1.0.0.ebuild 960 BLAKE2B 12ad5929eabe11a02960f152101a92f4569d7eb59f20caa6f574f96291d8e4e1b32918f8eae36c8b1ba9bec16b93c5b7bf60fc31903efb43f8b60c5499cb1009 SHA512 4d28c3846a1b5146c9ba2402e28b1605b407d42fbdbb7b24f9061e69560039fbc7ab1c9f96fcf5b5ad1217e2a98d66621a9d258a9ed73234dd71a316b962be4c
-EBUILD testresources-2.0.1.ebuild 961 BLAKE2B d26dc0563bead1429036eff46a8c075ce84db2ade79f1e6588e2c2eff0c27df43b0ce7d81fe851fc8b952e3b7806261c953e3259ca3d8b3b972e9fd2422de0c7 SHA512 b97ac53d7020aba143e8dff1456d3e905979c80b2935d3854cd9899e4851902cf83dfa02088378d5ba1af2d7e91cb33ba864fe4ba03c128ffcd615d5179bddff
+EBUILD testresources-2.0.1.ebuild 963 BLAKE2B 7f81faeda123481e52523cb1c1accfc89b65b7da084c9765da59b6b789850dc24ec38546099d1924303e6523f66d83a495545f25f3da169cc99872299b7240f0 SHA512 47730f71dc599af6d3687e0c21531d5096840daa21446f45dc3cb12cd3f95aa6a2dc19848e632f63a889e97fdaef11de228b1004e5042d2bd16bca2564db3567
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index b541daf8cc7a..2384a3489502 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index d8e1f4c9947f..9ac7c080e27e 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0.ebuild 1015 BLAKE2B 093b33b4b5496f0fde677719fb3d64934abb711285b8002b6795b719553c55194e4af23e4db8c1337a43e1ae3e52329762f2f88f31cebf8f80faa5385f9d6697 SHA512 5242ccdf2ded6d79e07ad23298b3e668448396bc40f5e526283360dba3d095d5a3a51277e36d29fd4d053f438a036c603a385d307fb669eef05728975ceda048
+EBUILD testscenarios-0.5.0.ebuild 1017 BLAKE2B 3b589fd32b664aa4b136be3fc6e88f9f3fb2cd1a34b72b9cd599fc1f43c19ca72774f1fa51aa141490aa38c6700cc8d1109ffe51cef19a9a141103c46c632a29 SHA512 c910ae6f58028b135dd0081773f83450d296cd005fb249005373b0fcae97a912e5da8e186b181876b87713ae868234757862b451ef7c3835b8dd5962b67128c1
 MISC metadata.xml 979 BLAKE2B ab0d7bfbefdae5ba546ff15669d1caec70e59bf398e6e2ae329821bb141aced038cc946fc309b79a0348051352f7d758e24c081348d6a7e587fc326df14dda09 SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index 81df8618ccee..87db01559867 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 173c507c3f12..1869879a062f 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 1524 BLAKE2B 1b8a4d164c97aca82578e44b0facf3146c01e6aac43d41c4d6d95e04c37389cb9f56e78b0b05e0854f50e1a2efa4d7304506ab0fc70612e789ee733333bbdf71 SHA512 c83aaf1d846b3b2e8f0adc9e42cd7f814f0b1cc25d3d94804ab5f2aa289204bd81bfd970a5d10c73a91cd6e48b8384456df8b5d6bf80e704b1ad84190a8fff16
+EBUILD testtools-2.3.0.ebuild 1534 BLAKE2B 588d4b319b39d8a7151a53a6bb36123e3e8d3ddeefd02454dc10f2f50306162b15451a0ebf66c08764eeb6a16e3a437afb43c2082ee140027cd112039db3e624 SHA512 ba2d2bd815dd8a957bbfea894a16112d0e534e81343dc888ade7fa4c135e0ddd8e27ed25f256a31fecb4db56a426ef7433c480be26955dd413333fe7ff278f15
 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 e37da41b3e77..c56966713e1e 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
index 8b8f53c7754f..2e58abcaef45 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -1,3 +1,3 @@
 DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
-EBUILD traceback2-1.4.0.ebuild 629 BLAKE2B edf4002ec1707707a00b58c31d1698a676421d557b2e208884925db02194107cb36194f6d7697f7bc5ceebfafd3ce1bf2da4c3f47cf1086ac167eecd699f7ea6 SHA512 cfe50391dedbb22c191a5f65ebfc9a043866cd733113e3f551129e39b6f4613570be308fea9e9d1c100b8618c00f72237387f18bdb538cd16a701791f19a35b1
+EBUILD traceback2-1.4.0.ebuild 630 BLAKE2B 7a7d3d6c1c5c2baa21e04cbba78ea331439bec8ce41f268dcfd477f51cccd96994745449af421323c2234e01159efd0bae76975786e9735fcaf506405e17d575 SHA512 06a172b44b1573e41ee9912222dfbb3b9adb048fe466b29947777626b3276954e3470e2b7043ab76ef309527d2f927290952d6e7b80b0cabb3fdbcb642a8c66e
 MISC metadata.xml 276 BLAKE2B 563ae71afb266c7d05063c3419fa37500d977a315f313f50369bea04971964d9284a880d00e926da1e53ade6bdc53ba91b021c63a4e09eeefc6e5fa1f405fdaa SHA512 a3c2b11dd3258894fbc16ca98ecd74572fbdf279ce9b537d0fb3482f2ac0d1221cf9d2a5903b969af13b09c166c25286a3d9ced8dac6bcfcb5c3c33b454908f2
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index c302862e602a..795a16d5e90a 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 3a01eca63793..2bf45a88cf35 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -12,9 +12,11 @@ DIST Twisted-16.6.0.tar.bz2 2979747 BLAKE2B 898e0a0fa3ae8547a801b09118423ec8ad80
 DIST Twisted-17.1.0.tar.bz2 2997334 BLAKE2B 54bd9813fb265f3561be7bc42a3ca6fc36aa5f8553ff0f40fd4ba7939947015632ef91c011a088b511d9f3f262aa0a785467ad3e4fab00cc97cb85bdbd93a726 SHA512 e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966
 DIST Twisted-17.9.0.tar.bz2 3019243 BLAKE2B a79fade6c84a99303df803ad80f02c63562e7064d5b79db39c08bd0ac9a62d61f1388932b36348aa106aa409a51b2d49dc0eb5b1007ce10f196a34c2f963b8e5 SHA512 0fb854db1044bfdb208594a379a0f8df0193326a9974e193266e82113488d49220648d4a50b323fa144654e94976f5848e1d60efed13ab2668b02cc795720345
 DIST Twisted-18.4.0.tar.bz2 3037019 BLAKE2B 6fc32f7591493ccc4fe03233307b566899b82cd035ba3329b3faaf950339a6653de697ba3873b37b22f9d7f8a66109694b80496917bf61e79c56eeb7e351ac87 SHA512 3733a6df0196ea580187da3576f5fd08f287437528a4e19813056d019cca213c61b62d879d80a12eef38661d3505ba33aac9a4fc956b19afa6da7d37a6465c83
+DIST Twisted-18.7.0.tar.bz2 3063847 BLAKE2B a71e7f0f2888eab2849b90405350194091731730e8507172744212b9af73ba440a0c21d5c5a45ae987752c813c07c4dbb06e0e27a8c8e436d7ea6f7c3026137e SHA512 feefa578bc1787648df07e4a53bd6fe29b43c4357472e4fba37526f075be9263e8c671b6781ce6ad3569c1b1666cb702efbee903f597714a749971695018f826
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-16.6.0-r3.ebuild 5724 BLAKE2B 108dbd9936312c45c5deec67b539a1154435a5ac46e604c61ace5f6daab3ac53bc1ee2b79fa3d849a4932465a2059342696b080b38ebe445aee3862aaa10c402 SHA512 6532cfb88d75b3e82b7e0cd5cf54b70c7727d23cf3f5314af7b490b26cd8e16c3c8aa17acdc4c9533867f818e6aaf9d61510dc5ad3dbe66a3efc301ec714dff8
 EBUILD twisted-17.1.0-r2.ebuild 5748 BLAKE2B 89d1134a993c8c474c4afb010e5cf99839b396b7c17cf5f8369485852c4306fc9db0bf0f1820f4896d499d8b4d499e8bdf9e3056e79edcf84a8c13ec876c404a SHA512 662b4382f38de1c3177e73df9e7598f175f6a511131d633a676534ce2ca80e1e1fdec96a5bba3d859de973b416cd02a384233c24fbf56069f0ab6dc59910dccb
 EBUILD twisted-17.9.0.ebuild 6037 BLAKE2B 6bcb95874ad77de1a27e823a936bc99da1149a3a7040ed24d3ce4d726e8946d153b29e0d1bd7e0c51791e5d1167cfbd6ce2b38e98e98f917d611fd1979b313e2 SHA512 701e4475125c89600b85158790da2198d46774b8011fc3db66a4c3efa22538523c45fc13a0f31041d927432284dc6372ccde014cfe89d2a7d829141bdc10c6bf
-EBUILD twisted-18.4.0.ebuild 5904 BLAKE2B 49c877416a803bfbfe1c3ca941078bc272502757aabd5988f2ed7191bd118868b3df63c1d8f35b7257aa466582c1fbfb5a93a0bb84d6b5792585eb355b83ef65 SHA512 3679e96f0819bdc252803889c13e70b4753a01bb07035d0aad838a8d6ddde414b7125aa1c8dbf258cdd08ad996be48e5410ad5bfb22f27c3210f45793834b10d
+EBUILD twisted-18.4.0.ebuild 5905 BLAKE2B 1096e2c14fcfdcd8e0e5271587e734e8dadb5395fae138c4f73e4e2786d0b2d4765004a2244327ce63781754955d5641f3a75d4cd846cc750b8e4e879ee307ba SHA512 edf4bfc48e7eee3c8be3c59cb700f84d0f6c5411306477786420a5cc71d682c4df1fdb9b16d740eb83045d38424d693c5a8abac41c376b370d818f3296a35d39
+EBUILD twisted-18.7.0.ebuild 5954 BLAKE2B b561a75c3d72811659e4358d98e81670266b3d96a445dd090343086f69d013390af3ba2faa9cb6fa303a84a127d71cfb9a02c27d193ce1ea98d6328c5acf2c56 SHA512 a8dcde0a86dcd3f3d7670b3647356fdcdda625c094e5af9a74cb05e54a1cb96eefa9014efa9d987b602e2f0d9bef92cea13325aacbbf82821d29df120da9c941
 MISC metadata.xml 1429 BLAKE2B f6bf7279da38a837c80fff9f9319d5c2d3893fb4a5a17d731b170153d1c4e10479b58a6576d84fa59ae653794aa017862a4fcb11bf1bc6ca85c374e3b9dc7cd5 SHA512 1ddcc6bb727f97eacb712badf834ceca15a4544e340090622774bc0e781f2ce1a20a96f8b5018535998e9865204697a25ab84eff87c480246fe14e39ef9411ed
diff --git a/dev-python/twisted/twisted-18.4.0.ebuild b/dev-python/twisted/twisted-18.4.0.ebuild
index cc0e79d778b7..4cbee6f4674d 100644
--- a/dev-python/twisted/twisted-18.4.0.ebuild
+++ b/dev-python/twisted/twisted-18.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6})
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
new file mode 100644
index 000000000000..ef2fbd2bd055
--- /dev/null
+++ b/dev-python/twisted/twisted-18.7.0.ebuild
@@ -0,0 +1,190 @@
+# 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,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+TWISTED_PN="Twisted"
+TWISTED_P="${TWISTED_PN}-${PV}"
+TWISTED_RELEASE=$(ver_cut 1-2)
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="https://www.twistedmatrix.com/trac/"
+SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
+SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+
+# Dropped keywords due to new deps not keyworded
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~amd64-fbsd"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="conch crypt http2 serial +soap test"
+
+# openssh-7.6_p1 test failures: bug https://twistedmatrix.com/trac/ticket/9311
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+	conch? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
+	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
+	http2? (
+		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+DEPEND="
+	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+		<net-misc/openssh-7.6
+	)
+"
+
+PATCHES=(
+	# ${PN}-17.9.0-Fix-test-on-Python-363.patch"  <== version specific from upstream
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-18.4.0-Disable-writing-of-plugin-cache.patch"
+	"${FILESDIR}/test_main.patch"
+	"${FILESDIR}/utf8_overrides.patch"
+	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
+	"${FILESDIR}/${PN}-17.9.0-python-27-utf-8-fix.patch"
+)
+
+S=${WORKDIR}/${TWISTED_P}
+
+python_prepare_all() {
+	# disable tests that don't work in our sandbox
+	# and other test failures due to our conditions
+	if use test ; then
+		# Remove since this is an upstream distribution test for making releases
+		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see https://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	export EMERGE_TEST_OVERRIDE=1
+	export UTF8_OVERRIDES=1
+	unset TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE
+	# workaround for the eclass not installing the entry points
+	# in the test environment.  copy the old 16.3.2 start script
+	# to run the tests with
+	cp "${FILESDIR}"/trial "${TEST_DIR}"
+
+	pushd "${TEST_DIR}" > /dev/null || die
+
+	if ! "${TEST_DIR}"/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+	# due to an anomoly in the tests, python doesn't return the correct form
+	# of the escape sequence. So run those test separately with a clean python interpreter
+	export UTF8_OVERRIDES=0
+	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
+		die "DaemonizeTests failed with ${EPYTHON}"
+	fi
+	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
+		die "SafeStrTests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	python_foreach_impl python_postinst
+
+	einfo "Install complete"
+	if use test ; then
+		einfo ""
+		einfo "Some tests have been disabled during testing due to"
+		einfo "known incompatibilities with the emerge sandboxes and/or"
+		einfo "not runnable as the root user."
+		einfo "For a complete test suite run on the code."
+		einfo "Run the tests as a normal user for each python it is installed to."
+		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm(){
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index 229458dd66f2..16d7ba64dcfd 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,4 +1,4 @@
 AUX u-msgpack-2.4.1-little-endian.patch 2129 BLAKE2B d7bd75e409753dedc3e1e7ce984fd2401cb8dff71af6b3da90950b00ea7f2af35f8d3b87af0fa333b61f916bd904934ee5ca09a124bf17a4099f334afe76203a SHA512 978c6eede0b89238134b31b596f9e0fd87d31431fd95d9f44578bb782b17fe8c39fea20bd494581a633219f8137c23156d5bbc454040c137552c7a72901525b5
 DIST u-msgpack-2.4.1.tar.gz 12026 BLAKE2B d8f9c5558daba3afda53c4c1b8e10edd6baa08a58c82796171ae0752c10c638b76abc608349e2ba090e83b2df66611a5c0c03febd38c2a13c45fb617b6bcf74f SHA512 4c3edb72455e8eb8fa7a4ed9b6ef4461755b782391f2c362d52d0fafda3e790fb40d0d239d05ba99beb3ad4cfd9e200175e2a1917cd64ee1e5d8cc3c4e8b3f25
-EBUILD u-msgpack-2.4.1.ebuild 827 BLAKE2B 3b2c3f165ed02e26a26c58af2b7f3f52305d70cd46fa5e1174bc8b39f43d34d546b3d5f6252c8a75bc00651cae5588ebb7fe7167954087701a198b0be097a625 SHA512 e7493bf54356274dae79c64a3f582726fe1e8d48ff161282c120a6dfca2654a28c0996d6d024aa2fdb28e3949016dc421a852b0aece70b78adb8bb19502a152b
+EBUILD u-msgpack-2.4.1.ebuild 826 BLAKE2B 969ad987cb2326e797550172dfef8ec166dbdc52e372e7f99f89e9f759a70065793cca1a8a20d0b18d6cca377310e66b709a027b3bb293bf2b58ec1497d5d8b9 SHA512 518cceb0919d74ef6093bc36af5f0db45d11960292c423d71a66a5994da62c9e57bd2ee11194985baa7629609a8805015e073695847bc916e90e5f1cd41e0797
 MISC metadata.xml 985 BLAKE2B 6c8134062eec629a9e15fe23321a10d4248f00fd92cf14d43d35395b29970c7668661500dff63f3f004925d2b00d0dc8fe91487d3a056a77b7b2f1f3a33d5d91 SHA512 642fd0a2bed62a5218a3f2765f51f7e221ab57850d03a03f018ffbe1469705e34884b82c51958bc83c4fb722f00b818fcfd85df0366eee2c0550a58d0fbe91a8
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
index 6f0bb2d1b085..251384bb6a2f 100644
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
@@ -2,7 +2,7 @@
 # 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
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${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="test"
 
 RDEPEND=""
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index d9a28cd04e4c..fc633bd6e7d0 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,5 +1,5 @@
 AUX remove-argparse-dependence.patch 424 BLAKE2B 6b59d1913f24b336f9cd8bd40a0d42f281fe452937be9b1f2b7187aaff611c07de8bfe138ce9bbd42c5c812d217400d4a49ee991e44821020b5d3a131b5dea18 SHA512 e4a7b803ba5e77484f4e800df4c78d5b4d35f2d66e5c416c256bd6e7fa3db193c32aa0a455aac66b34f27c1038accf7949f64d98bf4a31a896a43d790de810f7
 AUX unittest2-1.1.0-python3.5-test.patch 1304 BLAKE2B 390a1972a4f24ca348f6d1d35badd2fe9a88fada8961c16e759f39da6843a1c931040ea3cd236f20b9671efa505c58857a2872553029c88a98b75c8358ac7281 SHA512 502a72811581e3551ab8fdd80f0f72ee4f6be9a3b0ce01a131f240f2199babfa115ecb18c5d4efe297521e6951f9371869b9419c829396720623bff548f09398
 DIST unittest2-1.1.0.tar.gz 81432 BLAKE2B 02bf191baaa895689078e8f484bb368cd178ea2d1e275a5adcd3413eb25d18b9109c353046f60819c7ec26cd233867b7397e6e38004389aa928b4c53cfeb637c SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa
-EBUILD unittest2-1.1.0.ebuild 1025 BLAKE2B 1d30da27322b224c4e80590b6ed048432fa31be0c861dc6aebc07931b5ae42a8570bf9bb4652fa39e7e6a9db090b135cebdc374c816f4a4fef9c9a636fe9164e SHA512 56dd1ea8f82e588f2ade43b24f68b3019a027d87194cef6e1610f4916fc97d32001ac8f340ba561e1ee39d864f438e993f1825893e0b37bdc083a38f564f02c5
+EBUILD unittest2-1.1.0.ebuild 1027 BLAKE2B 57b7cac18dad980de860bf3409cfa3435f5d10eaf0376870423b5b341d20373c3fd03e5926864ff4729be3be5927bc3c2abe012c1c32f399df0e9ff702ca9779 SHA512 f0144e5af1b19a7768057757d0dc9a50b4c7b4479f34068a808af8bb009d657466d721310da25162183f7a7b26817f74d5af360c3537599135f38b8d2ad6c231
 MISC metadata.xml 378 BLAKE2B e0a0ad885607d8593e090798b8facbacd746a69c3325f6d429743482a6265bff57b2d0fd6d12122e15336e063c4c1e539da10cc41ea5ab159b2c5673e8316c8e SHA512 b1db02e32f39f739de9a077d770579cd1adbca7bc7b9c1eb3e5800f5242a1706ec5a61694b98ea7e3e6f6099b128d22e731f4c49cf3c719bb38be52679845d34
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index b811a9c8cdc9..7594f556d6aa 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 6e2f06e27bb4..19b5d3892ff0 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,4 +1,6 @@
 AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be8281110bbca5abd39b78807fe67317052579efa0498bc8a321d09fc953c9358dfb963ed210451549d14d6f58ac4a94cc3e9a5d1 SHA512 a7007c74a2e46e281dc0db6fcc45475e36f3a261445c2162fe0a548e577cd7cc344957e3284c52fffdd21cf223e91ab5b4fc1936b6893de614c4143cd1b40419
 DIST uranium-3.3.0.tar.gz 906093 BLAKE2B d41608170da64f93d6149e76cc28fa476e439f6b291bc667f8b562dbcde047f234aa77cfa52b73420f286b926ef05ef50df8fd74722fc81dd3fe94b407bee7f4 SHA512 48de8ecf100f6bfbaa6b3bc6562fef25991ad07375f3d8f752f130b44c2e4728b2979f99de23570cd46367d868bb7139dfd9d73a7d3755d2141edc1fd46939b3
+DIST uranium-3.4.1.tar.gz 646742 BLAKE2B eb65d5a35b3c63cfb069f6c1077a91b7aa10517dd7fe6938b639f1229e61c5c6aa892447cd9d5851df46808f01f237820811b4358a235c50a89f2333df3418ef SHA512 59e0a605f3d898765bb670104cabb7fb1471061934900e63b54c1a07219970e07414a3983e96a577f5986302779b7acedc8e0ef0da3756dceefc0170ec80645b
 EBUILD uranium-3.3.0.ebuild 1389 BLAKE2B 66d6d70799f21ba5906e78e0308c83beebaa28b7809d831b032a5b41f451a403e119536f45959bbd38816f85f21354a73e2f9301adbe3cbde439e4ff2a7a93a2 SHA512 7b662a387df685fbc46af0acbe82428a05835edca3e2a3ad1867634c21da027254295394735e43684f3ee5b1eaaee160ee8144a46b596bcffe7c697de7f8b582
+EBUILD uranium-3.4.1.ebuild 1389 BLAKE2B 66d6d70799f21ba5906e78e0308c83beebaa28b7809d831b032a5b41f451a403e119536f45959bbd38816f85f21354a73e2f9301adbe3cbde439e4ff2a7a93a2 SHA512 7b662a387df685fbc46af0acbe82428a05835edca3e2a3ad1867634c21da027254295394735e43684f3ee5b1eaaee160ee8144a46b596bcffe7c697de7f8b582
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-3.4.1.ebuild b/dev-python/uranium/uranium-3.4.1.ebuild
new file mode 100644
index 000000000000..ea926475cda6
--- /dev/null
+++ b/dev-python/uranium/uranium-3.4.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit cmake-utils python-single-r1
+
+MY_PN="Uranium"
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
+	<dev-python/PyQt5-5.10[${PYTHON_USEDEP},declarative,network,svg]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+		DOCS+=( html )
+	fi
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" tests
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${D}usr/$(get_libdir)"
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 53f176871e6c..f4ddea55e5c0 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -2,5 +2,5 @@ AUX urllib3-1.23-tornado5.patch 2878 BLAKE2B 7d64d012de5f0d83043ca5c6262d4e395fa
 DIST urllib3-1.22.tar.gz 226083 BLAKE2B 6d3067ea1c9c90e2e759e6319115ed3d29ca1e31c4d1721d7e7aeed432ea4df22635d92fdb9ea91a411bbe67c72160abaa19e0d42870be0b0a866c003db6ec62 SHA512 132b69d7f390916bdcde66d46fbf0189d0c1f976f91778dcb0a9ef8174487b7bb4b37b9139e84f7c70234803be95284448aba0b820f3b54530c0c497ca7a1dc9
 DIST urllib3-1.23.tar.gz 228314 BLAKE2B 63cd0ed046ade8b775067df92f3589bdfa21788481292724ec6af85b5789cc990cd267e1a0dfd925529d147441232a89b4f1b23a1276fc7a68a7047cbf2ae8a4 SHA512 6baa76ad3bebc639d7ec0a042d809fba7ef3110de6164a321756389c250e218728d178708611049d91f39d17f24b8b08585edb2f2c260c987bd4c7204e0c0b5f
 EBUILD urllib3-1.22.ebuild 1755 BLAKE2B f74bfb8db93173a4388ae644e81cf4e3c8a3fc491ed0f3453def06a323b03ffe52bc471a32c0fdab64880554417082f0c4b7967f9d1bb185e04afdc65da3faf4 SHA512 8bab85bac5e97dadc1729434a108c82609a82a69b8af505aa77f267c897a368e49d23ba176ce45f583517e6844185ca2524c09cd31a1a76795dc99b8e6d1849f
-EBUILD urllib3-1.23.ebuild 1864 BLAKE2B 550d527d91cfbf99ed366064a4ae0f7c6618daf968fe604a91f0518dc6207b726c0aa4f41a6dfdf637f450af391bd1bea3f526c443c92c3eb7bf68532b2a91a9 SHA512 d008993c701cf28d2126dc5f3aa5671945235cf4b65b430353d99e27103a79b668f13db5be94a80602751e55eb59ed3eaaabd1af91ebcc78e17a2622d3e71e77
+EBUILD urllib3-1.23.ebuild 1866 BLAKE2B 24a481d18fbfc929accd42d6e3e6e1de64c1437fc3a428e644f6589396dbaacc52ab0bcdd64201c06888ae5eb79d80c12135cc659e442469ce6e22f9909dca27 SHA512 c41c3566d1fac3fd03c2a94fccdd1b812f3ba8a64f45013e0ae16fcd35a13eedaf10d97e16a03f12f3c93f2a55269acc0e7a1dbdc7e36ef3b4a0e558bf81f2fd
 MISC metadata.xml 376 BLAKE2B 2e9ba1b23bd9ab2770d23ce9bdf21f4083f46184c22d1dc0bd449b6605c24a2ef0168e1503327b549ba55e81b7bb52fe5f73fa375f06f3c64fabfac6cf5a9d77 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543
diff --git a/dev-python/urllib3/urllib3-1.23.ebuild b/dev-python/urllib3/urllib3-1.23.ebuild
index 7dad09add027..8fa669db6d19 100644
--- a/dev-python/urllib3/urllib3-1.23.ebuild
+++ b/dev-python/urllib3/urllib3-1.23.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="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
index 735df0ebecee..406dbc070bdb 100644
--- a/dev-python/vcversioner/Manifest
+++ b/dev-python/vcversioner/Manifest
@@ -1,3 +1,3 @@
 DIST vcversioner-2.16.0.0.tar.gz 9024 BLAKE2B 70d61a0d65129c28c9febfae54454a50ce99fa3478b4948fb677b90f52d7abff4c14b69ad8e71b26c45cb40a7535be8f916cdf3951a1ca932e1b7d0f07ceae0c SHA512 e4e34693aa813e57991eca01d20102bd2e939b536461e2e9e063ac0e3558580e57d7e8d5e08d010690b3c901c97e53f187f20b48520b333eb492ec33e85757d8
-EBUILD vcversioner-2.16.0.0.ebuild 693 BLAKE2B b63d8376ecac76e6abb05f9125b12f31a00b12c9983e99f1c8adeccee5bfaf0360479e91b529568f490db9aab16b78e4c9aa2baf1634d1973b0dbf479ace21ee SHA512 700fb40417ab3d7ba3ea37e385e624e6271ec587abe706cf3b68bcd75fcbddb3c8e1e58a0e89d870502bb40c0dbeaeabe8cd07e0147710d6376df887921d1f32
+EBUILD vcversioner-2.16.0.0.ebuild 695 BLAKE2B 5421a99730950e4932ad89c91c005b7286dcd2ad398be6deff016a6fedceda04f2d595bff0214d9377d3e9632b0d954080e4f362b5013806e3358df0338bd55d SHA512 207ef60c4339041e5838fd465cdcdc8c7b63449770f0c7b544830123de496f40fd3a9fc9edcc65bde96d6caac1692728f4be7313570fabcee6b5b276e252da9f
 MISC metadata.xml 308 BLAKE2B 4d08920d23a6a0b63b12dd665f4002efc68eab182ee8be145f7d9f707bbf028ab84daaa2ac37386397173c9cb6251270a7500e776d9f3264d371bade8ac923d1 SHA512 550f181e53960f17bc2aff125dc10ffdce51bfff4e8b61572bbf1133e39a1e18ac8e473880504994447fdeba479c172c14aa0c20777ab4e7b07c0e855c686fcb
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
index ccd074ebd906..24c8bfa316e5 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 5d15616c75ae..9e0952a42a2f 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,5 +2,5 @@ AUX virtualenv-12.1.1-skip-broken-test.patch 542 BLAKE2B 8c924cafcc0ee78b3101d55
 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-16.0.0.ebuild 1245 BLAKE2B 5e0a13f9a04a942eb0cb43d50e87d3120f161cc04a5ea4add49a453939850a24c6a0364a9445de156f31ae570e9677a70b5e81c11b1f910443da3c4245f925a3 SHA512 07c66d581592e99b8a34d94c7a2e7339c1909aa9a5e22925b7e294572a825f816416bea297dd142787ba2dc2703b342f19e72f3cb48409b11d1feafc1a84f247
+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-16.0.0.ebuild b/dev-python/virtualenv/virtualenv-16.0.0.ebuild
index b43ff98f5d16..e105eae7912d 100644
--- a/dev-python/virtualenv/virtualenv-16.0.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.0.0.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
index 261a53c2f437..0e89f1832ed9 100644
--- a/dev-python/virtualenvwrapper/Manifest
+++ b/dev-python/virtualenvwrapper/Manifest
@@ -1,5 +1,5 @@
 DIST virtualenvwrapper-4.7.1.tar.gz 89930 BLAKE2B 8e101f04e365dbb6244bc787f853dd90b15d7b33a44725ac1e047cfa74845b9fe11ca100c8437536d80943f29be1dbe10920eef2ce9766bd95ec05cd96951eba SHA512 f972179992728b8b600388b34562fa9de355f526e4ee25ea88840700a57f196a60eba91ac3137e7d826925c7a8ade7479af383bcbfb8b9b837d0a374b8b3c4fd
 DIST virtualenvwrapper-4.8.2.tar.gz 91331 BLAKE2B a01a971ccfdf1822d65fe6d2f3ae09fde2646c8a6246f54316afb6e5d5068078e77732fed3a9805371fefeed7a4357c27b52eed24e9bd03492965779d6a50836 SHA512 53d92f653b988873da5a46e316a40ef767d97f75072e311aa4a8ae45c8aabb49569e36cc35597f9bdfc1f883a51eb648d5f01f4ea8b3237fae30a21dca67d7bc
 EBUILD virtualenvwrapper-4.7.1.ebuild 1028 BLAKE2B 4abb541072d96a864261f21c95006d902416889fd4372dbeb54481982fccc9857191da6c1141940c21704e29ab2baa7b6c1dc157e3ddec4fe6c5b53c008288d5 SHA512 89de7909296532ad52eb44940ab5d9345db57fad77b848fa94165d22e2549335742fd68f8681df602c4ce8d34cde100ad2034265fa49e287df2b45923c1a0b02
-EBUILD virtualenvwrapper-4.8.2.ebuild 888 BLAKE2B 9485f44337d3a9d2b7d9fc78428d2596b9c9b101b04b06819f724549c96d03f5bd4a2edcd0c6c9c71bf128e98ba538518d2c2cb2ba3d163e6552439d6cec314e SHA512 88b397edf2400f292c4c6df77be350f481d64f5225a01560a6a3962fdc1ee99a811b1292005aa420972f7297a0a1355ce68d292e80221bf8c445be960bb9e83a
+EBUILD virtualenvwrapper-4.8.2.ebuild 887 BLAKE2B 9a0f9804caeda825006b4ccd8b9d8acc18b235ee0914d17b2a381dd20911619f319b7352f88acdee1af83f01348b49783c57c31179007ce9743493ed01082d60 SHA512 ef120474c0f5c2ecee7e14af1b0ac3c6f8a835219d911dfcf83bbb79e41090ff03cbe9d15ea8ceb37ab82868d847047dab284339e17217dc0746dfdeda1c9b88
 MISC metadata.xml 320 BLAKE2B b3b2f48545985da37bc3f4cd0a6f9fb8540a320cb6cc6e0be1cded9fc77862e47f0f30de3dbb683e9d7001cf05e221cb45f922013c155d5bf418d740ad3ef543 SHA512 dd5556b6b8cc96882032b3b00de65e2ca95cc0ee93c00639f1537e4abd31cc14022e2b61cb04f12b53480c273ef9be269128c4b683a9774590b1cdd552582386
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
index 2df8322f07d7..adc8ea358698 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
diff --git a/dev-python/visitor/Manifest b/dev-python/visitor/Manifest
index 789261bf94c9..dd9bdf8912ac 100644
--- a/dev-python/visitor/Manifest
+++ b/dev-python/visitor/Manifest
@@ -1,3 +1,3 @@
 DIST visitor-0.1.3.tar.gz 2985 BLAKE2B d645e3524ee5d072320e6feca39faef72b880ec7341053d078778765d9b279bd2ee3f892c0fcd5f21633e7851acd49ac23aef769eaf190147803ce711b717da6 SHA512 414c77df8efcc22df5ee8073e02b8c5c28563954ef9b9a869c4ea3f7f1268a97929c1fe29142ba41e3a5acafea52599f6bf073aacd654643d7d8380cd4f41fbc
-EBUILD visitor-0.1.3.ebuild 672 BLAKE2B 45119d71ff258a2d1b9e1c834e2b61ce98e419a29a0c9606219ac0b93e48f989b98919fd90d83ddeb18d342f8b4a89762d52bf1f4915a1e5594a1f9b1faeb00a SHA512 8c6f858b36a38190be8b6c2ef90e08f487a9bdeb9ea269eae4f36a006190b40e8626b68c11c74caaa88746ae1c8fd817fc91064cdb2a0893a333e520dffa0746
+EBUILD visitor-0.1.3.ebuild 660 BLAKE2B ad7bdf4d8f8df4a3ffbaace52db3a3cc1206d271a02b32cf5b2157b81b6f3f5ce078183cc346d2a16fab998a4130f31ae438fd7d9ce6138d5c45308e5554ee90 SHA512 30ab1c71bd1d18ae8539e56892ad0a9c85f871e16161f19cdafb7818ea5289e1bd198a15477ae41dc3ea175158088644709b879a54a26fd7654f6d016cb1d1fb
 MISC metadata.xml 425 BLAKE2B cc0a5e61430649338d19a17059161dceb4e843aad01757da22faf77c327750b901abc8bbcfe0879909febb0f94d764c77494aed2ab9eb4b7b241412a9a993a79 SHA512 21c655b1feebe9dd77a24e8af3fed6c8f40a79c6696940b455da05ad61c0cada17dc99f8c34f3b05309fcaaa1f96261d6546dfa3e8ca21d26323985f713d6bfa
diff --git a/dev-python/visitor/visitor-0.1.3.ebuild b/dev-python/visitor/visitor-0.1.3.ebuild
index b6ff311f6c16..56399f3c1fc5 100644
--- a/dev-python/visitor/visitor-0.1.3.ebuild
+++ b/dev-python/visitor/visitor-0.1.3.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
 
@@ -19,11 +19,8 @@ IUSE="test"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
-RDEPEND=""
 
 python_test() {
 	py.test || die "Tests failed with ${EPYTHON}"
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
index accbecd6c22a..88640fd1ba65 100644
--- a/dev-python/webassets/Manifest
+++ b/dev-python/webassets/Manifest
@@ -1,5 +1,5 @@
 DIST webassets-0.12.1.tar.gz 181402 BLAKE2B 907a4184e0274a9543bda2b7c2fdfeabef346b0920d98e04abbfb3b9858ecae3c0da32b65efe8e4b52d82ab938e182e2e37f005ba25afb1d62235dcc5bc9bee7 SHA512 1e65956afc63dd4bbf43b3b7e220ec6edb8d69d817c6361de67bf8fc7a90b34d3f7e4d0bae4cc45cb3fc043802d2e5d5c8a7cc87421186000212a36605fbc26e
 DIST webassets-0.12.tar.gz 180368 BLAKE2B eb7484d724d41467a8c04c1407cba9666abc77d52b06736f489f20593deb265f30d682ce26ae8bec5f34bcd66b11d052c5ee240d9dab191e7c471c8ec62f9916 SHA512 ad95e5345f9f736389fc684c5b51bb47ad5abb3bdca03a3a4649892095d139722aaf5aa57677997fe869e751b1b82a63c3a882c58005bc6a2ab954bc479447b7
-EBUILD webassets-0.12.1.ebuild 980 BLAKE2B 5e0a17b63f113a9983b20bd31f403a79e61d7f5834097836bd73fa9549c706598ab2861e26361f4a6d9e5eb727d7b534779f2ed0e9f7101db630e747b6ef96ed SHA512 68f69e0a54623858e8bcc27f7607c7b2acbc27fed18efedabbf90cbfa93175dc10f87fd433d2578bd9a10aab417641e24b73c6efbad949c118365c8e4084fdb6
+EBUILD webassets-0.12.1.ebuild 979 BLAKE2B 3a6ae791538dacb97d2c90aee9e4199103d91a872acf890b095ce0e4a5689152fe59730e0e729aa1dc5cf78a0f9f2fb3c4b45c85525301168c9fd4c1642166ea SHA512 f23d8d220b2ca2a300ac6687f8c894a59336806bbc69176d492f8b7dedcfd97133d7c748918dcab4c276cdff17737052eca5e2b8aea9d19afb4dc83dd4594311
 EBUILD webassets-0.12.ebuild 977 BLAKE2B ecaf9a32ee27658c061c4d6dbbd6955cbd21e6687cc49da3b1d785d7cb39d3843f3e2913ce48596ce29fab7519285eacb583d952c9009ab444c4faafbf9a902c SHA512 990a66505cb38a3d83e1c74d9ee1b7e961ef415777e1f97a62a32a79f6600a93caa97b49008ab14db5e0c026af9b0346790537ae3eb23db535189ff949f0772f
 MISC metadata.xml 334 BLAKE2B 070bcff10f1f0b3fdf01e30021d06ecfdc49952aedfde4a18c254eb9f160c8bf990d5816bdb510995818a73a2da25a77073a672d375cd07684214a325283e390 SHA512 5bcc0fe8286771e758641d97206f14e447f6e0ff49d6c6e91285e0cb6eb5a4116760851996679c79dcf5fdfb4c0252f299676847612fc345fca020e44fd4d2d8
diff --git a/dev-python/webassets/webassets-0.12.1.ebuild b/dev-python/webassets/webassets-0.12.1.ebuild
index 7bfe8e9f0d8a..1356b77e2210 100644
--- a/dev-python/webassets/webassets-0.12.1.ebuild
+++ b/dev-python/webassets/webassets-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # ^^ pypi tarball is missing tests
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index b2a060ecaff8..a747448bd079 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,3 +1,3 @@
 DIST webcolors-1.5.tar.gz 29960 BLAKE2B 0d46fa57b54525594547b1224801308961f9265dc76866153752e411dcf81d3ca2566cb289bb9f0cd486bd6ec1ffe7cf88f99a04f5554ae43f183175c9eb925e SHA512 84ce8cbbbdb4523bb146cf379845b549570623411a56651a7f9b9687152b7adc9dc42a3a0f684b55b61fb7a3d51d49d3871100b56725c86a727e3374b53c84b6
-EBUILD webcolors-1.5.ebuild 683 BLAKE2B 1e131d642528104148f63d325495708c32887223227bec60fd56642be6bb110c38e416a9891a4b474c68e9c9156192766c211dc707f8aebd5e239deac9e2132c SHA512 3fc07ed34cfc70416a394142c4b1af29527059457ad474c3b08e5ff3828485ded14538208437fcda01d6f70e1a26c720add6afa71f19a90b643b904a61fd5fd4
+EBUILD webcolors-1.5.ebuild 685 BLAKE2B 602dbe072de8ff57661f190e2c8761c8a26b1917eb4c40662e637d3982b954f128a412d22f4fab3e8426198d100945dc43804604058fe23e09785bd196ee85d4 SHA512 2b185483f1e05dd8fcff1338aba6deebdf3643ecd6ecb3a5fd81561b1ba5d02af641ae6891421dba4e567d35ac635e412583a629285939344b51c333450cdf17
 MISC metadata.xml 373 BLAKE2B 77ba0f1d033aa4955155891349878942ffb67450d1e4891c87f068454546c73feade5f683574ae6a4263bf9cdce3f2beebc188e3812086d84a6cdeb840328c48 SHA512 0b99d1cca8cba614a64f182192f08d168e01c3d5dd3227f4425f41f438769b7b0566be41c9d3a3b3bd98825582315c035a7641766416fc5e57816b72d27d726b
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index 9eb52a63b4c4..b794e58a339c 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index 4a6914f1a259..d7fa880e35ec 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 851 BLAKE2B 49d58d79efa2c0a79308f437afc4e2081724531d04bb9f9056ee948ba94e48d6bdca7d5e3a6892cc9332c19ead42dff6a3c6cf4bf91d69eedb8143bd009b74b4 SHA512 4f1b77af05f0ad443ce0595f9acc1cafdce4a27b5c5c448796f82ebe2c3185aff106440116268e996aae039bc68743dd3d5acf87121927095cb0d24e054127a3
+EBUILD webencodings-0.5.1.ebuild 850 BLAKE2B 1ea38dd3062f4a4b2b950d34d6c1333b6f36119fed4d48619018d93b222af2b63bf1deba4cc387ce5157791657ef95f4868152a21914f14a1a91aa422b9f205b SHA512 1f6be459d7efc02d1fc98ad52802a2f7abc80d6c989dd2c6c1425f32881f86e57e6b1769c83e8b22db0282e1cca7cc95c44a27bcac60ee44a31017bd7c9a4fb4
 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 6b07f5c88aeb..e9163a780597 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.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 )
 
 inherit distutils-r1
 
@@ -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/wheel/Manifest b/dev-python/wheel/Manifest
index cf942ae6f67f..0d58ac3c1345 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -3,5 +3,5 @@ DIST wheel-0.30.0.tar.gz 43087 BLAKE2B 796a57298571a9430094be93f38c679941157679d
 DIST wheel-0.31.1.tar.gz 38574 BLAKE2B 83684b33d587fe4a9593aa1b45c8e3f9543a97f80767c973f2b796bd23191af489760507fc491e4c471d804cb8c8a969de2e6cc509beeae66e1911650be5d725 SHA512 38854a54722cd8b3ff3b53bc62fc56255b37adac5ffb3fc1b0cb5f252a3cebd84390f3bac0600835c64bbec158337a7a13f0725dda47a659183fd038986cdd75
 EBUILD wheel-0.29.0.ebuild 998 BLAKE2B fe9d6e9b2a16944bc754ba9d9bcfcd471bb4f4d3d5cd3db6c15e575042eba4aee12103b5af9be465396f215152ed8b147c5939d649a72c1637c6cd40577491eb SHA512 387cd792495d26346e4aea329e53ca640c0582f78af2b7a7a5e96d6ec2d7bf4c581ae6deeb12a51d869f69a8e58d764f709b76464003c17e53b1f61088249bd8
 EBUILD wheel-0.30.0.ebuild 1023 BLAKE2B 5a96e4dddb45dbc42c58b484b505683d0653668a20943debae1561faf22aa8e1d98145853e3aa68a1a06e03dda9fc758e3babc4fd7eb65be90f625ce81098377 SHA512 646b30a918659e0b0ea0a0eeb64e17082500620e1b5451618439a109e963025884abd87ea838a5bbd8d530fd4823daa8d94591aea2ff738eb020f8d8ebf59d53
-EBUILD wheel-0.31.1.ebuild 1023 BLAKE2B 3a17fe464465fa368d9c2157e016d237a08b7dcad11ea257adc3e632d0bc7cc401d035a6823f822cd924a15bd9bda64f421b64496fb550e3dfb5363bbc037980 SHA512 0805ef8cd9ce426fb867c018855cec7e6c1f1d2c557b12732203b09c0fd488ce4195c7f34441229fe2509ef427273d791718303b9f7464340703a760463c1817
+EBUILD wheel-0.31.1.ebuild 1025 BLAKE2B 81f8b4da6db1df776bcb92683292bcc86d6d87ddc72821fa6d441bcbaf12066862524f677bec1b86e9528bc893761e67d8b870454c0e2ff1a8067626de6de00f SHA512 7e48c1706be6499875bf7b3766319c344652b53607e561c45ac5a0cdf9c7ee8e095650e5fd7f37f2b476e1a93e4741cab57e9b84d13b04254390e556f0f08845
 MISC metadata.xml 308 BLAKE2B 32390fb7a1a3de815d3a791850d9f96d8092be48cf2ac61f8cebdf132e7d1c5c4cba95bac3edc3f2ebd6a2d9e9437e0c9187f9668ed95c4ddb4ee6072f496d46 SHA512 d5fdaba19a51f826d45ba93cc77a08fd4be563634f51236cec379763f066ed925869a57c94c75a34ed58302619d419f31dcad641d9e85c68d11d72ec53d2d45d
diff --git a/dev-python/wheel/wheel-0.31.1.ebuild b/dev-python/wheel/wheel-0.31.1.ebuild
index f0aa2dd6026d..cc595d256a00 100644
--- a/dev-python/wheel/wheel-0.31.1.ebuild
+++ b/dev-python/wheel/wheel-0.31.1.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 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index dc08ebf893c1..cadb885485a9 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -2,5 +2,5 @@ AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616e
 DIST Whoosh-2.6.0.zip 1193541 BLAKE2B f5afea36c53a06e3f23e06e3b6f51acd2adafa02488912c52fdda207631a6adb071256d26ed455042de1c4c2a136156ba7c89f4d6773ec60b392b03de3c37da3 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
 EBUILD whoosh-2.6.0.ebuild 1257 BLAKE2B 969818795f8a5179b912f79fe4435102ce101f32179a5c9ca3114818c301c86ff9da6fb633a60b556dff7d77bfd293d931fb18fb65464e5907fe0b8639b14484 SHA512 e4925f0060fd414db1555642106bfaa72872cb61ec11c8124ea07df6f78eddac663d1295f9281c347e68b2b2ac78664ce7cb236a71951661a34d48019c484e9c
-EBUILD whoosh-2.7.4.ebuild 1472 BLAKE2B 1e4ed48d3645492e5795a915f5680ccbf5951deadd00bd2e786d9cfb77152a6aaafd65e12fa001a1d0a4b498076de8620aa83423a30cf69916486e0d76079d6f SHA512 4cdaba50112cd3aed07fd3051ef0bc635d789ea9e175b22383d959c9af7ade8f65687da90dbe2c58d24c591f852422e56eb59c95b52bfed5b601773246693d17
+EBUILD whoosh-2.7.4.ebuild 1474 BLAKE2B d344258dfde5f4781de87d34976ff3be30d17ff476acafda5418bc21e011460bbb11b954a37f404eab3ba2f538ffdc14b0c5ca985970bbe7850de7ed9bbc449b SHA512 68af7b2d671016eebd7343073133b71d442f9a7c8f4383954ecf0c93fc5c2ecb690cf6cb4e036af8fcc95ff6839432e5f93398ba9183f5c3c81a6c65f3013794
 MISC metadata.xml 817 BLAKE2B dfecf5c1485e029a3614d0a45b78ae77fa7965000e5e9b95d6e7ed21155c4781f23b895f24b7189b1d7fbe7007828dd152d30c4013ea35d93ea1c5dcc985b834 SHA512 b9c1def2c09a31740729aed91c02a3382c9b8f10d9f959c0c80f41ac4822ac5ad3b2c7c998e244f91e64581c17c4d52a7264f679b44a9981587c053bc3b576ed
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
index b1259e20cc30..bebab4dc689a 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4.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} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index e4513b86bd14..3de5274e809e 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -2,5 +2,5 @@ AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c2
 DIST wstools-0.4.3.tar.gz 148878 BLAKE2B 96b1e9dc0310fb0fc5515a7c061f82897e2ecd1b6187167b57444394d1e64e8f63e5db011d77c80b5fe6df2f67fecffe82f861fb761190c6b3248346cd9f5b5c SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed
 DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
 EBUILD wstools-0.4.3.ebuild 593 BLAKE2B 98e5d6f79a1a2425d4ce2764f9e1739510d15f9bf8849516bb4b5278a783fc442b868911efbd56f353f9b80de727cbcd669f8280963a3f0e2454d602fb57c0e0 SHA512 046cff4817e5440376ec2f47c1be6191e63b5fb4e7dde9ce26d232b55f2070932f77cc493678cd9da6d5e8351970775cbfd175451d5d36686b9cd6709c11affe
-EBUILD wstools-0.4.5-r1.ebuild 805 BLAKE2B 67cd12ae99991604a858518f2deefd9c597a2f9b8937f41f9a4fd0ac9efccc6115031de153f63767db193042447d91339c3a1d4c9ef7b6987d707f6b12aec1a0 SHA512 e3374883b220e202e7290d67124bbffa478ecfe7377eaf7433c9e53c67f3382636e024dd8af2899fa52425838b31a4bcead6f1fdf44fa1bbf8fe207958b62192
+EBUILD wstools-0.4.5-r1.ebuild 809 BLAKE2B e4fa19cceb0e119d31622df62efb824d69a8e314fb9241334564e1146296c2b06e04ed5d07974ed7b54939f9738f033200a7dffe0bcef69788e9851245d02c31 SHA512 b0f78e88a0069c9d1f2afd3cbdf59b5bb33660efb3b9f405e867b3330c11c301bbf65b2c6479e73756241f1525e5fef53cda47426cf587517dcf0606cd3ea644
 MISC metadata.xml 376 BLAKE2B 4bee67bc37a09d4b34b1f67902a820f63563f87d9771eb462eb7f098955806e025196082a7e6c118e5ab0638c7ee70d1a63c8183f607d1ff9a26f1b0c16d5206 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
index 9cd40cc8a03a..ee485d999110 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
index 4d3d0bea9306..3c11ac78778a 100644
--- a/dev-python/zict/Manifest
+++ b/dev-python/zict/Manifest
@@ -1,3 +1,3 @@
 DIST zict-0.1.2.tar.gz 10839 BLAKE2B 6256e6202f6cca1db025d21c42b98163ad897ceda6a1b878e75165b358ec0a4b9150f04ecdc05f5408dd74c97212b8301d1f45d91f92dad138789570ffcfa562 SHA512 13fc6647bc1506bc5e8f69d39a07851a06634949ce917f294762ff3143c8a539117f8731b103df2663708fa1e8c968359985d9c4273aa952f500a89019c176e3
-EBUILD zict-0.1.2.ebuild 662 BLAKE2B 8f6947aa5b36e1854ed3517e5755d1ca978a91259545388b25e0e1e7b8155dc62c2eef7e356534500c38d17c1543a36c85fc19bb2894a89b6bcf1a099b3c95e6 SHA512 85642116ae855fa325bdb0f3a4cc8c5cd890fdafbc35b3333efd8855312dc7f0c4944963f9b69a79f16f8eef30649dd01909ffcbe2ab1abec1163067270db986
+EBUILD zict-0.1.2.ebuild 661 BLAKE2B 2a5f82a0cf8e103bd5e7612d19a216049091b6020023035675eef152bb9715afa7ac7ca94dbc2e17205b8faaabf19ca96125abd1b665899062a619650e60a8c4 SHA512 5a53259e826af62cc6ff376cf8bf311a110ae2ac9101cdfbab395edcb103a24245284e7046eee1ee7e1f1a5095cd4f91b22ebfe33a5b2f90508e57c8f741bfb3
 MISC metadata.xml 372 BLAKE2B e0704ea4318d17b85ab75fb9818e2ec6993173823f2b0d8fb92413e9ea83095a5ad95c05e69c4f6ae447c9cc2fe7a2735355b311e84b6036780a6b48ae5e7ff4 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0
diff --git a/dev-python/zict/zict-0.1.2.ebuild b/dev-python/zict/zict-0.1.2.ebuild
index 436b56ee9a9f..4102dc5de24e 100644
--- a/dev-python/zict/zict-0.1.2.ebuild
+++ b/dev-python/zict/zict-0.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/HeapDict[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index e7b8ab1f1406..7c4e24ca7af1 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,5 +1,5 @@
 DIST zope.event-4.2.0.tar.gz 488532 BLAKE2B 89c2c2e9e75a57afd43f7ee984cbe8f7add3cb4eaf1271695b2a5c31e77e5fccb0c884d3f8c44c54fbd06be209e4556bc2438cda9bc987124d46e795822bd841 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989
 DIST zope.event-4.3.0.tar.gz 17829 BLAKE2B 5d508c834321c70399eb9888bc2b000f5b18de625c68dc089f3ab8571a7948c1e43e76c62811c955777fc2caa65585347c124e24f2afc46b23e9d30b6c4a4599 SHA512 dad303d1b76c75dcc98f1164c6dec8f8458f1adc4109146942cf9ff40ed3f92579b2da742b10798bc720ab17cbdebc86e54008cfa5155616e2ac68b332e62571
 EBUILD zope-event-4.2.0.ebuild 869 BLAKE2B 8ea1f0050b13e3f65a5d7575e78ce1d0f5e1cb0da128031676aba13a90e6edee488f0e215861ecbc382a80355b51083a5c5e33d07fa33f06d2a6e24036a38af1 SHA512 c522d3536a55c0f6bc85ec5cff427fb4332c97f4b60244b4b573f06fd7a89473d5ea621277fe9bbf4e278c4029a10367779e262863fdbad182d23135d2d3a33b
-EBUILD zope-event-4.3.0.ebuild 1103 BLAKE2B 379f5f7c3b2d75dfe45928eabf16c7698d5df040ada9cd6fbecf90a96437810b78f13ed144725394427ad7ff45a7b8678d1e9e8d914287487a85729ab115b5b4 SHA512 7203951d157a0072c6f8491a180f79dc1b4522f4b014c0c3d7d1552bb12199b2376dbc8febf9f82d929164de4b2e3e3bf454db1115f24f8d221b94f883c9c8b4
+EBUILD zope-event-4.3.0.ebuild 1105 BLAKE2B f8dd37b31f9377129cd94910cc24fb3686c3e22cd9ef2aa6eb885bbb1718e8dd328cc3fc6f5a8352f1803df954c05a4c1fd7ec94ef68c74df0b1083084e564e9 SHA512 846a2c0d13b23c8b29f57d7d5d1a66115193a853fd55e4f68d9c20fc73a4fabcfa65a74641cae4acb713ec119d5534a8ad1a55b65f6863710eb1741c5d276222
 MISC metadata.xml 378 BLAKE2B 53e40f9f0e2a3c17be6503b23c943f72c4221f8d131e56378bc7aa56ed8d889706a4e09f177e137fd1cdece259a2b13a2c6aabf4709b57e20d7e3964fdc580d7 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831
diff --git a/dev-python/zope-event/zope-event-4.3.0.ebuild b/dev-python/zope-event/zope-event-4.3.0.ebuild
index beab379acd88..8a1e0afc0063 100644
--- a/dev-python/zope-event/zope-event-4.3.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 MY_PN=zope.event
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index cc7968e37e77..303e615d08d3 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -5,5 +5,5 @@ DIST zope.interface-4.5.0.tar.gz 151261 BLAKE2B 45d84249c4c64e8c5a7406ca50f3fe96
 EBUILD zope-interface-4.1.1.ebuild 990 BLAKE2B 0729e2f728a41900e3700f862484779805efaf9663fe44c052f3401cc3bbce1e3adebef7e2cc14817c2d14d4af6968ddc5a24e7921eb78ea18c0c47656ed36d2 SHA512 1c29fc3ac4e42397ebe0aab827b21f43793486f23af0492c66feebdc8f303b13e24206e660f623d1e37421d394af415457de9096487b23f80d5c2a516828c3b1
 EBUILD zope-interface-4.3.2.ebuild 1035 BLAKE2B d7374a0b31b73d857659b569dc33a0575fb97acc462178e976b3071c4926642181e624495a8df816c9fb7fb939b62e14e99a224539f8df966e7cc662647ee63e SHA512 e7bc7ce215f332423fb4bd5a1def6199ea8a091931366e12406217a7a4dfb2a4700efda24537400e13db8305d98a52f5e3222b2328c8fb2a9f458e73eb665ef1
 EBUILD zope-interface-4.4.3.ebuild 1281 BLAKE2B a5d3774b4b12660253634e02dbeab78426983e0fb94339cce121f5f7634a02a4637a3cf42a8c99e02f5f01fe8889e0fb5e3158ae526e5f12d397d6fbc5b9732a SHA512 11816e8a8e6793fb4f9f9be3246e4efee9b3999ff2e744b25982fcf285d0c29879710777d60b243115eab310689e876b5de060af77e8cdbc846b9c81976df2d4
-EBUILD zope-interface-4.5.0.ebuild 1290 BLAKE2B f83fa7d23ce99d3d2b5c5a2ebbb66550b82b22b94419c828cc1e57682e13de45d8aa50c10c1e6d0738414cafc30151cfe8cc4d1a66872d07c429d38a891a61b6 SHA512 d4cf4d49703facd7370c941729e138068e171b306ca1fae4dc2be7107158d91d89c72602442173daeea58f580bbfc7d67564dde243ba8af34cd914a203969735
+EBUILD zope-interface-4.5.0.ebuild 1292 BLAKE2B 967138753260fb83e6c11d036c9240c81df96d19a94d1c8025bd9ac881058cbb498b163b89cba29e6cf2a12592fb4789621c84c5ef7adc890c256b42e98f2598 SHA512 08df16098422b0c353f4bfa67b1331a412325563364708f95e5a9967107ba2a7c25c4c38921de5a4475658e3bf54cccf37b8278e0a2e269f2942c5e7f760cd7a
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.5.0.ebuild b/dev-python/zope-interface/zope-interface-4.5.0.ebuild
index da0e81e1c162..49051b291429 100644
--- a/dev-python/zope-interface/zope-interface-4.5.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.5.0.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} )
 
 inherit distutils-r1 flag-o-matic
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 18:59:32 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 18:59:32 +0100
commit	520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch)
tree	f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-python
parent	3811bc3072bf19e2be351d2c63f81532945c0f21 (diff)