gentoo resync : 02.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-02 21:45:28 +0100
commit: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree: c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-python
parent: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)
242 files changed, 1185 insertions, 5378 deletions
diff --git a/dev-python/3to2/3to2-1.1.1-r1.ebuild b/dev-python/3to2/3to2-1.1.1-r1.ebuild
index 4f850563c501..9297c84877eb 100644
--- a/dev-python/3to2/3to2-1.1.1-r1.ebuild
+++ b/dev-python/3to2/3to2-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 python_prepare() {
 	# https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35
@@ -23,12 +23,12 @@ python_prepare() {
 	sed -i -e "/test_argument_unpacking/a \\        return"\
 		lib3to2/tests/test_print.py || die
 	sed -i -e "s/Exception, err/Exception as err/" lib3to2/build.py || die
-	distutils-r1_python_prepare_all
 
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	cd "${BUILD_DIR}"/lib || die
 	# the standard test runner fails to properly return failure
-	"${PYTHON}" -m unittest discover || die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" -m unittest discover || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/3to2/Manifest b/dev-python/3to2/Manifest
index 49138d765b65..f3274ae25b9e 100644
--- a/dev-python/3to2/Manifest
+++ b/dev-python/3to2/Manifest
@@ -1,4 +1,4 @@
 DIST 3to2-1.1.1.zip 78779 BLAKE2B 441e74bd06017c84bd382c32513d84f42b8bc35f46aeb62ec1e3f5b9876573e0a76f6e04f4ca529175761af6f29e10ee0c4d4114ff0bcafb066d2d6344b1d885 SHA512 7580f174409420556f89ae78eba07cc95b95aee9d062586d0862bd41980ae31bf4ac82a43855e160eec745fcdd3b4aff614f68e77da1bfc5f9f404413cab1492
-EBUILD 3to2-1.1.1-r1.ebuild 932 BLAKE2B 27f414a3567d5c27c86ced5559854a9149be18d7f827edbd26604cfba9bf4c02ce7f8eec0eca5e18731a6a4e1baa3fa4f658cab2f79feda3e6acadf8e5ec66f7 SHA512 46239f8cd96b23c026db9146aa5aaaa6be90cec19aa2e39d16692fe74d5afd312656b604d97c199a474f961a7fc3dba075b8789c86ecac96930360e6c22d64db
+EBUILD 3to2-1.1.1-r1.ebuild 938 BLAKE2B e82f635615cce525c61ea754a63a90c088818d4f38b7d291e227f7c1544f2ac4445e4964ef6279d06d5cbefa9de32c9c650091f3f5af2259d7e1da837731c55a SHA512 c7803360442d06e5404e486a33620960cf8b3e99216aaecce4cba770828e2c044ad382bf609aed513e1058c19a36cd54ad7a29e98b176704754f741000792618
 EBUILD 3to2-1.1.1.ebuild 595 BLAKE2B c0223c8bda0a43b0a31311a1971345a5fb73b05516699fb2d446a118fee8dab1cfcd3329cbf26a8b4ad3876fe899a0e58acc1725fae2210288158ad5a1dc9e85 SHA512 1e58c8e8ccfcf84091295f186be9db8a41c9ba011702e9de44aea636e230b6419a65b3a3d5e29949ca0cdae80ac4865816e98bf882f7024802ee6bd5101c8f44
 MISC metadata.xml 433 BLAKE2B 4f1b66cebd6b0b9f083d0896f702cc2f882d0d05a28634fad2d83af9802ccdfeb237e8d1eddee71c5a18663ede779085c28c81c3586b4ccfa2274c5dd8a9e1cc SHA512 fbf01ed6fe0bfdf49ba985e62e8694d7152129e0d46a3701fe39dd11ed7d48641efaea848694a271f39b9ae7e6b805b0ac535945cf33d455e0745d1f66ad3c04
diff --git a/dev-python/ImageHash/Manifest b/dev-python/ImageHash/Manifest
index 3d6ce6edb69b..ad93d183b2d1 100644
--- a/dev-python/ImageHash/Manifest
+++ b/dev-python/ImageHash/Manifest
@@ -4,4 +4,4 @@ DIST ImageHash-4.0.tar.gz 296405 BLAKE2B 1623d679c0f10eb18d20f7cccb0a87c2584535e
 EBUILD ImageHash-3.4.ebuild 674 BLAKE2B 5868facf6856eb30c0ef7740ff835f52c7dcebf56148e133c7c006848dd8c7664131d033384884e874e56ee1efea61ac36094b772db61d602bdd8257eb87b02c SHA512 a853a7a4e8eb454976b60e014d540e623a7da3e22471cd289a71d27a88fd7c603831106d5baa35fefd0fb886e7bc9eb6a590b934490419c8641711c0ce2295d2
 EBUILD ImageHash-3.7.ebuild 674 BLAKE2B 5868facf6856eb30c0ef7740ff835f52c7dcebf56148e133c7c006848dd8c7664131d033384884e874e56ee1efea61ac36094b772db61d602bdd8257eb87b02c SHA512 a853a7a4e8eb454976b60e014d540e623a7da3e22471cd289a71d27a88fd7c603831106d5baa35fefd0fb886e7bc9eb6a590b934490419c8641711c0ce2295d2
 EBUILD ImageHash-4.0.ebuild 678 BLAKE2B 5c7598b9921d6704092db8124b98d5320286eb6158e0e57252123cbbaa2c53b92bf323e8bee1d310b1a1c8c3cd4b9d5e7fbf284134f60b56689b53c20606639a SHA512 c856bb8005bebf05312a905d8051ee2890eb5e8569247dd800177a18fa489f643d17fea522e43c397fbe2b49321883ddcfafdb3a39192f629c665a69600fd4e7
-MISC metadata.xml 706 BLAKE2B ab0d81756c67a0937dc22a79c3bcb3ccbd0f90362ba3dd3a41c96ad92ba3861cd8b08dea737781be5aba843928018cc8853f45580a1d8385e771f38146bb0d0a SHA512 289175e72c831818e13e1011c2a4908b6bb60ae5f2cdb91b81765f4386215283648694a7ef1f293dd91f11f9b5177156de9617cb081f1e31d42e6c1ff3f5ddf5
+MISC metadata.xml 591 BLAKE2B 3b4b5c4b552696dce9aa4272c11453fa2d548ddcd97df84b392dd849123828cdce8aed16f5a78e51361ca728645b3f13d454a667169c1e5a3478a6ad44387a55 SHA512 8cdc106ca017b178f325da5e3fc1ba887a45e921e0917b82099e2c3987e49d35394890bbda5abb977563a290855a6dab9884361d095699db62001ee97fb544e4
diff --git a/dev-python/ImageHash/metadata.xml b/dev-python/ImageHash/metadata.xml
index 5a0f60123ed1..22613607affd 100644
--- a/dev-python/ImageHash/metadata.xml
+++ b/dev-python/ImageHash/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 57ed46dc8e5b..c169eab083cf 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 36a06ff7540f..6d1d6d70f914 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -3,7 +3,7 @@ AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d3
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.12.1.tar.gz 3147086 BLAKE2B d5a018f1fca401b9f70dd16e2a28ea380c8a83f5e18dc8577e317dae5904a7b95f8fe979bf7f574f95e71222c514565fbf051b1de87f97cd2ab70c09d04e86ac SHA512 f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67
 DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
-EBUILD PyQt5-5.10.1-r1.ebuild 5790 BLAKE2B c75e543814d465ddac56368ab5398aa37c1c49b6985bbbaf0b739893023a00aabf94765715e30309a5f511fdae853b69057e4c4f50bf2854126e311f8d96d884 SHA512 9c242c66aac8d2d9ab358ded73ea2defd4a8e562c919d01af02d1f104becdea0532d7a228790f9eb73acd2de4c893f0be7f25d0a64b2c4f0bc5218452035b33f
+EBUILD PyQt5-5.10.1-r1.ebuild 5789 BLAKE2B 0c5209887d90e42e69acf97227950d3b6048d7f3f0c0198a5a15fae632232fb626431e019809dc9d6c03cecd404f69df0fdeff22489b55e7acd2d81191ffea09 SHA512 981f6dcfbdb1f5a29eb32796013e6f8daf3e4a5d370d7f66d62198ad287538ed77cad62fc0aa9c8f8d9f6d1d8a23fd79d420108739fde990c5dd47d7046de738
 EBUILD PyQt5-5.12.1.ebuild 5851 BLAKE2B 4df140ee298f0b6978de8efbe0118ad8526fb9ca9c76da79392e1687430da18b04f6508d2f4a26790b5a14450b7baec9167a06c81c1c80a27a3775bcc24f046d SHA512 82f32da1d670326cd3b08ac7fdc0a44da2bb383f0e82407dd42dda527f0f486cd880e5a211743a260d73c7040ea712c53614df26ba5564d8b92d677bb800eceb
 EBUILD PyQt5-5.12.2.ebuild 5908 BLAKE2B bfc735c4c3606d2247a5486c8eded9121bacd4af52f8d73f87f054ab17054c30e8be576a935e3c618362e71225d6311c7e37b743717c7c08d32819742f266719 SHA512 9fcf1fcbbd30288f06b268a9819263482868a3f4bb100754d7db9fbf76f9d65bc4506b9d5c3c5db098e80973586b2c9e67fbaddb097155fa796e9ad599f3f8ee
 MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
index 0378fbb04cb8..304c6df9ec8b 100644
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
@@ -19,7 +19,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/autobahn/Manifest b/dev-python/autobahn/Manifest
index 2d86708221d0..e94895baf988 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -8,5 +8,5 @@ EBUILD autobahn-17.10.1.ebuild 1905 BLAKE2B 9f39260926ebd7685625abc8d7e3658b5028
 EBUILD autobahn-17.5.1-r2.ebuild 1898 BLAKE2B a738f87af9bc2d11d307fbe3633b38a1f8bdc3c1615806f71116ed2c4eb9d0e6e3f6d861c5167417f63bc541f0ac6bfab41392007e2ffa598e054e7f50ae6ba5 SHA512 aec7c1838be2a21f3ae0d331ddb78a3933fa2421257b4b52b3c015b3af56ff706f70414fe7cfca79f4c110d9366e13970154a2ce6f1a259825dd03d79310a1c3
 EBUILD autobahn-17.9.1.ebuild 1905 BLAKE2B 9f39260926ebd7685625abc8d7e3658b5028b5d95b146cce27a318daf11757f9c45d53c95dfb5595953c8486870bdff1cc6b58efaba194dfbe53bb1e8f028ca6 SHA512 7fcb18f912454a08e4e54abaca48a55fff8489a247e6fd4e2042ab8ced54df1cfcde0b393d06ab1bffa4fdd086d0a21a571400c257b9a06cac989514ec28d31e
 EBUILD autobahn-17.9.2.ebuild 1905 BLAKE2B 9f39260926ebd7685625abc8d7e3658b5028b5d95b146cce27a318daf11757f9c45d53c95dfb5595953c8486870bdff1cc6b58efaba194dfbe53bb1e8f028ca6 SHA512 7fcb18f912454a08e4e54abaca48a55fff8489a247e6fd4e2042ab8ced54df1cfcde0b393d06ab1bffa4fdd086d0a21a571400c257b9a06cac989514ec28d31e
-EBUILD autobahn-18.3.1.ebuild 2166 BLAKE2B 174b6f3b346adad5b0c810e1e538db9b57c7ad9d130a3646803527c32a3d0a037059b96a59517a9674dfda0c2baa2b12d11328413a45d2d2c17070c781fe6556 SHA512 53365c45264c53a34d8777cf7458b51b5906be3080f3aaa71b50e0248a6c927e4d210dc306838ba78ea716889c5b31a5106bb0dd12039752521476b9532ce18b
+EBUILD autobahn-18.3.1.ebuild 2173 BLAKE2B c770d1e9d78ac69d0b71b4e7f3bf80371fdfad479ab7fc7901ae08ac05c890cdd49fd7dcdc2340c4bfabf0087917eb53a4fcfee01eb635e5444a4942a0d07596 SHA512 2dc92ac4a522652cd16482332ab08d8201c6d61489e6a8740fcc4326abfd51c638307e78bee45301ed96c03a68fc22558df5ed02722f92f13f8a4f4691bf3c70
 MISC metadata.xml 321 BLAKE2B 2a222ee5e7e6a2a90a44b834a4b7d430938813786c7179fe3fe273456b501feba4c20da2fe3b9671092085a991fd35c736a5b64c179a08f54fddd029ac5bd731 SHA512 fd00829f66750d3d54b7bfb472179639fbe453840e7c3056b406af546acb952d3fb8d4552973a68ff0966f25bead8dfd4501888cbd68721e54207b5a7628ac36
diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild
index 05ffb8659958..2ba2f23aedf8 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-18.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="crypt test"
 
 RDEPEND="
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 061c5e036804..e0bbcf4fdf2f 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,9 +1,7 @@
-DIST brython-3.6.0.tar.gz 9310837 BLAKE2B 616874f2a9c303e910a3fd2910aad6ffe360f87e98d009d66e85fd8c05d61c5d96c1a313214c08b69b5d073a23008b23d882a607af0d54f7d2942fcd2b6861ff SHA512 c59cee89634a2439a6fc64d3397966762aa508c6c00d05186138acce25fcf6597230511e30a261217898bca3d86a11eea92516cfe630c5d82cb271603dbecb2c
-DIST brython-3.6.2.tar.gz 9314999 BLAKE2B 809b9367eb42e723aa58dc22f1d1186144258135bf129de6d28be9a3d86f5f039c2c566e897ed6e8b436ee1ddd80ea2950c6053e366e204255877a777bfe68db SHA512 3edc603bb06a3ce5a383f6e86023e3266cf3ccc916c209fcef0ee69b4cb5445aba820034b5ce33b7c828c5a9a50f48c1226bcb69724967ec438c0702558c7641
 DIST brython-3.7.0.tar.gz 10334976 BLAKE2B cbbd3b77c1ef4cb5459621e33456ea7e1999428c0aaf2e52f60f4c1a3c737c84649880dc7e06d9f5b19fd4a172982ee3c1bd8df4f2e264818d6e5cac0908bdb1 SHA512 38f42c5c4399317c9a75af3159776d15047d6c09fd89b3f4d244f9077684cdcb3aec2a33304b6fe0005c129291b2b1ecfb0274f766da6005c0ff215751660df0
 DIST brython-3.7.1.tar.gz 9898874 BLAKE2B 2fbdfae401662878138c5315fc821de77125476d1567dcc395b018891282ca3880ec63e377d9ab8381060e54b6d4947f036f75a518ef363b2549d29a12eace78 SHA512 0ab073cd12ae5f2c45a205b37d20d68a996d6ba7247e8a3b8e461158147070294bebba46368c6618771b6bcac11d5a253d63be02cbab1241c11d74ae56d0fd17
-EBUILD brython-3.6.0.ebuild 737 BLAKE2B 388ec69293a20ca8ee9129a7e607a9be66fffb389f83c9afd46395fc926d89a1a7fbb0fd6548fb65fc34f4714166113c230dee79d98a718deadca6f02316db97 SHA512 9b1a57bb0cc4e0c1517fa1aeef31a6ff2874ff8242e3ffbb423128f9d38ec7939d77b6e64e27d2728111e7ad370ede61d9c90a515140477e22cb21e474974c95
-EBUILD brython-3.6.2.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
-EBUILD brython-3.7.0.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
+DIST brython-3.7.2.tar.gz 10403203 BLAKE2B 1fb7778a961c68a873033321fdf7a5b24f422d52195ff1f0606384c76007ab87a1949ead2ffcd7b660b544a9833acf90b254a542ea8856510579bacd0be8477d SHA512 76bdbc005832b4980e38ff4bf2fd705291eb06ee6b9f0c4b25a90df9ab4e6da6638990abb37ebf526d064f54823a9b4ff387edd919db69b1eb3bfc8ed27d6290
+EBUILD brython-3.7.0.ebuild 737 BLAKE2B 388ec69293a20ca8ee9129a7e607a9be66fffb389f83c9afd46395fc926d89a1a7fbb0fd6548fb65fc34f4714166113c230dee79d98a718deadca6f02316db97 SHA512 9b1a57bb0cc4e0c1517fa1aeef31a6ff2874ff8242e3ffbb423128f9d38ec7939d77b6e64e27d2728111e7ad370ede61d9c90a515140477e22cb21e474974c95
 EBUILD brython-3.7.1.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
+EBUILD brython-3.7.2.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
 MISC metadata.xml 467 BLAKE2B 06e617c5b2362ad41950d7d90d2f3ef25a2858f6c4b88df6edfd6ee01aeb32d1988d30bb66c0d9b0f3c5ed771596678f03aa5c707f016dd1d01259d11f1acced SHA512 a9c3c34e617cc5a3ea80f30c8de8964712af694d8048197662ce2c68d521279761751824a55c68bde5b75444495f176cbcc7d867c46924729391d3488fc3100a
diff --git a/dev-python/brython/brython-3.6.0.ebuild b/dev-python/brython/brython-3.6.0.ebuild
deleted file mode 100644
index d035d0287952..000000000000
--- a/dev-python/brython/brython-3.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit webapp python-single-r1
-
-DESCRIPTION="A Python 3 implementation for client-side web programming"
-HOMEPAGE="http://www.brython.info"
-SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	dodoc LICENCE.txt README.md
-	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
-
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
diff --git a/dev-python/brython/brython-3.7.0.ebuild b/dev-python/brython/brython-3.7.0.ebuild
index 447c9b9ba91f..d035d0287952 100644
--- a/dev-python/brython/brython-3.7.0.ebuild
+++ b/dev-python/brython/brython-3.7.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.brython.info"
 SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/brython/brython-3.6.2.ebuild b/dev-python/brython/brython-3.7.2.ebuild
index 447c9b9ba91f..447c9b9ba91f 100644
--- a/dev-python/brython/brython-3.6.2.ebuild
+++ b/dev-python/brython/brython-3.7.2.ebuild
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 4bf7d7f2513c..2965862ab1c8 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,5 @@
 DIST bsddb3-6.1.1.tar.gz 450571 BLAKE2B fae21052d3422e6e837f21a0e5f65aac063cb4c03b4c833e8b74fdd7da929972f81c3eaf5e869ce0990c1d55454d9f5964c3d526a44c047124d12da2afd78361 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
 EBUILD bsddb3-6.1.1.ebuild 1940 BLAKE2B cdaa1ed8bdb037f43efdd6e40f2f2c4bbd412ac48420164fd431b637dbaea03df4aecf0a5623595846d50fef7cfb3d291125f7d25ef6552734d087d1bf12df1e SHA512 085ba98fe0374aa5349a7812b935476a150c2e92fc2cf5c8d0ddb4e8ad430d99b0a78d639e42bb1b46aaa1f1ead234f964ff41307994d43c7c10256e8e225ac3
-EBUILD bsddb3-6.2.4.ebuild 1940 BLAKE2B 6e6b62ecacf8aab999f64a17d9a2e28969f55b79c0f42b667a3820787e4ec3a7dc01cbc6f6c5fd3d05d3f96e16ea7a5b33ad2ef2189a5a75e72ef41d783d0fe9 SHA512 7f99c5273ce5da06811359d3f07d81fea1d890444c1bcdcc7d65f3c2e5ac18ea1a42d704508afae6570d6956909dcad6a98c0552795b383b436ab37303440c97
+EBUILD bsddb3-6.2.4.ebuild 1939 BLAKE2B 8f787fb2c77b737117424cdfee3786934d6eccdbe89200d6bdd59939a84cbd37d3a90cf74b06b75bb6542a7181b60cd98bc376f5b26964919fd1e0c1913d6f63 SHA512 8f9278aae23784d90ae23d7ff4ad3289df730a231666bdc41f0cd6a28c8654ab0c71e46e024cd0f2d56b754da6e4dddef64cb1b16d32ce9ca230069b4cf6d762
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 484748d7ecdc..0b0b57a9b3d1 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index b7381dfecf2a..f9205849c807 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,7 @@
 DIST cachetools-3.0.0.tar.gz 20513 BLAKE2B e6fdfe2aff22a9ae35d19acb7a678410c5c06d3147cfc3d57725d942c3e4ce00d5aa8bfce7f8ee80960751643bc655d5d2226382e82c1c5c1eda746cb34a556a SHA512 7211e4d1525b94f5a74a89571a1a3696719d1cb15246f4b8158408082cc59ef03935ba82ddd78a34dbb31b271c234dab6cd82839c13b23159b80264bd552bc51
 DIST cachetools-3.1.0.tar.gz 20664 BLAKE2B acb9ecdc1a9ca4bfdea7b9f593aedd6c8db9f96c703b71fb3007ec6e255d4d99d53c22f6b61ba25d53ac9a3bdee8de7303d18ba05115017bd6ee63c2bacf1fca SHA512 1d03cf42b56857ccc1203a658a8c70fa3c0a3be2ecfa3b9501c14ba674463d4ffccf8a8a9daee13084545a5072ecd7757174a4b074d33b0619020f7ec89515bc
+DIST cachetools-3.1.1.tar.gz 22055 BLAKE2B 9141adb9cff5e7f76a370666c24664de09b1562a9e40636b8103157cc65b146dca96ad871065191618e2d458078cb7da30c80da21b4fded73097bda7916f4819 SHA512 23a7d9c91f97727984585745169dbf94922288e464196d5c05f442226cbff4efeb3588ed463f481bd75892824188bd3ab8031f4f2f8e52924c74428b1034714a
 EBUILD cachetools-3.0.0.ebuild 604 BLAKE2B 2ee50629f0ef6f39666b407ef0aa5c1f096d8d09015a1796711a528c983e3ea07e6bded44cffda9e39081f6e91ab475e183659a5598e2dcfd75a406a4534d860 SHA512 c1b5c0bb6f6e277d0fdf3b14e9b32f8b1ff8c7dceaa53ee3de970582415b8d71458703f5cf2036cac474ff2b44cb544aaefaa75c6b0508ace443df219f8efaef
 EBUILD cachetools-3.1.0.ebuild 606 BLAKE2B 9752544e0328123ecbae39d783147a423be6a043476648474ec5eb6f052f12481a18b849a8afb3694fb83da1d048744220ad70429f48cf9d800fae0179fc460a SHA512 ce7d28be334824cfd888219ce4868f60f8659f16ab1a1723203c2637edd4e082d4aa0e206ad7c4c6c6863b9c913de34fb0220f96f1f12c5830f561e5a86bd726
+EBUILD cachetools-3.1.1.ebuild 608 BLAKE2B 659b231464beccb378959b1bdd44a8a370e363ae4e4f7a01cd6227096acc417c06f2fedfe8acbb76950e959b6f4783deaa14f5ae3f675731060351627e3e6214 SHA512 12a75e69359ee3d1d31da2f410deb9525d5e27b72b2cc961b73bb8017b1a95c078d0a1295dd0553a94cf2f1b478b5de2860bfac12b307dc15a65beb0469fb2bb
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-3.1.1.ebuild b/dev-python/cachetools/cachetools-3.1.1.ebuild
new file mode 100644
index 000000000000..507ba0de8cea
--- /dev/null
+++ b/dev-python/cachetools/cachetools-3.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.org/project/cachetools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index a93895df4821..1f2a9bf46c50 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,9 +1,7 @@
-DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
-EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1072 BLAKE2B 19d846f9e6dc2c1671c816f70ef0a1b766cde0ac96040032cd16d0dcdcc9996849725442981e2f6034872ab043dc8f952126852366b1be34a056dc1335aa5a26 SHA512 31dc85d0fe65832a62aa7097661b8db78e9689a627225f9634755a30bfaec9827fc8822365d2c7e29188224a6c4e3347ceec2e3b925e40931872e8b697cd6231
 EBUILD clang-python-6.0.1.ebuild 1090 BLAKE2B c98cb3a9f8426a3ccf544884459a6e551ae22d51ae45843aa63daa10cf0da9bf4d22f9a1ec635e0dbd045d3d93a9349e79d8dea840bb846285ff07619215278f SHA512 0b274c8efda44e4d1a3f9de7cd5b8fac5bb0a60ea5b1878fe8c07df098abdfa9b8a2700debaad7f425951c4b5c4c336fc8661acd8bdac6da4ac97e152e6c13fd
 EBUILD clang-python-7.1.0.ebuild 1099 BLAKE2B 28f23947826044651ab666dffe31466f1c7f8000eec9f5f3fdaaaa6c5380400d144587c305aea974da935938e1c4921e434442cf5d57a8d611bc93b0f7e7c791 SHA512 3a05a76fe779227853c3ffaeb453b2980bc290b238527d89b1a1b3f5be07610b082369d7e42b3e09b26e8408c9db08b55236743dd3f36dfa26398a6bba6c2953
diff --git a/dev-python/clang-python/clang-python-4.0.1.ebuild b/dev-python/clang-python/clang-python-4.0.1.ebuild
deleted file mode 100644
index c77ee951ec2f..000000000000
--- a/dev-python/clang-python/clang-python-4.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/cfe-${PV/_/}.src.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/cfe-${PV/_/}.src/bindings/python
-
-src_test() {
-	python_foreach_impl nosetests -v || die
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index 953501bcf56e..045fc9c7ab74 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c06467507405d4fd3eb55d93e2210df0eae124167e0206fe9996298abbd7ee26edc8849d5c4062875db12ea92937f225408b4e6 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f
-EBUILD click-plugins-1.0.3.ebuild 504 BLAKE2B a0dec96108abea202201c08be14d5db6108a54ad57fa1055ba398c6bef8b2c9ac0d9335cb85c0558340b404f2fef2831cabf8940948c3bb95d0112f15e580851 SHA512 921a3dcb6184608731243036ca4077088c7ec7e064363cc390203e1ec67fdf94c39427887151d38df3e73fbf3bbfdd26e3ec93830230a4ef6b12851f427ab685
+EBUILD click-plugins-1.0.3.ebuild 511 BLAKE2B 798d667bb72b5f44c87815bbbcae51352c01ace868ed7bf9eb2a0f135c92993acc0a0129eed969eb31b3b40c7ce79d2781d180f895b962c8d4dbdd4ad5e038e9 SHA512 449e41eb7c97966e8a9e7ffa4e3776547bd3914d676807e4e8a5f79e82b5d695962ad1db5ea54b94416e5443e91467f0deba951b43ead3249e8a741325df2f83
 MISC metadata.xml 299 BLAKE2B 86d5b1fae7081c68356c3991a2b423a2d4326fd29d7db97f3371bccf74ad772f5e53ff22c6fd07fc4442215ff4c36401b0d6c7af59a9584416c4f04f426c1bb4 SHA512 b37fff24719eed45df0c672912037dff92cd7c820316fd17ac532d8aa3d6b04103c837fa436fb4863b4dcaecde2fab4fb35b0e86e2f7c083364be723dc979e61
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
index 93fa2316c1e4..e0e394b4eedf 100644
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/click-plugins/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index fa948d7dfe5c..905d182b4591 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -8,5 +8,5 @@ EBUILD click-5.1.ebuild 1213 BLAKE2B 03d408ca41c1d8388774e33e99256cbac1e6a5a1e76
 EBUILD click-6.6.ebuild 1200 BLAKE2B fb5deaa2c1ac14b0f4653835afd3e22718cb4f44795cc315087ed61940993597d0392893e20c0c0ad262a68e50a09712d2b1babe6c21ce671cf5b1fd0d196172 SHA512 d33eb4ffd768d1a26641a62f7ed035b7bcd53a838e9ec413553f3951261b82e37c4905accaa3beeaa09ae6b52dbaaef6d923febc19de75320f1149d2f9be9ea0
 EBUILD click-6.7-r1.ebuild 1419 BLAKE2B 6dcb7b0998d5e05082260d3ef13f86dc8b4794675cf2c24e447c1b9c97787b842ac5a8f5135870f7764be2b3a167e7f7b91ed84cff9729299bf78e85e9d2e4a1 SHA512 6fc30acbbe305fca880f4a192568039d3ebd084ccfa0858d17dc07e11010c97132dff9df7d2f492190d080d6f7dc09c5056eab0371bc348cf51f41468bf6d691
 EBUILD click-6.7.ebuild 1307 BLAKE2B 2f13b521b88d734b69b9be4fc7bbc5cdb5aaf761121fafa9eb4c3fdd5f1f382844b543900a63e0af803dd43d46031018abbd8c73c52557126a3547ade1b2192c SHA512 ea837a3e2d42cf681efe634352b85ce8e63f568289f335dce6d42fe6fd5bd2f576fd52b70835fe4cd58e073013bde5e6ed55b8e29fcf352c12e3f9437e26c617
-EBUILD click-7.0.ebuild 1193 BLAKE2B e7e6d032a9f4d9007722fe4531c06e6cdca61099fa3fa6ac32a34d79b1edce6847bde3eaa13935bef768a18db7126efb32e93914b0c63d515ce5ce4a568b0123 SHA512 a6aaaea43ad24c9d8e6ef020ff70ba6de918227e6b31e3b94b194baec6876f365d66f8de46163d60b2faddafb185cde19d9e4746706ca87d6b5a8f76e5cd7659
+EBUILD click-7.0.ebuild 1200 BLAKE2B a25d0932a8c935ebb3632138392f3bcaa9eaa27b9f72ef7ac9771bc7a40b0cabe5010ed3a43c97fbd0bee160f20cf947740924ac319604ce492b06521bd68f0e SHA512 0533ef18ebdf22e11b0430933da21aea643abade42fc89a86869c3bcdc131007e0ccb23a50a4deeb494e31e078a412db6bf5e2004b604cd899a177e91a2ad569
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
index 32314ed99fe5..3f5b491c7586 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 6552bfb6ab26..c72108ad3c6e 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,7 @@
 DIST croniter-0.3.17.tar.gz 17362 BLAKE2B 59887df1cb1464046612fd87bf82575355361b9baa934817d92ea17ded6a440100015168d7622952a218d96d6f8d3a568ebdcde85f2a7ddbe8a31a44b201b3b6 SHA512 4215fc7461843cc2c62fca05424d5eb7d0c80c21cc1e637f5ce3c4891da458cd609d6ed501fab7fe244bbb234e9834ec8a12b76289eec10808ed6c30c1b4d45a
 DIST croniter-0.3.29.tar.gz 20276 BLAKE2B 951b9f2e998be496420dbf08e06a60a0eb3eb8538d9e63bf11182bc449bc49eaec36c1d1025269974fd0ff24430e16c3cf410d2b50873498d077ac22e0b52fb8 SHA512 0333e8d801aa7453ea6bc2b49abcabb24390535eecb5af2050512cf69410d21179405ceea14b8037c8f107321ee53a10c6060796c86c9b24ae48af65068e9b87
+DIST croniter-0.3.30.tar.gz 18122 BLAKE2B d15e19167eabf935ca12ad2b277b9b97459248c3a47982346070b4500b45f8296beeabf76c5ceb9bbff579ab2d713392c82446b234a6f4b4f6e8317adc67613d SHA512 1e7f5da56991281a16919abbb386a20a8437604bbe0e57d12726d5f19c1c038e9b320a900471b1d4dad9f5dfd0eeb85ced17232a4907e50025592a293a5a8ad1
 EBUILD croniter-0.3.17.ebuild 705 BLAKE2B 334c85369f1742c53af673b644a8fea6ad2a9610431c5b32cbb741c207aa9a61f3988d818d7838e76f9f5329a23b873270c39b2507b55bcf22cd45192d85b844 SHA512 64bbcf594eadf1ee101dd2c959c79665c42a31eb69ff419c72ee22a913ac2b3977382558131d3ed5850b07b62a9150ebd4cba71090ffbd5c77a183d50edb5a44
 EBUILD croniter-0.3.29.ebuild 707 BLAKE2B ab0d3248a765756c0fff00acf15fabcc87b5921a7537af27c17049a4755b06cd0f7f9b279f3880cee8cb43346761c27b059facebd1f8f453fcdd7592419baa7d SHA512 0a74da3662de834545fbba5de8d6b9ceb2f4a06745b9d0a74cf6348980712c60834406e66a23b6447382ea19bdadb6b96523bd7c44c94e5f0efec47ab65b18f2
+EBUILD croniter-0.3.30.ebuild 709 BLAKE2B 7e780000b3e15366d15467805f9ec8ab3cf70322561212aad92bab87c7019ea0dd518370b7528c32a69fbba724e326c6e760ed3fdd22b0c1283f63e92f82d504 SHA512 5349f4d0d96aa8b6a597c7170446de0b69316262e23855509527be9174216661c1b72e557fd63844241df165d62237a2c20c554fcb37f6969b3a1679d6e867d8
 MISC metadata.xml 344 BLAKE2B 1e0acd7a1c4fa483433385eb74da9459dc1348f00cc2bde0d8f5b98a0e298f943628252e15d60b1a3c1b2858358ac6a7683394c51f0e06f3467accaab2af6ce7 SHA512 13584ced1986613a6ab7550b050531bb5049b8f0bafc6dd59045620744513d785635aef91f5300cf9eb302b385e6049107691201a866d51061ef2411a24e9a2b
diff --git a/dev-python/croniter/croniter-0.3.30.ebuild b/dev-python/croniter/croniter-0.3.30.ebuild
new file mode 100644
index 000000000000..7bc1326df135
--- /dev/null
+++ b/dev-python/croniter/croniter-0.3.30.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
+python_test() {
+	py.test -v src/croniter/tests || die "tests failed"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 6f8f4d3ee8b4..20b3e598178b 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -4,14 +4,12 @@ DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd66
 DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948
 DIST Cython-0.28.4.tar.gz 1880943 BLAKE2B a97314147294c95fa0bd6d3fa1a1315d81f8abb46a1f2196009c1ef6f0dd7f47f81a7b31ab81d1fd00e8de37878a18a22d225055181ee74ffe4cc8105d84cd75 SHA512 67d2da2d776fc02193cfe98c8942e93905ec5e30bf4e0f9d5c965d930a034936d4c29c8248fccefff5db6d4dee054ec854994bea63fa3f64ff65df7550997c29
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
-DIST Cython-0.29.5.tar.gz 2045488 BLAKE2B ca809728115865b7d28100943b358d8f5236382e5ae5a43d557620c3bd856407a9f52b756fc910564a6c041d64b1439d60776c90c6970614f74ee2d03f94665f SHA512 4bbf54b248b9a08b9118d751a6bb5dbb81ae7a8238c8a3124d94bf7be67f15b68820e6ce5470903fb5d5ff5c3c213e1580f1c57a8cda33b356263f9ab46e8851
-DIST Cython-0.29.6.tar.gz 2047021 BLAKE2B 32fe6697ba407a75dad79f08fd2e33ba11b083c65f69e09cd269c8a9f445d183a8cf36794fc8b2abb5e98b9626f0c62a099367359634833f36273c7681835572 SHA512 bb8095b438a7d2567b8b831628fbb32c02299c866e41113da62fb5a5d4982dc0df947a9f723a82c52086806435d8f3518e78a803166149d476f81e042a12494e
 DIST Cython-0.29.7.tar.gz 2047944 BLAKE2B 79a2dbbbeef2c87e523d1222c1e3b62a63273644a0295a08fed3909ef01f2167baf15c0344a64ec168820e21c5c99b0accc083c8dfcaca7f1c0cb8c4b23677cc SHA512 1c2fd2185d65445318118d917ff6f8b4b958b0a036bc3ce1587dcb8fa94ccc750901cece27e4d0d39c53db68c3a620edf2dcf9424d7a6df58a0275097b90fa6e
+DIST Cython-0.29.9.tar.gz 2049206 BLAKE2B d81cc4be6d99e8be025167700517880c3250feaf929f84a9de76e2c9f1ac5eb8018a7cb4609d95c01112e35ab54070eb373157004621d45db3c347ea2b585bb5 SHA512 17ac97eaa01e3c6cd9c7d597822ad25ef5cec2354055304a2999a0a0d969fa0513640470260cf0d88c8d9a7c331f02d1ebf144245a6c45de47e26e7fa73b0ae1
 EBUILD cython-0.25.2.ebuild 2136 BLAKE2B 9e80d1abbe44ecf401f9fa6f2c013e02373c294ca654272b3d44d2b39c7e42fb0e890efdf047eae693d3df9ab960b9778266c1bed7295adabf1ea6c858f448ef SHA512 ed871f7d255fbf7e112fcc67247264005f8c38cd4a9c8be0183e7f2edb6817cec0a47ab858133aa32f5042003fcbcec424ef7c6ef930e1e0060b0f2d73c1a0b2
 EBUILD cython-0.26.1.ebuild 2080 BLAKE2B 0d61c28232f347c0646c5585b3d868f0cd490affaafe70b3e3cefe14ca64dd734d36c4e74745acfe49eeb3f28ad8cf215c3059229c5e7059bf0fa5ef63600abe SHA512 1c1a079f24d7245201a069b757e1b490c7ffc8108cf72ae00cae8b128953a5b910aee4be6c1e78750dfab809b0c3a76214a21dd81785655453aba68f9298af40
 EBUILD cython-0.28.4.ebuild 2196 BLAKE2B 05f6e26da211e42cb46b6a182bc017077bd1e632b4c963cb4a0c48a64dde5926866a47195f235ddbf0143fdd35a588d4651181c1ab9443c67975a4abc0bab5ac SHA512 979bfda159eb6dc89cd7a790166926201f0e74ce8ac3f887a5a40a6ee023e5cf4e2fc9d803cc5e563fb32ba3f7ba9d4447fe47e38c5b7ce6f3292653d9f0f9fe
 EBUILD cython-0.29.4.ebuild 2163 BLAKE2B c91f6b96e8efa825c19d1cb2bb228ba3d5143847c7bed4b089ad5fdd4cda6e48667b2c392f64054b96ac50e43296bf69e842c2080e6e4c49569fbc74b174b75e SHA512 388f4f9b56a58235bb832ccc7fd321256112663f02c63d9708ece8263d712c8e6dc3a72bba25c660cdd2dc732686b94e7f4a5690dee9a3d50987c53b5ffad6ee
-EBUILD cython-0.29.5.ebuild 2209 BLAKE2B acfa7a196a677da67ea43d8c392db746be319f5609fd34e24fb5a3de7ad83b57549f8473528d8b9c217f4de84d96acfbee3b828592dae4dc183cd00b5764ef21 SHA512 564fb57372436ab89b195bde9cb2f1883ca9da6b7ff576a6fed81ac1b205ecccade33ad5364180f8bde4d3b5c4fdfc1628ba7609d467800ca30c6853492eb4d8
-EBUILD cython-0.29.6.ebuild 2209 BLAKE2B acfa7a196a677da67ea43d8c392db746be319f5609fd34e24fb5a3de7ad83b57549f8473528d8b9c217f4de84d96acfbee3b828592dae4dc183cd00b5764ef21 SHA512 564fb57372436ab89b195bde9cb2f1883ca9da6b7ff576a6fed81ac1b205ecccade33ad5364180f8bde4d3b5c4fdfc1628ba7609d467800ca30c6853492eb4d8
 EBUILD cython-0.29.7.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
+EBUILD cython-0.29.9.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.5.ebuild b/dev-python/cython/cython-0.29.5.ebuild
deleted file mode 100644
index 186a24979823..000000000000
--- a/dev-python/cython/cython-0.29.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{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="https://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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc emacs test"
-RESTRICT="!test? ( 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 && 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/cython/cython-0.29.6.ebuild b/dev-python/cython/cython-0.29.9.ebuild
index 186a24979823..3bd1896df64d 100644
--- a/dev-python/cython/cython-0.29.6.ebuild
+++ b/dev-python/cython/cython-0.29.9.ebuild
@@ -17,7 +17,7 @@ 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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="doc emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index c235b3c57ca1..08d16e1dca91 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -4,5 +4,5 @@ AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea53
 DIST dbusmock-0.16.9.tar.gz 71014 BLAKE2B d1c0853cfd06848f1d10afdd8de764814054a44080b44e1ac2ef3a1658a538f1e4c7f5936d65658c16da33ccbc2e94f35d2746f200fc6791f645e1eccc55f6fd SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54
 DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
 EBUILD dbusmock-0.16.9.ebuild 1066 BLAKE2B 9df8f24c4231843c9738982b1836135f8852774bbe5de4b102987594973d5b9d8d23694aa36447cd0246d415e2aa9d4c17db0c423ad2255f2dda55445baad209 SHA512 63c6f73a03800b347c54dd6fb1f060d942e260a9230fec805344ad486d2443d39fb8983427dd8e41cf59048599d95e5ec7d0c65f6766f8bdeace873e2bfc328b
-EBUILD dbusmock-0.18.2.ebuild 1049 BLAKE2B cde48334778f85cf75d6889c690c424f19c31c18a001f01f4d3da40187c7f8b0e6861686be9362c6d1e24df3bbefa814e4068cd9b0d9bd6629b25c3d5748559f SHA512 2c2563e7a538b8e833609960ba73addd28259b3f098538969cfbef30b083a9e1ba108cd06a8c70056562b65210f75b18d04217d1dd9ec06f7e3d705df951f10e
+EBUILD dbusmock-0.18.2.ebuild 1048 BLAKE2B 63f0a8d82f52eda473bbab08ca5c8a9ca75b1c98546c37649c2a690288f86571fe9d2519a51a1d8e9943388a7e279074b4a039e772581cf52fc423c812ae9e7b SHA512 db90c3026f33a1800b50fc2e8e756d4e3df236a8f982a2be4c485c5a5ffadc0b1af12a3e9a76cca0661607a69d09719488f70fd34910f91e50a60eb422b7468c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.18.2.ebuild b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
index d6f08eb0071e..94c5aba6777a 100644
--- a/dev-python/dbusmock/dbusmock-0.18.2.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/djangocms-attributes-field/Manifest b/dev-python/djangocms-attributes-field/Manifest
deleted file mode 100644
index 9d8ca544e0b9..000000000000
--- a/dev-python/djangocms-attributes-field/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djangocms-attributes-field-0.2.0.tar.gz 27958 BLAKE2B 23828aa35cab8830cbdab04033335985bb36b27e28fe469c68990775fe379f99f5ba339a7e7cf0f17d9df116a85131f8009068eb76f113b9b785b50f15c9c696 SHA512 2afb7ee05db12573d7f0a174334168ba9e9a9b96f8ac940d01694573f4711845d87995e60ba00af88626eb244f9fee7287328ac3a297c12a2a5d1d90425d897b
-EBUILD djangocms-attributes-field-0.2.0.ebuild 599 BLAKE2B 6357c3633c1b7f222be57002fa17de6207223654b85edb9603abf080f5a7520587fab6f609be64a69975566b35c4e0b5f7d4b78bc02add2a299457e564258caa SHA512 68ed933cfbe3c9d8034857820d1e3895a66b06d7b416810b6500c9d789adb2b7f5c4b6f7e7842d0bf3c5ff20f72dbf6d9fea69937368b979649a4a972d623f50
-MISC metadata.xml 386 BLAKE2B 9bd6228ac5e963f3e4af054380f9f0f70efa8e1c30747de7f304a0ca6543d470bf45a7006b338d80e22fe9d94944f072000df6022a696172364d7cd82949b6fb SHA512 2ece860c10e6999cb835fef57b20352c441a60f53993b77a830db6b2c131727eaec3e864fea4f7254c3f7ea0ab63d61c5238ed9db80de24ceb38fab4a32ef21f
diff --git a/dev-python/djangocms-attributes-field/djangocms-attributes-field-0.2.0.ebuild b/dev-python/djangocms-attributes-field/djangocms-attributes-field-0.2.0.ebuild
deleted file mode 100644
index 863ba36d69ec..000000000000
--- a/dev-python/djangocms-attributes-field/djangocms-attributes-field-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="File plugin for django CMS"
-HOMEPAGE="https://github.com/divio/djangocms-attributes-field"
-SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/djangocms-attributes-field/metadata.xml b/dev-python/djangocms-attributes-field/metadata.xml
deleted file mode 100644
index 1e23483f3d05..000000000000
--- a/dev-python/djangocms-attributes-field/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-attributes-field</remote-id>
-    <remote-id type="github">divio/djangocms-attributes-field</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index b8cee5ccdb7a..4621dc9f47a1 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,6 +1,8 @@
 DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2a8e179af14c0c3f0d5f9926cc3705dcec84d2b9b2b7b3854bf9de178256ad2c4ef4bc567c6ba0d95d2abc32b8ac SHA512 7b06cbc7bf7a7f9002e1d61fbbafdb7ee6fa804145e7ce7edc547384f22cac8f9a9072bc137e201ab08a49eedb5e4f2ea8a1f02bd806d7d01525bdedece4afb8
+DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
 DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
 EBUILD docutils-glep-0.4-r1.ebuild 1153 BLAKE2B 1db9e9c166a235e4da1e5eddbc767f10d9381283b20169a47fff45d1d2ed39c382412f71929e23b49966c97803cefc67bbde254e2f0cbea0cb24beb7ecb5b235 SHA512 7a40e104bb60ef53a9c3c6df65d6a58331b5d1f671b759e42faee518dad584692997b063b8cee47a0db3988dba08b51177ed7c29cf924c94fa9ebb468d0b48e6
 EBUILD docutils-glep-1.1.ebuild 834 BLAKE2B b489e6691c62e197b4e2728fe05436a7c753a48a1dabe70a46b7a0007d324fcf94b2785d7cdef01dd411029bd10f1b0aca2f5cad8faecdc6b71f8bdd08441776 SHA512 d92f970556aa3c6fb264d36eb1520b00195c6d9fa12837bfbcb49f5ed52f2fa41697fb853b008fd3a2e5b0a5241562f02da93df3cbb4cf151d0fd41c6223d69f
+EBUILD docutils-glep-1.2.ebuild 843 BLAKE2B 7ac03898d5801779ff289088c61c3431fa0307867583e0429bf1e6bc512f0acec9abad604b4ae6ee2ee5ba4f7b6e3912d88056c8cf7f0b861657c98a577c20c6 SHA512 ddbb1853bd1ed2f56074d5bc9391ebd1dae28de5c6672388751927ffab7449a11903131f78448b8c946d0b3e9ecff88e1748b3d4d8c60cdef543916f455c01a0
 EBUILD docutils-glep-9999.ebuild 570 BLAKE2B cb654f71ce1c806d6a99796f7e8384d9c9e9c4b71c9a2a50cc900e5c9b7dac6774f5698f929fef77ea883bc75c219f6ad0e5273a98a6dafae4222c1398b75dcb SHA512 b4542db1a99d274ec73f9ec9d46e0bc4490091d7dcaff07173b401f28e1371f6a80356e33e0158fa1785d5ab949e05c7e7a0822b76e0a5eba437dc22ddd1c5f3
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
new file mode 100644
index 000000000000..cc7630dcaa83
--- /dev/null
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Gentoo GLEP support for docutils"
+HOMEPAGE="https://github.com/gentoo/docutils-glep/"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 63134df19447..aa08b7b20a2b 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -2,4 +2,4 @@ AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44
 AUX entrypoints-0.2.3-setup.py.patch 614 BLAKE2B cd5248f366546bbba8c068d8a27f5853ced0757528f95f082473ab086dff5145f7735d48bb29da92237e1d1f31183726a0da4f7a8a405d1635c23ae634414c79 SHA512 eff2b655b0b0efe32fba265ee7816e6618062a665f86371104862cbc2e1ef79bd6ded749084ef18c09c6a5a43f572daff4c3377b6fa39b6b46d926de5bfeb42a
 DIST entrypoints-0.2.3.tar.gz 11219 BLAKE2B ae7745a075d564b3cc25a0580ae9f30f6e1a0b4bca7315c4fc3700408e4ab3762831212a451eb937ab94096d1db5c1478980b216dea7cfb95a8577d6337534a0 SHA512 dbf8085652e50cbdbe137ae655ef765cff58bdaa6beefebf1383dcd96dfcbf9c92580c09e9a58de7893aebdd7b2a701ef8d13a56ef0fa9a3d9ef7a5bd1d9b11b
 EBUILD entrypoints-0.2.3.ebuild 1294 BLAKE2B 9ca193f90026ca4c1eff86509d7285feb791a6bdc8df963ebd8e9206e72662b240ee110c3e1b5e809223a4ce579040a8c37b555e0853083eb43d71def2196ce4 SHA512 10fc02f0393cab09261d8b1a02b0ee2e07f701be086c8d1bd7034b707d12f6e44a7de8656df7a4075dee2b9e8139b5ecd0a891479f982b8fc46d3bbd62cd8164
-MISC metadata.xml 742 BLAKE2B 0d40b3569d09f83f28d5207a9667ea7029dce119d4fbebc474ee93191effe6c587b3e37423dc1deaa1a205089a6150a8c07d486487577b8078fa398ba411d90f SHA512 0588e7b73f038771ca8f1a6aa637f1d2a67ee1ea8bb35b73fcad109deaea11d7e57b61314a088c82d923de66e9fd8fc8ff5927dfc835ee587c819367f1f4d68d
+MISC metadata.xml 623 BLAKE2B 997ce85b64d32c5c365c929f73349582978e299e71b2e304c54e37b0886b19d468270a63d2d766ed7ee52de4a9fc45eb02d11e3289154b03769dab99306d0940 SHA512 0cba95670dc165b6d6d173947a0a6bd567db198cdc6f10617ed68eeb55f3ee4392e5f95fdd136a6a1886a2f9b1e33b0ba8e098ff8c07f7e11b2374ae544ad506
diff --git a/dev-python/entrypoints/metadata.xml b/dev-python/entrypoints/metadata.xml
index acbfe4f76fbe..7cb364b31780 100644
--- a/dev-python/entrypoints/metadata.xml
+++ b/dev-python/entrypoints/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>marbre@linux.sungazer.de</email>
-  <name>Marius Brehler</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index a56602d79ed2..5d151b9a974f 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,7 +1,9 @@
 DIST fido2-0.3.0.tar.gz 125907 BLAKE2B 95054f258c775ac3b4f65608fd3b62ec4165a568c237064ebb66da1ca6ae899a3d88b5613e9dd4be87c05068ebd698be452dd3467800317e5894092216196e12 SHA512 c6ea83e104d77350413156eba4c1aa2635b77ae00d157dce61e5a8539c65aca4dd1dfc5303f9d408359582eeb98ae558aa1e2043a9b1dfcb23415eb8bc9c6a09
 DIST fido2-0.4.0.tar.gz 141714 BLAKE2B 3d57ef1598d2c84cea8a98e75cdef96b77807d4eb5951515560b43655a48bb0816c4e05ef39314b13b6bad84509e09145aeab5727a9fc6cba65ddf42f588b007 SHA512 4eb95a95e1f5b8b49267bc0a11e5501bd041a211ac8a6249ff9cc26ebb0b155b9d16494c18391a14feecb197d61dc50c8530b2ab38ba7e9dc600276abd6f8bcf
 DIST fido2-0.5.0.tar.gz 161562 BLAKE2B 20d4f6c4e54366a26d5a56a84a6ff84bec0f0e22107aa612db721df8a5186a2129373ae609fb58a27008dc700b4b92d607fc2bf16aab7ac6bff8d9e7219204aa SHA512 fa83848e179b9208e2a701a3330faa1dde75e5e23133540eaec896145dbde376bc424a5e59865d3cf90c5765882e22530e96df2491101d2b5dcb22cfc4bcbb87
+DIST fido2-0.6.0.tar.gz 163137 BLAKE2B 3a30d4267a1aae00eac8fa8c05065163f992b72895097aca95dba72300bd9c30373c7537a867e532949af779e8e7528e1a3aad8f04cb0170678675294757b5d4 SHA512 1fb8e591480ac2ac9c405e4fc74895d55d630e462626f849952193c3ae6720104cca1da47af1f89adbcc026034f69dba12fc38577b00f9802434db2162d0d1d5
 EBUILD fido2-0.3.0.ebuild 815 BLAKE2B 47d151f3b6815c8e4e1d1b1b358a990740de87fcddead0faf1e1b5af7a65f25605f14ff187552966639556a590339c15b9ee07d65a5c534d2f73e00c7aecbf84 SHA512 d362a8541aa7d38fb48cee5aedcf3d19f6cdaca0abcad46a4570fe878d5e87d4d54f4804fabf48945e69359242508ba64f5f5feaf65e27a7267bf20cf162a14f
 EBUILD fido2-0.4.0.ebuild 1105 BLAKE2B 962bd3af7f775bcf36789d49b5c38351f4e011ec6353b18efc7bb20ea87420499bbb04917c2f1dabca1315c4b4518b47f8eba73c94871d8a6e3f2c4ff67b227d SHA512 bcdf8004248851758b7ee65a7bd1ce50ad0ccb185c9ca00c11276096e1f75a370e34fe582bda443cfac6bb247ab2c0072b0c40aad53e1113afab570fa44485a5
 EBUILD fido2-0.5.0.ebuild 1108 BLAKE2B 3236a27d2332a0a7a8aabb6fb378ee154fb3f79be7573b35be91dbfc9455b0ff2f5eb610665bc09ad81b5aec1b3270bc6b6b84ec9fcde80f8f7b7139be3a5323 SHA512 73c2a5bd2063a5a08cba6cea1860f4e6b8b2d94e5363672d8155a6ab1a954eb0bc07aafacf67d7a113e0a05b45188efe312818d4151c15f7b0b6393e7cd4017f
+EBUILD fido2-0.6.0.ebuild 1156 BLAKE2B 3d8346c8709265241373b9c4b55efb19417f2d86f650f23693a28ec02756cd1958860bdd3c6a6ca04f280ab3222ac57414a3a1338a10a1dfa6d99576c7321b82 SHA512 a6b08fe75c9fb85deb6249eb6418e2f5f9153e9246d088ecf81c5cecab6a9f5382efba38cfcb46765a62a67e6b69be91824499a5749e9f5b8bc54d5261f25cf7
 MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
diff --git a/dev-python/fido2/fido2-0.6.0.ebuild b/dev-python/fido2/fido2-0.6.0.ebuild
new file mode 100644
index 000000000000..59d15dc14264
--- /dev/null
+++ b/dev-python/fido2/fido2-0.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python based FIDO 2.0 library"
+HOMEPAGE="https://github.com/Yubico/python-fido2"
+SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="test" # Tests partially fail due to stable openssl not supporting ed25519
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	examples? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${S}"/examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 3b2aa3e3aa2e..7eeb445b2059 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,8 +1,10 @@
 DIST graph-tool-2.19.tar.bz2 15147961 BLAKE2B 93f4220d6f86ed5e18619a4300272185673d54418b6b73eb9cf2264d698b9f66589f22fe9906082c5b6360e037115c6df7c52871e33c1dcb8ec64c3596b76bda SHA512 dc0bd93ccf21bb6616035dbfe33b0d9406eb894791e615795d486dc8f9d9991a6b93cf835cf4e59197005c14faedf105f3384cccd42db544104840cf857b2a84
 DIST graph-tool-2.23.tar.bz2 14998733 BLAKE2B 5eef201f9751ba0ee64d3f3d0694631b23b8ee7799d0e0a1a52125b3b355ee30bb59400665404cd040df29ab2534dc0fdf940d2f3abdb1ddfff0894fb150ed3b SHA512 bd7e493806152d004ed8fcd5cd93f8a27200b0acacde07026ad6f83e8b9a0cdbdedfee79f5ff4c41de179ea3293a1d100571501e8791dad2ff608ecb424a9e36
 DIST graph-tool-2.26.tar.bz2 15000764 BLAKE2B eb4db3d6753b4af8e38cbd9a71e5e5a6368e30556b83f8b9b9a67d8ede2fea9789bb959eb405eb1896c69c487915f18849146bc5fbd95bea1b7910c7c871d577 SHA512 97f51f777f45383780f765277d1af6ae4879ec39243e9b5c11a5c8f58e952e34c301d51e4ce86a0de1bb7b86bf7150d85ef182693e99f319a19a36d2cc25742a
-EBUILD graph-tool-2.19.ebuild 1841 BLAKE2B f13e4b7c6964ecc45ea006c704f951d9d8f8c26e3a31590f4752964439de34cedf08d2c9475dccbd2a513b9385ac1bcf0f3e5d66e4ad4ab0ab196827683c0dd5 SHA512 a48d35efe8a4334cd68ee4e8b50b979c26a28eb22c93fba77773fba7d71132f6a42f7d8cc400c8814147a54eec28dd804325893d71c27dfec1d64bcc9e9fbf21
-EBUILD graph-tool-2.23.ebuild 1826 BLAKE2B b5d2945c8a72c143fb8f14b0276c1c87e84ae54b44688db2a76e25c90d64d429f6def85accd5ae633dfcc070f73a4249dbd6d2c6f795aa6f9bce0161bbeb985d SHA512 79f24d5b86153d62a91ba440a9809202e251daccb63f6053290308aa3d31d395be9270aa78878f8238497b590eb93a5ae86accb504daef15c20cddb01b2feeaf
-EBUILD graph-tool-2.26.ebuild 1827 BLAKE2B ab12d6856d360d2154525866986087a5e1fc673c901f1fbb93908f6d17af2b17ae1f418ec2e17932b0fa498858115874f0e4aac058d7afeedf1eee4a8842fabc SHA512 336f4ddc81de2746678360f6be8d0ff594550c13919da72cd24ef5d7084c64d657dcd05c390f09d017bb4821b6c5060b68e5b66c02db5052a26e77537da85abb
-EBUILD graph-tool-9999.ebuild 1827 BLAKE2B ab12d6856d360d2154525866986087a5e1fc673c901f1fbb93908f6d17af2b17ae1f418ec2e17932b0fa498858115874f0e4aac058d7afeedf1eee4a8842fabc SHA512 336f4ddc81de2746678360f6be8d0ff594550c13919da72cd24ef5d7084c64d657dcd05c390f09d017bb4821b6c5060b68e5b66c02db5052a26e77537da85abb
+DIST graph-tool-2.27.tar.bz2 14989318 BLAKE2B 1fc307f33fc3e4642e91c20cc4988915cae61306ac445be070f19c263e2d2a74a241d651dd9c4b6b78d5f28fc8cde00789cf90db53cbae6db0583cf216824301 SHA512 39ea5e76a91f03bc2475d80df6001c87fc47517d279e27fdab413aec8982146993d3c4a370f85cb28a53e5c974b0e90b0fb22538f3d66ef9cb635abf6188d434
+EBUILD graph-tool-2.19.ebuild 1847 BLAKE2B 586f2f7ea0af6a41ef67ed1717c914b6f54978b1e28dbb01fe272fbef49d73747f352ee73eb5ff3c6e7a3ba9d83afbb920ae433ee489a0ea0051128f596f317d SHA512 2fd9c982640b48cb13d198bf9b29bc14b9de9c4145d80c585903b4744a00a00a6f4d619938c0b40a2432516fae1fd1a1115599d63fbd22f5c28bab8658f33f54
+EBUILD graph-tool-2.23.ebuild 1832 BLAKE2B 39d685863139deba4614e2279f71b8ba74db7950fb4ebeed35dc334ca7d1b57fbb69d031fd1350625f4f29fc07eac7e7d723a102340871aa3be2202bff49d399 SHA512 2a5986c429a9aa2ed1c1470bc2dd71a5485e80b19063b0f9862a1cfffc265d3ead53eb76126202923782ef5c95a327fcf98dc60d8a21ff2f75a5f4efd9bee762
+EBUILD graph-tool-2.26.ebuild 1833 BLAKE2B 0a6bac1cf32f545ccaf626f00726e8053958aa026bf6f9ca7d12f62fc9e44b45af85e8c4071751f6b4473196b7fa0c8e8250b2535078b5fecadd938bc05c5458 SHA512 bebc147f099d820e1c5c3c4916e20915ad9612b442a82762c2a7c644258c096d37624c5b62d20bdf5dc79b1522b9cc8a6b5bd2a26b714de82da6d15e23d4c100
+EBUILD graph-tool-2.27.ebuild 1769 BLAKE2B 4b3e95b50104f32abc8290859a0d6e31b0911baebf87b9293a97dd9820315b2002583cccb6567ccc6315f274cdd8c9e418832726c3acab61b219f5119e5c6ac2 SHA512 8281f1260a758166f2496be1c744332acbb429b492d53d01e271f307870af49bb5c6bf5594658f025c178c1ceb31e0cf649c3a17de9c21a425233352e9c3e47b
+EBUILD graph-tool-9999.ebuild 1769 BLAKE2B 4b3e95b50104f32abc8290859a0d6e31b0911baebf87b9293a97dd9820315b2002583cccb6567ccc6315f274cdd8c9e418832726c3acab61b219f5119e5c6ac2 SHA512 8281f1260a758166f2496be1c744332acbb429b492d53d01e271f307870af49bb5c6bf5594658f025c178c1ceb31e0cf649c3a17de9c21a425233352e9c3e47b
 MISC metadata.xml 354 BLAKE2B 7b0030598a6adc4b25abaef5beb3a7cbf24142a41f3272ded30dd4b9d8ac1e0ddfb0747affefead95b2ecf2a7540308a2e1e9c3dffdee610a2542054e9ad82b1 SHA512 4f8b73df8933d138d1d86ef9436bca38dc449b035701b51ea1d3ab666f3348a21fd3ab09817358d8e6e15a9189a7e61edc3d9af42755e4de472f1acc59852f51
diff --git a/dev-python/graph-tool/graph-tool-2.19.ebuild b/dev-python/graph-tool/graph-tool-2.19.ebuild
index 25260b09ba80..23f0806166cf 100644
--- a/dev-python/graph-tool/graph-tool-2.19.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.19.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	<dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.23.ebuild b/dev-python/graph-tool/graph-tool-2.23.ebuild
index b42f702c4c8b..68411e981641 100644
--- a/dev-python/graph-tool/graph-tool-2.23.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.23.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
+	<dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.26.ebuild b/dev-python/graph-tool/graph-tool-2.26.ebuild
index b3cff09874f7..70694fddaf91 100644
--- a/dev-python/graph-tool/graph-tool-2.26.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.26.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
+	<dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/graph-tool-2.27.ebuild b/dev-python/graph-tool/graph-tool-2.27.ebuild
new file mode 100644
index 000000000000..722d8632350d
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.27.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="https://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat:=
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-mathematics/cgal:=
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash"
+BDEPEND="virtual/pkgconfig"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	configure() {
+		econf \
+			--disable-static \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="boost_${EPYTHON/./}"
+	}
+	python_foreach_impl run_in_build_dir configure
+}
+
+src_compile() {
+	# most machines don't have enough ram for parallel builds
+	python_foreach_impl run_in_build_dir emake -j1
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index b3cff09874f7..722d8632350d 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit check-reqs python-r1 toolchain-funcs
 
 if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+	EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
@@ -25,19 +25,19 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat
+	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat:=
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	>=sci-mathematics/cgal-4.9
+	sci-mathematics/cgal:=
 	cairo? (
 		dev-cpp/cairomm
 		dev-python/pycairo[${PYTHON_USEDEP}]
 	)
 	dev-python/matplotlib[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-cpp/sparsehash
-	virtual/pkgconfig"
+	dev-cpp/sparsehash"
+BDEPEND="virtual/pkgconfig"
 
 # bug 453544
 CHECKREQS_DISK_BUILD="6G"
@@ -58,15 +58,12 @@ src_prepare() {
 }
 
 src_configure() {
-	local threads
-	has_version 'dev-libs/boost[threads]' && threads="-mt"
-
 	configure() {
 		econf \
 			--disable-static \
 			$(use_enable openmp) \
 			$(use_enable cairo) \
-			--with-boost-python="${EPYTHON: -3}${threads}"
+			--with-boost-python="boost_${EPYTHON/./}"
 	}
 	python_foreach_impl run_in_build_dir configure
 }
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index b20414f26b61..8873228d3431 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -3,9 +3,11 @@ DIST grpcio-testing-1.17.1.tar.gz 12422 BLAKE2B 015a756c04db0d6a67b954c36c7d725a
 DIST grpcio-testing-1.18.0.tar.gz 16603 BLAKE2B 6f6170211701b56d5937947ef227cf9199ec1fc7c5fdfd140a222dbdee7db7d352e95fbe2d50be8e01895c19986b858c9dc2ee2ca4a6582e484cf05b148e0a6a SHA512 1f855129b7b939a1b70105e68c1ad78b3dc32efac66657a985d1f21a3945a2077d80c70fbe5bb0304fd8f85d69c1a75478b13b7a824c9e66a0563c1730c13f83
 DIST grpcio-testing-1.19.0.tar.gz 16355 BLAKE2B c4b88f4fdb358ca121593b1628faacf269e02ce1de8693401197883aed94005ae1903da9b92f77b77afa92f05a74ec6f65fbea22e6f16b7acaeba90283890b88 SHA512 82522447620ab0155cc3e4a159897942da15726ea7e29a0dccd76fa39e718539c8f05353b718729c87f77864873ae51f2b28487676ba6f26ccd9851a17f1973e
 DIST grpcio-testing-1.20.1.tar.gz 16553 BLAKE2B 5ea6a92238cc086a030c23666340f32bb00941518f0507a2db306feccc568263813be6819d4bcd593f7e52575f79b1ef29d3024e591227b530815a95211a2c73 SHA512 5cce728015466ae6f14c28258abc71e73ef0b195ba2a874999d3a18f9f8e45450b50a3b4d3ee72f07d8c306a324de60383bfb0e12e5331968fe28519e0f2cb08
+DIST grpcio-testing-1.21.1.tar.gz 16879 BLAKE2B 4595b99b174db549a2637c9e203e7de0a799086c0119751927b7d57b3837958e296671cbc7b6dd5598d8ea10fedbb23380de200604367308186c03ed77e607ea SHA512 3556c21f0d51a5b4cbfcf8eeec2b383b1aca5056337d3ee8f46a5dcc7c7fc4507b858d2309232e982650495a83d1d80f6fa251f25f77a6b180817fab8d4c4527
 EBUILD grpcio-testing-1.16.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.17.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.18.0.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.19.0.ebuild 522 BLAKE2B df149020fd4d3b66348cd08db83e3669cbfadb8c62110efb0e643af2737be7eb2576ed04217722936cff8eb6f11fac521edcdf22aebd46245f845ba0ffce6410 SHA512 90ad1fbbd670eb50c52d02a51963aec60287d8b803d99df335c84436fe7476a376c312ec1e1d68f285838ef7bcbf4719516879ca806283e1dc8d49a833ef4a7d
 EBUILD grpcio-testing-1.20.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
+EBUILD grpcio-testing-1.21.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild
new file mode 100644
index 000000000000..0f6ea5237441
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index a1c82d540408..efdcc59cdc31 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -3,9 +3,11 @@ DIST grpcio-tools-1.17.1.tar.gz 1900052 BLAKE2B f84f9b7f52eab6758321d50aeafc25cb
 DIST grpcio-tools-1.18.0.tar.gz 1925482 BLAKE2B a8a97e3a6204593bcc0e96d392652d31d1b1d545c91922222b124dc250d020327ed81fcc1c5feb02115517da34141651a4b24a13df825fe352dfed7715724768 SHA512 5c581a41804eb5dbad34829c9dd32253849484dc6e92d0bbd43b816ec3b45b741b23bffeb9969bf2dc3b7183cb05135f6dcc20f5b260c07f7173b9688c9852c0
 DIST grpcio-tools-1.19.0.tar.gz 1920614 BLAKE2B 00d3a702071d33a51fe47aea6ef47d58e2901df6b55cee8fba1c382e45695fce32e2fc20e438d48b5024b7a80373bea76466f2981f58b106192016078f2df214 SHA512 f9832237a0ec3e1dc8550dce5c0b06bfe43d1bd164b251c1bf9b8075ee647f23c8da31f90c84cd7f047682832876616ec5c73b495cb4a1fa2d83982cf368eee2
 DIST grpcio-tools-1.20.1.tar.gz 2018570 BLAKE2B 9c2ba04b06df9883ac79726aafec6eb129c338be93c61d49cafea29d4849bd497bd45da106431b7e17ece281037cfb0a53ed33ca7078306b727812fbce9df9b4 SHA512 2888e5c3ec92733b43b6bd115bbbfc2bace99ffeeff513a8c1c98fb670853a4407de41a5449613f88d8586fc21809d5a0c6de953dc211f3108b32198964db2ee
+DIST grpcio-tools-1.21.1.tar.gz 2032788 BLAKE2B f26e94c92ebe076496a8738dcbdf9b67dedd5fd60426632589ba88bffd3943cd094881d61b4c67e25660902ec10887a0ed154dc9e6e33d97460313514f4d5eb6 SHA512 624f23bf9d7d6787d4b65e60d948feb88548ed6963443cf8cb1a3eaeaf03dd2ca9a8fd9e8a6882137b781b737b23934b84e3a922df95da95885bbd5f3de873b5
 EBUILD grpcio-tools-1.16.1.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
 EBUILD grpcio-tools-1.17.1.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
 EBUILD grpcio-tools-1.18.0.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
 EBUILD grpcio-tools-1.19.0.ebuild 759 BLAKE2B f6e127ee9d8d8a98a5f810ca27ac3bf15041a58d95abc247e6c79fc1d7045c71919a29a92a8e54f08707ca16d9cd069bb2c114ea900aaa1f042682ca6f9c261a SHA512 124ebbaa082a3acfb3a033d1ac8210c6f7d22a79b99494bbe6da518c22650d65fa5866b514c9b420640a23e3e1d6b2a065f0a97d956e76dd07f27bf3d240b6e7
 EBUILD grpcio-tools-1.20.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
+EBUILD grpcio-tools-1.21.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
new file mode 100644
index 000000000000..c9f032bd7710
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	!<net-libs/grpc-1.16.0[tools]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 95109b3a65bd..9e3ee7ceef6b 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -3,9 +3,11 @@ DIST grpcio-1.17.1.tar.gz 14563233 BLAKE2B 61ccfaa967ee348f02f5a201e4f36f25d4fa0
 DIST grpcio-1.18.0.tar.gz 14601124 BLAKE2B 4dc57243759c573b960e841def6af335f490fc6aa285f88979b4c66365b104a84269688c589ed7ae797527b04124a9997937f5bf33b179978077b2b680e515f5 SHA512 da791a418e0f6f3a7be921e107586837edcd2020dc8dab1107712372ebd4896b6b94e00d7501ed957e4ab0d5f7d6a3f2b57477ff33c55eb5e4ad7828b2f21624
 DIST grpcio-1.19.0.tar.gz 14621509 BLAKE2B b756ba60d317baa089b8ee57c458bc68fb72e61a87150f1ef3366fea23456ca8d5bd443ba1579d1bef5d0049f249fc8c2c6e7c7cc0967eb58c102fb03d783103 SHA512 620459dd1a22cf60cb6bccb1b7dd64175f1efdfc098152cfa1889ad0a727b7a92b72f9de28b57e9a45cc8d2c22e2fc36307af8ab52ced454a91aedeaf7158273
 DIST grpcio-1.20.1.tar.gz 13882426 BLAKE2B 4211d9dedc7ba858a5124798f17b3b158f255d055f32f5947191fcb5fd45cca9c97aa3f8c4966e7195add5289ba3747a77b2f0c01a35762ffbeba6938c76046d SHA512 0ac126d8b2c25204bb03daccfc9b17016bc18dd31f89f6e208f2ae39d7e6fd17ae04a8178367a5334421d959b14fd3d31ac71a692b48a060d98f983553fcc3e2
+DIST grpcio-1.21.1.tar.gz 13919484 BLAKE2B dcad98da8db4aa588facc30d1b010ec1e4d5f8085751422277631329f1c4949ba3e2c3882829354025a845992ba9972df1c48a277df93caef9015969f9423aef SHA512 0ea20490ce5e776a6253d4b89dd9d9091afb7462d6bd6bd9d2d3329979d61360a3e31abbd043b90d0908512cf7ff2668bb21cb472fbf0ad5a3b5963073850dd7
 EBUILD grpcio-1.16.1.ebuild 921 BLAKE2B b6299a97f90c14a8fd60c148cbe6449a8025b391c69a7f3a9fa1201e06317a687982c873437b270ddceaa5470d5077cc840cc931c65a6e7cb442ad7342f75c8d SHA512 70b3fd83bc2bbbbd2e1cfd93624a5f6a18e2a126165ec5d2d1d946e5f77a672ecf2a2ddcc3f21e29d14e0d3e65e97edb89f98034b0b81644adf516ff3ae48259
 EBUILD grpcio-1.17.1.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
 EBUILD grpcio-1.18.0.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
 EBUILD grpcio-1.19.0.ebuild 1097 BLAKE2B d9eec593595d99eecc5ca5e127f1ab24b015715bfd76b19013788c793aea428732daddcd6458889142a1ec542cc82bbdcf1f74d6b0f158faf4a4722efedf5d36 SHA512 353cad322f66ea4dd434f8c26b29220b5911a66e53228b6f87b34fbb6fa143e9f13dd78be15b9e1aa60b912837e73c7e0554a015c6c788cd8421b416962a9b7f
 EBUILD grpcio-1.20.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
+EBUILD grpcio-1.21.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.21.1.ebuild b/dev-python/grpcio/grpcio-1.21.1.ebuild
new file mode 100644
index 000000000000..095bde11b67c
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.21.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	!<net-libs/grpc-1.16.0[python]
+	sys-libs/zlib:=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 01c743e488be..e1750299bf6c 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,3 +1,3 @@
 DIST hcloud-python-1.2.1.tar.gz 63592 BLAKE2B 9a6d2dae97ff405ebd9b92bc833c9d953c13840e68be4eb43fed375a60e55cf4bf9b4b742b26fb03401f631b7f7127815961861cb673adf4839c829141c8ed00 SHA512 cb70d190350457fc3c6e474bc6c943070102762595dac2f386041956f64255f390a928a2f2411be861645cd65b015ab9e0c931b36aeed0076b06d9f67ac72d1c
-EBUILD hcloud-python-1.2.1.ebuild 1057 BLAKE2B c8fda044b354b74e8a282868820a70160ff64ab607e0b0f3ef8da7a5c4e7257863bf125318e30579cf444dcfe85140ee5ce53e5b1f6650b27c10709b7f2108e9 SHA512 ae66456a47e8d72a8c6c5cd2e03ed333e5da3b66ead7aa42aefd4d4bc11c0534f9ab16fc0bd32934bfbf24ac3566470cc048452333993780f378460139250ddb
+EBUILD hcloud-python-1.2.1.ebuild 1057 BLAKE2B e3e150a586a21f819202687513e4cd98cf80a38f017322f99cfaea2fb1e57c9b3dd13b6cfae24b53ca1ed50a70689a26c47253e8f62d80d32fc7b3ba3de0b3b4 SHA512 c1c34c485aeddd153d4ea714e15d31d34b94a3da28a026b9e6648382ca52c5c0cfa8ab6fa56801abcd0fe6cd142efbf57b9fe3d455a986b808a9d5309279ad18
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
index 79c12ac6fa46..e9d98103d9c9 100644
--- a/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Official Hetzner Cloud python library"
 HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v1.2.1.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index db2af269eb4b..12cdeca43b7e 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -2,5 +2,4 @@ AUX hiredis-0.2.0-r1-system-libs.patch 746 BLAKE2B 5819aad60d449d6516587855bfe1d
 AUX hiredis-0.2.0-system-libs.patch 899 BLAKE2B d84ddab512839d0901b0f14d649970252e3cb00716871f26a68206a54b60e4b015f4e8498211727b0de7d72981e4171ae5517258ba8630678343da02ac0f3c7c SHA512 fcfd8b3bdc4e987bc82d461babec71b7f35c50aa9a9032784821dc782cb45ae714c2f199806f84449aa5e8b9a5d4480b0ca76ec1b4f1cfbb869a5ada7486951b
 DIST hiredis-0.2.0.tar.gz 46113 BLAKE2B bb0479f99f5f705488846ff5e7b52d6e8a5c34519936aa747027e8a597271d3ba70efc2455f54c24248091a4477ac2a307cad7d89a03c96cb7d331e6b6e82a30 SHA512 9eb18ec089517340043d14938a213b139dc948dc9cf2f9c65e632bb4694ac22543b87a5875c1cea083e2bc8e303103c749047889cdb3e9d5680b586d34330c86
 EBUILD hiredis-0.2.0-r1.ebuild 613 BLAKE2B 85b60462fba3c0008a66822f4a80d966cf3f9700bc8791dc76791c573690e662f8c9d33ddc91c0cd764d2633e117605238322def6a5630c8bc5c6365c1189155 SHA512 abc9e2e0d5778abc443499ed17ac6a9e5975d3c7f70ddc90dc700dd222bd3911dd9440bef2be45b24723cee0c97e10a5bd17e78bc468499791011b4b52dbc8d3
-EBUILD hiredis-0.2.0.ebuild 607 BLAKE2B bd77f99a7b594c7d4b3bcba2424a3c742f77c5edf6cde7ba6c20646f4d7639fee0562fbd9c4f355ebdd5d5fbc856c678e97462164d297d41f6eada8ab3f9dfc9 SHA512 29813ebd778e854535dcbe41b770f0a32f5159964f2f60c0339458306131d0cb3c0c582cfb026a9e3223061c39135002c35e5c7ab39f5147eb2398e55d8639a9
 MISC metadata.xml 494 BLAKE2B 066e1d365169e3818e9b5d37f7a2c7812af63ccd2ef79ce1e8dd224b2aa4d110792441762e769791d2c93f5f90349390cb04671ebe4cd199117df20f6fa7d8bd SHA512 f378121293d91d941dcede71f7e7a1a3e6fe906aa5963bd2388f8538d4e696d0bdb16c4f44126105b43ec81b1ee9e36e9549e7557d76c6a032c1cae3a4103265
diff --git a/dev-python/hiredis/hiredis-0.2.0.ebuild b/dev-python/hiredis/hiredis-0.2.0.ebuild
deleted file mode 100644
index b403546673cf..000000000000
--- a/dev-python/hiredis/hiredis-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/pietern/hiredis-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-DEPEND=">=dev-libs/hiredis-0.13.1"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-system-libs.patch )
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-	distutils-r1_python_compile
-}
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 58ed0fcf9470..5470ee2cdc5a 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,3 +1,3 @@
 DIST httpbin-0.4.1.tar.gz 88101 BLAKE2B 3df333ba92d50e065a598b2dc51ff3355eb94eb4b3a3094ba79cbe95fc11424e05f187e434ac299023dfbfd790b32db070a37e08a962ac19d803de4405603bb8 SHA512 feb519ee909c5115971f4bfd488ec0f9e987cd473464721f4e343e09b9d8fc592cf48b50ff3a2960bb67310521d865091cd766ed351ebfaa2dc8193115e9f052
-EBUILD httpbin-0.4.1.ebuild 888 BLAKE2B dd2b79e54dd79a64944de8af4e333980544ea186d5bbea1ece7ebf6914ab3f5f27ad6e2e4e50fc88432faa4d67e4a2bb9e5f99cb88eb0382c43af21238da9e7c SHA512 dfc4b2617611b7f9d2fccd6d7762ab33a8afdb7581d96fd7361103ea065807eecf8b76dd551d171e8f5efe0b2e6b39bfb15de4a0bd146bb1355539812b263f7a
+EBUILD httpbin-0.4.1.ebuild 895 BLAKE2B 4c5c5ec61394a4f13f81d1f240fb8967469d863c734c36ed1bd02370c3d5e533b885d8a7aaa64ae19ead1afbc6fcb67d9b0ac42b8fed3f0660ab4dde4e41b9c0 SHA512 49a277badcbae212f365d58afdf744b03f6c32b42837a93633b75f4564464e14872817f0ff0c104f9b5accb33563df4b82b29595f6efe3da317966269ebb79b3
 MISC metadata.xml 500 BLAKE2B 1270abbd84e19a72d75a2955858c49c6b33a8c92da7f86fb7853fde55968a840d941fe9f7cd1ec2718e8cbcfede6166c412aac7fc40e483043330935720dd898 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1
diff --git a/dev-python/httpbin/httpbin-0.4.1.ebuild b/dev-python/httpbin/httpbin-0.4.1.ebuild
index 50b502713c17..bf83eb39831e 100644
--- a/dev-python/httpbin/httpbin-0.4.1.ebuild
+++ b/dev-python/httpbin/httpbin-0.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipynb/Manifest b/dev-python/ipynb/Manifest
index 52b1ef2a1da4..3a4eddf41fbf 100644
--- a/dev-python/ipynb/Manifest
+++ b/dev-python/ipynb/Manifest
@@ -1,3 +1,3 @@
 DIST ipynb-0.5.1.tar.gz 50890 BLAKE2B 57c7d680b467b67baeef8b36f741cd1f396c716b20efe2bbffdb889a1e78ff81ce10dd52bcc01450279bda5bdf17b39a0ebd4d014e884fa61a8c884d9042c04a SHA512 30e4755661795401b6139e79b8046cf1d157660cc1effee4c19fe62fb1b0daee4daacbea3a6e7cf0c16d7efa6d82d83becea11894bfae6557a1d6cb04efd18e2
 EBUILD ipynb-0.5.1.ebuild 468 BLAKE2B a25b40b88a141a006610ebd3757407233f3c8a85c60ac3481ba5713a6b204080224a8400f4bf8f6f158c0bf550fada898b24132fdc2c232d17579a502cd84fea SHA512 5de722c9117db581e72959f9699548f717fd788e4620542ca1fc24b9dda9ae4c4089646f24f34701d097d82223967eced38a019c61748bade6aa788ba7e540f0
-MISC metadata.xml 667 BLAKE2B 5a5af7df22273f550e9d2bd7eebf7f2bf4a00903949f3d0be67f38d57896a86051595ebde9310cbf4bc25d103c3be8b1d7388efbc3b72faae51d835329bfc027 SHA512 d248835afd2ab8ae67ef01fbf340ad06739c962efe9efa2a64565d7e189422d8b435514ceadd848ed4d70cc086b14f4b7ec0ea5c0e5cd0da306fca7e924bcf12
+MISC metadata.xml 552 BLAKE2B af3199bc2d1056f824ea7af9d2028e279f9137914df7295fa095795b472ac32cca48712c53567220d22330478c66af505020f17f1519c2bfaa7ae851bb461192 SHA512 dd576715c94368f5e15a3433f3f1896e7630cb91a6247050ca4519c6eba4086df52f9198d5dbce26ffe7de31413f6e46b4b7cf3eb637077d92ffc99ae5868a29
diff --git a/dev-python/ipynb/metadata.xml b/dev-python/ipynb/metadata.xml
index 580977109cb1..aa8b7a52a645 100644
--- a/dev-python/ipynb/metadata.xml
+++ b/dev-python/ipynb/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index d353dbc4e295..c9c4b31ab7ad 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,5 +1,5 @@
 DIST isodate-0.5.4.tar.gz 27691 BLAKE2B 91c05cab9a9d7313a4a98bf6843c4a6baceae86e2f030c684d0b7046d6df9e446124fa7704fe2c4689f2ab10da6c3ae96922809742cb4efcfb04a50f48bfc610 SHA512 ef5fd27ffa61ad10abf499723c452fd8fd6c2f08a0d5aca6ead88857e5d159f50a3d01769b9fe0aed59a57b0f89a70b359135b0d7c5e6a75d023daa824e5d80a
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.5.4.ebuild 625 BLAKE2B a185da6b5c1fec9af8e0835eb405f9c7ae40d9479057a7045d505cee0ee2c32d61da9fa798a161cfb3609267d039d0f2c963b5e7116c1b3f24951de5af3abab4 SHA512 e44e18aa0a83b7777a437adb58e5417a0f7abdd877fca16e2aa2ad06c239911a562acc5259b41776441b9cc4c9e7ad4b4a591dc6fcb4061531b48967bd81f58e
+EBUILD isodate-0.5.4.ebuild 631 BLAKE2B 11a0983e72bb75eb1dbb8fba754f17528c726238aca5fbf013e08f17df361e0419ee1b1721f91b33da90f2c0ab4e17d45315d02072d554a0ce0c40c1dcdcae3d SHA512 ec54c6f2e42630d7670a6c281321e8a8b0bb5e4eccf9ab9adf0e8b12defff39971b203fa4880d93e9fb054d0fbe85b1dec2eb8594c39eefe7b53867a45b8da20
 EBUILD isodate-0.6.0.ebuild 716 BLAKE2B b7534068c13ed318559b37ba90dfad4cb4dde84eaafae10f882f5a04ae8bdfbf63b16e2646d4f6e38c2042b5dfd335920d3bee8d9c524b3151c445e497ec81e4 SHA512 43fb55262b99543f132aad40bac447c64535180d4a74fa7a1bb4fcd32676f6d322140987eef1e4b40903f32a76da63e298e39329e7c6cd167ee0a2cb7dee0449
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
index a2bf29a30cfc..ba76f79c7163 100644
--- a/dev-python/isodate/isodate-0.5.4.ebuild
+++ b/dev-python/isodate/isodate-0.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 46c31a161cf9..6dc62d67aa5d 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,3 @@
-DIST jellyfish-0.5.6.tar.gz 132177 BLAKE2B f5d3ac95c6057fc890705c7435c4d79ce81de4684cecea89001c00f785bc85c316587a85ffc5e3334d239d1ae6b375525924fcadb32d5159925d0217e488465a SHA512 12f09e877dd2a9386adc336a56c8ea6566179e5ba333045ad70604c17c288fa61fad2aa9735c76c58d69dfba95f99876e608e2d05995085f970834132fb8504f
-EBUILD jellyfish-0.5.6.ebuild 986 BLAKE2B e454eaa31fb23bb8482808b0abd8d08193ee3cc37e13398668246ca347080274ad74b7d3912043e795229ca8109bbe5ebc00bde564d7b10566865d5a75e94810 SHA512 eed0ccd59ebd849e61c2d49b0f5b8556a7ea27c95c1b58633f4f382f6d81c5f3fb0a12d3fad6af28b8ab649abb5b4172419d4c7945e17fac2210c2e7941989e4
+DIST jellyfish-0.7.1.tar.gz 131122 BLAKE2B c494e38d3101b1a7bfd295b80957d834bc3e475dac72bd9d81669466eb395e293faa41a581953250133d455d20ca71959414cabd73d5c3dea444ee39e4e8f973 SHA512 c8464171cead812f6dab8c61c74d83afafbf6451e7143e5be74400dffcf895be925a3628ac4fff47467b6dbf70b6d068daaf1c141b1846e53d5d19bed1617ca0
+EBUILD jellyfish-0.7.1.ebuild 982 BLAKE2B ea3d45e98b2cc9c132eb52b57b1087fd77d480cf7e073dbe34e13d6e551c5fcdc9a4872bd01fc22944bc22d1e7274558e483c489dd5108ecfcd1b6c6963a3975 SHA512 384a979f24a1e59bf6d06a8c473b49108297b0b194bfa41c8e00fc6186fedc896e34c5ba472bc3f1e13eeed7a3d0662259dbea5daadb3bef3f12aa1c76a90f16
 MISC metadata.xml 503 BLAKE2B 5233c8c8b58779463d926f276a3fac04e25f70ed8992e75aaa4963a259de9d525b3dd4f040e0fd2aca83efc5bbbce73b7eb86d5b59cacb81f9aa1f82c7949850 SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a
diff --git a/dev-python/jellyfish/jellyfish-0.5.6.ebuild b/dev-python/jellyfish/jellyfish-0.7.1.ebuild
index 9e60204d8f18..f3bfa9346a12 100644
--- a/dev-python/jellyfish/jellyfish-0.5.6.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
+EAPI=7
 
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
 DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 5957643afa4b..bbf3249f247b 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,7 +1,7 @@
 DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
 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.1.ebuild 1651 BLAKE2B c76d9e3bf03394949f2711cbe09d56474c4bc9355f8a46e4e6e34d2555df526ab04c51d98bcd91a31cb52fd6068906cec73bf9f157fe1b680e9a3564722fa6b3 SHA512 62618c1ec2161811ada2997044abd257aee2201b1841990a48227be00e4075d279abbf4bee020bb8228b5e9bd1d023f2b7616fb45b76b2da1757ae92dc2dae1a
+EBUILD jinja-2.10.1.ebuild 1646 BLAKE2B d2eb73bab2dce7041bdc9124e38eb45351da9ce1e22361b4bbd97723f69878af4979a1cbaa60d5a703b455a5cf471c7afa895b59a5190bceaae13b5901804fb5 SHA512 f32df86711c6daebffbe74b1bc0671301c53749b6a93da06a959c36c7087a2b5ebb6459248df0d188212eacf9ddb66928ede1c3266bddebc7a7d43cbf033d9df
 EBUILD jinja-2.10.ebuild 1644 BLAKE2B 5337458f20455b9fb20d96a207ff87aa29fb8b418de76e4f9d953cf61b79137ff780dcf41fbec99a15b19350142653cfe9f61fd3dcb0ff46fcb92deade13f140 SHA512 508948d814e81917f8575a1b5d83c78f0636fb2350acc2f5909d07bb09eb544c3952d994cd82f6788d20184454e69bb1cab18b63c8ebc0839486af2dba63ce55
 EBUILD jinja-2.9.5.ebuild 1735 BLAKE2B 25d70d81701a93dd526eb0797c7b30bf737692e23182e03305e2adcbdb96ff980a6665aa00eeb1fea856ec3415becc7781e00c38ca6026553e5238bd3ca8a05d SHA512 8ad076186716fc63577f992000629cb546e0bed4bb378f51cc881059be529b4764e66f62c19c66d8a046c4386a63df50ff628f07d2d0697b1795af9572d6e17b
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.1.ebuild b/dev-python/jinja/jinja-2.10.1.ebuild
index a5a156d90816..a101e331f803 100644
--- a/dev-python/jinja/jinja-2.10.1.ebuild
+++ b/dev-python/jinja/jinja-2.10.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 528a0d3a39ea..951fa41cbd69 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,4 +1,3 @@
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
 EBUILD jmespath-0.9.3-r1.ebuild 593 BLAKE2B 668709a0f0ab19eb3abbcb3b941346aeb24b7199970cbe1d8825e0980eadf3db5f65bbb1517835b3d52b4d257ff8882e134ab3234d46c3086c40e282b10139f0 SHA512 1119ff6db0942c5b9f0dd1f886cc2ddac9fe492c3082b04c5288d798489cdb16a444fa751215b9c29da857ede677725338dbea4203bd70a18da16865e4f691ab
-EBUILD jmespath-0.9.3.ebuild 589 BLAKE2B 9c2d982769fedec2d472173cf504bc9b44378704ec3a6cebd1191eef3c435656589f2a3b630d538a968c01f00532468facdec0a0007c71f8091cf05a65908336 SHA512 e834d3f8c7eb73d08e121c950a60f332ba04d0351001d55dea70a3973180e74a81d5dc91ed11b08cadf526406b8345ef072089499f34d99b3169e178777818a4
 MISC metadata.xml 570 BLAKE2B a6d5d0e838a59de2031b7df52ac683dbc5a7d692ed96a6334bafc5e76d0018f32990913a49539e7d093f195f548ef4ab55e8cdc93c1fa1779d87140336e40a8e SHA512 dc7e96be59813dd79d3492c619d3080c0858711b948843a12a2b9043b853b99885b780b130425ed0f437d2f51139e0024c3f37623cc7c4794e86568995bea36b
diff --git a/dev-python/jmespath/jmespath-0.9.3.ebuild b/dev-python/jmespath/jmespath-0.9.3.ebuild
deleted file mode 100644
index 115fb480368d..000000000000
--- a/dev-python/jmespath/jmespath-0.9.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="https://github.com/boto/jmespath https://pypi.org/project/jmespath/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index b3b12c0e589c..874f69d32142 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,6 +1,6 @@
 DIST libvirt-python-4.9.0.tar.gz 191922 BLAKE2B 272f0827faa7083e4896b34cea81554505e38733313df556d608fbf0e2ab935088ec5d57e9678c7679e172ff99a619939abe8cbd828b49655de70daf11d20efe SHA512 7d1345693c87f11be9dc751212820f4c4a519a467703f0ea2fcafd0e66d39941686cf7c84c2c68e8639889da1bfbc9176a72cf1059c87d76a49b2c74a7b05c0e
 DIST libvirt-python-5.2.0.tar.gz 193270 BLAKE2B fecd1a07091746779a91e0cfeb9c3068048ee7e51d2f79064b4ee529a19b78d04ba53a5abab68182a1fa9c4a82f459fa9e971c33fcd10b42fe7011be17f7c6e2 SHA512 afee2dcaf08d530e6298fdf2db674af217b9e4115941258b5815aba00087d96db6eb421c9854d7dca0f9dfe24069df72aadd969c924545e72be216f01bc173cc
 EBUILD libvirt-python-4.9.0.ebuild 979 BLAKE2B 845bea170e3514ecdda19b74a1e3ca627cc272cf6c39c5527f06f036c8eb67aafe67c4ac2432a060c158898a214e8f2ac32faea1dd70652b059f214f451e9f41 SHA512 ea87646612370412b96a6c276de497a2dfcdf2898c33b74b000f60769d505c8042306a5f8e2880b80354d4e8fd494f87c29d8a63a14fd4e9551a354cb56fd102
-EBUILD libvirt-python-5.2.0.ebuild 976 BLAKE2B 06eb6d379d697c684a5aacd4548a8963990812ffd58879258294f1d3a31b2d1adc5e1032272ca3c69204f555390b5c2b33ed65dcc1686c98a6e46dc74592f0c0 SHA512 9f74217106d897d42ca04fbed2b7db7d0349de2ff5286751f661cbc645ea1e97f3a9c7387a8f9e7a166aa38bc2b37a974768a8be5986073c8382a3cc2ee82091
+EBUILD libvirt-python-5.2.0.ebuild 979 BLAKE2B fb91ea46f10a7d83215fae5c8557626ca99e16d893f3c3ab27b2b528bf1e85e0473eb011d43597ff63105b8cffe5d9de28cd22688893715f8a13cb05c16b2268 SHA512 af012b0e554b13c1de26c9ebf67a384d553b03ef30e96f90253d441e8064a2b9cf586af9375f82339a2b16225fee326bbfaa9633f6173ad248d4f7f23673d6cd
 EBUILD libvirt-python-9999.ebuild 972 BLAKE2B bbeeecd0e48f373b22ec37ca905ae23cfcc4754dadbec45db91f76e5f1bd06c51979fc1e583169fb400f3218bfd8e3ae7cbb7424741e67f329e9f80f85c52991 SHA512 63357b3802f1989965ca7fa33d6bccf9a49f80ab42f83fbff365f86837e5bc4bc19c5add1183485a10040fdb55bfe32b4f5f76b653a453678419fa3e863fe8e7
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
index 5059927ccfdc..b0d227f81e12 100644
--- a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index ec5a314ff4d3..2fc01bb31098 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -3,4 +3,4 @@ DIST line_profiler-2.1.2.tar.gz 83131 BLAKE2B 0f61d7dbab24988a50c1c0a9dce528cf79
 EBUILD line_profiler-2.0.ebuild 666 BLAKE2B bd821ac106ac082cf97baacf9277b6ecb4f7966b0a0a9b4ae01d7caf8f40a9c915cdb8e67c81bc2d51cb83d6d9a2983dc1bdaa35b6b5765533f82a8842491d26 SHA512 09fb5fe8f0a1a93a6bd9a505de127777fbfd377f56eeac2f688671a8b1d34b95fb7d533f851df40052be4cc67f5ccebb794a3c10e1fd7c5325581d369565bded
 EBUILD line_profiler-2.1.2.ebuild 660 BLAKE2B e51c717b7a97571329ab7b482a5b5752933f09b8b00107d6be71606232d16ed7f3aeaf53492d62fad32a12acfae0f9d2c79effe1c30474cffd63e698298e6202 SHA512 18d2c73433fe2d98545b15508667680b3f99df2dffdc542ec0bf11698a426625d9ab90a0d8521fc041f67ebbdb087ebed96c093404d88ac3e861076e740c6734
 EBUILD line_profiler-9999.ebuild 579 BLAKE2B baaec954a604fd884acc5419ff69a407603c037f43de34ae37a4e122c53b389cae6ea29b6bf0a445c10fb885b06ac81f389353f5de230bf17de3734c3a51fa3a SHA512 ef15aefb6bac771e193a50f9d6eb93b5fad33ca557e3187917cf15fdb7f0ce0cddc5bc362a3daa4b5d57444660f130dadbd4b3263d74c602012b1b14f6c5855b
-MISC metadata.xml 948 BLAKE2B 98a4791e0201690c210cd9460be2c17378a360c9dce1502f3293e26468f94aa0c20b28844e41e6e43acd049152057726b4e12f4f7b2a99e0ad38a73296d12403 SHA512 bc38bde3c69ae03dc884b60a55eaaa0b039119d31a552083d22baca047f102f7519606ca2219578b3a9ed3dcf40a68f6aa0dc8508e7258f0a6a993b2ab7a0461
+MISC metadata.xml 689 BLAKE2B 115e811feb48f966543319af1851acd8f7392dc0065d3216b469abeb470b45828481e2969346fa29e5486ca86b29e7efa0fbdc173358ca59824ef787bfa1bbf4 SHA512 28daebac470f3dbcb3eaa2de42c159d001184dc87696394f7ed78b984addf886432278f78b601cc8673c6a6583bc8dd479aa696354260443a6959c3b96f72fc4
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
index 646d50c3d2b7..9039f4a31310 100644
--- a/dev-python/line_profiler/metadata.xml
+++ b/dev-python/line_profiler/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>marbre@linux.sungazer.de</email>
-    <name>Marius Brehler</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Gentoo Proxy Maintainers Project</name>
-  </maintainer>
   <longdescription>
     line_profiler is a module for doing line-by-line profiling of
     functions. kernprof is a convenient script for running either
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 02aff1977c16..cead763fb53b 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,9 +1,7 @@
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
-EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
 EBUILD lit-5.0.2.ebuild 899 BLAKE2B 688966a355571c6ee01e56dc980df5ef49f966ccde9edd85143d7d306ccea6e2217dd4870ae3210fbf4c615ce8f57950a3aa34d44b98bcacd4a18d617bce79d8 SHA512 f5f36aef2a795c4b7d5c241810bf4e441b5271c3edaaaffe2a3250fed2f08bc1bc4907cab20303747d1c970d74fed16b55fd48e919b741f3cddf6fb1b27e12d3
 EBUILD lit-6.0.1.ebuild 1009 BLAKE2B 6e468d6a7274031b8e81eaa7c0827ae991e8e11f7daeb20d86fbaa56d26b2462a58e58f3afc75369bcd04c229d3c7644c06f97c08e0eb0fb5b04441bf190ea3a SHA512 63870e81d534e9995d2476934962055c6193522dfff741d2a99155ac83d15ff7e7ea81bb89af14e8d3b09e9dea9f6f593f520f062e4af80738bc1afb3183f58c
 EBUILD lit-7.1.0.ebuild 1012 BLAKE2B d1cf0e9cc017dbc69a9bf3af33072d5aa100fb6e3b331086d297dcef9eebc865d443fcd2e0c5905669a09172965a5ad99b2c3b1a44e9e169f766a50f6f621076 SHA512 e8aebe61958a11aacd8c30df491cdcbbf4fd0fe762ceb7e25b80c1276f8ec9d41e76d480a0f86a546787bf9f8b4b1401f50265d4c59cf805e17c72720b76bc53
diff --git a/dev-python/lit/lit-4.0.1.ebuild b/dev-python/lit/lit-4.0.1.ebuild
deleted file mode 100644
index 4e620171d645..000000000000
--- a/dev-python/lit/lit-4.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-MY_P=llvm-${PV/_/}
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.src.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}.src/utils/lit
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# Tests are broken in this version, fixed in 5.0+.
-RESTRICT="test"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-python_test() {
-	./lit.py -sv tests || die
-}
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index b844c5f2b2c9..5199fd7b4163 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,15 +1,11 @@
 AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
 AUX llvmlite-0.28.0-llvm710.patch 2095 BLAKE2B 78b009a935b9014da648fae3a077cba7db8f3469d2c49509bb8d5f97f139bcf5d91b9c727ee74a114e191bcf79ea2d848953fac45a07d19e1bcdcff83107e819 SHA512 d09485b7e93bc9cf3bcf89dbe734934ff4fbc634142408ed54544d0c3a0b7fe3700dd227bdad2d3fa4585898c60da2e46c097877b9620838678bc40d3bf0034a
-DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B ec9cfa554f44162c0d6e755628603c9afd85642998f56ed49c2ff29c3ef975ef4ce14c6555382ca282b70d71a1ff7347c0b773b339b14345e10d3b9ac96ac55e SHA512 c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764
 DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
 DIST llvmlite-0.26.0.gh.tar.gz 175536 BLAKE2B 6736e94c13974bb79bcda08ef58dd6d1e67d07a0173b5f2ab1b2fcf9a6e72b2a0b8737da5598023fa0c6db85cfd84f2d429f6077e1342a15b500376addd03c69 SHA512 e6bf76b209f44624fe21551971d422bbee6a6dcdfbd2c42607904be32db1b94cfcb185e70198fced5deadd938208d66d94eed4cea31726ae7f4779d58b57eb48
-DIST llvmlite-0.27.0.gh.tar.gz 186891 BLAKE2B c7175beeb5c45b6fda62b78b23352d1c22111a37e7fdb89897409c6ab245dab23aa4f799fd5add1bf2199e8f6783d6094101aa29c4afefa2a3dbd48d735b418a SHA512 6c3230f23fec53ddff077c885bc0da4a773049d0226817142e2b7ded9fe6a665dd5cf8c6468101b342ef8e3b394bf2078cf93fc513e46fe451cd75755111448b
-DIST llvmlite-0.27.1.gh.tar.gz 186904 BLAKE2B ee3af4b3ec03799ea6e643e0ee0a793537c46427d239fb3a26abf4a719b68432f403367321345c30a95758ce1bce411495bc48273dbf2452a872a1edd67dc9a4 SHA512 365ffd95050a39269d9f806d3969657437111b8e999db6cf03d0d99fc5bcc024dbc08f1d379745572317f8d4384d7f86095216674695c34f463a0b9bf48a8be7
 DIST llvmlite-0.28.0.gh.tar.gz 191141 BLAKE2B 23c86c28311a4e8c7f9c209a7ed7816ad5002c26f9fda7a47cf2b54c4578db28ed0781b54a716726db8a7c1abce79a79a99c3f5bf4be2a61d547eb74d06cb507 SHA512 c00c767c80a507975a055088ca4328766c992e7267219dea54376daf5eb11397532b243352976d3569185149007650d5e94839b61aa55502e1991f72b1ba492a
-EBUILD llvmlite-0.20.0.ebuild 1279 BLAKE2B 74c0c77df7d55ba0c356801545c1255482f30789a4a371b7a2d5f42184ed4ac8d03195ca9abb9930f8517c3b55e514b49d327ea84fd29de9d6ec0a00d7c1d17a SHA512 4236a97bc7270456208a59e550f2c86bae8716f93d262286bbb93bac3cdbd20879ac8adaf0196fe734465906f1745c206014719f79296b2bf9d5dd665159e0e4
+DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
 EBUILD llvmlite-0.22.0.ebuild 1353 BLAKE2B df1cbe7e93bead771f9abc130fc053caf9eb249fb4da0340df9a1e3dc0b5cfb429634ef6c0eaeb68e72ceaf5f981c2ec62697480d3173f47c5c94f82c725b15e SHA512 7bba6a546721e5cb4a023a3332439d789977134cc7698c40cffc455925ca294e20085d2e605d8e2466c69b2c2b718785dd531cf802c17f21eefb5f20594cff80
 EBUILD llvmlite-0.26.0.ebuild 1501 BLAKE2B 93d3c40675120ca291a8d4fa90d84f484982a110f06707e1f93ec281d7dc2769a34427db467f976d82b9740ddd469b3550488fb00f210db570242cf74a12a033 SHA512 6ddc17275c10c8690e8bcd686dffbb86a6f60dd45e9ac73fe70d574ce1226e3292d9886fbaf9b96b916af9cd7437522a071a7506692285ba9c48017a3090a2f8
-EBUILD llvmlite-0.27.0.ebuild 1492 BLAKE2B 9dd18224c52fa5c67c6938a1bd91d21027594c86fd0b8350f59331b95947faedfa34f1bd22c50af83eba176aae2918ad9ea8a3a7b5bf9a1c196fbd310efb0c56 SHA512 d87c9739206de53f080b9b566fd32749b61ca72f7b1edb8d4cef5cb1c892cdeeda9a85cafc114935e3da60819b381ddcc7b86eae0e5d83a32ccba996af3e69c2
-EBUILD llvmlite-0.27.1.ebuild 1492 BLAKE2B 9dd18224c52fa5c67c6938a1bd91d21027594c86fd0b8350f59331b95947faedfa34f1bd22c50af83eba176aae2918ad9ea8a3a7b5bf9a1c196fbd310efb0c56 SHA512 d87c9739206de53f080b9b566fd32749b61ca72f7b1edb8d4cef5cb1c892cdeeda9a85cafc114935e3da60819b381ddcc7b86eae0e5d83a32ccba996af3e69c2
 EBUILD llvmlite-0.28.0.ebuild 1541 BLAKE2B 2d6575051c5c5fab37a40a4a9164ad2b739d1f18164836f4b68d7e4a2dc03a4fa1999b41afc1d3beb39d20e71356d76d68dee157690082cc3c74e63c6bb089cb SHA512 2337eac3c683cb2c7deba8a24556c5f5830b54e156ba589b8896aba3a2676841bc79e7c143a8e998ea53e8a0b871bfd40154a2586d1c15ccce1d6bcade47410b
+EBUILD llvmlite-0.29.0.ebuild 1499 BLAKE2B 32a92d4cd70f01ba504ab6c5449e9462974d57663cbe5eef712e9109aa7e3a0161256755ca33c3dfe6cf93c0b9df7b60551b175f5ab4a5de389b59189e50e19d SHA512 95479a9f360dc199cee279a1e2cc8dff7558cabc04edb179b535e8cd388cc9d1bb777c1aa07ba7d6b02a0288854e486aae09be9fe1215ae2a7c1344e02ab5697
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.20.0.ebuild b/dev-python/llvmlite/llvmlite-0.20.0.ebuild
deleted file mode 100644
index 4114a4b5a1f9..000000000000
--- a/dev-python/llvmlite/llvmlite-0.20.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=4
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_prepare_all() {
-	# disable -flto, we do not force it against user's wishes
-	# add -fPIC, needed to link against shared libraries
-	# plus use those vars to force our CXXFLAGS/LDFLAGS in...
-	export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
-	export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/llvmlite/llvmlite-0.27.0.ebuild b/dev-python/llvmlite/llvmlite-0.27.0.ebuild
deleted file mode 100644
index 0cb1efa94f0a..000000000000
--- a/dev-python/llvmlite/llvmlite-0.27.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-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=7
-
-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}]
-"
-
-S=${WORKDIR}/${P/_/}
-
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_configure_all() {
-	# upstream's build system is just horrible, and they ignored the PR
-	# fixing it, so let's build the shared lib properly using implicit
-	# make rules
-
-	export LDLIBS=$(llvm-config --libs all)
-	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
-	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
-
-	local files=( ffi/*.cpp )
-	emake -f - <<EOF
-ffi/libllvmlite.so: ${files[*]/.cpp/.o}
-	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
-EOF
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/llvmlite/llvmlite-0.27.1.ebuild b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
index 0cb1efa94f0a..f8d70ec09ca5 100644
--- a/dev-python/llvmlite/llvmlite-0.27.1.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
@@ -13,10 +13,10 @@ SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
-LLVM_MAX_SLOT=7
+LLVM_MAX_SLOT=8
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 08f8f5f0e94c..0774744cb4d6 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 569 BLAKE2B 7ba3e5ba101b3bccad8b8210e76e1e1803a9495acc7063581543e26c5aada7b972a06e01eeaa22ba6304fce4812eb8c6f9818de05e0287b1e8d9e598c16e210e SHA512 de208ef33c852ba7e4b895fe1566d8ac57c39976cab8f157eca3f7a820305cd6f52c937035d8bb07b9d36767dcb4e46a424d8260c495cf7f99b1ab854bce0bdf
+EBUILD lmdb-0.92.ebuild 576 BLAKE2B d4e7fbe6c97538e281da2fd1aedb00645b9400637b2abfdaa9b1f6438d6d8d505b945085015b78329d6882f851f58511f39288b1b40cf5f98d23238366261001 SHA512 450fffd40d12b8c5feca462ee881870893c828038711160ac30ca715678d43e568f852d2ff092570b8c170661b0c22b006346d24132722dd8668d69efc2a5fb4
 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 cf82f2ee3ffb..c2d5b696e55d 100644
--- a/dev-python/lmdb/lmdb-0.92.ebuild
+++ b/dev-python/lmdb/lmdb-0.92.ebuild
@@ -12,7 +12,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 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-db/lmdb:="
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 8bc31fc563de..be28bbb3fc69 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -2,7 +2,7 @@ AUX test.py 269 BLAKE2B d0b9ff664ca4a954cb8ebf227a1b1c80f1eff8a9bacaf1cebf2f359a
 DIST lz4-0.10.1.tar.gz 92068 BLAKE2B e581540036d1008c5efa008a1b980c1bd612bab94635b7a506e230921bd17c534fb99272e3ea09bc5be4faf09e0a8f701224c433df1615b4e708d620a23e1149 SHA512 538880742257e08b027c45c33aa29e12d7303826f63817d1f6d316ea9b69dfb20710a4f573499ce141cffd12fbac701305405521cb815e2329333934e7e1f2c9
 DIST lz4-0.8.2.tar.gz 30818 BLAKE2B ec51d733ebd33fcb00d3d3b634d11be39d92b14741a595139e23b5b067955a43ca325a0a655233a5ae3a62e18a1cf70cc21787d443703fc1a56ab7a765d5e2f4 SHA512 e516d5c3309f214fa422b040a0aacdda079395624dd4f5548ed7af637b1594012aac75b309cef260b41c10a623410f815fc089b54ca5d80955d5f2ead12841b1
 DIST lz4-2.1.6.tar.gz 129066 BLAKE2B 1a739c54946150441ddd4025b4ce8bf79a718d64a714ca5cfeaf8712c73fa88c47e1823a08ec7ad50acd31cba5bc10292f4c9e0905d8b5965b789944dd6eca9f SHA512 e37f9576f182adab263d8248e846c9f7d8a0260b2d2c5f94d74ebf3c2e51d91ba07d4bb0bf8a7560981a930fd380a2a3f5c4d21f4de5be3ae066d44a2246e9b5
-EBUILD lz4-0.10.1.ebuild 575 BLAKE2B b342cc061468d31e84f7e189985275f0e17be22d913a19a17d1b74e418fb760f51246f0681f2bf8ae4109896e4d5ac5d480c56bb7b44b1ebb51e67c4fdcb79bf SHA512 eb8ece7e95fa1734bd501cff0f1c704a49bb0b346730fd37fc8b31d3d82e31b71f715fe231ef1f5433d0d6d99371c8d02feb986277e358ed13a6e7e908fd8b22
+EBUILD lz4-0.10.1.ebuild 582 BLAKE2B 83dbb7e6a0c7d2acdfd0f32448d61d02b0a3a16336d451ff6947fd2d9ceb9e99c9aed301d6edabc87bc40ba3dae3b31a60ddc3a50dbe4ae66ad7be332d75c13a SHA512 4076bf4828477ce12ab628f6a2642fb0c06b8b099dd40c20d5da1955a32d6dc6e73972bf8102a31d503fd140e53f8fc66c68d3c13177ed5d660841e2c113b0f1
 EBUILD lz4-0.8.2.ebuild 807 BLAKE2B 9457224581e67fb0b012a4de1b987100a475a0e079402df80418e15f56407150d5e42a810b0ed6432bba4f215fc2390bec7a4356794a533c5ab63e3d8daf3389 SHA512 9164abe156afb8c869670d2caddd96c1aa225a3b65062b506209f7c91749a81feb09dc1f6b0005db389efec7af937ff2572ca22aef0adfcdaca4a45f50aa3bcf
-EBUILD lz4-2.1.6.ebuild 561 BLAKE2B d52facd97238acecec9a0669f57241a5f1d961ee1efbb7e9b3380482898d22427863e87b47b5ab0f1c8e77b7b0cb746bc73b8c5cb2a404fc27eaf46ff563e9f4 SHA512 5638db74ff6dcaac6115644b277d8a543a7ed1196b67f9f80d97b1854472e5b1ca75e330245f36e45aea4d05072ce4d2e7544490247da0e89b4f809383f19a8a
+EBUILD lz4-2.1.6.ebuild 565 BLAKE2B a6d3fce6568d91b5f71ed181554dbdc2eec90e8a160c245b83caf80bcdf9df1295417c7acd9beff3b072cd2a2a0087f808f9999d3771d8cedd1bbd21cd8219b8 SHA512 9f26c892c3cfa5bc91c3a9769ad12325772c6311cc214f22546996997daa7675d25356e7f9ea7614361ffbd10491db630e28dfb011a1539ce6f9ee80fdc3f1fc
 MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/lz4-0.10.1.ebuild b/dev-python/lz4/lz4-0.10.1.ebuild
index 6ae6d5e12c56..622d03a2b10f 100644
--- a/dev-python/lz4/lz4-0.10.1.ebuild
+++ b/dev-python/lz4/lz4-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/lz4/lz4-2.1.6.ebuild b/dev-python/lz4/lz4-2.1.6.ebuild
index b1f535b1d153..3e1188a0b8e8 100644
--- a/dev-python/lz4/lz4-2.1.6.ebuild
+++ b/dev-python/lz4/lz4-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/lz4"
 DEPEND="
diff --git a/dev-python/matplotlib2tikz/Manifest b/dev-python/matplotlib2tikz/Manifest
index 61fc860877ca..9059ca690f80 100644
--- a/dev-python/matplotlib2tikz/Manifest
+++ b/dev-python/matplotlib2tikz/Manifest
@@ -1,3 +1,3 @@
 DIST matplotlib2tikz-0.6.18.tar.gz 527262 BLAKE2B 370a1e088a17a98afd29e1e465c93b98b10100c85a277be3130f5c39bc236a9efab9241f9edffdbd430f9645cba4ff00ebda73dddeda024e3f545b21e548e786 SHA512 e12db2dd54a2145e1d66e19158c8a9305243beea60add0559959d801d319c43a28aa779048764d2adf29f878f7ccca9b2363bbc5034135a9d9002a8815fe37ab
 EBUILD matplotlib2tikz-0.6.18.ebuild 950 BLAKE2B 02f1a30decbcc32b424ded1909c1e320af3fb7ffbc104e19bc829937b19776074bc87ffc957a05d25e8e0d0a8aaaa4fd712b3d094608d5cd77ee81e1e22fecc9 SHA512 03826bcd979c899dfdd1b147ce36840218dd3ff8e3da7e7e1f47bf9b6dcc1f45c512900b159eb99f24f99dd3f1320aa5ecdb77178775766e8e552fb2551a6316
-MISC metadata.xml 1108 BLAKE2B e2f8648c239f0f117db6f046e0a8fbb006ad25530e791987f974fed0ea105d626bbb867ddcbfba05b1fe041be751c7737fefe241ea31cb6acce89f9d0fc0c115 SHA512 ffd5556daf5c3903437775b6da6bda2623fe8a9d8d6d8a8ce2f3537c3c50bc57353fbb0151a40c1a7ed113fc0732b64b231a38b69f10a785f4e089d94c1507e1
+MISC metadata.xml 861 BLAKE2B 3a77e5f5055cca84ac21709c19a530ad3e6cd33b4b76b55516c8df06236fe6e5d3eca2847aeeaef836ccfad3c2e90a4e391670215957a03b73cc943dd324dc47 SHA512 7d654d1c7d3370364278b9c4722f4c1233203dd0196f6ca7a4fabf4ea0f7708dac8b105ef26ab6b3574cfa5c019f2f6574a10afe0cf42702a4b1d26c931b7c2c
diff --git a/dev-python/matplotlib2tikz/metadata.xml b/dev-python/matplotlib2tikz/metadata.xml
index a4fca97ba72e..1d946eedff04 100644
--- a/dev-python/matplotlib2tikz/metadata.xml
+++ b/dev-python/matplotlib2tikz/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<longdescription>matplotlib2tikz is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of matplotlib2tikz is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of matplotlib2tikz retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
 	<upstream>
 		<remote-id type="github">nschloe/matplotlib2tikz</remote-id>
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index ef84b1a13680..edf8e8ad0e8b 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,4 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
-EBUILD miniupnpc-2.1.20190210.ebuild 748 BLAKE2B 67ab0e95d689347412b7c08b9949a059adedd4c62b0705c8cebba7347bdae1727fdaab0138200457289ac1a7eaf425163894b850e69268e9bae55cc660784b1c SHA512 bc8300b2f4df692141a7a46307858677ae37c57b64655f21daad9ded09d51c7d9bd28e861482d08b7681fd4758a3f65ac169a150a0bfbd29be464b567a176ba8
 EBUILD miniupnpc-2.1.20190408.ebuild 748 BLAKE2B 67ab0e95d689347412b7c08b9949a059adedd4c62b0705c8cebba7347bdae1727fdaab0138200457289ac1a7eaf425163894b850e69268e9bae55cc660784b1c SHA512 bc8300b2f4df692141a7a46307858677ae37c57b64655f21daad9ded09d51c7d9bd28e861482d08b7681fd4758a3f65ac169a150a0bfbd29be464b567a176ba8
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild
deleted file mode 100644
index 454bb7265340..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index db535d883272..c84d9e829282 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -4,6 +4,6 @@ DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf479
 DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
 EBUILD msgpack-0.4.8.ebuild 764 BLAKE2B 9a5e5880ef71e89506c316880316f56518eed8a3e4abf21c4553235d39801d9506cfbc5cd55a5eaccbaee2d0ed904ab5897aaea4515b7e2679d8d7fe23cc0471 SHA512 c9b4bf69484031066719ed6c2c9db56826c8ec560fe3525332cb20b76c9110fac26d100f5069705ec2f2b5f29999737cde4d8bfc7df2cd12f2bf82a38f48559c
 EBUILD msgpack-0.5.1.ebuild 763 BLAKE2B efa206b2e0c07a00a3e42c03d5d82b3812c7f5273916863bc3e22a14445df5ad0ee8be023d44b323dbf8a29150c7ee2da9eeb0dfb5613602e80e5971f7a979ee SHA512 57a1785ca05eec1a783638552b463a87c102bed67cfe7cfdab37a9b0a95a2d5e5f60665e8c0df44ff932d43e1b5a07276076e1d6a93e6b41ee4fa43dfebc92fe
-EBUILD msgpack-0.5.6.ebuild 1053 BLAKE2B ef21e6f1cdd6ea6be2fbeafd26bc9244457f1fad0ff890b598269e46c823b39e2be5050aea67f42dea84e7dfbabe3c81cc4d29a99eb2f50288e692b8e815cdfa SHA512 930ad02507b145d18cc0a02869e2623da54382a23b77a4bdf5f8b37c1e2a3c030247419c269f2d29f666fa193d8194300da1d1328e9713ee29a62618cdfad476
+EBUILD msgpack-0.5.6.ebuild 1052 BLAKE2B b27200d6ca629b2cf9f332d822c00c4b9e58945a2d1badb54f6e00dde80bb87e5b15b5dd63053ffde9051653efaeceffdab4ce0e4497a825f0af52619ac6ca93 SHA512 b53e7f4eda98a6a19c58fa9c8c9bff46f72ba58277d7d78290dae815c412205e11661d441a99bfeecf80742484a6121b23db97cd276b682e730d73ac1ae6bda1
 EBUILD msgpack-0.6.1.ebuild 1059 BLAKE2B c491ff8283bcbfa389db530623971a6f89c7f0ac7354ca9c65acb2a0fc537c41ce6f45036e7b8af9eb96825da453650b6bd38779b9b68f4816cb07e8b85eecf3 SHA512 6b83b84ce6aa1fa56a7cceb86ae287075905bc30a7d0b33637e75ccfd851a2645a32df4ee3ec03bb95a388166a2c9c4fcb9656c5b09789fb1f43124b99b9dfca
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
index 24376918a280..9f7a775db5d0 100644
--- a/dev-python/msgpack/msgpack-0.5.6.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
 IUSE="+native-extensions test"
 
 DEPEND="
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 27d1dbc1baae..a6c47f7b4b10 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -2,4 +2,4 @@ DIST nbdime-0.1.2.tar.gz 3864624 BLAKE2B dbf51b7eb07d08870fe1c629aa294b784fd95c0
 DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
 EBUILD nbdime-0.1.2.ebuild 1352 BLAKE2B b2ebb2c82b4ee8d84733a9d165512394515300f956f4061bb8abf1ad9d1e554573f57d7c815e7ba08ec7b51332528d76e332553e316a1b87bd873479a4ce096a SHA512 9fc47ca242ef87508bac7fb2fcf672ca83eef16f4dea3efed44b6b61726a7585d2c055dc8d5585baee85333421168171f62a049f12250cc019b9e06cdf1b42fc
 EBUILD nbdime-0.2.0.ebuild 1604 BLAKE2B 5512035cfd987f67ecaabf154c884e4387dde2281867b616f554c4433b820decfc508b158d2f9f71ccd202029bf745f37b1ddff51826c7fbbe98699618c076eb SHA512 c4870bc67feccd91116ae3c99f480e1ef140567426aac8a8891e58509774fe2530790564ac914d907a819fe0e4184f3b7ee0064b784ab1a161fd6ccdb2d5190e
-MISC metadata.xml 722 BLAKE2B fa4bd130e775cecbed839354417e50c931edd2fb00e24620ab90b782429ec2902bb32b7a0c683dc47986ef271a2485e6d9fded7d9a18e1930f1efc071924784c SHA512 0f319098fdae96681969217b5deedafca1908b8bf47e9603ca3ecef75c4461c61e64ce0fe20e7356713d2256de8267f4abf4162be8c0098930865f464914f59d
+MISC metadata.xml 601 BLAKE2B eeec61d75fb90ef3e0f0dd13264d7864a204f560c047dedf6a3ddb5a2df0faffcd344127d8a7bafe8a1f2d0b6382081d56901c6f8c5e0b9e94c8d52088f29442 SHA512 27deefa922e39c76bf3b3ea96aa1f1b5ef478a0b5cf6bbc9832977cf35bce6f9c0f38bb69fd54b0a27877087aab719c34b5811a6063890fdfebab28c57d6ff94
diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index b2a229dc3754..9038be08ea0f 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>marbre@linux.sungazer.de</email>
-    <name>Marius Brehler</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index a628f14d6322..77a262d719ea 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -2,4 +2,4 @@ DIST nbval-0.7.tar.gz 51805 BLAKE2B 3d1089cd480832847ca8ab5c64b69781216d4fbf2b33
 DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7
 EBUILD nbval-0.7.ebuild 812 BLAKE2B 8a11e61bed06702ed5a51e042e4c30fe68cacb8621605cdff9f3ba2e6d61f9054475624cdb56aae768f98c32fa19969a5aeb89dc344bd60680af17874e11948b SHA512 1962987f0c468f5be769780419b2bb7652af485cac293122530725cbbfc690a4a021de40b2038a3b7d7269de0299577ea9944adad5d3f540df0147781e4ab63b
 EBUILD nbval-0.9.1.ebuild 721 BLAKE2B fd7bbb8291fb5cafd403f19e1432d84db91d0594914d5e5cfb6f8f6f80e7f21be55059116b65fc0f4415070bf2698e1a67bd96815ac80d40bcb250739b785297 SHA512 0989c72a0bb2b2fcd39185e19bbd6768fb31a71d82dfa95da154efbc0e5291c4e8fa878e3b323fb16c28e3b6ede81b99409fe005cca7dbac0a5f5e17081265b9
-MISC metadata.xml 1206 BLAKE2B dcac4a50dae5beebee0b8af144a0666c87f43474464d06a7ffb5a3c5f02501f760d346f9c10768a7065e6f5a054f2aa8e664a6f5f259306a6db691d90446cd53 SHA512 2408122c980076cea7021853c320bb48b93bae5cf20b4101c07681ee0ddf8e741ca39789b884ed04f9ab0ccb2817e9610387e6efc1dac512dc05c9c9126e2e36
+MISC metadata.xml 959 BLAKE2B a6a44c85198fd92b1b26ae2b110ee4f1803d8e6e7dd55860f9aef67f57b29369c31d26d85f27de5a028551d8ce7c502a82189cd0ee2ff127491a05f0d965609e SHA512 63debd61c5149c3d9dc97a10fb4e40aaf2debc480608319158fcad3a8aa39a7f0623470fe906a78ed66ce844894780aab65d4b7a3a4afb5fbfad8dd06acd7af2
diff --git a/dev-python/nbval/metadata.xml b/dev-python/nbval/metadata.xml
index 19121442841d..30a2a59d768b 100644
--- a/dev-python/nbval/metadata.xml
+++ b/dev-python/nbval/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<longdescription>
 		The plugin adds functionality to py.test to recognise and collect Jupyter notebooks.
 		The intended purpose of the tests is to determine whether execution of the stored
diff --git a/dev-python/newt_syrup/Manifest b/dev-python/newt_syrup/Manifest
index f9698be9abbb..b0597b2073ff 100644
--- a/dev-python/newt_syrup/Manifest
+++ b/dev-python/newt_syrup/Manifest
@@ -1,4 +1,3 @@
 DIST newt_syrup-0.1.2.tar.gz 14283 BLAKE2B 3169f4caa309f5fcf5eceb288555800835a946cbe7bcbacd772c641c484ed0af1c237f01ec921a7ac440c16a88da516347aa9c9e0a3e9e2949c64f5589cf8765 SHA512 8e9db226f2f31eea5656d5bea0acd287fefb4699816e8328471685952d6f323037665bf3908cabaff4e2d0359996989ce8e03ce8c8933c995f13c1a5f035ef0c
-EBUILD newt_syrup-0.1.2-r1.ebuild 502 BLAKE2B 38e319fc37116257c0ca9d327de0306e7345953b3b76ccbd1e9a35b70711a79c04726887ab810ec5809b3ef441badc69104761d78a8fc566e6964fbd1cc6e236 SHA512 779e97837d725a095ec18d06b594f5cc9578be5603c8d78340dbe7869214313208dd0ca143a30cc685b4062306f71eae6a56d3250e97708aa821936054e87343
 EBUILD newt_syrup-0.1.2-r2.ebuild 500 BLAKE2B e333d3eafdfbf3e3ed99a47fa7d979c1edf60f83fc74674e156c549756c0e17ba149185bae12889a3f4eae021d1053a1a4d7a6d1371575c409af23498c6cad0e SHA512 1b09ee0aee2090f0f1f3e111cf91576d0670864f5f2594d95abb4a178c6d449a728957234f380a7cc76bf561ae868c656b83ca4b66625a5e4f1c09b0b9b921d2
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/newt_syrup/newt_syrup-0.1.2-r1.ebuild b/dev-python/newt_syrup/newt_syrup-0.1.2-r1.ebuild
deleted file mode 100644
index ef7b1d14ec13..000000000000
--- a/dev-python/newt_syrup/newt_syrup-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python framework for creating text-based applications"
-HOMEPAGE="http://fedorahosted.org/newt-syrup/"
-SRC_URI="http://mcpierce.fedorapeople.org/rpms/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-libs/newt-0.52.11"
-
-DOCS="COLORS"
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 2c0de6627faf..25eaf660e7b4 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -4,5 +4,5 @@ DIST paho-mqtt-1.3.1.tar.gz 102133 BLAKE2B 905a51824d487cb125e06114bcba6b1ba862d
 DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
 EBUILD paho-mqtt-1.1.ebuild 492 BLAKE2B 1f71471c32b22b4b0c069bc6b0146421957238ebf69e04f8ac05966abbc23a604d083cf27cd8c55aea4a4dee84be4770b9a3d97aa426b5938130548ec1b1dd75 SHA512 a3f7f041312079a2761be6306689401ee94fe7afb18e744b8e9fded6e70f694a427e143411862f9098e8c1776db2a1152de40263bb02beea659299445c6c4cc8
 EBUILD paho-mqtt-1.3.1.ebuild 828 BLAKE2B d6607b3246b2a558f48cef712d4c1a043dad250379306b5dab3eff1c704083e65f0ab6c16c2e793788264cd527f403e8693f488067ab60870d65356f41b34621 SHA512 8ddf020fb22f5a390fc751e467a3b562bbf68b8d269f7860895e51f1b0469625c57d1918b80392c06636ef638791a37ee8eaad4e0a2f46c9afcf63d598eb689e
-EBUILD paho-mqtt-1.4.0.ebuild 837 BLAKE2B 04be1247ec9aa08e4c6a56a50e7c172de5c6e52505971bcf43147fad23eea96555b8888187e7c9d72598b64714ecf2028e38719b001e6669e74703da47d4c8d8 SHA512 46a29c929118d7719167060c0eac90fe03745cdb97490b94d83d41fdbef0b877e383b1145026a691d7749764026d22d298d50c7e186eb05952f53c0b3367576c
+EBUILD paho-mqtt-1.4.0.ebuild 844 BLAKE2B eb9da92d33054ce9c8844b8bbb0f1e0d32dcf40d32982b25121f623abebd797383bd3e0375662f181a6fa079dcd530bd49ba32e70ee7dabb8f863da23ca20cac SHA512 288e004051b739a9775de094a614fe1e732e5591442014970427d1113a7b1d209e3ab9229ee0e72e7f7b1b51de42e4a1ceb3d65fe8edebdd652ccdef69888cc2
 MISC metadata.xml 461 BLAKE2B aafc02224eae792f2800211f291493df079437667e706879cff3d8f7e895f16b8b778fe623280434f36ee878db2da6edefb459ad7b59b3fe5ec6e4dc8e3c7b36 SHA512 a9b6ab584e14070bcc2087a7027b1e36bc91706124039938a7bc2eaef5c14247afbe3c4827a22a3899c8e3c527f0d0ca0e394f1465b42e759e2fd26cf965297c
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
index 7b8c7c8b7dd1..75e216ddee17 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index f95ee933e1c9..f37bd2f2d058 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 652 BLAKE2B 368a7eea0e15bc1c732842790557eda0450b3c8871d06109f7d02d848250680eff4c8cb195e9cfc8fa74155477114f57706420b9b74c90e3791bcdfb111afe1c SHA512 28d01b954b201dce3366d7e3b9a8019f5af2c9d1bbace302ef93b8113f8d51ae0d00b82e829306a9a3b53f2a0da12905436c7b2a26aa153be52b839f3c03b994
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 659 BLAKE2B 5965d91ddcf7b9891a0e64cfcbc45f80952ce97f3de123d7d11d0725a9e0de8a5fd8106a74c0bd0e3d33abf07586a6de697c91089b86592fc8df68448599fe47 SHA512 8ecd69afd95a32140b21338bc2465895aa7c34ecddd38a4148355ce1f5c940e22e1a19a3a17700b42b8036cd5014cb1b768f5bd447f2ace651d7417e85ae9dcc
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index bbe9e6d166e8..574582349bf7 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index a3e7c4bbe3ca..87e90af96107 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,4 +1,4 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
 EBUILD pathtools-0.1.2-r1.ebuild 457 BLAKE2B 391e40c3a83cb8ff9a448439837920461263a0812404128ba299897afd4ee0ccc383874085b11f5a5c6fb3b89412ec805cdbd5ffb2c4e107c01f5d679ca1ce3e SHA512 751a4a38380b1899cd7a566302c58e8f33f6f1fc7cd90d060ca474b0f57445a9881eef6c9d89e7d93ac4088833b5cbc46c413a30ec8c39e3339839a8868854ce
-EBUILD pathtools-0.1.2-r2.ebuild 461 BLAKE2B 345097e4a45d386ad28d927ea0c591d0b7a40037ec7b0413d8ea823dc72f7dd8be524009bea78d8d534d39da3373be5cc0d91c3893e317794163f0d9f15455f7 SHA512 14705156ce3613b4190ead4b644275f2e4728c6c85f399b49ce72d6e4e7ed126902195f26e9a207104de891facb76a14268ec77444354b1eef0efd18b283ea22
+EBUILD pathtools-0.1.2-r2.ebuild 468 BLAKE2B d88dc6de0870989d92ee5e206acaeadd7712be83c19395733c2709d1e1aad864477ef75ef3277c5a2f0efbae14e464d031a0beca11c42c2fa57f6dee8ab0b956 SHA512 85fd10027beab21dbfb962ec59af6616a046aa9e347a6d432767fa78c8de033404f17fa1bdf2d7a0bfb91e771ab8a3ecb25b5c6651aed7a0ac0ad281e1a1c9a4
 MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
diff --git a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
index 0e3f3ed85709..d7c7d2612789 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pep257/Manifest b/dev-python/pep257/Manifest
index a0d6abdeb8b7..1ed0321ac4ea 100644
--- a/dev-python/pep257/Manifest
+++ b/dev-python/pep257/Manifest
@@ -1,3 +1,3 @@
 DIST pep257-2.1.1.tar.gz 55760 BLAKE2B e470b006b5db04c4bed5c3145b14b949980c71d1dd91dbe34d49599063aaf1cb1d0842dfb992e5d471436446455bde2d309ee573826c039540fa99adba3f828b SHA512 f23939e0350094c67565613bab4ddf285dda5a7379e6ac2493953d6e60ab75588143fd374715765d2aa0728e7117d02e91312dbbe5a9cad28aa8e8e7f68e3bc4
-EBUILD pep257-2.1.1.ebuild 721 BLAKE2B a836a2c55c622e51d4bdd769b85aab43800c2c94e6a6d15b8b9cfd7eb45bd1e4b46915ecd9178cdf7dc4dd8c7998bfbefefae56d599b16c87d6982228c1c891f SHA512 11bc89b864b408b4337116aa4b0af17c85feae4a93e93a472a2d1f4aa660b8167662335318bcf7011549d3795613b5af00d5c3999b958c3c440bd0777a2e6a6f
+EBUILD pep257-2.1.1.ebuild 716 BLAKE2B 2c5504078fc045d383a194fc4894ed4d86188ac0732278d93c50b9fa0e4941782858001426716b57b79d8a8da9d59e005498f13f87260abb80fca6feae68f5a3 SHA512 246290e89e5ba82fb0a4648b1a0352a3b1354a44659d87acfffe66896f838650ca6e7361fed7584265861213fae51094f71b4125a627864e4a676b1293cf4d46
 MISC metadata.xml 464 BLAKE2B b427cfba180d91335b6cb1b632d0f5cf2f2d468ffc31917cd1cf03248ccb8baf4359357b2a8f6018a663ee973e8c4c125a5cc19a973b5f017420c1a929a980c3 SHA512 07dfa48f689377623d1a3f0fc969b7b6377d6623937449ad4bd67003583a218a309b229a5815d93adb57bb97edb8a02a90321e29520ae291663e7fb75b9bc2fa
diff --git a/dev-python/pep257/pep257-2.1.1.ebuild b/dev-python/pep257/pep257-2.1.1.ebuild
index 38e682f3d835..3bde0267c0d3 100644
--- a/dev-python/pep257/pep257-2.1.1.ebuild
+++ b/dev-python/pep257/pep257-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/PyCQA/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 3b80d01e0f8a..fa531e3e46d7 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,5 +1,5 @@
 DIST pkgconfig-1.2.2.tar.gz 5305 BLAKE2B 39fe5e05489e4eb8fefce66f23820d96039f5dfb82148e8ac2d691644aa2d4f1205bfa483f9fdc69837b7956834d1525d85281ba6aa0a0c079748336d47708c7 SHA512 88cfb27755297871c500f37c422da5d4ae30a14e0b9974afbe63f22c59746be0d175b65d9e3d2ed315b4d942046e7c18be062aef914199c99070a2767699848b
 DIST pkgconfig-1.4.0.tar.gz 5915 BLAKE2B 17ae11783b6642f6c8e726b42b725b7904ea282829b4527f92daa1e6ea43c3c126e6ef7e29fe5eefc89b40f3b69799087a46df6ac5695a593903dab9dc247c04 SHA512 8a270449b7b8b850aab9cc5774d1d6c6b68254f00157b66530c15697eda214948d3a71a75725067d63b906a9c3b1d789a775ac15a1094ff5ba3f227bcd666528
 EBUILD pkgconfig-1.2.2.ebuild 697 BLAKE2B baeeee40cd76fb9c3a0980cc20f54d7fc7c265c1d9b3fb1f6118cfe6d809a64a45b8b9a3aaff2d6d44e0dbbfa235f89ac8f4d32ad4d005e1533455a79af3291f SHA512 89e12ac6cbe334139c6aa9169d096abb4ccd35e82bb2ec6d395956b884cbd507df1c639c4d4037f9d90db662a6f71742de7271fb3dfd50a515dcd63bd15bbe9c
-EBUILD pkgconfig-1.4.0.ebuild 754 BLAKE2B f7ac1fbedca3d3b904e590fc6750dcd0c8876ae00717c06b17e9f4d4cab3ba561e5297a6a1b8fb884c5eeb863783a68a915cf97fc3fb7d48fcca4be16b63824a SHA512 534aaeb1e7abd4151a5c6fc3735ab21e9ea2bf53cbebb7d4b6a85d13b3482b6bfe2ba3b3b1d3a469ab3e0e59bb7ae769d1323b088dacdfa780ed8e8afb11bd23
+EBUILD pkgconfig-1.4.0.ebuild 761 BLAKE2B 6c1435ae04059e9eb9d968a361ab6cf8e4bf88ee3e255331b59ca5b9816622b3afb1290f959181eee30b562cfbd9c4d87d37736c92ab2bf2bd190ab76fcce659 SHA512 ab39f94fc6d1c6b7e8ae480d2ea112a648c54985a4d4f5b7f69c5ab0fe5b32ecb8dd010ad6404288af8dc7ee5a5cb2b74597e95078f30c9b05f906679e49e6cb
 MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
index 1823ef123659..f41c378e86f0 100644
--- a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/progressbar/Manifest b/dev-python/progressbar/Manifest
index 2f7365f395b2..523d1609c8e0 100644
--- a/dev-python/progressbar/Manifest
+++ b/dev-python/progressbar/Manifest
@@ -1,4 +1,6 @@
 AUX progressbar-2.3-python3.3.patch 2646 BLAKE2B f381950997463c466fd65b9bf9b3155e67172488cbc436c13e6a64744e92aa41d5c7b592ce9a3028ef066c9cdce886f1736a573ca4f4d8bb5176f6327d79eae2 SHA512 8f6816119c01809f3116ade0d52188cffa86e59fec516343937e6a624fc077dd75906325a88f514568b0e61d262435bf9c743807df2a4099991e8e3bec804b50
 DIST progressbar-2.3.tar.gz 9420 BLAKE2B 025f2d42fb0ef11a2e4b974ba6a8cd44c48a7f828ec40a08347492d393acac46fa9c29962d39fe296af655e94ab2075885c73ed6953e2d739aeb6f5f0c0aa13f SHA512 06fdc8b6664642bd864be8023355316fba23bcc4deb0c5877c5dfa91da5d233301a8f39342f133cbb63f37a20de7b8b24910ac8073127fcbdf43b5200d60ed5f
+DIST progressbar-2.5.tar.gz 10046 BLAKE2B fdbef570f48a0c61659bf02b3cc4e0f64d9e4e2edda970edb79fd4aac5fe2cc1bd0a7421458100cab7cbfd3d9d8cf905774113e336ff2d687d5e06b04a4e113a SHA512 86a56a573b903b947baac98b26f88e40072603007fdf5cda3e4a7e797fe4c4c42fd1a4b1ddb1c9ca9a062659d3647c428e33949e2df9e20b0f56a9a4099de51b
 EBUILD progressbar-2.3-r3.ebuild 560 BLAKE2B 918a634d4bd12a573725d3f7248690462957024822c50d801448dda65d9cbacaa77ef78db5bf5b9d2b890ac5dfdbca156b056c475f78c120fef4c9210b6a9db2 SHA512 ab797b3fa9b12ed0e37b667a60d10b520f564b1b98ef4c1cfdcab301ab6bd6f7dc21e1951aca1d24aa986adbc48f570c5e497ace18a50384de0e7f7786b3ab14
+EBUILD progressbar-2.5.ebuild 516 BLAKE2B 7d070850bb68d6e93930ed2abf885ed7899637a507a14e4ee0ad776fd2e52bada8464581ca6186646d479a1f0123ac1dd65b82357831ac394e73269e3389cab8 SHA512 62d2473b9c22087d22aaf55b66a4f55247471918f0716c1edcd9e0398a09e00bedcbad30beb1c35171b77af21a5da3a6214a8333362faa485c6aa9594a089b24
 MISC metadata.xml 324 BLAKE2B 28c39259d7567dc383b5f8e80cb81deb5c235fe9431a0a8dc90c7e35a80ff058c541c5f27236db96d5ecbd905071d8ad60a4a6232e31ef99786a0d847f674a39 SHA512 96cd08f27e9f075bacf7c3aa012b69642d245dbf7b99ced6a6cab24c2183c6304cef7bc25a44392319638d20233f9bb6256990f08c6eff60846815de35ed100b
diff --git a/dev-python/progressbar/progressbar-2.5.ebuild b/dev-python/progressbar/progressbar-2.5.ebuild
new file mode 100644
index 000000000000..1aa5f92eea07
--- /dev/null
+++ b/dev-python/progressbar/progressbar-2.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://pypi.org/project/progressbar/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${BDEPEND}"
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 38d8a0e4868b..5c4075ef1ed8 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,3 +1,5 @@
 DIST progressbar2-3.39.2.tar.gz 131723 BLAKE2B d8ff04986e125d17b67d86399308c4f7ca55c1dc744e2cd42042fb61ec0b93e61f6af1308e884e24e1b423a5ff66e3074b30ce75c0fb7af85acb700288a7bcc0 SHA512 efbf08a09665542fc361757c2a649ecc3bff0077e68b2669f4dfe1635e7730cf3cd0c6a3ae13e059adada31dc77b291098c21746ed9b5e0929260d2788345d6b
+DIST progressbar2-3.39.3.tar.gz 131839 BLAKE2B 2cbf1ecf04947b3a393b5cc473a696528cdaf38f132a1b0faab5e45dff76aecdee497ca1b2810b9ec5e3b180acfa8e2af1d195e5804c058a7d8880fc3b0a330f SHA512 b8944b319f1133fe7abdd256bed8803e9f426208af5ddc58935121845e81b9f65878e536bd5a1e4810eaa6906b24d114e8681dddf1f77c1bf96cb231f6473a5e
 EBUILD progressbar2-3.39.2.ebuild 556 BLAKE2B 073e66325c9d00700696df54aee11abaf845724e78a37cf39f9b374072daad0e7ac4cd511521acfa91417e451d5ae5582210b84116073a9652888fb020078dfc SHA512 b98e73280be33ce98731a66ef34fba91ee75ab80658b3bf0c04640cebb127c46233906c30bc0a20dc1d6014b805415a479cf0cb7941f919654495c802668e928
+EBUILD progressbar2-3.39.3.ebuild 562 BLAKE2B 9255c16381c00dd7d2ed22dfa9e14c477b9e8bffc850f4c98f1ab9f799f50b6e52154961e5fcad2dd27ad445b0035173c7dfc440c23214f4b0743b9ab5d3780e SHA512 1b686452f4ed1ac2cf969276bcbaa6a78bf754c2a2f1cbc5b335b39566b080773d6d86b2f583cb6ef3fd7b9954ef6368c05873d41d4f46441143edf88f995fe9
 MISC metadata.xml 321 BLAKE2B 91ed0719ef7b045724e73976e54e9e99d289ff410fb04207bd51ab9e570b5a03f799487183eb8180813e370d7dd34e779db641e7d228674e32fa14f89046b744 SHA512 51998db2ca2a1835c61326b8f7cd3c491238ccf8853b636d6fb768243785f74f74496092f3e076c485293363da6cc317110d754dec17dd8973dd89a4f57e556b
diff --git a/dev-python/progressbar2/progressbar2-3.39.3.ebuild b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
new file mode 100644
index 000000000000..5e98c5dd5bf5
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://pypi.org/project/progressbar2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="!dev-python/progressbar[${PYTHON_USEDEP}]
+	dev-python/python-utils[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}"
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index d632fb1dce59..cba2b3573da2 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -2,6 +2,6 @@ DIST py-ubjson-0.10.0.tar.gz 44653 BLAKE2B 91c40aab4cc66200d863fb13e4f0b64f4b190
 DIST py-ubjson-0.11.0.tar.gz 45473 BLAKE2B b74bfc20b30a2a45fb4511aa730d51245e6810fb8b00980dd61ae5bfa7cda1f60397de8c9d914195dffc48e4ec9582f839b9e133b98dd897b0a47a03abfbb67d SHA512 2c5dd111ea91fff1cebd722c62b312422e198bb8cc614e1254a3913067f72124efd1cd9879bd83ff88c2fc12ff2ef17fcf350ef7a3d6587c96a58c8b9e8ca547
 DIST py-ubjson-0.9.0.tar.gz 43338 BLAKE2B 8bcf61d1329931a2bfb7399cc27e72b14f9641fe902f0275ae190b1b256c67d78fe9b436aacf6b33912ef0e29a008e4e7b05a12b10488714ecb5b31451c1e69e SHA512 d9f061e548405d16a22d235f487740b3d4abeab8b555f9684b632cdb5e2f655ba8413a207230f90e7f3f352fa3289b16bb9a56b623c0cc5fe02f61778a8f78a2
 EBUILD py-ubjson-0.10.0.ebuild 433 BLAKE2B 8400c323d203cc5a59cdd7b2de731ae2619cf75087b1d1cd1795f76a2d8095ee88d2f0534265b47d7213c01d133c5e5da82198d16f0a2b4dd6dcc4261d55311d SHA512 fcde8d7440caadd017485c7528b16d9ff5f32b221b2b378553e86494c193a034f0fda54a477f462526b110cdef1f101fffc5f9e79942d0c44dd930a2faa148b8
-EBUILD py-ubjson-0.11.0.ebuild 503 BLAKE2B 195e033be2f02c7bc59586a6d56b8445103c9549d6f89e77093ea803ce7223a3433e5275aa2c74fc4dc2a946156f2a3e345355be2b47b1442b2eff901480f6a1 SHA512 03e2b5c14607ed280f0c58990d32bd82fad2e27f29947bd0a72506a30469f5b2ad50aa3f2cffbb631370e1ded5e435aac1ee0b97fee4303a78d827e3d12951a0
+EBUILD py-ubjson-0.11.0.ebuild 510 BLAKE2B fcddf93340771e6831bb5d079f262e1871816912203e986f6ca7120e99357c0880a739007a40e983ee1825fbb0ca81a876e0f180ea0f17e02efdef093f47d8a7 SHA512 632435fa402ac659f8b8b2cf0a0996d127e45935a8a2b9b48343d2e56a0845732631f402bd78ad997ab55879b7af8c123f37e6f444d29f32dd15989c41249c12
 EBUILD py-ubjson-0.9.0.ebuild 461 BLAKE2B 207179e60d31b7c6801bc379a85d017ec20c526163086241bcd8ea4bbbb71b423db2bc675bfb8801333db7bc0e38c28befd3861a7c202e618167e5cf7b9fa653 SHA512 e584775f50d56fcf17fa7a9535e74ddede873fa8594085c5a6a7a5d6c81413b3681fb6a5c8b5868fb161484356bd16ffb79ac6206fe57b2c06f6b1b0bd099e94
 MISC metadata.xml 712 BLAKE2B 69ca065a27809d3112fccb2a0e812fac18a216d88afca7ec654df0a181701be32365863a41f1339a42260d551a3c8aac678451ff7d9ab6c58d8b4eebb76ab33d SHA512 18ee84822f59b8a2b8172c4703d0ed93522a9997013ee0d533acfb4e23343ac2df70f719d8b161dd40604e5875d4c74f1243880ad0725726b445cfb84398a767
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
index 8b01915169d7..9d539e717e1d 100644
--- a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index 611523b3cac0..e68fe0ee8730 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -2,5 +2,6 @@ DIST pycups-1.9.72.tar.bz2 52687 BLAKE2B 37d2bf2afc71b4feabbd5aac0c4dab49142a580
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
 EBUILD pycups-1.9.72.ebuild 1255 BLAKE2B 4568166dcf0935cc900039e6344e8df2ba984c447c75e301d535faa06bf04a2e1651bd69b75e606b3235305ac370848fa4a5631ee8548e89014af6d77f058d1c SHA512 9533c094c3cacfecd5124cdd313a7d4e5e9cd63b94f0f745873dcf2918dbc9723a5fc52c9517352eb7a30abeb3322a6cfb4616c88fd13b6535662d84b41f6560
 EBUILD pycups-1.9.73-r1.ebuild 1419 BLAKE2B 4b86b07a1fec179c8e23f428316251fb60650469e4b8a4cc8e927b01c563fecb721470861b090360aab3b3d2698d569e588cbfeab7ce9a98f9d4c990c56ddf07 SHA512 84ebc4a6664d1ccf5769ac04eac5acbeaac7745a69849d5d706c7d550906c47bfa40784cc861ac64233e3580925f86d7aad2ece7d51b3b57a93def40f9490e47
+EBUILD pycups-1.9.73-r2.ebuild 1432 BLAKE2B 9f259400876aa1443d4f976b665d1b2ba3194855a4659d640a3be8fe9ade3908dcdd6040e0b0655d71214e7960ff68723fbc2e1c0f06a51c23f70a1be9084808 SHA512 9c91124e782689475a5fa47a377b6b565e2beff60941ae3729d2c874fbe9c0fd6e4484bff6bb89fad8a39b27d60303f9de0e80e419d14a61e403f66f043a7a94
 EBUILD pycups-1.9.73.ebuild 1327 BLAKE2B 4c7faa8943c4e091cbadb1f039668b0d477570adfc70a57e8565bdfb342ccad308dbef8648abfe193513580ad66583b3bb4024b67fc96afb789aba64f296e1f7 SHA512 445e2fd1524f8cb03867f24deba97dac67156643feb7455aa699442bb100dcb7c713716a4ad8dbe901a4ddcc4341d27fdfdbc0884bc50bb094f51215f9b00b30
 MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
new file mode 100644
index 000000000000..2476fd0819b3
--- /dev/null
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the CUPS API"
+HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND="
+	net-print/cups
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+# epydoc kinda sucks and supports python2 only (it's dead too),
+# and since we're dealing with a binary module we need exact version
+# match. therefore, docbuilding *requires* any python2 being enabled.
+
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
+"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		# we can't use Makefile since it relies on hardcoded paths
+		epydoc -o html --html cups || die "doc build failed"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 24abd27f9f98..7b61dbcd1395 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,7 +1,7 @@
 AUX pygame_sdl2-6.99.12.4-mixer.patch 1513 BLAKE2B fa0134e7e4c458caf720169bdb655793e2caebe746e04c5204c210b3535830afa56e8cacf2972fb27953500c4e82dbcc5554fbcbbc20a098d7a325b4b30e08d3 SHA512 4c7fb5b9f55e8f4bfde5ac911bda4f83be535a101eeec80595f70a290228cbdddf2686595901aca25c429beac34ed4ee906c92ddb0522b4c73ce48c1e1556b31
 DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
 DIST pygame_sdl2-for-renpy-6.99.6.tar.bz2 133501 BLAKE2B 6d23b9bad3fad1b508525bdc7b18dbf0801d7c7e36e15b843104e763b5946c79e22663bf705e071b35c8b4742e3f8e59bfaa0345dc95b18f91b9dd186e6d4df6 SHA512 de1a40f7e8acdb46a7e0b13250c7fffdf848bd44c07408928aab6214afbc741aa77e1e8314d9049324328d9ffc645cafe077a468457a721f36e49f98e5217d53
-EBUILD pygame_sdl2-6.99.12.4-r1.ebuild 998 BLAKE2B 3cc813056970486d9377058ec681b68f98c8e9c0ea616319c1a2d14027820946d6a56de07436580d44cce5685185ebc427ac34c10ad4d3657dc36afc2eacb182 SHA512 241acabb95ebe15ba09fc71cc4eeb48e6f2e9758170fd9e72caa31b7eb21f360b3da6bec75d9c46864765e5d4792bc0c6cb8cff20bf29ce3a1730f64aaf43b34
-EBUILD pygame_sdl2-6.99.12.4.ebuild 915 BLAKE2B f87331240d935019fe7316f84c68785e16038f8abb0cd1024170b70788b9d5984a41d74f0cb5d84b4e1214f76fdebde99a60128a3d3cccdb4f99efc907649fd1 SHA512 7cc69afdef18143d62f53927e38739c77bb75586226e612e781c8367dcbb70287f2131e7d43f309e63cdfa077c672b35ec42b36b19cd4974c1e61ff41968d531
-EBUILD pygame_sdl2-6.99.6-r1.ebuild 722 BLAKE2B 5333eef00a447f48ff8b0fa950bc0b257a951c60a97f3db73e248cf5c937841236ea8ea51bec2b1946999acb8ea3283dee178dda9767766847872b9b1634aebc SHA512 ec791b201767f3703eb855be55cac4d0c6a2d240e527a9aa051c823bb24bae48e7e6f8fcdc9200e28a386d83af5810abc5506e65f54692a950c4b23503a239b1
+EBUILD pygame_sdl2-6.99.12.4-r1.ebuild 917 BLAKE2B a4adfd1c5d45af36f7f215cd7c8343fb47bc7d2dd212f26466289d989779274a6e530e61ffe97916e02406c1fc6ae8261f4092e4e06d6a04e2aec80b0b0e2078 SHA512 c1199dd62a0ffe7e09b58f1ca14a28e9a53cb71340beb1faad1cde4fc37ac8857d205f4a1823d0a8a131ca87f667690ffdf3c50edc97916be9e42ffff9b57dd8
+EBUILD pygame_sdl2-6.99.12.4-r2.ebuild 997 BLAKE2B 3441c35728da4023a2c814a4c82e0b5955608764f740bedcc63a22c3e32112f793d84968a56a46e3e4410c337e1aee90464b244085074dffa366121c2f1cd14f SHA512 70bda9acded801f03cbdf69579f67a4afc3fbb9a152bf59adf8d6554f357b817c601194ab66f05d980f71d40371a06fa89122dee6b69176ff163bcb55c99ffed
+EBUILD pygame_sdl2-6.99.6-r2.ebuild 731 BLAKE2B 396464cf4ecffb8ed6d289b923c53b2cb9ab23ecb3e24dd7f95fc2c340af2d92b4fea7dcb0efbd869d4938442044f734cb26e53c1fd7fdbf5812ab269092a01b SHA512 e7490cb3bd973f474e0380bfc51c32dad8ac1726f145158eac6ea447dd7109cd85d4aeb93f43523c7ae983cdba9acf24f2a78c253c6facf6e7a308d24255cd1a
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
index 2c7b47dbd37e..dc01aea24405 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
@@ -14,31 +14,26 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-DEPEND="
+RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0
-	media-libs/libsdl2[video]
-	media-libs/sdl2-image[png,jpeg]
-	>=media-libs/sdl2-mixer-2.0.2
-	media-libs/sdl2-ttf
-	virtual/jpeg:62
-"
-RDEPEND="${DEPEND}"
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	media-libs/sdl2-mixer:=
+	media-libs/sdl2-ttf:=
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
 
-PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
-
 # PyGame distribution for this version has some pregenerated files;
 # we need to remove them
 python_prepare_all()
 {
-	rm -r "${S}"/gen{,3} || die
+	rm -r gen{,3} || die
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
index 372e1a7f714a..8f6ab7706900 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
@@ -14,26 +14,29 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0
-	media-libs/libsdl2[video]
-	media-libs/sdl2-image[png,jpeg]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	virtual/jpeg:62
-"
-DEPEND="${RDEPEND}
+BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	>=media-libs/sdl2-mixer-2.0.2:=
+	media-libs/sdl2-ttf:=
+	virtual/jpeg:0"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
 
+PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
+
 # PyGame distribution for this version has some pregenerated files;
 # we need to remove them
 python_prepare_all()
 {
-	rm -r "${S}"/gen{,3} || die
+	rm -r gen{,3} || die
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
index fbf4027ae86e..8312566925b3 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r1.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
@@ -15,14 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0
-	media-libs/libsdl2[video]
-	media-libs/sdl2-image[png,jpeg]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	virtual/jpeg:62
-"
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	media-libs/sdl2-mixer:=
+	media-libs/sdl2-ttf:=
+	virtual/jpeg:0"
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 12a222378bf5..fa305321e162 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,9 @@
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
 DIST pygit2-0.27.4.tar.gz 479157 BLAKE2B 5b650c7916127219ba18212f035793bb805adda570dd4a89cc7fcda8af581c7aa3916d2851117a5efe7b434dbe2e9ff103e37e69de5d158d0a58162b15f1e18b SHA512 046e8830d403d869418a8cf7f22549293e336fa1b8fc108489c3c2299316838724d1eebc8747005d594e1c6c3596aafa5192dd64a1f34e0a2d080c83214324da
 DIST pygit2-0.28.1.tar.gz 496243 BLAKE2B cfd9ddc8b1e5665016a2743bb0a2f6f5821e08a5173f7be4d99b11e1bf5bc0ba97a9d9fce7eb560f6394f30f23f7b7ce69abc5968ac2d566565c6b06b06f0f8f SHA512 46bb9d6150b7413311f26ea1aeae15cdcd22a2d5c4cafa17bd8a1c02dbf0c9a630cf89583e77a07be5c74334ac28a672de31290ba986476ded25e8a19abf7f3b
+DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
 EBUILD pygit2-0.26.4.ebuild 621 BLAKE2B 12689ec100e542aa3bb628e1395f1ccd8b3423812985dfe09414c0afd29c69881433355b5a8941bc8124e4ce02ca664084d18fb68cdba44dec0b9ade23356df2 SHA512 c13efaa6f3a1686f2fc6bbbbf0e9a67c004675cd5f07352b0bb2ccdb5875ec1acbe557a28631a2bbd6f8864e41f72f3f80741280bd1e54a07e8942626e2aa0e4
 EBUILD pygit2-0.27.4.ebuild 838 BLAKE2B d93bd63226b8428103d17a5870d7773aea35155c2b8eb73f5df573a4f72775e5d60878e131a31b32ff5ef1a4ee41d6c8483c860638da1f25328e350b619559e2 SHA512 db19631909b47e7895dbae8b2217522b1640623dbd31cbdaecbba7a2a96bc431a2f224426afdd4bd45b29f9ae0447a2570f6e231619f507942313aedbc5323fe
 EBUILD pygit2-0.28.1.ebuild 728 BLAKE2B 4aabbded2e54267b53fa5a234c09396b76017ec703d3979a63e2527bfc673e24f430aa84f7300348cdd91a07fd9271fcf0fec44d5c697fdf10761b8ec78aced8 SHA512 b5fc02a1e0b71c5fc7e0c9c2ea5212b9bfcc1fe5a56324fdee087227fd8bf275ec5e5834caddb4d5c532f7fd3be907d187c0d41b57667d0c91d6c49893a5d23f
+EBUILD pygit2-0.28.2.ebuild 908 BLAKE2B 1c9e89d18d2a5a61c583bed417c294f4573bb69a52ebc319411d1690bb26423a296bb7e790b4a549464f452216d97f6de91fb4b3bdf8ff0b1b00c8535bce69ce SHA512 45de481b1c50545466ccc866f5e22b0945289d41c54fdeac4a0b8958723d46e0b00571987ea08da36a7fb5f70bcca24793c03fb9f0bdefa2b47caedbf711d416
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.28.2.ebuild b/dev-python/pygit2/pygit2-0.28.2.ebuild
new file mode 100644
index 000000000000..edce720a1fae
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.28.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-libs/libgit2-$(ver_cut 1-2)*
+	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# we need to move them away to prevent pytest from forcing '..'
+	# for imports
+	mkdir hack || die
+	mv test hack/ || die
+	ln -s hack/test test || die
+}
+
+python_test() {
+	pytest -vv hack/test || die
+}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 059a0e6ad70f..bf1d0269cdeb 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -4,5 +4,5 @@ DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23
 DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
 EBUILD pygments-2.2.0-r1.ebuild 1617 BLAKE2B 12203987ca08ccd71d28d8bbfcf1a5bbd4a91f2c9ba2418f6cef611b1735e4a42815d63d731b8d42b5bf6e0104f9078662bef9e03394e62a190a5a954dd5ba98 SHA512 a5a31baec8484f8a30aa29207f6f7ed5ab3dd9819510915a396a624426305d2128fb593e611bb984d18a8a6471a1c151341492d7a5f8d15436fb0854dd4c41ca
 EBUILD pygments-2.2.0.ebuild 1768 BLAKE2B 09ad9ac25d4879a54c59ea4dbdbc2699229d2bb150d81a4ab6a8ce6ec567ede12c5f2a341ca69532459c8510324612da1d4a77b2e7bf2132f7b09084b5b1bac7 SHA512 cf4bf9e7785589231cdc8c31e5ec86714b99c65bb8c71dd0c6defbc2e75d3be6f84429562c727e75e3d5a0149f13c300e442aec19d255c00c57a3312dc111186
-EBUILD pygments-2.3.1.ebuild 1441 BLAKE2B 5771f02ae454b9581469af484ca3a2633950ec7e758397df3dc791a943f7f5795f632db7011b3ff909f2b43f0fc08b52b1888cc3af2a940e79afae617dc26cce SHA512 e4fac61e3f4763d2ceab443696ce83711aca80e4dffec68f411b7650c716297c601cffd599d63943ed9ebb608aee78e0f299019f263e748d028a0f56814cb322
+EBUILD pygments-2.3.1.ebuild 1434 BLAKE2B 2cba0db1c7f2e382ed645ccc63f5d71dd1cf158cf2fb86932c89151eec2b911359213fee534175d82878d607df82d517f0a31a00f9573097e1d1d974d7068b84 SHA512 9b5e9ee99553424cb1dc2aa60bc15e6e3f4b5f50b00904636f62ef4ce38af8a80d784c631e6ba9c732f6367afd82ee3d54d2b0dcd3b88ba35be37a3b8c850847
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
index 9f067d1aa5e1..af22fcf8f760 100644
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ b/dev-python/pygments/pygments-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 1d87804c0c25..b3ecb234f7b3 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -13,5 +13,5 @@ DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd6
 EBUILD pygobject-2.28.6-r55.ebuild 3537 BLAKE2B a5b8ed9f09176314ffd8584203f5688399c9aa4320379765c0867c4605e38d2fdfc51986b58960465506e36b70260afdf48e68d4de385b4ce0d0113a20309d40 SHA512 c605ab80a65d3a8e71669c22675b4cf54cb94fefad28126df05504e84b0d867bb5608952c0b0e161df4c8895c159159035622919b9321d81b1f26b34ea677b0a
 EBUILD pygobject-3.28.3.ebuild 2781 BLAKE2B e61485d38a4ecb0fffab6b2be57ab6eb7f73b7b3d93a3dc5b6053a590b3dc5b8808e015ee799e97e385af58398312c9d4eaf3253ea8edd443e68d7240ee681d5 SHA512 26d77d8707389f991564abcf4367cd8219d41161eff8a8e0a780d40fb678e204ad8873e25813b20fb797fd7a07ac41b32cf2e6f9fe7fb6551ea5628a47bac6b1
 EBUILD pygobject-3.32.0.ebuild 1799 BLAKE2B 30ce722d41ec0cfe78a21bfae59657bbb7c0b247e23ab33753f69922ad236d9939fadb5a51f6d30009d116c5eae973e180bf6ba4d06755e8ad2edd084730ee96 SHA512 3ed9eac4109e19cff59c189da5c04cf53f4ea7f63dd828b5a95b91bbd306f1c5b41eda1cde0a68361cf58da9109d2a9c5f3d0547409e83a4bb92c041a2e65f35
-EBUILD pygobject-3.32.1.ebuild 1804 BLAKE2B 8da0454c953e0576212e530e471af82a61cbac27c980acf5bbb85acd5c40059de5d70845f35a5b0abcc8b9735f11fd4c90e315baad9df9d880bfaf8bc1285c8e SHA512 ea267d822fd997a0652b0cc5584925be69e35e4997caba63bc17df8f2b8cc55896634a858275b0620256f6c6630b78b8d99ad106789c6e839bb2f64437e60259
+EBUILD pygobject-3.32.1.ebuild 1803 BLAKE2B 6dad28e0d82d5d5d4873d271f55a5ad0c6970dee30b281391a8afff013bd982212197bd6a6cc7cb99ce8b0c4b0cefd9a02522a31bc70d7b52d5155e0aa599a8d SHA512 c5fb53da9c4af1f80d542f2a6cd3164e64ba92b5e2342fe41edec6edd1400839e421a61935581040e841cbbb2b4eb95657d3c7f1b5f820c15ce279f89dfe37f6
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index cbfe2c87a06b..9f4d6f5c2cb1 100644
--- a/dev-python/pygobject/pygobject-3.32.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index 6ae7535b55cb..05644e787b34 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,3 +1,3 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
-EBUILD pygpgme-0.3-r1.ebuild 532 BLAKE2B 9b66b4f2dfc6c8376dadcb5aa9c2c7ff157bc5f0ff35d3bccc3598cbe6d8df7449ec8e21cac6520ec61002a4fd57a153757de7f8271781a008643001d5b3cdce SHA512 3e6d8eb352dfa7389de75cde464c8696e9ee8435d78a30b2f5cafe436e098d1aa13055a046941bfd59da657baece5ab28b8cf9d7bcf0682285af4ec93b34ca0d
+EBUILD pygpgme-0.3-r1.ebuild 536 BLAKE2B a368f68dd7267f52c37dc3979a61b4d3674e709ed19c7de38cea6c4b08ae0772b0b1281d806b81aa6a4ff98327747ba39a379dcaa81bcebc2e358c2039856e0e SHA512 8d63765b3d25d084a020812c09f37f73c8a0d227d55ab32c6a95c16e905f28c48dba5e274c4012e46f7f0aeeb4f1119c1ea39604ae891a39a0107da6f9ed3b4b
 MISC metadata.xml 665 BLAKE2B 4d0fcdc592cc195fecf65d0f7498d562235ba978b7e9723bc7c89786fb6800ca69415e3a80139d7257054e2532b902528cf2862352e3044c5d23d65267844a10 SHA512 1e9974929cc266d7dae9f6f9cec2b7dab4f105765b87b22f675a62ebb75743dd2043bfba3bf8732e4edeb9d18f6301d54324815cd90f3db53821ebd2713702c3
diff --git a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
index f29924d4688a..4d0ee94c2aca 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 3f3836fcbd40..717ad3e0abd7 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,8 @@
+AUX pyicu-2.3.1-testSurrogatePairs_workaround.patch 1474 BLAKE2B 7b9ab4f4c0021f8e987830966551cfd2a128a0dc964f0c45c80d74a171c6093d2cda4b9a18baddf40c264bb66c2d8765e1d78603a75db4be1af4044b817be767 SHA512 59f54524b0d8dbe6c146685901db30f50fe04f2438ca64c824cb97e737eaa74c831e736ec90f376b66a1d8c69e0cdd76d0743a940a374dda342322e70210246a
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
+DIST PyICU-2.3.1.tar.gz 214761 BLAKE2B 6571f1c10b6fa15b0b6fde76c16b2e1a1fa99af83db615aa7f7a172844183ca2a818747749b38e36162ff297c3e99311cd3328333880374c1c151955fe983f78 SHA512 edb60320ffe649f257d4d691ad9cc8287a7611de6a970d33a25a6e12a14c1faa591023d99d0b10619b0860bba70d1b67af2eff5cf146381afcaa872f0af1be29
 DIST PyICU-2.3.tar.gz 214710 BLAKE2B ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c SHA512 2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94
 EBUILD pyicu-2.0.2.ebuild 798 BLAKE2B b014a5d1e6f71ba326121adf1456622a6d0747725a799dea851b5dbcb6be25b0e20164f7c6d39ea760004578969b636c25c37d4b853bde377484dc7a3634e36f SHA512 4f76c7e878bffd3976c8e2395208ec065b80b7c36fa35a159ae5d8d09db97c0fec23c91e804fdbca7561401e80e8de5a6bdd5f587a456b2da5f45b47067bc669
+EBUILD pyicu-2.3.1.ebuild 759 BLAKE2B c61cb5f74a3d86f9dd7e3a854684a272ec74a4c11f8c407ee566a3c1563ad2c127a1d37cd26516b94f96faffba65998ce2d86143168149f582d65b670be310fb SHA512 10c0654ae29ab091b0e496010b13a82f1960094a789d9d6d0cbc161e84cb0540afa4d3b90e50f01866044895d62cc20b6191cc6b019ed4d1257127cdb45f4b8a
 EBUILD pyicu-2.3.ebuild 821 BLAKE2B 67d8621c6f96db9580ecd62123fd2c41ef127b6042856d473a2d2ae911a6d9126f4adace4ddb2d32abd71332c0f0fa4f1fbfaf94eb6299c823f598ad9b89dc62 SHA512 c67f7bd407977b46b83bc2f0c76db926a1dc87da9035f4c666185464574c6e6b8bf61b08e362fc13f4b0349089c81e302253b722215c579a9e49e9af31f38ab6
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch b/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
new file mode 100644
index 000000000000..3525cc16e966
--- /dev/null
+++ b/dev-python/pyicu/files/pyicu-2.3.1-testSurrogatePairs_workaround.patch
@@ -0,0 +1,33 @@
+--- a/test/test_Script.py
++++ b/test/test_Script.py
+@@ -40,12 +40,16 @@ class TestScript(TestCase):
+         if unicode_32bit:
+             self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
+         else:
+-            self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++            self.assertTrue(
++                (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++                (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+         pairs = UnicodeString(pairs)
+         # iterating UChar, not codepoints
+         names = [Script.getScript(c).getShortName() for c in pairs]
+-        self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++        self.assertTrue(
++            (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++            (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+         # iterating codepoints not UChar
+         names = [Script.getScript(cp).getShortName()
+@@ -53,7 +57,9 @@ class TestScript(TestCase):
+         if unicode_32bit:
+             self.assertEqual(['Latn', 'Deva', 'Hani', 'Hani'], names)
+         else:
+-            self.assertEqual(['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'], names)
++            self.assertTrue(
++                (['Latn', 'Deva', 'Hani', 'Zzzz', 'Zzzz'] == names) or
++                (['Latn', 'Deva', 'Hani', 'Zyyy', 'Zyyy'] == names))
+ 
+         # iterating codepoints, not UChar
+         names = [Script.getScript(pairs.char32At(i)).getShortName()
+
diff --git a/dev-python/pyicu/pyicu-2.3.1.ebuild b/dev-python/pyicu/pyicu-2.3.1.ebuild
new file mode 100644
index 000000000000..2e9d029a29e4
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/icu:="
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest
+		dev-python/six )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+# This will no longer be necessary in the next release
+PATCHES=( "${FILESDIR}"/${PN}-2.3.1-testSurrogatePairs_workaround.patch )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index c54a42a63acc..928d69b1bfb1 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -5,5 +5,5 @@ DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb839
 EBUILD pynacl-1.1.2.ebuild 860 BLAKE2B 9e00b4a7a68828c4729194110f2124d11a1b29e78158dc14d4787a5ecc555cb1ca731e41918b1dc2ffca31db9585277f327850ea378412b0d026fff179fc90a6 SHA512 454e4595cf84bda0a3d0da5a121d4fc468b5a065d40d89b1f7d5c38b7ca1f8454089625091aad753eb8943bb3487a97bac49ff6548dac7d8b25e341d4dd84d41
 EBUILD pynacl-1.2.0.ebuild 856 BLAKE2B 56c28a21c37d39eabc4fc27189c65a0938b00f43f5b4a18a3e73ce7b698196026f315bc30978fd9c4150ab9da3771b20d777753a576473260578515f5be9b160 SHA512 c11694426a8cf630346c546085b969fe903fee4421d688f3a8732e8545d2866c57b4533db3c050bdadfd3f7b8441a33662a554b691816ee1c0f40400453c3ad4
 EBUILD pynacl-1.2.1.ebuild 1002 BLAKE2B 56b041a58dc7c03d1076fe281e61c0efafd0bd78052980c0837342dea22fd93fd9452ebb0a2fce5922564db8bf5736c0f576bd06e2c53e85ac3cb78138c75727 SHA512 ad89ae2a1112ca2fcd930fdb9b1d70318de20076d97fedefbcaf14edd30fbccb023a59d1d9a3c342fc66b3bc5ec3d6fc73ff25275b568849d9b16d68c077c488
-EBUILD pynacl-1.3.0.ebuild 1011 BLAKE2B bf8c8f5c08dce8a17c234a64adf265fbcf58a4e10e78b735389a82b844bc8ef3bba0c532f614054b4ce32edca7ed460e08b79ebe76c309dafcf2fa45940dfab1 SHA512 b828b2a156a3ed430f6e527e8ed164fc8a6a29cbdc70181d6e595adccc67ecb48ed3bb37bd9ec728d2c17e385d62c514d0ec8ef35877413e37ec11343f5ee2d1
+EBUILD pynacl-1.3.0.ebuild 1018 BLAKE2B 725de06eeb53b2c7d0a48a2e57d8429566782ebac223a108ea2af4d0c2e5b2140b57f6f05e79678384fbfa56e604e3f6db9b58989028de56281f72b7341a764b SHA512 6e5038698c439d3c8c4237b0e3a4e8b44502ad062e2450648a2db2820549d41c80784f9ddb02b0a5f85b9039d580ac1d8c36828e6605f30a6e1aeabd5e14e62b
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
index c0afe300d433..0e882379de60 100644
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 99dc0db4ec12..945726cf95b4 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,3 +1,3 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
-EBUILD pyopengl-3.1.0.ebuild 839 BLAKE2B ecd4baa91c8072a9e4ca33c58443abc62db6e51800d9329f3da8a12aa387fc34834ee8382de6a8f2d5416ddab0fcc9990e2046f475237a233142824bdcfb822b SHA512 62ee99cf7ca78edfab8572e365e62f7b47f7f985c2139828564d9913eac483b980ae99d8fd3f461d668ff0309b350132800d41cb8d93b8f412ffaaef92af63de
+EBUILD pyopengl-3.1.0.ebuild 838 BLAKE2B cc3fb237d206eb3346e63c5acde5bff031e0c94fa56f67084ea35603e3be6778d49129a582dd8e19df23ff0ef19dbe02da3f61d19f491be622e65d1121ba73d6 SHA512 5792368802ce1b94f8a9995521d302b488c428ac43cf57d0a32cb537cf5fccb15cb25d083c1cf1191c55fb2f63442e9e9031ca2784ef0496aca900e2914fa6c7
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
index fef5d98a6f79..fd8c5b9341ea 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="media-libs/freeglut
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index c433289155b5..5e6fd4e60e29 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -5,6 +5,6 @@ DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf06
 EBUILD pypax-0.9.2.ebuild 1093 BLAKE2B edc30b3507a0ec1d074b0728d7b03eeb984f9116a20cb6628c7760e0a28af15c0a3f9943dc4eb5d558ab7e2a7ce4cd2f6e006f96ae72da316f42c6f9ed1fd26a SHA512 b3b58e205a537029380179d1bded45d8eb248adbf5d3df52bcda42e0b3e47d2df9c6116d2c57065729ab0cd7e09a7c6090cb46f6655deb97f9af2bd7b130a68f
 EBUILD pypax-0.9.3.ebuild 1097 BLAKE2B 015ff94c5122e918715eea10f161271e5b2a3e36b8dfec1482e0fe4d0236f563b324eb42b701a87521b06690d49b3e6e22828fed79d684b68723197941611ed5 SHA512 5b29aa8fdca22ea0b7d459df3256d711deff11fe75560e9eff10bc1aa373f4673e6055b0543e3c6dc495a09e3c273686a596df41c7f7aa40218d92c7e692db8e
 EBUILD pypax-0.9.4.ebuild 1092 BLAKE2B d893dad6067d2aee809c8f6c8121ca7f1557d564a66c9b116b6493d9e324a4ec368e9f9f69ac5eaf08ddac3678c881094e6e67bfae88877935fd2934a83274ef SHA512 597dc17378266e61ae28b0f26784c7e0b010b34e08a2ca0caefcd546d70febeb6cd0d8aefdcd01e9fa6bc989a9652fd4627037f571b330a813ec58bbe5484876
-EBUILD pypax-0.9.5.ebuild 1093 BLAKE2B bcc8ac8e28db05d8731f736ed9e14d57df13ff5c937bee8eeca3e16120d5bb78f9e4f9bbfeb929f048b33c2f56f4d60292baf5c56cff70b1773b1fbd63c0000b SHA512 09c2145a62f778f540a69b3ccfdb5349ec03a39a4b3f26d561043fb573df7fadf275ed9856f777a99409c21d88979051fc89f35356d4ae6d63d5302aac67b98b
+EBUILD pypax-0.9.5.ebuild 1092 BLAKE2B d893dad6067d2aee809c8f6c8121ca7f1557d564a66c9b116b6493d9e324a4ec368e9f9f69ac5eaf08ddac3678c881094e6e67bfae88877935fd2934a83274ef SHA512 597dc17378266e61ae28b0f26784c7e0b010b34e08a2ca0caefcd546d70febeb6cd0d8aefdcd01e9fa6bc989a9652fd4627037f571b330a813ec58bbe5484876
 EBUILD pypax-9999.ebuild 1102 BLAKE2B 3602425ccf3b84cdeb301509b502ed4b699d1f8f1246d89b2504d377feb64f22c3c64c15ed19240dc114df2d9d2895c6b34b5524636511a5836ee936b8257ba7 SHA512 1ca8235f4e14576ec1299dadcdebbed2741236475340e2f771d42eec39754d18b3ef49b4247615e6f7dd3103561bb924a9644562c65e7844913649490180c6a2
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index c1d8e2b4c85b..78e6e089582d 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 11dc2f256dff..5437caaf7387 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,3 +1,3 @@
 DIST pypng-0.0.18.tar.gz 377942 BLAKE2B e27540cabc4b872af5779a128b3213745ff173fd4c0c94ef7b7e9868b84a58beaca40e0ec6c5886a6a6f8652118bd792a0b61275920e1991cafb1568af8a5312 SHA512 3e44b0c86c3ff042c7e4bf03e82281c6807c4eae432c45b9bf4bf9fc844e24031a17245410e9060e6912ef77a30b9ea956422a3d9aac4331e7e81323da632e47
-EBUILD pypng-0.0.18.ebuild 441 BLAKE2B eea32f7107e69232ae3626377f5031e967d35793577dfb4844b3f694f02aa71681479e8b3595828aa0bac4f99d6615160365bfe286f5ca37a4fb222ca3fb7d34 SHA512 e3344c90b65e919ce9b634b489c2e9297866e7d00b208934177e3e9e6aa8d872c2be6b792d97fd008a134ddd17c9bad771539eab3ffbf7870a2d3ab03e676942
+EBUILD pypng-0.0.18.ebuild 448 BLAKE2B 2bc92aaee92de07e3a91902820d695a9eb68f8ded7b6bd447f2c57b9c4080e971850af8b540c6b12dde7bfb1adde9380088557a848d9c6d11d9b8fcdee4445bb SHA512 95476613460fb3d9b50f276e48b334a932d092a50376d731542959617d4a4bd2606e47cabdd2e5c8a152f2fe43f4d71893fca2321a7347ed6e74e48481f63d45
 MISC metadata.xml 640 BLAKE2B ac4ad29886e66226f2947fb26a8778d0b2cc8641a7e9b5d250eca4fc3757f7cd92745ecc095fe7b456c2c3846f75e17cd729f6247690e38e760fabe56a3df38f SHA512 04ff397dd9d70ec906ed9181c7345f297cbfb7a00739519d150f2bdfdcfe5f1a6406d16cecd09dee95bed5e06d8443eb62b04e63496a265bd02c2acd91d04e94
diff --git a/dev-python/pypng/pypng-0.0.18.ebuild b/dev-python/pypng/pypng-0.0.18.ebuild
index b0f4c0da85d8..232bc136c3b9 100644
--- a/dev-python/pypng/pypng-0.0.18.ebuild
+++ b/dev-python/pypng/pypng-0.0.18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index e9dd9507fc09..555180ec8e05 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,52 +1,6 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
-AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz 13018301 BLAKE2B b851ec3e73d4203a4c1eece2cf81dada7cc2b8f7047c9f4e06bd4f24008c1650d95fbd29697fafbdbed953d19595c8e77143a7bd9c8306ab3a15b2c62be48bcf SHA512 8edaf5fdad14886f4120358066fbb09be17d2b7f10dd7600f256a3f3d4b66c90502b85e8a500a70113135ce408ae2877296e1a9cb82d06ae0d031db26e09066c
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12940199 BLAKE2B c3790050d17e98a0fc78fa12218267aea62580287fef06559df136b15fbbd791b43ad191f4a91865ceb4e6f0954af40676beb89182a0d6f720644d4aea98f439 SHA512 967a2332439ae349d47713c33518e88f350769c4ba2c8191f63c145b4d036b53308232adcbf08199e0111ba1cf9bb9df78beb16f6933f9b377f617f34af4dee1
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz 12981891 BLAKE2B b098e2ee15bbdfbeab5b9ab0b2b818f24160badadc8d7e3e8921eca85251a2246a595964ec491e1d23f84150253f2db23642038b476ebe930129d1b9ad170ff8 SHA512 65202d2970e52df83e206068d66079e7fd3254c9d6fa3e410f23f379b3accf324af09fd3da4c13a483c00b9de523485b8f3008f4160f134b5935948f05028c80
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 12916168 BLAKE2B f23aa0800c48d976f60d6826a424703fed1e1a00b0eb1fa09adce609cd1379f47e42df4669dad6edb59270d708f145049a7342ed73971d33183fef80dbd00539 SHA512 0ec4acf8fa2fb4b7ea409eb21a5dc0dcf14fb5616b8cb11d7892fd99aea6aa0984d0951ac474fd1469fe362e841a684d2292cafe6f69c078d003b90f224f2780
-DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 12932560 BLAKE2B 97693b27ce350dd35103cf6176e7113503f790de1fc498810bfd23ed70f324fb148f801ec3d5ffcc1c578d49098ff7c4353da10509c0d56a2f3c6c4dad0a0dfa SHA512 03db8101a5aa288eb59b73d849ca0767a2b6cdffe1bfecb5f4ee5a70ceb7d73c4e1ca9be06424e18e62c2939b07c152bad1c762a9d209faa8bac9b91c48b4317
-DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.ffi7.tar.lz 7546991 BLAKE2B d4e84d839dfa106a4e9b3a60327bae1fa96c326bf219b4f8dddc9dc968412b4be67e80ed1009120cf6a8b14aeede83ebb863bee1296eeafdae95a01ef0efd1eb SHA512 e3775fbf8e2a28d30a90f5bbde84bb03007aa00a6b778834db067d470d97b87c6e15ae792996d801b96d1486aecceff124854f0bd2d2bd8e353c0ee1c12662d4
-DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7466895 BLAKE2B e199b8330dd4ac2acfe668fd19b2900843c96de961b3ea2fc418ec71c289c98d9c505cd42581e726179441dc877feb7eb57b89ee63c8ec00895302dacb039fbe SHA512 560886744633197abf14c21fb872f41d3d614427861045d6654c72b940e7b16996af4077ef9d531cfecc28c3e65dc64e2db149fe23c370aa8ee446dd5b0359e8
-DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz 7525252 BLAKE2B ccb34328f579a61070d6021f59fb948a80cb11803479a7960d6459cd4df861f125057982c4b051b7e9825ce3eb4c6ae3308b9639c9ed91dac1e042c76af1bd68 SHA512 a2439faae18ed12e1c8d2693471f665c08c29163957f94fe1daf240844e932b012d6cec6d1e70c9b14837ddb800359dacde44ac1444af56b296ab913fd541d44
-DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz 7558174 BLAKE2B 62dc408c958c18d9751466b24c5dde46bc8705634e7312593c996c9517cc36bbaad7278aa09b179bbcb962c4124399d27647b82356c79e20e13434153b8c79b9 SHA512 8c232c7852f3e8d9e3b5bfcc3785e171ea64c63d3e1658662d9eb0340a21efecd4fa037b15ede155015b262e2f60e4fa0e80d72beb18d5e4b01dcb3e003a516f
-DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 7547568 BLAKE2B 713cd16e54cdab7e25c091db931a760f51de990bf53e566b711754c5a705507257f1c54abc5f85aba7b2449f6d3967e820d14f55953a3880e7bac3eb028db203 SHA512 e8efb0af8e8ef89c95e5fe73b177f34b9120a172e0af7e52990e428e498e3b84b31eba3dfaa28bffcb121625b5494eaeec71af2a2fa46d6b888c148ca162836b
-DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz 9857459 BLAKE2B a125f68fe7ca8259d614c1d375029df776944a8f14960528d5b96125a1b46c7c014894ca3f952157957cca654dc8143033d04f4db0fdef182a6915304b630dcb SHA512 4fa02202d2ceee6cdbd2473e8f3028695a73577504053eafd87464dd75116028a3b2129be16d422fbac5372cd7623c0ee4d9ab75b87a1423dac9470eecda1227
-DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10268326 BLAKE2B 0f0c9b9f9a586b7dfc1099a9dbe28fe56d49c808ffd2e632f428b8992d39db3db7f70fd4f2fd0fb261d8c85202ab4ec2febc35b1bd4dc86f38ab8fba5715541c SHA512 40986918e0ea94053b3adc5594a21acff34d4f18b0f4827ce9cb2646d3ddcda8fb6b107ac17869c2c44f99f153a2829fc3ae89e8d4caf61ead4c4a4c9b8e963d
-DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz 9877659 BLAKE2B fb017132e28f9249b4cf1878694cde812fb53c26e58e66156d0c7512a66baa8c4961d7aaf5358d3f2acdac9aa41c6abfd9432d9c7e6fc199cd80ade911db3790 SHA512 516f7290ea2f36c9fa6c62464c32bf80f6f15b4d94dee50d1f153400f0b1fe9c12afef517cedee014d8e88f254985c70cba08a0da29250d78057d222b4e529f2
-DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz 9859596 BLAKE2B e76d456b931bb9ffd5f5140cf4125ed1446ec81432785a97f7a631adb3b97c7184d174ef928df0089e6327a1818ce70072e6835561877a6a6398bc6c6ab6705d SHA512 80895434011f8ba14cf04cd060e6b022f8f7a92fc11b3005bf92b20c267200aafa98f114eaa7b473ce2a27a44f22882ed20b59b7bff4d1b1eef3540b9154e1e5
-DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9857367 BLAKE2B 48d9271213dfa04991fbefab294cf3ee1a8d69d954315b0b3e543bffaae2134f0ce1e5f3da09e45041b988b0e08359c68b49acaf14c8bf26913cb540ac1928f6 SHA512 deeabbf19d95a6e6e55dea59cb0ff06fdf1ce687d6cd9499ef010d90445e05102056b5c8bfe9f44528cf86f087e4a2b1dee00fb5df1f7526673333cf73d5c8ab
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz 5940394 BLAKE2B 4f83e1bd745e686999c39fc8976c204a95b1e2e2f6a4ec23020e136f0c1046eed4ba4e8327c7bd6c2f11d80abb398fa46fd57ea18f9e9a7ed24577c67e274e7c SHA512 7007867780b9dd8f0501d278a651e0e6e82bdfcf40e66344a4d194ea71d311e0efdb8ac00a7bc413d796cadcbbe10b603707c371bec4fe12f1b090da81e11226
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6301309 BLAKE2B 8f8e16bd05da671fbe3e762dff33f32b1c50f3ce866432d3bc039724d025192a7116d6aa2590007e3adb52e5b3dd3ad9eadbc7c8f388bc7e02b049fcd980e3f1 SHA512 e6d32352ecb3a17e614f4ddac600f7dafb0a39fa807ba2fcce506eae881ee5c8f959e2d797f8126bfea74b801b76efbd9a3df86dc03c8521ec320fd06d05659e
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.ffi7.tar.lz 5938624 BLAKE2B 218e2a75d601cad1346d4513f01e8b9544cf2d8e0de68e43e6645758efa94e8f770e06c73be16e53964752e2a747414141a99137e7f6820f33ea1d7f3463736b SHA512 c2d17b21de8fc2658c4ffca3ca02138d2446503427c7fb4d488a2a58e1e0b0bcc1eaa0548dbe176cd7a668cdf296ffdb3a0356b27dbfbd7b6be44d2224779358
-DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.tar.lz 6290475 BLAKE2B e51a49ee9cdf7e2b9194e00ec9480cef3668e7c1fa7e632eaff0b7f1ba415096bdb2a2a4322ae25b611e4ffab28f00d15a4429142bf7a62bf0d32ba4a157ed79 SHA512 258404258f7bb96fc55cf4bd8a086d598e0b583a62b282ed6809af740c09792dd854efe4a3780b85d7b84ff1c8b0169875dae38f271f95db76db494d63f0774b
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz 5947112 BLAKE2B 9153940c44f99fa0c9e911e3a815679f93413fa4be46cbd965b48e8ffe68a1e7ebfc6e872bd7d59e4d0e0ff9d02fbd5c30b1e0d9db1521448c0b0ffb89cbee7c SHA512 435d33f8ff36f424c162a450f3a9c8419bb46280b34b9d2370bc18f961a78f144128aa712dba094755e7d350cee97f395a9b61fdcc6f0d4054703dbd01d29c3e
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5943737 BLAKE2B ba39bff2fcccebed496c12ff85d95ea6f7d6092661b251673b53c061fba831eeab74b1286d4fb3873bbd5daa6f4ad5af2cef2c9db561afecd34285b806e0b794 SHA512 8c6a6dd5adb6a0b80c1ea3cc461ff2316084319e26b3f0c531ccf67bf518f603156624596d94f65a2b307e462cc97cef39dff33d662f847a20620103b78fcc5e
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5979890 BLAKE2B 8f47c34f88b7f4900808dfcc8b22920c8053716dd8f46382d5656a15d742be13d5334e40cfca86dac663695bbd7b6ada58546130ee4936ca87c916713d069614 SHA512 498478f91302312b54cec3f42a03f817ef02b4d3bd66019c9bf9e0398b58a791202bbbdffd25778a20ae5d49bbc34d956f2f5bbd5d132c098e979357f8ca5e59
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.ossl11.tar.lz 5940234 BLAKE2B ba4133f9c261c7b8d7c3a5c04de61398f48c1d34d146009535c5445dd8abab17e914fa675c6c9f4717cafb1be5ee8defcb6d1ecb20cda60223677bf5c2b22db9 SHA512 afe12fcac3a93b8b139a0cbbc5475edd23eceddf3b6e58e5d425459dbc51056ad10459133adee3f7d282c403e881fa0d4d1f9c30955163e580c87be7e1b7825a
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5939972 BLAKE2B 86ca6f1dd9f00d993986476fbeb253b2a7efb862dec7c8b90945c32e9418d52460d3d305fd0e182e9351e6de148928cf786f461cb3174601d84f5604ca1ae132 SHA512 4d14693ba0bcf3d6f56c9e8a45959d84ba5aacbccee0a643a8c713569a0e5de1449e726e7c813a93105c8dd145f1be6a7f78eec22bbb5c5a8aba31f15cffdbe5
-DIST pypy-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5941591 BLAKE2B 45a4c150e1403fd5a579c3d452cd09f4954238fff18702c5cafc1b23f12134f07a05c1aa9277b76b5d8c4e1da48d64699a2540feb4000b6bd1c285ab59b6c4a1 SHA512 3a69284917e0c233ac27fd96707b43499a5d9e05da946cad21f89fd605d34483454703887efc1049abeeb1d503800061027794d277123ad874583074203ce3a0
-DIST pypy-bin-7.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 13183739 BLAKE2B 41e95be3e48f0b53425ce9777b7bdb998dfbccb054c369cfab9b15f3835649d1520ed6ff6bb746feb96517b608b711678e3efe2cb8b70012c29347cfcbeb144f SHA512 974b438233bb9fbc3d3b9979a4f7591ae9e6b5a36795cd9a86c2a9b45e2288aa478811433b62696e33aaa4f8c9d3579b909554a4bb0a2b53975d01357fdb0b58
-DIST pypy-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz 13129901 BLAKE2B 9966e298e25d3a40c78f5d729c61e57c82423dda7415b692179131289bfc64506dc347586b7ef0da3a134398671657d89281e35c217d422a343505492dee0081 SHA512 0c00195abe6481ace527bb0653f6f0df1e3b431246948f76d608dc5ea606a1f7ec9bfc014dff8070047c607648575d29356e44b1768c8fb7d07b50be4feded04
-DIST pypy-bin-7.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7650838 BLAKE2B cded65d6d3791f36f8bb61909555bc85110cbb2550336b2366444217d55ed6c615bbd58d0797048e940bd67dd049df063207bd46858e69c7f1ac70dd6c6eedff SHA512 db2d2aff65662dd1cfa2cf42d9bd588f6d7c6f031608931807435c31b4c2b53277e56b517157e8234b386eab2299c51828980817e3d730d946288571f11ea733
-DIST pypy-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 7652033 BLAKE2B c2a8d54ae2ea6c727ee686d5c2e6b612c940c61ea335596ed8fee0397396a0d7a4344e4e03ebc4f3c50fdf311ea6932b93b7422ad2147c5ea6ec8ac1ff8b7271 SHA512 fc39e427fb1b73136d8786d9f594fa355e8d93cebf01a4f5b319e0506b9d6843ef2332086eca569ff694bfb64a9808eb65c727e96b9c7d998f28cddb35717dda
-DIST pypy-bin-7.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 9985530 BLAKE2B da9155481b466ad6f3b28764c01c49fa397a728ec6646727038cccb84fdaac9a5808ed73aecebad7d8e1b436932554e5f65e1078547b96dc82c6e6cc1f4b44b8 SHA512 2c378a47473152e464e2f497f959c1f0bad9f5237d18e83969643e267123d1819c2a551892279800b0b810d6ebea6b0e769f9ee6f2077bee5e92dc3c2c80df3e
-DIST pypy-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9981851 BLAKE2B 75d89b10e9220c2f8b507529404849d24a88678c0884ce1c8c0254306165c5a6782c4a6efef63228e813a4f42103d7ef33a514dda8726e4ff72c3ff1fbf5f127 SHA512 e09f4f1d7c4e12735d2a4529dc603bcef43c76e97ee6ad7b4505675c7fcdc2bdb3d6550f45b8b731dd7c4f0813ad25a0c503084b4822c44d45e1c6e9aac23171
-DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6050854 BLAKE2B a8fb831c82f7056d30b5ad2c7829be82e282008a5840ba32edea97394819845281825ec88885daafc0097bf11e572ea6021249ca424f00d6133ed274b3fc990f SHA512 3fe84c10c7f8e5775137d154dea45aefd2b101acd10da38f70935fd4cd69000d64656a96f1452c76537dd7297ca45fcfdc5be2b383fd7fdd3ce0d4848c6d0a81
-DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses.tar.lz 6010259 BLAKE2B e841ff1809424a06b018d8ca219aa57d6bc0942e2bfdae545bed548efbca0d19e84365d5e9d0fd3324904d9ed8c5e50bee5b87ffa9742af7d23af84abd11ce82 SHA512 1f736593a1ae0c49e6929498a655bf778a826cb104908356c1ce13298c36fbdb55d4a8de0e39571d74d9ff3757815e81249b301983d6d3efa8cdd21497781603
-DIST pypy-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 6023604 BLAKE2B 07a218bffe485e6b39bea2f901a2de473ce7f6e334739bcc8d9fc9aff1e83cd2fd72aeb420a61464e69bfd9eb9468ae8401a597e8b8251bbdeae5b5644dc44ac SHA512 e74a868e6e12e266d75feeeddf4df700eeb84be70d6f259efa1a5effb0c9c0fe5d228c16f5015b2b993540f17e3b2f45644f6b1ba0356dfe71b778358983e2a8
-DIST pypy-bin-7.0.0-x86+bzip2+ncurses.tar.lz 6022022 BLAKE2B 26f7e87cdbafafe956e143bc5b6814ac9db2e1a3a53a5dc7c10ed436192645951e2a4966514081df94fb918b871a15b68afc55289e611fa04339591a81d3f90d SHA512 47a8d1ae2c3ba5caf7b0c08c37b01f7ef7dc3b2fd44ad2f61823305e02cdfac551080b80958bc1dfbe738fd5da960f43a37bec318e2805b8bdf90dac4dfab5b9
-DIST pypy-bin-7.1.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 13185942 BLAKE2B 74c7478c8869b12d78c0173494eebd563fc704ee79a2b2eccd177b714efe1e96025a198cdd916e6a18f7ddeb14c34737198a323c85b7715e9f53363ad64f784b SHA512 ab390b0b9edd4707c96eb68369c5c7d2de6c71dcc2f8f34bec0f9c9aec6b85106c81cd3cb101ba756dc369ac45f109a93e14bf4f5037bebf108577f7686a316f
-DIST pypy-bin-7.1.0-amd64+bzip2+jit+ncurses.tar.lz 13079893 BLAKE2B 6818a3282569ed3c3b0d462d5bc3003d4eae31dd811f863ec78b11c1ce6242da9a7c7af8c1b75b677d3b0fa0c4845a3bfb8a964dba21d1d050b5c25396168a52 SHA512 38a66d4143d4b9de0d735a1131f72bc259ba2128e4bad1786d56288bcc28da49df588d790514b29c9ea5a8cb45523a853690ff0637941fe47d7be1be96633e02
-DIST pypy-bin-7.1.0-amd64+bzip2+libressl+ncurses.tar.lz 7683507 BLAKE2B 1c7ab3cc128f40499740978cd2edd6c9dcb3a92df1c3dea398c4bb759afda15c04539c39b487875a70a7982eba91b55ba8966398a53d79f3c6b41dc7f09b303f SHA512 abf5e8d084d3270b1658564af5a5e786ef3dc5296b5379671dfbccd56d231d2b43da7482089b0877858d9e04c99f86e09db0b22c3735e4d7a2f44f62026d2a46
-DIST pypy-bin-7.1.0-amd64+bzip2+ncurses.tar.lz 7765738 BLAKE2B 3e535cc65a4bf3c61cdd7dd34dd4fc9ce731c762aa2d85aa5efed82f78bb69b55ba6f92e5cad83e8123c1fc60e0be43e9a86a8c429f45d435ed84c1610c726bb SHA512 31f103e95a8e8878dcdfdd0f5b8ec1546f866c2aee8dad4a3bb66e3bdf1a3933ad5c844b2a4453477c5e69a8a869962e2325dbbb5c23b529f7d57d27b99762a1
-DIST pypy-bin-7.1.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10015037 BLAKE2B 3dd9612f2329eca5816dfd08fd2a82cdfb0b8461cbcafb5abc0f270b8ef686bd69d87d240e0368e6a69681f369c99d350aac4fd300330b5c2038ad139b737585 SHA512 a593a3b3ba48f97ff531ac7d6539d7e52e56bbe3c766ff28e7380bf2661e6bd2282d588fe31765cbcd589254dd1c239da468487a846647919a8dc7c2aa03a998
-DIST pypy-bin-7.1.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9986329 BLAKE2B 19eba48891da80bc4922a6d3fcd8278091a045a4f8371b4bb1a787eec1cdd7668f8ca78039bfc2df4c2164dc3256b3c3ead5b342bbfc42491dd2ea7709e6fe71 SHA512 1a6c57b559458094ee1867cf9f4547004f31f928e340684145be9f598470bddaa7e0c94354fb3de8d51742ab666893437238ab0f81337ad6d137eddfe279e660
-DIST pypy-bin-7.1.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6093992 BLAKE2B e9cc966e4fe6a3c2d2cf4193abc0e3d8b81b5353e690ce3b11ff199cfc30c3e1dceda2d26d04cab1848a04e49c62c91912404d002624b94408e81ac667680d47 SHA512 0bbd040e7e9161209a056136a508bd3befa123f3086f165b0de05d404996fabda9fb0ba360be31bac2d80056e5b8d7081a9d47433ee5b1386a859c8b97aeb544
-DIST pypy-bin-7.1.0-x86+bzip2+libressl+ncurses.tar.lz 6090777 BLAKE2B bcb332825409a50c57d09ac67c21104a88c58b237b84ce4c31484c3b81afeb783dc140123773fe5702df41002eb44b403bf29dbda1c66a40ef9aa037d6ae6217 SHA512 3a65faf263085abb2f1652b58e6da1712dc8632f27944bdabec1d9ddcd21065babc30967942717d7ca179ce449f94175b0d03ca44179afaed55a32d11bb7e9d8
-DIST pypy-bin-7.1.0-x86+bzip2+ncurses+sse2.tar.lz 6093175 BLAKE2B 31a7e0b517370bb5f77372361205e5f24d8e129004af3430b3d2e3b2c58f455eb7fb2e88f86419d498724202349777189aea40cdf90eeec73b83a37a185aa653 SHA512 daeef87f64f5efd77e178fbdc6a85c0170db3d351c6951439c74ab3cef1641db8ab9266ac3d1e2b8e0a1efd2d2b1b90a1576ee21c069d8fe62fb1274ed49ed24
-DIST pypy-bin-7.1.0-x86+bzip2+ncurses.tar.lz 6089713 BLAKE2B 8e733f4bf527fc5ecff06907d96dc8a8462b3f92cf5e328e8e232f54e7ad26303fc38b127d481ad70dccd406ef0b752619899ba45b18b3e1ad9ed692e6529a18 SHA512 b8b66a23c8b03b2840d721291b7ac39a9a0617acc7e54e3da35a930a37f8f64b95eb784c0a010513575972ad7477751966360dc0de10659f4b481d9ed275dafd
 DIST pypy-bin-7.1.1-amd64+bzip2+jit+libressl+ncurses.tar.lz 13220880 BLAKE2B d4b45f757069405f5641ed9b70ce8e94970b1a67c9ee2865fe4250c4c85b8dd44268c5e3aeb7c852fbb8822df4c0326d4d9fc5f77cc8db1dfa4eda749b6c1122 SHA512 b8d4b35ce8b1119fef4dc624cd28c71afdb13669e9c44f380440cd6275156f7f2a1ce240a855038bc82638152f69d1f27191d4937c23052e0a9b0ca4a4efa215
 DIST pypy-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 13081888 BLAKE2B f693f6148eae1583d4fcfcffa48cdf2317d99d4839ecc9e592868285f789e74a88b5aad1c842dd22e8c4b3c43a897fedd2ad95076105e95bf8cab53a27cb8308 SHA512 db4ac8050597da6a727b7cb4ee9549697796a1452b786888c9e9fb5cdd218817edcf4b3b6317a39716b589df140d831539185b6120eb516f80f472e8d7acd0b4
 DIST pypy-bin-7.1.1-amd64+bzip2+libressl+ncurses.tar.lz 7737448 BLAKE2B 02c5aa5227bc6d2fc4087b4767c63737378d90f222a7402b20fee166f36c636fae35855dbf1df9c63984df5624c6ec052e1ec598ca4eb367a6ffccec7c397952 SHA512 ab2b274b3aadf04d55dbc9e4df5ca59ea97ec7df4dd1f8bb24feee4d46d7c02d9c72d55fad784d7412382e0803f172e871f01f82deba2cc5155b97e5139602e9
@@ -57,16 +11,7 @@ DIST pypy-bin-7.1.1-x86+bzip2+libressl+ncurses+sse2.tar.lz 6092434 BLAKE2B 71141
 DIST pypy-bin-7.1.1-x86+bzip2+libressl+ncurses.tar.lz 6060032 BLAKE2B 660d834c3a76ed699170b7c13d36f6dc00df3b4811a09c5dec161af7f9b0416c7fda461ca04481ad656bea39b6ed25f5220b8d38c8ec02c9634a025e3b3d6cfc SHA512 21baa8cd6bd255a335c67a1197ccef856553987740f517e1b33c27758e57b61c22b8274419b445a257ad32511d3c07901d4550151047e04adcd39c9cbf20058e
 DIST pypy-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 6091202 BLAKE2B c173cf6890143e27677e6d6ee68b2a1f55ec97897817622559c25f2f49ca5bbb5a0a2c32785a3356a6bb8f4899ff19164e550fd2762003ee018faadf80227c95 SHA512 a630e380177da78daef288e69f15a4cb333c4ef1ab2da8b4b6cf76ec139c1961d692873c7ec119e54f596ef4e1435a6c6b3ef933edca2b0b5cd6fc24963d3b0d
 DIST pypy-bin-7.1.1-x86+bzip2+ncurses.tar.lz 6088838 BLAKE2B 555bca61d4693b3e5d3c8344bac3781cfe06acc4a50bcd74add2d122c68f177258ef438a7801ca4633a006e8a001500110287934f232ceb52789f3cc72b9b34b SHA512 0748e14e903b0863bb2a067b558826f47cad2063c31c935b84249eee2a9cf96cfa36a5d5ef92f0facca61356499f4b9cfee6496a6cc3228bae7729e50edf6be0
-DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
-DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
-DIST pypy2.7-v7.1.0-src.tar.bz2 20032490 BLAKE2B e916d63d7915959c87830509630d8b2ab993d012d314e88c7cc84bed4c595957c3fc575f7b57fac7c24aaf1492797ca43b146e457357b6e73d9772724461de66 SHA512 fa7c1a6669686dbd9c0da627dc2a06ad696f20274218af9602f91d73f3ebe0ede380c6e1a50534f53dee8f075eaef5a403c7c5b5bdbfff25e679ba30522391bb
 DIST pypy2.7-v7.1.1-src.tar.bz2 20027876 BLAKE2B a411d7312ed3b9be9297e7ff4cc569530529272156117ca037bbe29ad477e7ce3b8903d13c6a5a35e9867a8ccbfaa418061a7b37317b4b713508c429a41ffe9a SHA512 f998931ecf4f9aeee24f0fed95589716175971816c00e50bc53de6de0cfe2a8537b89c1aee636d15faecf91df8c29943295485686185f5247a3e0913fa514f48
-DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
-EBUILD pypy-bin-6.0.0-r100.ebuild 6329 BLAKE2B c2533c30797562a60c8db615279cbf110c3b7756a8ea772da095936fd6125da948d4fe625fb9edccd5c255610287b09280059d3b3c5a324de6030f4dab1b0dab SHA512 644af55ab278e7b4d5441f5dc8adc1b0b91e9b5a901aa32c2eb0979ad290ea5164844e78bb073aa303d9c90847352f158aa9b53da6fac7e39fefbebb79a84356
-EBUILD pypy-bin-6.0.0-r200.ebuild 6493 BLAKE2B 2b6bbfd1ec9f0828ef30765a6e8b1c5f3ac59a296f1b3174136ba74b3010a1727a5032f9ab27d282e453dbdfa9ff8d377d26f7248a1e1b6204dcce43538a58ee SHA512 69d360de30278f0d4048ccd66c604b005a1174b8d46d98c5ebc6782cdc5cc65ece9ee913046230e58ed85f9433a8fd6a8c152f30190bd40f85bf7c3339e25cc6
-EBUILD pypy-bin-6.0.0.ebuild 6277 BLAKE2B 87ff3104c49ddaa0ecdfe85433ab8e258de55487f025dfd849dc48cd6885e4d3365b398a6ec22fa53a71830fbc206bd87270233f355cf903600acd7a0cd0c8e0 SHA512 2158d69a46abb87bea0f7f006ee6ce6a681bada8ca532042416a5d1797e241293988d5070ada0f6cac02ffa822a08397aded11e8009d7c56ef8e7cb9cf4c0bc1
-EBUILD pypy-bin-7.0.0-r1.ebuild 6282 BLAKE2B 0f476e3f5011de66e0b783c0d0af329940e5874dedbf2fbc278f1ba580dfd1bfe3a590b0b25f26c9df4ff94fb98a58b8dd0fba9cfce052c3cb1f863f089d328a SHA512 e5642c50817bb249bac279e40ed195eba6f3def312a334256b3ad7a02e9d35fdcc410f05492d5c9479b23a572f6bfbb19985e963fd4499e209debe2155e29d51
-EBUILD pypy-bin-7.1.0.ebuild 6282 BLAKE2B 0f476e3f5011de66e0b783c0d0af329940e5874dedbf2fbc278f1ba580dfd1bfe3a590b0b25f26c9df4ff94fb98a58b8dd0fba9cfce052c3cb1f863f089d328a SHA512 e5642c50817bb249bac279e40ed195eba6f3def312a334256b3ad7a02e9d35fdcc410f05492d5c9479b23a572f6bfbb19985e963fd4499e209debe2155e29d51
 EBUILD pypy-bin-7.1.1.ebuild 6282 BLAKE2B 0f476e3f5011de66e0b783c0d0af329940e5874dedbf2fbc278f1ba580dfd1bfe3a590b0b25f26c9df4ff94fb98a58b8dd0fba9cfce052c3cb1f863f089d328a SHA512 e5642c50817bb249bac279e40ed195eba6f3def312a334256b3ad7a02e9d35fdcc410f05492d5c9479b23a572f6bfbb19985e963fd4499e209debe2155e29d51
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index 4d394f9340df..000000000000
--- a/dev-python/pypy-bin/files/4.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
----
- lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
-index fc43951..fed5218 100644
---- a/lib-python/2.7/distutils/command/install.py
-+++ b/lib-python/2.7/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.6.3
-
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
deleted file mode 100644
index 66d1c991e75a..000000000000
--- a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.ffi7.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.ffi7.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/0[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild
deleted file mode 100644
index b36272792bac..000000000000
--- a/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7.ossl11"
-BINHOST_LIBRESSL="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST_LIBRESSL}/${P}-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz )
-			!jit? ( ${BINHOST_LIBRESSL}/${P}-amd64+bzip2+libressl+ncurses.ffi7.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.ossl11.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz )
-				!jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+libressl+ncurses.ffi7.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
deleted file mode 100644
index 2330fd7634d4..000000000000
--- a/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/0
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/0[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild b/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
deleted file mode 100644
index 53daf3ce27be..000000000000
--- a/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c
-	usr/lib/pypy2.7/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
deleted file mode 100644
index 53daf3ce27be..000000000000
--- a/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c
-	usr/lib/pypy2.7/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index d7aec4d28171..4ae219960ca0 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,17 +1,9 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
-AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
-DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
-DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
-DIST pypy2.7-v7.1.0-src.tar.bz2 20032490 BLAKE2B e916d63d7915959c87830509630d8b2ab993d012d314e88c7cc84bed4c595957c3fc575f7b57fac7c24aaf1492797ca43b146e457357b6e73d9772724461de66 SHA512 fa7c1a6669686dbd9c0da627dc2a06ad696f20274218af9602f91d73f3ebe0ede380c6e1a50534f53dee8f075eaef5a403c7c5b5bdbfff25e679ba30522391bb
 DIST pypy2.7-v7.1.1-src.tar.bz2 20027876 BLAKE2B a411d7312ed3b9be9297e7ff4cc569530529272156117ca037bbe29ad477e7ce3b8903d13c6a5a35e9867a8ccbfaa418061a7b37317b4b713508c429a41ffe9a SHA512 f998931ecf4f9aeee24f0fed95589716175971816c00e50bc53de6de0cfe2a8537b89c1aee636d15faecf91df8c29943295485686185f5247a3e0913fa514f48
-DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
-EBUILD pypy-6.0.0.ebuild 8186 BLAKE2B 5f77473fd6044bdf93b23420c3905e55d6b225c63124fac1815563580ba495cd7dc1dee9b402564f541bdf0a2318ccf306219a9b3ced13103bfa729193456e16 SHA512 c99870cbacaa963c3d94ddeb22c2da64c552e3de7d7603205df53c6eccebafbed89a4adfcaa1b2c7a509a7e5a6011ac7435b840690f2a4a1f91782c247a07ccb
-EBUILD pypy-7.0.0-r1.ebuild 8171 BLAKE2B c9e84ac1b80219632d68e0f43fda967f29ca0a737810baca1f112acccb4f92e8977fe2a34717c45cfb89b38cb8bcaa026a9b611a428e873fe850d8603c312e0e SHA512 815c3aa66c6a84506f1226f075e4b28b3278816ed3b818aaa507b63a446daabb67b7ef011715d6b72fe35732b78b6eb5d366ceb334e95160dd4d31e31d3c9312
-EBUILD pypy-7.1.0.ebuild 8171 BLAKE2B c9e84ac1b80219632d68e0f43fda967f29ca0a737810baca1f112acccb4f92e8977fe2a34717c45cfb89b38cb8bcaa026a9b611a428e873fe850d8603c312e0e SHA512 815c3aa66c6a84506f1226f075e4b28b3278816ed3b818aaa507b63a446daabb67b7ef011715d6b72fe35732b78b6eb5d366ceb334e95160dd4d31e31d3c9312
 EBUILD pypy-7.1.1.ebuild 8171 BLAKE2B c9e84ac1b80219632d68e0f43fda967f29ca0a737810baca1f112acccb4f92e8977fe2a34717c45cfb89b38cb8bcaa026a9b611a428e873fe850d8603c312e0e SHA512 815c3aa66c6a84506f1226f075e4b28b3278816ed3b818aaa507b63a446daabb67b7ef011715d6b72fe35732b78b6eb5d366ceb334e95160dd4d31e31d3c9312
 EBUILD pypy-9999.ebuild 8181 BLAKE2B 65fa3643a8875871015f6878898cbe57c9f2f1f7568140ea74fa6b28dfac8bb07939ce50d22e623b43f43a9d1aadcc28a586f8a6b1ad21488d3b72405566724c SHA512 bb089f9837f9b2e4a0cc501c337f7b837a5900d4aee414a83c9b0cff027c8190ec7ba22d344c98cdc17f22e20831bec40299b811ed1240e0833a8fefcb91c1a1
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/files/4.0.0-gentoo-path.patch b/dev-python/pypy/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index 4d394f9340df..000000000000
--- a/dev-python/pypy/files/4.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
----
- lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
-index fc43951..fed5218 100644
---- a/lib-python/2.7/distutils/command/install.py
-+++ b/lib-python/2.7/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.6.3
-
diff --git a/dev-python/pypy/pypy-6.0.0.ebuild b/dev-python/pypy/pypy-6.0.0.ebuild
deleted file mode 100644
index 3f036775348f..000000000000
--- a/dev-python/pypy/pypy-6.0.0.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy/pypy-7.0.0-r1.ebuild b/dev-python/pypy/pypy-7.0.0-r1.ebuild
deleted file mode 100644
index 7a956b9f4a0d..000000000000
--- a/dev-python/pypy/pypy-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy/pypy-7.1.0.ebuild b/dev-python/pypy/pypy-7.1.0.ebuild
deleted file mode 100644
index 7a956b9f4a0d..000000000000
--- a/dev-python/pypy/pypy-7.1.0.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-		# no module named 'worker' -- a lot
-		--ignore=lib-python/2.7/test/test_xpickle.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 9e3431c8613c..7e82c91b987a 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -1,41 +1,12 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
-AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4adafe47a5b2fb269b32d7b0978b996bb1aeee9d1ddcf7dd2097a494317851408c6c9bc56a829a77126376f5c7853 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747
-AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
 AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae
 AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 10697120 BLAKE2B 3e368d0fb6b875472d79b531bef926bedddf73c1f2bb25e00f56cd41c4349be119281d2c2d52239bd2769f3f9810280f8c00d9332e02b8664e46de06f2c112d8 SHA512 2e9c405212d35289a8add374cae185bf9096a46604c4e2935f1a58bee51aa756b311e5b611098e917da7fbd10194706fca809249f627b7d4b8c628bf9b38aa54
-DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 10674209 BLAKE2B f9e00ba0cdc113ebe156212c5497e122a45bc9544cb242ad02273e06210eb691f930aee7faf1d4ed3a7b14080905a9cb6d30b309c38a2c3795f2183750b4469f SHA512 52e615e2b51a43a2c91f9a2a8f0cec16a6090bfd230ef08dda462bb530da9ee66acec9c449e77f299e0b3363d6bcbc7150b14e7adbe9862d36f4738dfc6be1ca
-DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz 6710567 BLAKE2B 239badab3e3f4cb17116f2d2b3cbf58f7a481bdbc78d813563f5a7c2c67002cce598de70ebdbdd8d5dc348ec5db07559a2f35e712ebe46d1f472f2b2ccb9fa05 SHA512 ae3e76c2df50a2ec39e8f447fcacf913a1e9a3cf1268324ddc303b35e8a7a07413278e313e92579c311238ec185cb61d3d97fcbf6e972846859dc423792f55f0
-DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 6703329 BLAKE2B 64ad2b2ae1580833735dc5ce4b821f79458c98c5f761d7c9834624aff172204ac16e23582e3a776baa85accd221a9fd2225c22099de1de9c319b4f29b5f15071 SHA512 57b2e2f0ddc8d6f78beff6c049adb0a8d316db1d9f7bf5e07e4e593fa363e5ced37d212f549c0a5305459207694ac5a6aac9698a1ca3a4bf56a4437899b7e97b
-DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz 8253376 BLAKE2B 6ea95d691a5ccbb89bfd5f9351199f3d3cd4cb855d44937db58ac6327b80b71ed5d15f5dcbdc961ccf5ea1fa945ba31917716a3b9ff79327f4db3a99961569c2 SHA512 e68722eb0004680df884ff98bda906e94a5252c4e6b3ca55fe2df48a5a18d9dccc0218906c6b71a579a7a97da3a4633bb42317a276ee2640a16a9d31c1939f8e
-DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8268406 BLAKE2B 8200d7cfc5bd813cf3138017c96cace1c07bc031f68d5a9df2f71cb887a5dd3bb979dbc67d395389c965904037935a518bf6c1492b04ce5a9f21a9bb3bb5504a SHA512 4c09c454b25faa51024c5319ba5e91f4b1883bdd25f504694f83011ef1faffe7aa28a51369d3c5c6bb9f0d8eb53d1292d57608343b731c67ceeb99f41736b044
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5384351 BLAKE2B 952676b1ec9c71b5ec477011ec4c5020512508f7c40009d8715972726469319bccb30546105dd68be22a02572f6646f06057495442da12d889ac9695a1b14537 SHA512 c4b4289b9348ad35f79f0581e2d3a8cf1109a3edfb52cccf8e04a0089c706ae12de819d901f875bff3a439680694a98c85605c1b9abfd7fd4ff825846c2c89e3
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5363942 BLAKE2B d53b89ef73c2d4ee2bc00360a0c4a791fd8b6ac2d28dfeeb7510a465e6302f79c378aacebbaf4993b6ee55dbc6d85876149fe3f5a0d689713f029c928d93a729 SHA512 ce72d84200dd275841e691810dbf402423883b282cacbe8bbdae9285936869d40b3d43d053b0f3d4904c7ced72f35480d1780358180a1c98e8111852fef1f77f
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5384380 BLAKE2B 7e452d0b163f401d0741e95aa2f55e84eb223eb3152f0299b365d1dd53268d315496977d988149c29e0e3439834d7283bfa9a9e05f2d7a8abb3f3d65aa05e567 SHA512 d743c4275abfbce1ef1ae2949e93097faeca8377e38761183ff7d0cc23b92d93700bf370d1511c968743e769a0b41acfeae01543885cc55bef8cdd2c6817af0f
-DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc548250edec05256be64dd5d1aeb5b2fff839d7d5e8dda29e7d4e0a03b1fc0c9cd418685c558bb47598c625e2d28cd4caabc45e21eee9f4f8 SHA512 5274535d01564a9087aea486320921c8784cabcc7bde3634c27b9006988fdc745e6e5e5c2fb8e7b0318fd5ca6fda3fce208743cfa079a7474ea44277237ea873
-DIST pypy3-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz 11042296 BLAKE2B 3717c92b3e3a0239c3089cc86434db42725f7e42891fcf5c46f7234aca09a6c693ce662a8bedda4e5a9f646f3266ebd16f25668068d6c1d9df30b6696627ec42 SHA512 5108388bd322c5af4e3d411a4c59a4d8b8b4a75e4ad1e53e90ddd9f76f64868b2c31210d8ac5b0d8222402441ca58c781264742e74e5ff872189ed6c24c2707f
-DIST pypy3-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 6873174 BLAKE2B 6ed19040d3af0dfd6614441e6fb838328b687c44415e1444f27e74f3db4bd3eeb7c077f0cc95cafcacffaabd396d68f6ff481fdfa44f9e6b26f83f1e61e99e30 SHA512 dbdd3e6a21b4553060804eef1036698324743e5eeb4b9e2933785f93871a750ae98daf5a1ef7061238d6161a6df8d18c590b88dcd0ea97ae4ab742aa4df7dbd3
-DIST pypy3-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8484244 BLAKE2B d23b84aa9f045e46c2461a4d26383e4fcd0c33283f54e11d0693faafec2d3792039534c9a93b418cb78f3e4d45b98f1377cd0555a20ccb2fdce5b9b2e17a133d SHA512 4c90ee87585a448466883aa47ebd4a3f92438d54fceb6cf752fd638746f1c0f2ab7a3145b310555ab19ba53838352523e981485904c4092bc457c7002931ab59
-DIST pypy3-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 5529689 BLAKE2B 038ad3c9132d430268dad3ae7b1c2b6ca507743f3b2f7a3aef8b7aaa580b070287767878d2b528297c152ecd0a440aaa6a47e32f7aa5400bfda2703302c583fe SHA512 8932dbdf49f7a227e9108bcfd0e7136cd1287b036eee7665bf16868a0e322ca841eb6daa6a18b8a57e4184b8878abd20de9616f90845c0dc76d5382f7f53f3a3
-DIST pypy3-bin-7.0.0-x86+bzip2+ncurses.tar.lz 5537714 BLAKE2B 49cdf63c1f94899ec4642d395dbf8ae6fe44fe9fc46e7f64b31e30d20f9e1dcc5d40b511d582f6c902724f5629e7b3b8e1090d76a3bb1a789b32b1c29b533e87 SHA512 42c8afa8fea5474d5b2c7c7192b2a79d8a3eb8d832038aad68edb011c056d6efb3903e67084f423ff167b1757804a5d796fddfa6f6f077966c855a1e56eba9cc
-DIST pypy3-bin-7.1.0-amd64+bzip2+jit+ncurses.tar.lz 11031092 BLAKE2B 9e9b530ff356aeeadd9da18853ece9f7e292412db427e70e4d93e58c57523a36594131b9d5185ca5f00e19da2b4843e7fa1fc79ec6ca2cfb94abd8360775486c SHA512 b002c6018335481e6960fbfbf75fdefcb45093687491b591e9db2ef870201b33ed33294a4cc975128aae8d8df4d186309c748c620255337b688d21683b653861
-DIST pypy3-bin-7.1.0-amd64+bzip2+ncurses.tar.lz 6917379 BLAKE2B 1be91d0001a09574e970c53cfb156f04b84149d6fb4f78e7713d26a44edf03cf3c4556900343d36e59edd2e273c1e626faff443ab097481c54d6e3dc353867b1 SHA512 dcfc9cc25df65bb477bc0e62f2b3dd5c723d928b2b3a7ac96e6583cbba25162681f736eef13ba3fee637f27326015e32832a2e7f021051c294efb4c7d26d0fca
-DIST pypy3-bin-7.1.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8510623 BLAKE2B 91bbe4286d82d90d05c3a4280c285bfccee3ae8661cf974554ef8c96f3806f95187cae1767340cc1e17f65c37f380dc9a4636cf3388a3c4bd2664ea4d61b63b8 SHA512 f5aa0efc4cbff57c0eb49504a46aac8b03bf298e5b996dd2264d923fe514543736df2f856d841b15a4386cd84809051ce6b29840c47fc32cdf7482d53d52b755
-DIST pypy3-bin-7.1.0-x86+bzip2+ncurses+sse2.tar.lz 5546135 BLAKE2B 7ce2fe3c8b662d808ec63c96fe7ba42b78210d5cd1828050b139616d577feb41cca65c79c291d376b3f53d54feb157894700fda705d067fd536af3bb0a4e9d72 SHA512 87fd9091e30a60f034d96cefa3a192801ab5c8ebf76d8e13741cf5f18317b4751e619b1b1e9ddf9098767526c119761208885744c08a4ce131915f3758e198d0
-DIST pypy3-bin-7.1.0-x86+bzip2+ncurses.tar.lz 5540259 BLAKE2B dcd4e666c66d5bb711e5b95431fafe19a81a8b8458af2fdfe1f2272ff05214f9687b9f88d8b58ef6b05272252db4b308b32cfe4778e0f224825bcca9609313ed SHA512 8a9f681b998189b6871d85fbef00289b5c258ec67805fc2bf3179fa4650655051c33b7715845dde8e93c5ce9884a36cb1501f653804328e4104099ddcdd1763d
 DIST pypy3-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 11031375 BLAKE2B e01ac298d3c8ed06742429b36739223fd0dbf87a9df4d302349401aeda06dbaf5cd8b972ebe997a1e4130a378d63ab69ed25b3ded4b9608db5d59fbaef8d04f6 SHA512 e5ccf27683dc81a683df52f04092167774f3a9c9dd3a38347dc9d5cec181148885ed342165b16689d44533511cb58bfcfa397a5e51869649086fa362a3bebc98
 DIST pypy3-bin-7.1.1-amd64+bzip2+ncurses.tar.lz 6915836 BLAKE2B 0f3f2210e7f6e73872d32b2c01a911b52ad2a8c8987034709d9e4c72cfe11e422eea7b6522b19b3717876307d9fbbfbdfcc008dc2e3771dea083eeb61c202e6e SHA512 7fe6a19f56d7cdc142b368154e17af8936b8b730102c4a1c8a6b756a13b643d1375a51f45a0a3d345f7a8a23b75a81d35a6aa810129d231bf2091e156f69a914
 DIST pypy3-bin-7.1.1-x86+bzip2+jit+ncurses+sse2.tar.lz 8540485 BLAKE2B a7de0db24e4bc56d54cbc03d618f8e08932e23a1fe5a1ab227600c244e222a6dae723c72fbd5cdd059c3e3f52bd355c4c9ee18506f6b39961bd1473358d35bd3 SHA512 f3355109bc073e220a33e8763c2d2ccf152d223d3850bb85aac71c19170ce4b118a84f258a829c486209f3c3014264384b158de17c9a0156c24afcf5b130a8e0
 DIST pypy3-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 5523574 BLAKE2B 44f760842b0f232f7f5fb7a2fe3f60ff1f832dec3b0c16d1fd27ab36d09c12d6be8aa6727a880c3400506ea415317ddfb982439c1a581a03909099eeb6ea8cf6 SHA512 df664a7afa5bdd329d19046c81e362782c4f9358add2b7e54100df10a23434b9a341ec504ac1d49b2b017917937ab23ffd3cf723f86b65d7080789f795f5a4d3
 DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.tar.lz 5545191 BLAKE2B 2afc40968977cd6956cb305a829811640e8437f0a811435a20ec694181286c94c820fd4148e3b6323a014ff391400d5265a7c1ee8b918c3db91ac02b44f3d585 SHA512 a1dad750491c5f524217986817a046c5c7a97b2b250a1d24b6a077d2d8067e249966cd331a5336fa2960a3d317c1aa83196c3e3b2f4a0734d79fe43cd9b55032
-DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
-DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2
-DIST pypy3.6-v7.1.0-src.tar.bz2 23167216 BLAKE2B 12a085c2d4820289643818d8bc1c17304e4cf4f4687054452d878c6f26fd36802bbbe5baee73f0ce2f0322e126dbccbcf7b48ca6569bb7eb8d59f473bd80d4b1 SHA512 1a0a9e9de31c63114c0537747c4a718504a28b780a2ef1f76bff6051a1ec68b496b574989f0b729c07611cd81e199135dd268834dfa6f9664e1e119db8ae20e4
 DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
-EBUILD pypy3-bin-6.0.0-r100.ebuild 5574 BLAKE2B 8cfade201d213feccfd71ba3ea86afe43c7a659a9fc3a2fab7f584f5e05052a4bf07ba8539484bf135daa96623a816ec704420aa305fafcf803655ef07eaa425 SHA512 7b5fb47a68cf3b9c64ae0cc6ae5309b671dea4d8fce026c16240652d0778ebe0bc76f2fce34686c0a29f9c91f8b3e6aa9c5a864b4d9273a864fbf98805a45894
-EBUILD pypy3-bin-6.0.0.ebuild 5547 BLAKE2B 27f7df0cb40c23e17bf1bca4d350f42fd5583a4c034cf79b8b6e213137089f1254c38f90a81976a194ca908c9046219646b4326a4bd1acfdaabfd67b275cd215 SHA512 23523b49c740d09b4e871e8ecfbf72e40a929be0500153398aadaaf8b17ee9ef92f3d03e8b3ef7d189ad2c377e4ef03dadc4d68716fe36e797c0f360a19962e8
-EBUILD pypy3-bin-7.0.0-r1.ebuild 5486 BLAKE2B 4536a0fbf064472be4a1ee651f38ccc47fd027aad1e941cbaeef67abb88526646f463b025179825ea719247be07be2370d5658d9f05b5fb2a46ce6066d99e47b SHA512 d0baa35e4a58c89a0309c099edc3a6ccd60b52c263fe9016534fefdffedb1c0acdaaf63d7f0f9d155d8989273576c8a74ce7455661105cb80d915047f8a15475
-EBUILD pypy3-bin-7.1.0.ebuild 5723 BLAKE2B 5b65d80f0bae857db38ac6ba36f55fdece5c8f833504f4ef896b012434d5469a4228b4b790c4735ecaf66c6d0c733db6321f75814d3dff230bc614241588225a SHA512 d70f254db7483b55ff7addc62bda682cc0b4ddfb526b3bc93442100e2109d028fd0355eff759899b7b9fd3a8aad6ac3b475d23bfbfd68cf98d8aff09f29c719b
 EBUILD pypy3-bin-7.1.1.ebuild 5723 BLAKE2B 5b65d80f0bae857db38ac6ba36f55fdece5c8f833504f4ef896b012434d5469a4228b4b790c4735ecaf66c6d0c733db6321f75814d3dff230bc614241588225a SHA512 d70f254db7483b55ff7addc62bda682cc0b4ddfb526b3bc93442100e2109d028fd0355eff759899b7b9fd3a8aad6ac3b475d23bfbfd68cf98d8aff09f29c719b
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch b/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index cf96d3fb2a53..000000000000
--- a/dev-python/pypy3-bin/files/4.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
----
- lib-python/3/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
-index fc43951..fed5218 100644
---- a/lib-python/3/distutils/command/install.py
-+++ b/lib-python/3/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy3'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.6.3
-
diff --git a/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch
deleted file mode 100644
index 5d89ce2711cc..000000000000
--- a/dev-python/pypy3-bin/files/5.8.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
-
-https://bugs.python.org/issue1222585
----
- _osx_support.py                | 10 +++---
- distutils/cygwinccompiler.py   | 21 +++++++++--
- distutils/sysconfig_cpython.py | 25 ++++++++++---
- distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
- distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
- 5 files changed, 100 insertions(+), 45 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index 13fcd8b..0525be1 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index c879646..a6157fb 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 raise CompileError(msg)
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError as msg:
-                 raise CompileError(msg)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 573724d..0a04f33 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -173,9 +173,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -190,19 +193,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -211,13 +222,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index a0a8dec..aa97c4e 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -72,6 +72,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "cc -pthread -shared"
-+    g['LDCXXSHARED'] = "c++ -pthread -shared"
-     g['EXT_SUFFIX'] = so_ext
-     g['SHLIB_SUFFIX'] = so_ext
-     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
-@@ -156,36 +157,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -194,13 +211,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index 254b22d..c9cacc1 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError as msg:
-             raise CompileError(msg)
- 
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i += 1
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
--- 
-2.12.2
-
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
deleted file mode 100644
index 6a1c7f4db7b8..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}.ffi7"
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/60"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy3/pypy3-c
-	usr/lib*/pypy3/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild
deleted file mode 100644
index 262971abd21b..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/60"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/0
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy3/pypy3-c
-	usr/lib*/pypy3/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild
deleted file mode 100644
index adbc9b5b3fe2..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3.5-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.5 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy3.5/pypy3-c
-	usr/lib/pypy3.5/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.5
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.5/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.5/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild
deleted file mode 100644
index 0f8954a4f842..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3.6-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.6 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/7
-	sys-devel/gcc:*
-	>=sys-libs/glibc-2.28
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib/pypy3.6/pypy3-c
-	usr/lib/pypy3.6/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop curses syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 7c08fb04ef1e..0f0d0d42fd53 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,17 +1,9 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
-AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4adafe47a5b2fb269b32d7b0978b996bb1aeee9d1ddcf7dd2097a494317851408c6c9bc56a829a77126376f5c7853 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747
-AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
 AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae
 AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
-DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2
-DIST pypy3.6-v7.1.0-src.tar.bz2 23167216 BLAKE2B 12a085c2d4820289643818d8bc1c17304e4cf4f4687054452d878c6f26fd36802bbbe5baee73f0ce2f0322e126dbccbcf7b48ca6569bb7eb8d59f473bd80d4b1 SHA512 1a0a9e9de31c63114c0537747c4a718504a28b780a2ef1f76bff6051a1ec68b496b574989f0b729c07611cd81e199135dd268834dfa6f9664e1e119db8ae20e4
 DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
-EBUILD pypy3-6.0.0.ebuild 6921 BLAKE2B ab3d2be852a4687f570f9eb5aac9c04679c5f23fa01b4fd41932fff060307c81fd8b1627aafd9e9a905473ed9bb408accda15611d3377c11c4d8fe008a42bda9 SHA512 b0e217e44bcc83566ffe7bc0bcdecc76e86103abe9fd7fa268b5370915ba3f929963bdce600ddd9857cc66936da4452aeb6aabcabfdefb87606ff645378e34b1
-EBUILD pypy3-7.0.0-r1.ebuild 6849 BLAKE2B 52cec3fe80dd34950bf94dac99979ce799e878b7cb3f77d43331742e2afcaec7554a852ab225d9449940c83df795142d20cb72572c8d41c0cbdd9679f2f3b43e SHA512 6cfc17e8f0c0d4cf77d3b2b217b434c3b36e662e900a0e2118af8a4cc0be27cd54e1644419862b31381b4dd416d1d5a0cbedd272e43f56a5fc7ba285c0dc81ab
-EBUILD pypy3-7.1.0.ebuild 7086 BLAKE2B a185d362ad5041db8492f77d4dfd12aeaa955c2605af0ea63af622033f5aa5c4fe26f163ea90485545fb9f9eee4e14c84f64ece10cc8aa859b839ea9bcbdbe13 SHA512 2ad980acd2913543f7e9dfa83d78a2e266991fcdcfa396258ac7866e594c4622baee2373733d852c4d3af50850895b2856440c618978bfb965c1915a8477cc25
 EBUILD pypy3-7.1.1.ebuild 7086 BLAKE2B a185d362ad5041db8492f77d4dfd12aeaa955c2605af0ea63af622033f5aa5c4fe26f163ea90485545fb9f9eee4e14c84f64ece10cc8aa859b839ea9bcbdbe13 SHA512 2ad980acd2913543f7e9dfa83d78a2e266991fcdcfa396258ac7866e594c4622baee2373733d852c4d3af50850895b2856440c618978bfb965c1915a8477cc25
-EBUILD pypy3-9999.ebuild 6899 BLAKE2B deb7ad2878e9774c6f5d7c78ef8c6041849b87bd18cc85be058d1d713331f5988e129072510c84ba90172cdc557366ef57a113890b17a3ef1e502d172a8ee047 SHA512 07ba00e030bdeb26f764d0fc0ba6435c0522054b4e401757c3dc742cb833061a49ca89d19d83c5875749285b1749e54a8c616adad4edd693630bb23be1247cab
+EBUILD pypy3-9999.ebuild 7136 BLAKE2B 64bf74462e19ed816e362d30bf8e1c3dd75f8a7fcd636cc7980dc46503872c53a63baff10d355159b102ff1d09631672ffc0e30f86d60a1559d6f280bbd7a6e9 SHA512 c63a47bcbfe5f8e42188579b8478ff45231ad7498c0c1ae497b924f387685b99cd04295c022c171f655c44c9698fa61472e553c07fa0bdf3e82566ff0fefa73c
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/files/4.0.0-gentoo-path.patch b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
deleted file mode 100644
index cf96d3fb2a53..000000000000
--- a/dev-python/pypy3/files/4.0.0-gentoo-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 27 Nov 2015 17:02:42 +0100
-Subject: [PATCH] Gentoo: override paths for system-wide install based on
- sys.prefix
-
-Override all default distutils install paths to ones suitable for
-system-wide install when sys.prefix indicates we're running the Gentoo
-system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
-
-Fixes: https://bugs.gentoo.org/462306
-Fixes: https://bugs.gentoo.org/465546
----
- lib-python/3/distutils/command/install.py | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
-index fc43951..fed5218 100644
---- a/lib-python/3/distutils/command/install.py
-+++ b/lib-python/3/distutils/command/install.py
-@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-+    'gentoo': {
-+        'purelib': '$base/site-packages',
-+        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
-+        'scripts': '@EPREFIX@/usr/bin',
-+        'data'   : '@EPREFIX@/usr',
-+        },
-     }
- 
- # The keys to an installation scheme; if any new types of files are to be
-@@ -476,7 +483,11 @@ class install (Command):
-         # it's the caller's problem if they supply a bad name!
-         if (hasattr(sys, 'pypy_version_info') and
-             not name.endswith(('_user', '_home'))):
--            name = 'pypy'
-+            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy3'):
-+                # override paths for system-wide install
-+                name = 'gentoo'
-+            else:
-+                name = 'pypy'
-         scheme = INSTALL_SCHEMES[name]
-         for key in SCHEME_KEYS:
-             attrname = 'install_' + key
--- 
-2.6.3
-
diff --git a/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch b/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
deleted file mode 100644
index 5d89ce2711cc..000000000000
--- a/dev-python/pypy3/files/5.8.0_all_distutils_cxx.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From b2f2c9d23996d431d606ac7d8ed731a5302b4e97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:42:33 +0200
-Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5
-
-https://bugs.python.org/issue1222585
----
- _osx_support.py                | 10 +++---
- distutils/cygwinccompiler.py   | 21 +++++++++--
- distutils/sysconfig_cpython.py | 25 ++++++++++---
- distutils/sysconfig_pypy.py    | 35 +++++++++++++++----
- distutils/unixccompiler.py     | 54 ++++++++++++++++-------------
- 5 files changed, 100 insertions(+), 45 deletions(-)
-
-diff --git a/_osx_support.py b/_osx_support.py
-index 13fcd8b..0525be1 100644
---- a/_osx_support.py
-+++ b/_osx_support.py
-@@ -14,13 +14,13 @@ __all__ = [
- # configuration variables that may contain universal build flags,
- # like "-arch" or "-isdkroot", that may need customization for
- # the user environment
--_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
--                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
--                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
--                            'PY_CORE_CFLAGS')
-+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
-+                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
-+                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
- 
- # configuration variables that may contain compiler calls
--_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
-+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
- 
- # prefix added to original configuration variable names
- _INITPRE = '_OSX_SUPPORT_INITIAL_'
-diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py
-index c879646..a6157fb 100644
---- a/distutils/cygwinccompiler.py
-+++ b/distutils/cygwinccompiler.py
-@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
-         # dllwrap 2.10.90 is buggy
-         if self.ld_version >= "2.10.90":
-             self.linker_dll = "gcc"
-+            self.linker_dll_cxx = "g++"
-         else:
-             self.linker_dll = "dllwrap"
-+            self.linker_dll_cxx = "dllwrap"
- 
-         # ld_version >= "2.13" support -shared so use it instead of
-         # -mdll -static
-@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
-         self.set_executables(compiler='gcc -mcygwin -O -Wall',
-                              compiler_so='gcc -mcygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mcygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
-                              linker_exe='gcc -mcygwin',
-                              linker_so=('%s -mcygwin %s' %
--                                        (self.linker_dll, shared_option)))
-+                                        (self.linker_dll, shared_option)),
-+                             linker_exe_cxx='g++ -mcygwin',
-+                             linker_so_cxx=('%s -mcygwin %s' %
-+                                            (self.linker_dll_cxx, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
-                 raise CompileError(msg)
-         else: # for other files use the C-compiler
-             try:
--                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
--                           extra_postargs)
-+                if self.detect_language(src) == 'c++':
-+                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-+                else:
-+                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+                               extra_postargs)
-             except DistutilsExecError as msg:
-                 raise CompileError(msg)
- 
-@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
-         self.set_executables(compiler='gcc -O -Wall',
-                              compiler_so='gcc -mdll -O -Wall',
-                              compiler_cxx='g++ -O -Wall',
-+                             compiler_so_cxx='g++ -mdll -O -Wall',
-                              linker_exe='gcc',
-                              linker_so='%s %s %s'
-                                         % (self.linker_dll, shared_option,
-+                                           entry_point),
-+                             linker_exe_cxx='g++',
-+                             linker_so_cxx='%s %s %s'
-+                                        % (self.linker_dll_cxx, shared_option,
-                                            entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py
-index 573724d..0a04f33 100644
---- a/distutils/sysconfig_cpython.py
-+++ b/distutils/sysconfig_cpython.py
-@@ -173,9 +173,12 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
-@@ -190,19 +193,27 @@ def customize_compiler(compiler):
-             cxx = os.environ['CXX']
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -211,13 +222,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py
-index a0a8dec..aa97c4e 100644
---- a/distutils/sysconfig_pypy.py
-+++ b/distutils/sysconfig_pypy.py
-@@ -72,6 +72,7 @@ def _init_posix():
-     g['CFLAGS'] = "-DNDEBUG -O2"
-     g['CCSHARED'] = "-fPIC"
-     g['LDSHARED'] = "cc -pthread -shared"
-+    g['LDCXXSHARED'] = "c++ -pthread -shared"
-     g['EXT_SUFFIX'] = so_ext
-     g['SHLIB_SUFFIX'] = so_ext
-     g['SO'] = so_ext  # deprecated in Python 3, for backward compatibility
-@@ -156,36 +157,52 @@ def customize_compiler(compiler):
-                 _osx_support.customize_compiler(_config_vars)
-                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- 
--        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
-+                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             newcc = os.environ['CC']
--            if (sys.platform == 'darwin'
-+            if (True
-                     and 'LDSHARED' not in os.environ
-                     and ldshared.startswith(cc)):
-                 # On OS X, if CC is overridden, use that as the default
-                 #       command for LDSHARED as well
-+                # Gentoo: s/OS X/every system/
-                 ldshared = newcc + ldshared[len(cc):]
-             cc = newcc
-         if 'CXX' in os.environ:
--            cxx = os.environ['CXX']
-+            newcxx = os.environ['CXX']
-+            if ('LDCXXSHARED' not in os.environ
-+                    and ldcxxshared.startswith(cxx)):
-+                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
-+            cxx = newcxx
-         if 'LDSHARED' in os.environ:
-             ldshared = os.environ['LDSHARED']
-+        if 'LDCXXSHARED' in os.environ:
-+            ldcxxshared = os.environ['LDCXXSHARED']
-         if 'CPP' in os.environ:
-             cpp = os.environ['CPP']
-         else:
-             cpp = cc + " -E"           # not always
-         if 'LDFLAGS' in os.environ:
-             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
-         if 'CFLAGS' in os.environ:
--            cflags = opt + ' ' + os.environ['CFLAGS']
-+            cflags = os.environ['CFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+        if 'CXXFLAGS' in os.environ:
-+            cxxflags = os.environ['CXXFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
-         if 'CPPFLAGS' in os.environ:
-             cpp = cpp + ' ' + os.environ['CPPFLAGS']
-             cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
-             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
-         if 'AR' in os.environ:
-             ar = os.environ['AR']
-         if 'ARFLAGS' in os.environ:
-@@ -194,13 +211,17 @@ def customize_compiler(compiler):
-             archiver = ar + ' ' + ar_flags
- 
-         cc_cmd = cc + ' ' + cflags
-+        cxx_cmd = cxx + ' ' + cxxflags
-         compiler.set_executables(
-             preprocessor=cpp,
-             compiler=cc_cmd,
-             compiler_so=cc_cmd + ' ' + ccshared,
--            compiler_cxx=cxx,
-+            compiler_cxx=cxx_cmd,
-+            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
-             linker_so=ldshared,
-             linker_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx,
-             archiver=archiver)
- 
-         compiler.shared_lib_extension = shlib_suffix
-diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py
-index 254b22d..c9cacc1 100644
---- a/distutils/unixccompiler.py
-+++ b/distutils/unixccompiler.py
-@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
-     # are pretty generic; they will probably have to be set by an outsider
-     # (eg. using information discovered by the sysconfig about building
-     # Python extensions).
--    executables = {'preprocessor' : None,
--                   'compiler'     : ["cc"],
--                   'compiler_so'  : ["cc"],
--                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
--                   'linker_so'    : ["cc", "-shared"],
--                   'linker_exe'   : ["cc"],
--                   'archiver'     : ["ar", "-cr"],
--                   'ranlib'       : None,
-+    executables = {'preprocessor'    : None,
-+                   'compiler'        : ["cc"],
-+                   'compiler_so'     : ["cc"],
-+                   'compiler_cxx'    : ["c++"],
-+                   'compiler_so_cxx' : ["c++"],
-+                   'linker_so'       : ["cc", "-shared"],
-+                   'linker_exe'      : ["cc"],
-+                   'linker_so_cxx'   : ["c++", "-shared"],
-+                   'linker_exe_cxx'  : ["c++"],
-+                   'archiver'        : ["ar", "-cr"],
-+                   'ranlib'          : None,
-                   }
- 
-     if sys.platform[:6] == "darwin":
-@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
- 
-     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
-         compiler_so = self.compiler_so
-+        compiler_so_cxx = self.compiler_so_cxx
-         if sys.platform == 'darwin':
-             compiler_so = _osx_support.compiler_fixup(compiler_so,
-                                                     cc_args + extra_postargs)
-+            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
-+                                                    cc_args + extra_postargs)
-         try:
--            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
--                       extra_postargs)
-+            if self.detect_language(src) == 'c++':
-+                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-+            else:
-+                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+                           extra_postargs)
-         except DistutilsExecError as msg:
-             raise CompileError(msg)
- 
-@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
-                 ld_args.extend(extra_postargs)
-             self.mkpath(os.path.dirname(output_filename))
-             try:
--                if target_desc == CCompiler.EXECUTABLE:
--                    linker = self.linker_exe[:]
-+                if target_lang == "c++":
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe_cxx[:]
-+                    else:
-+                        linker = self.linker_so_cxx[:]
-                 else:
--                    linker = self.linker_so[:]
--                if target_lang == "c++" and self.compiler_cxx:
--                    # skip over environment variable settings if /usr/bin/env
--                    # is used to set up the linker's environment.
--                    # This is needed on OSX. Note: this assumes that the
--                    # normal and C++ compiler have the same environment
--                    # settings.
--                    i = 0
--                    if os.path.basename(linker[0]) == "env":
--                        i = 1
--                        while '=' in linker[i]:
--                            i += 1
--                    linker[i] = self.compiler_cxx[i]
-+                    if target_desc == CCompiler.EXECUTABLE:
-+                        linker = self.linker_exe[:]
-+                    else:
-+                        linker = self.linker_so[:]
- 
-                 if sys.platform == 'darwin':
-                     linker = _osx_support.compiler_fixup(linker, ld_args)
--- 
-2.12.2
-
diff --git a/dev-python/pypy3/pypy3-6.0.0.ebuild b/dev-python/pypy3/pypy3-6.0.0.ebuild
deleted file mode 100644
index d32be15922b2..000000000000
--- a/dev-python/pypy3/pypy3-6.0.0.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/60"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		--jit-backend=auto
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-7.0.0-r1.ebuild b/dev-python/pypy3/pypy3-7.0.0-r1.ebuild
deleted file mode 100644
index 87ce4dbc2489..000000000000
--- a/dev-python/pypy3/pypy3-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.5-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		--jit-backend=auto
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.5
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.5/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.5/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-7.1.0.ebuild b/dev-python/pypy3/pypy3-7.1.0.ebuild
deleted file mode 100644
index f0f7cdf74a2a..000000000000
--- a/dev-python/pypy3/pypy3-7.1.0.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71-py36"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		--jit-backend=auto
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	einfo "Please disregard the import errors during CFFI cache generation."
-	einfo "They come from modules not built yet."
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 236616d1f286..ca7aae03fe83 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -7,18 +7,18 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 pypy )
 EHG_PROJECT="pypy"
 EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
-EHG_REVISION="py3.5"
+EHG_REVISION="py3.6"
 inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs
 
-MY_P=pypy3.5-v${PV}
+MY_P=pypy3.6-v${PV}
 
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
 HOMEPAGE="http://pypy.org/"
 SRC_URI=""
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/71"
+SLOT="0/71-py36"
 KEYWORDS=""
 IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
 
@@ -178,12 +178,18 @@ src_compile() {
 #    "lzma": "_lzma_build.py",
 #    "_decimal": "_decimal_build.py",
 #    "_ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
 	use gdbm && cffi_targets+=( gdbm )
 	use ncurses && cffi_targets+=( curses )
 	use sqlite && cffi_targets+=( sqlite3 )
 	use tk && cffi_targets+=( tkinter/tklib )
 
+	einfo "Please disregard the import errors during CFFI cache generation."
+	einfo "They come from modules not built yet."
+
 	local t
 	# all modules except tkinter output to .
 	# tkinter outputs to the correct dir ...
@@ -208,7 +214,7 @@ src_test() {
 }
 
 src_install() {
-	local dest=/usr/lib/pypy3.5
+	local dest=/usr/lib/pypy3.6
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy3-c libpypy3-c.so
@@ -217,7 +223,7 @@ src_install() {
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r include lib_pypy lib-python
-	dosym ../lib/pypy3.5/pypy3-c /usr/bin/pypy3
+	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
 	dodoc README.rst
 
 	if ! use gdbm; then
@@ -239,7 +245,7 @@ src_install() {
 	local -x PYTHON=${ED%/}${dest}/pypy3-c
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.5/site-packages
+	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
 	python_export pypy3 EPYTHON
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
diff --git a/dev-python/pyqrcode/Manifest b/dev-python/pyqrcode/Manifest
index ef23a38bd0dc..76681ed020a4 100644
--- a/dev-python/pyqrcode/Manifest
+++ b/dev-python/pyqrcode/Manifest
@@ -1,3 +1,3 @@
 DIST pyqrcode-1.2.1.tar.gz 36989 BLAKE2B 88d5274a503abd78d0b8cab462d12be0af925a5eee2a6ad2b47a276559710eac40643a8aec99f26a9579f94e9084182894163e7e71f0abd486c5c2913e510080 SHA512 784262cb15c10f3581b0caeac6bba046686b35b8c0709ee78684b805b6cba49f4250a004dc5f7d393cc25929cbf815c6c3a94e284a77d20ff7224a8dde3a036a
-EBUILD pyqrcode-1.2.1.ebuild 663 BLAKE2B d3596def2ae5df9653c893a7c5cee3d156d211b32de4ba85c0fe9e05f6115d2d5b38b5c6ed5b4ff206c7aae5c46981ca16d405cdd118fff8afb7ec7f7b842e12 SHA512 c79bc12288a44c272ac9c608fcdba8470c0776da33127b18c582a9d4cc9964badc0b2804c4e1ce57fdc2b4aa00f25def31cd44b1c34e0826364f51b49f1322f1
+EBUILD pyqrcode-1.2.1.ebuild 670 BLAKE2B d716f2e29f55fd482b8819b22de1c930eaea7cefd8ba4a5f8eecd4fd23ffd5137d859a808768f68e0f3a705cc90fc2d73a5b430c45df814e6f5849b553ca11cd SHA512 1915bdebe4cb5a8cf8382c717774af2462a6a0f6d9e3244e31a76aca5bd00791848329cec54d550340d86f37fd57775f5db3e122bc33c11a388ec0fe22327d0f
 MISC metadata.xml 763 BLAKE2B 8145476a3c29c4c43388021c2100a87c233f5b67f28ce84de8ea1fada589b82be9e0ebf62b92a623ae74ba7d1993e9141bf8fb88b0100d65cca32ad3c2a5184e SHA512 de826d98aa1166e3a5746fbc363b14b9700b81f36cf5cd4e4446b3db79143650cc11e50c1af92e6a6231d85b0812cb109b66e8cf06eec560557cf949b7566f1d
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
index 647156c27c0d..5cddca1d3c3b 100644
--- a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="png"
 
 RDEPEND="
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index f19ea2e8a06c..80fec4f22b04 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-flakes-4.0.0.tar.gz 7138 BLAKE2B e3c43df60484c664672f8b9ea92f8d4e25ae33e0dffc9cee200867220a3c8840f7325be28a4bec44918a9b44c1d73d3b89517db8dfa9bb982ed92a34c3b09674 SHA512 e74fe78e713040e3e85f206e8d26f5b8d8ef27dd94c2afccf3cd0f1f982c5e6c30c5966f2cdb774c7a2a8052d1a5cb324626b1997a9e75f5a7bb7d4a5e99376a
-EBUILD pytest-flakes-4.0.0.ebuild 605 BLAKE2B 2883167d473850c9ddc930fc0f243949896bc9189b05395cee3429a052793080aebc5d7d4330a2b592968a4f8c928a3e4c2c14c0a8b793eae62229e2721c50e1 SHA512 48f35fb5793d905e18ecf056ff290ff2d8f2e778cbd561edd7f75553440ad710d82f6459ced8bbf4ae5a5eb75722bb814ede7ebcb614d202eea8b087dc71dcf1
+EBUILD pytest-flakes-4.0.0.ebuild 607 BLAKE2B 0014526cb142d2762ebd6476e6d0a9d5800ba6845ed33a80d082bdb0307c93536b3e4b02399ffec29b44094dd267943235d5c9ca0012680ead383abb73465cf3 SHA512 061f40f74ccc943643fe3a423128c95166612d6d425eda819d3ff702aec542eac98f403adcebdfb132816b6caff51b9f0784a2f758c85834c36b7bbefa4444c9
 MISC metadata.xml 322 BLAKE2B 4f4573205a169edb1b0883546480cf852d1eb0a9b5f99c7326a55e4f6002345c06961d8394e7de26d13616ec78f8744cfbb122964b40ce5215920749f92bdcc5 SHA512 129a0bb37ba1cd528848d3c537a7a776b7526eded473f97e986307a9a185b4337d60f6f5f0ed1beac1d0f18fee6d9023753b9cb89d77e3b3a06576104701273a
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
index d273097c8000..adbbf8912f9a 100644
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 50d32bd09d58..683dda9d60e7 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1,6 @@
+AUX pytest-xdist-1.28.0-strip-setuptools-scm.patch 926 BLAKE2B 1943edbd4511b40b137ffbf27b67ef42218dce9c740c7a98e0c203a4688fbe8bc98bd3c15578dfc7c39fb5d4bb0aae7ceb4efa55dd8a633ab3bf3a80e69fbdde SHA512 43e6e52ca5e436b292f966d36c7276ca4d3dbc6f94c58eee014a357f18ce35a3ed8530b69418028f51311a465f4904c4ed52a279c910b1bb8469352238f162dc
 DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
+DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
 EBUILD pytest-xdist-1.23.2.ebuild 1030 BLAKE2B 989b87f68c288b535533c9a00f5b797c4b81b90ee2635b9f85e6366d165723a5f57c56400c501bca6c3326d8374ddc7f3aa5bbca6cc761e4c65ec0e910ddb90b SHA512 39a00470970930c6efad4db30661ca0aa6268540b4fae4a4116f31cd84e8fbb447de5a277d0479eed66881d963ee99b42e87378dac53532acfbf1e76e726b692
+EBUILD pytest-xdist-1.28.0.ebuild 921 BLAKE2B de88052bd65ac5c8dd9623bb024aa5ea3efd430cf1e7a20fac16412434d5c9ba73409bb0b83a642a2fc690bb6496be2de4707da16cc1511d6bf7c71453be77f5 SHA512 207b7bb0ab74e9eba667107372c3df2e18b6f11326d7bcb16adadd0d814dc072e8ae3b8dbd87e0befa2ae7fa2ec4fcd69a3019d8fac104a556e7f3e43c65f022
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch
new file mode 100644
index 000000000000..8ef0272d2b5b
--- /dev/null
+++ b/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch
@@ -0,0 +1,27 @@
+diff --git a/setup.py b/setup.py
+index 17abe9a..81422db 100644
+--- a/setup.py
++++ b/setup.py
+@@ -6,9 +6,13 @@ install_requires = ["execnet>=1.1", "pytest>=4.4.0", "pytest-forked", "six"]
+ with open("README.rst") as f:
+     long_description = f.read()
+ 
++import os
++with open("xdist/_version.py", 'wt') as fp:
++    fp.write('version = "{}"'.format(os.environ['PV']))
++
+ setup(
+     name="pytest-xdist",
+-    use_scm_version={"write_to": "xdist/_version.py"},
++    version=os.environ['PV'],
+     description="pytest xdist plugin for distributed testing"
+     " and loop-on-failing modes",
+     long_description=long_description,
+@@ -24,7 +28,6 @@ setup(
+     zip_safe=False,
+     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+     install_requires=install_requires,
+-    setup_requires=["setuptools_scm"],
+     classifiers=[
+         "Development Status :: 5 - Production/Stable",
+         "Framework :: Pytest",
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
new file mode 100644
index 000000000000..9564d7976934
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/filelock[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.28.0-strip-setuptools-scm.patch"
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 199c6dbc809f..3634fdbb903c 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,3 +1,5 @@
 DIST python-axolotl-0.1.42.tar.gz 53869 BLAKE2B 045d19b38478404b19717daee431a4fc36d187dc511d42ee950b37ef257d98aaee8ba42633888d596265c0d64bfc33f2da9307d45feb4189ec04c03d69687108 SHA512 db9e1cfab87d690619a672b1782942a18b12b17af555959c17bcc3e2581e9c689c57becc0ea884a1129df9dace17684ba03de38b81f8c8c65cab27962ebdb6c5
+DIST python-axolotl-0.2.3.tar.gz 52139 BLAKE2B 8539f4ff6d9d7e57965cdbbd510f499cf344490091fe56b013d1ab60986092ac8a7a76248624993692077020043ea21c1d9448ecf9b76a698b43da4e014f37ab SHA512 1a10dc9df2f95d19b49909d4d136b5266aae19e24ac84f8b263ae7d4de18f77353c737616ac0648b600e05699a90d348f95c6c1659849986becefb4a0277fc80
 EBUILD python-axolotl-0.1.42-r1.ebuild 677 BLAKE2B 976d2b5f03f5325e838d418ffc0b71e119b560eeb7d0928d40d4c54314080a2bf884e22168f1619490f4b90c7bf4e3b9679fa05fcf68bb650b2679fbc0e1e90f SHA512 c9589aaaf25abe0d810496ff41fbd55a34b3cf63d60c81ccca6fbd561c305c2608122eea8782a7e626610dc1f1492466900ec1a00b590a4848544bde1ab5a7ea
+EBUILD python-axolotl-0.2.3.ebuild 678 BLAKE2B 2805568d113a0c17f6fb0359e7c7e4e2d47ecd0479c040c813b3384f886f1a5f2e2fbbb4a3d53a5414ac6839756aee666887650bcb346e1996b5bc474ad8dab9 SHA512 085a6ccb8893f2158e2291141641e377660bc88ac829c5af3b52550326c5b6efc379f602aefac6454fbfb3e058605a47e1cce23702b4b1f34992d7fb851a0db7
 MISC metadata.xml 734 BLAKE2B 86bb0a6b6c1c45e41917d6ed44a49d6b72acb3de3a466417967b3b7295543af235d958ecc1057b9ae666a96152f9d56e2520d48fef45216024662e9eef07eedb SHA512 b779e5edf07f64d7ec266051a76ea3f3011808811f542c43582d85221e988bd7dbc97581ff59d7b115830a7e4d101306dda24d39f24acaccb3f4f54884e6b3ef
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
new file mode 100644
index 000000000000..66e74fa421f5
--- /dev/null
+++ b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for the axolotl protocol"
+HOMEPAGE="https://github.com/tgalal/python-axolotl"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/python-ethtool/Manifest b/dev-python/python-ethtool/Manifest
index 3468245fd4dd..8c801225e812 100644
--- a/dev-python/python-ethtool/Manifest
+++ b/dev-python/python-ethtool/Manifest
@@ -1,9 +1,7 @@
 AUX python-ethtool-0.11_include-net-if.h-for-IFF_-macros.patch 622 BLAKE2B 94c1de49912575ba542824a800ab9c4095c0eba768678f203f1cef2548f665675ff0e34b9802bf7aa983ed01fa6f46bacf1e1b565a2d5605a47ce11f46d66d48 SHA512 796beab89f476138fbe799fb296631d912155227b4d40118eef20ea69ca244d272756a63c1afbb42f2941243425994428d82699e1026c4c52a9bb4616fde5839
 AUX test-skip-wg-dev.patch 1023 BLAKE2B 564aa0fc9250041b181aea79d14af9f10c2d298f34f15ddb33b25e00e138c3e8a21729cbd0fc4b3c724c89349bb700563c568f27fd0e3d47da2736c2e91d2664 SHA512 fea83748b18b646d4acfe6fdbf204c0aa5f7abedb122241e54dd29f01e0e7862c5166f1199e20606c991305bfd9aad9ee1022c05e9cab800f2c9e980e034d4c6
-DIST python-ethtool-0.11.tar.bz2 34487 BLAKE2B bdb5eced32c508a593bbbc80fc287ece547c34504bbdf36877f4b62dea1239a33c5ea23dcecdd8b0f8104eea3ec7d5418a3ee5a1697930ea24a51da42f3ddc24 SHA512 b260e608e1024c48eedb72327b704b01fb42396219ca3d942fe42f22d3e8018fc74bfeffd96e37abd4efd2ce49a73915e0e2af5841a537a02e247d4ba5548f20
 DIST python-ethtool-0.11.tar.gz 37326 BLAKE2B b2345f5aece60c3b418d9fcd61220ab77fb49b9995a23b0ed6d97135dee61e4ffa177059869a8702430703b9f6518ffdcb8d690c868d0f8338ab16fdc36c58ea SHA512 227a9248dfdd36a9018a441d3ef4680691c23dac52972fe1ecc67ff30991f3de4cd71af0e48669ca382d6f177d1b3ebc97596e5a5ae4b4c80371456effe637b5
 DIST python-ethtool-0.14.tar.gz 41945 BLAKE2B d83e40e79481ee5f91f7e097dc4f6f0eb541f88ba83e13c13b3129ece2196ee999f9110310339ebbc2343b814a3b2c80405a3b4ce6931110509a54281b370cd8 SHA512 57a3f2d60dd8309192fc858614645d4e7533c90c03113ffc1eeeb810b86eb71b0a80b4eb209d3452c7624c5318a853de50d9d716d41334bf079e6e3e2490fd4b
 EBUILD python-ethtool-0.11-r1.ebuild 659 BLAKE2B 06540784fb06c039affead64ed7e298a6a064ded756fb9d5bdb8fa7275a3aba1e0f4cadd3537991c8f0bd599dc78dda2a5f0324cbe23848426537b82729a0c69 SHA512 f1e89637bf687d42025910326a5111bcc057606d693d2cfe87a6704d1366e38cdcf71895b8fb284c36fb3f4defbe74af5f1ef0c13e5111f5d8efb636ffc0f207
-EBUILD python-ethtool-0.11.ebuild 593 BLAKE2B 638119c63aeb9778562572e9da397a054a7f73d4155ed187a093135d813d6bc1f4f521801663ef524da412708603f3b0035d390e09b15543afe0c52d8bb36151 SHA512 23549771aaf54681276ef107417de835b13d5326818a3f45c94a1cde391930ebbce15fd033571ad63ae5cc6aa0344ffacf7aa5268ae5e2a90f47782e8f36e271
 EBUILD python-ethtool-0.14.ebuild 726 BLAKE2B 6e16d3c432f65763263eff1f95d9dce9c3bd1dfe8a75ff7b28bd5f33e5e74dc9356035b4427c175ee272ec6283308745da70af198c57508a7a510cb27092ec50 SHA512 fa6d487c3e392e3125aa814fc4eaedaeea50cb67fea967b7a2cfb9219a43498f18d7e45255d13122cec8754764a13031a9f03d971f56dddbfe743e611cbc08f8
 MISC metadata.xml 464 BLAKE2B e4a3eeee039ad5e3d1236e0067f72df7e73638bb550185f21de32977396c5457a3bb8d9358b65f3dad4696ffc1d818dcbd4ee6ca7f1a9692b3da0b7e56708b36 SHA512 26faaf69c1bcd592bfd2687b3e805ac9d5ecd155ad86a4d1d92875e96d24a2e21603d1a5a581fdb05bfb9883ddc9ce8bf86a5ca464d7521db65d271b5bc5485d
diff --git a/dev-python/python-ethtool/python-ethtool-0.11.ebuild b/dev-python/python-ethtool/python-ethtool-0.11.ebuild
deleted file mode 100644
index 54f2ce406b6c..000000000000
--- a/dev-python/python-ethtool/python-ethtool-0.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-# TODO: install scripts and their man pages
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Ethernet settings python bindings"
-HOMEPAGE="https://fedorahosted.org/python-ethtool/"
-SRC_URI="https://fedorahosted.org/releases/p/y/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-libs/libnl:3"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_include-net-if.h-for-IFF_-macros.patch"
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-rethinkdb/Manifest b/dev-python/python-rethinkdb/Manifest
deleted file mode 100644
index a54c2a962cca..000000000000
--- a/dev-python/python-rethinkdb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rethinkdb-2.3.0.tar.gz 116289 BLAKE2B b75dcb5792d7c0b9af89034dc7e44e2f42ddc7d2339a686db159a20186538778a4e5364a4c65e68671353f5ce5b4137bae3cecfdd18d6cb504f1fb4f065ced29 SHA512 1e710bde31ce45b5cda7463ae0a328c073bbf68544ad790d331163de188855b78257461a5b7367eba7becdaae329f19df545d7dd9834a095c6d01cd2710f481b
-EBUILD python-rethinkdb-2.3.0.ebuild 550 BLAKE2B a066650f84015267c71d5806c1495f145ec02de828d2bedad9b3bd89cd9dfb7cb9e184b351f2cffcf003bbeca1dc09c2723a9601ee63a70722dd8e5adff39943 SHA512 dad66f607376847dab1311ac24e7a6b6ce9b1ad110a4b5523a233ce49b7c8a2ff11c9a80fa5494b11b5ab911844057388994120ed2b3802625acb49cf6702bef
-MISC metadata.xml 316 BLAKE2B 5f3708493822de89c413d902691c11fdd363d088ce7547bd1dc2eb5d8f3698589efd4f28d86c6a45a372b549c3c8be40fc4d094b3718ec00c818df23cf361f0a SHA512 a04ce39c38775134396eaaf7a057251b348d9a60b60bdfd0c0df0811315b244518bb5a3e49e628d3da5848e3746e0e56f5461e52ecb427ef16a52853016b0fb9
diff --git a/dev-python/python-rethinkdb/metadata.xml b/dev-python/python-rethinkdb/metadata.xml
deleted file mode 100644
index 072edc1ad4e1..000000000000
--- a/dev-python/python-rethinkdb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ultrabug@gentoo.org</email>
-		<name>Ultrabug</name>
-		</maintainer>
-	<upstream>
-		<remote-id type="pypi">rethinkdb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild b/dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild
deleted file mode 100644
index 699f4a4bd9d5..000000000000
--- a/dev-python/python-rethinkdb/python-rethinkdb-2.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-MY_PN="rethinkdb"
-DESCRIPTION="Python driver library for the RethinkDB database server."
-HOMEPAGE="https://rethinkdb.com/api/python/"
-SRC_URI="mirror://pypi/r/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-# no tests provided on pypi distribution
-RESTRICT="test"
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index f91b3be6700f..fb86f49725f8 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,4 +1,4 @@
 AUX python-utils-2.3.0-pytest-runner.patch 461 BLAKE2B 245e0a6a4c76a4286616e0ad1115a718b482de4945d0321eb9b008699df1ff518b0ad7e6e2f9c5ee743fcdb283bac3dba73423b889a8b62951e004433f343894 SHA512 6ec873a2492166ba7d592ceea96e3ccf5851ae88c7577fded1803ad2ef49bead549cbbcdaedc5a8565228c7cf885736ed402b85ee0890f61e91891debbd14c2e
 DIST python-utils-2.3.0.tar.gz 19384 BLAKE2B 1746deadc8dbaf49a6499fe9c79d25c2b5cfea68e2d1b7ab6f88aa72807eedcdb338058e24a7822c6360dea36f1a044145572443c57f43f4cfed765a76e48f0b SHA512 482ccf9c635a0cbe603b69488a364d9033f8b7fada279d901725b5bf91ac13b1cd4a6b7e8d5834a9355d97d8b0803397d5e13da2b7ba72f8d8e2f7f39fee027a
-EBUILD python-utils-2.3.0.ebuild 847 BLAKE2B f68bc2a5924b7970b305b3e717fb32e89c24b4beaae548abcb74b7c6591ca1075794aefe6f7e7a89b44beb6f639ac5edf357aa2b0bbd1430924224cd0b1a0ebe SHA512 9c659ef20a0175a3790bb63553c2fab1ebfec7e27f2139064b542dfc0eb93e119639cef533d28584d9a4add9e597903f3869bc2797fe30cf0b476666740939ff
+EBUILD python-utils-2.3.0.ebuild 853 BLAKE2B 6fc6381d8f1e039965f621bfc090e9a08a710d752893ecfcbc03100b9b96f9531297da5c8eade01719e07baf00223ce72c4c547c9a49499fd059deab3eb7fc0f SHA512 f55de8a922fb2b772035939ebfa0754cd93995c8ae96c08d31e06759263874c164e31de63741a9576a43a7701467ae5f933963a54a1479263b1f33ee054e355e
 MISC metadata.xml 321 BLAKE2B 7baf4b7d0dbc6064c0588cae9708d10df7d571cf178f6156124938d4786a6560263e9862d23d53bfd17f6e098f58dc24188a9b02642765dbe4aa9d1628a78c66 SHA512 3073d2409eeb35e53d4f55a774ff737496ee360204832c17e178a2d8d0288416cf09fef68ae66bcf5f66a30f6644b364721b402e9bcedf7bb4f1663f302641cf
diff --git a/dev-python/python-utils/python-utils-2.3.0.ebuild b/dev-python/python-utils/python-utils-2.3.0.ebuild
index bd24410195be..9aa6daa7f23c 100644
--- a/dev-python/python-utils/python-utils-2.3.0.ebuild
+++ b/dev-python/python-utils/python-utils-2.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
 PATCHES=( "${FILESDIR}"/${P}-pytest-runner.patch )
 
 inherit distutils-r1
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index 75de9c5c47e0..5283b0b6ed2f 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -1,5 +1,5 @@
 DIST pytrie-0.3.1.tar.gz 94678 BLAKE2B 12631652ea33d2f1575f86bc8c42982543f8fa146debc9cb86e1139ff089f0657e04e50bad97b9bc344f4a270d102ee98e03fd389eb2c56ba3baac32b2288670 SHA512 72cb4ffff53d01545658b27b6c0b798736404f95013bfe34586c51c8823cc923ac4b3a8e874a938b26e3045784ce98ce2d8e51ab70dc435ff50075ffaf9d6c51
 DIST pytrie-0.3.tar.gz 228709 BLAKE2B 84c415722a724ac668624b3da29bfe29998c2ec8662ad21ab0035bb2a694e94759e9d09de980842887972b5c1690d699e43de41bf9f62e84ef3fbee86477d0a2 SHA512 f1dc6f810e51385fa4dcf2cbec76cf7fe5c184208f8d6dccf6212d43260591580126095e68d28ab6c8b01a631e6e16b275fa088643ae81568493ca231dcc6161
-EBUILD pytrie-0.3.1.ebuild 591 BLAKE2B ff8aa57bc45382f3f2a00cf0b0896e8b02a3a5562df2cff65001caaa2bf5cf0b88980e6b42051490c7d8321f8cb6c056e4a85d5095da796f9aac78f19e41eb9f SHA512 263a405e73e2daea81fdd274adfb6ea25760e2f106437d70716a2a0820f06284c7f689d5def361559561d629e7fcac844888d3aa33a0db849586314d79c817f4
+EBUILD pytrie-0.3.1.ebuild 598 BLAKE2B 4222725494f7a381ce122f1f3f8ce0c483485229d989624f621a54b1d41aab1d834b6fb4cab8d98a3ad0b8627f5e5d4c4246d8ea2c0937dfbb5615bf78a3e3eb SHA512 0627366cca1658439b508fd347a6e9438f9aa69a08f33b5050088500935387f20effd2cd10db41e17f3bc499caa1564c3cccdb5b915fd2ccfc51a351e4827b86
 EBUILD pytrie-0.3.ebuild 595 BLAKE2B 862638b14fd5cd871b5f241bb3ccec1e57afee8f8fef6b8c04e372245c02fa78ffe8fa3233d9a64288a32b1ae4de569bd06c06638b0adde7374594b95c96f75c SHA512 c45e370bdadbdc262d7d2390baac51dd3860804f67b52eafce89dba3c07d0791e3cfa1aad4dec211421b42218440ebb7ed658cfe13e21b14b84fd35a11b50b34
 MISC metadata.xml 964 BLAKE2B 9fbaa7700117c0416ae610f5f4d15078276cd6beb5fa6064b7a2649b5e1410b3ea957db671a6fbf7b3c387df22493df21246a5dc0ca563fb7f74c4a62d05a822 SHA512 cb64560edf2a771b3bfb856db54b4a6e41831a8ef51e6f2d9e045dc4e01db3a79a670d5c39a3ecedec4ed3c3f57473ca1ba5057b1e45a0d76f22275b888000f7
diff --git a/dev-python/pytrie/pytrie-0.3.1.ebuild b/dev-python/pytrie/pytrie-0.3.1.ebuild
index 72cbe7cd1866..2193998d888e 100644
--- a/dev-python/pytrie/pytrie-0.3.1.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index d149a8714a4b..020d43df6380 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,7 +1,7 @@
 AUX sec-patch-CVE-2014-1624.patch 1867 BLAKE2B 7345af45e863876b9c0f11c0dedb2dc124e53448c532bcf622f085e3a4c3040c9308352414e173c6adf74cb1c55efaac1824bb99fc8013f63dc8cfd3610989ea SHA512 f0ff5255108b7a5774d376a8892f1120f5056ec92fa543af7e5aabe3792e7ecd347ac78ff5c04ab36db35bba513a412f6aa06fe718933317a903264bd184b712
 DIST pyxdg-0.25.tar.gz 48935 BLAKE2B 8feffefff37da1e560040b36cc1ccb4ffdc57642b4de92f7a937303a02117ffe263a5dfc91bb6e85112ce60bc19509c21e7f8f859ef3ca5fca0e8c87a61cb128 SHA512 86cbf3a54fb8e79043db60dcdbb3fb10013ae25a900fa3592edc8a24bf3f440c19bc04626c7906293c785fcb56eab9d87d209b723b5baa872376ba1eb86758b6
 DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
-EBUILD pyxdg-0.25-r1.ebuild 748 BLAKE2B 94692935906f8036871eec7773e2c95f6c344feb737d4c31d2905dc5cc260faf8f586118ef656bc7d728fc3dc28bdad78bcd3c79f42b6058edc44fa8737c6299 SHA512 b7fe667f7a3a9d72e1d41bd84535f07b42ebac0de6ed0937bcbc7bf93f724a40403338e839b10b72f015f7a989f881c85fed3b668b425718a8752cfd7c33b321
+EBUILD pyxdg-0.25-r1.ebuild 747 BLAKE2B ace34b0bc7b5361992701508256b56880ff9b69d6430cc562ff67549af259cedbad739e1482ef01df1e407b347522a48d8a72c0c408343cb23ed90834fe77077 SHA512 c72ad12c502665aa7dc89acd0507e6590cda651a53b87b8a275438bbb7ee7b767d040f40786a115f29350996d27a39fa18f674ceda1b09ead0356f33e51ba091
 EBUILD pyxdg-0.26-r1.ebuild 775 BLAKE2B f6d819f1a0d4d28c92bcfc18b66843f6f95017498f05841853f230a48888e6382f74cb9a3280d5ae70dfb6a174a9700adb7ac1cd8cd1007e6f2511b47cc3988c SHA512 963ebcbe2e69ccfbbd73a35178c10778c8e935917817ce15edb9032b1746f6c4c07bd959aa9af8f391003a9beef1b164df3b9b77f692d43d3a926abc2fc201ba
 EBUILD pyxdg-0.26.ebuild 771 BLAKE2B 432500bf9e766b0a35b0b58ab38b8e3f4c872a304ef8a160127ab53bd2237756cf5b1c31902634fb41aaaadf5191ed0cc5a652e79cbd47792957135437c9ab66 SHA512 1322abade539c088a416a487cabc23c3d14dae3d81f32bdaf1f2c8f111e962f9c941c006b149b29248db4e3ddf06a636764da94bb8fc0fa893ce9cd8556594f6
 MISC metadata.xml 487 BLAKE2B 4967a9b3c1a439c3cc53208ad2095031b08c4848ade6f2bb08a69aedbef5f5046f28764db62bcf3cac4c1c33c68958a7d2aba03a3b4cb7b7a407e41eddfec5f1 SHA512 f00421023d46b9aa32d8038c5ba8bfdb1b60a732932d64f7d11fe6f0c163b734182e2162dde2ba663d7c74ba8c754ece721dfbfa0b8fa3081be622dfff3949ea
diff --git a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
index 89eb6d186218..370527c910ca 100644
--- a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~takluyver/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index a71c3641f23f..caa16451f840 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -4,5 +4,5 @@ DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052
 DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
 EBUILD pyyaml-3.12.ebuild 1068 BLAKE2B 75d565e4f368a85bcdc8f7a0b505c0969edaa8835480d09acd58e3a714c9502b085f419851d5bd15bc773f359a355101179fdedeee4d8468dc4adb0c5d5ca2c0 SHA512 7c839298eeca6ac9ca443cfa7e15e6cb1151789985391eb6b0eb81ec40c0e48dacd5c1ab0c7aef541f96312efb67b48e7cbb201c68278fb38a84dd7c272ce661
 EBUILD pyyaml-3.13.ebuild 1070 BLAKE2B bf3e7dbc8fcfbbf12bb5282ee012c9c1c83197f5573351181965efdc75a022f5b065181b975680240016b6c84f6259528e7010dd6645152b6f9b35bf66ea17fd SHA512 803c12130e4996bb868d71d8fef7819ae1f6f4aa44818bc68d6599c0e7a49b551c368d62370544811535c9bbe2126f3f190e1974148a727dad3a5adb52aaf79c
-EBUILD pyyaml-5.1.ebuild 1164 BLAKE2B f87df52805689e30c5847724007248dec8738730bd1b946f8d8a638a1926114aacb9c900637c8136dc4ec6d634bfb0328c1b9c2be08291bbb34ec024dc728e08 SHA512 6c86d2f18acdc962a4968f654daf35e2bf53fb2301f84d99db025b7bca912980df18ada76d0039a1c4b4df4878ca344d77b8c9feab3142b05f1ca88344bc8c67
+EBUILD pyyaml-5.1.ebuild 1158 BLAKE2B cf3796c5f5b7be00826c56d59bb641e63d44aa1d4b315be44944ae753c2318eb7bd497e0e9211e511fec8342726709b00fb9755b6b9989d53cfb483a8f6dce72 SHA512 ec6d704959496033b2c6407021758d30191f2e624eb264c094623af6de267c0ea8823d4f2df1a08a9c8aed8c6e3e8b3a3fa8795e8e79bbc373dc2c6d08077eae
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index d23042797045..b0343bb7d8e2 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -15,7 +15,7 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 )"
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 4762b119391c..6526b84ecf3c 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -3,5 +3,5 @@ DIST rdflib-4.2.1.tar.gz 889467 BLAKE2B cc5f675646ca7a55ff40d4d98eb138953d8763d8
 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
 EBUILD rdflib-4.2.1.ebuild 2677 BLAKE2B 709ecd89e9e7a13a40e52aa34dd69f432b5137d885356b01a559126ff58fcbdcf91c47cc311569322e94e16c71986dcaabb55f5ec2ec92df8b5e8de95191101b SHA512 fbf1d0409c293a053e9d7e89c9ceca81daae3f5018a6b36b91a39c0e64637a4958d464cc38cf50a09378337e694e09c5378fdcc7e5d17911fbee7e47517bd99a
 EBUILD rdflib-4.2.2-r1.ebuild 2929 BLAKE2B c83f419cc4bd6ae6234196ed4e9bc8c66544dd5b53774f0e1789aebeda2309a4b9d08869e1633624f81c76a083f058e03c160bdc605cd00e90a8ff444897521e SHA512 b406b89fe031309f0591192c625d18a812f7556b783b8dfdd7188d60425d26af3c24948a32ad8b989ca34bfe2dbeb3e0683baebb5c355a4241d39af7dc20b7d9
-EBUILD rdflib-4.2.2.ebuild 2716 BLAKE2B b694b69fa2e394b14cfe54c50ee2303c8d0fcc8d6ff4d942a8089600f3a9fda25aad6eb7cbba30a17e6a920fb5b68ada72797d86fcd2a341d0aeafd4ef866aa8 SHA512 7a11fc1d1e5b60c3513c5d6cb4fb6cd44a6c876bb47a98ae5b8116788454ca96c57063c4740b28e40730560b4c6dde31e288000896d72c341a518dcff2ab39d9
+EBUILD rdflib-4.2.2.ebuild 2715 BLAKE2B d41f8b35c8418a8c0b803f9066f066ed997ba8dd4a599b1a47d649b2e286edfba9b82978e487995322c7444fab45063d02a93d63c49b89b80c974f0c1545295d SHA512 116dab6c72ec55f353a8ffd5eb75f373e6e4a45b993a039229209c1b0dbbf72643f6694ea24b0e64a09a6d4d28746762da8bd6c7771115b2bb4555cbe2e1abfa
 MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index f7f636a1a267..32f070a4bb51 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 8f9725582620..c15d2f92dbdb 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -5,5 +5,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
 EBUILD reportlab-3.3.0-r2.ebuild 1654 BLAKE2B 75324010068f8d97897151151776bfef87401dfa7859fa7b825d59b667843dde3e5e514e4039893534f7c5a6af5c38a937ab18ad48629c43f7f9a67c28671646 SHA512 a80631147edfc37e13fe28dfb03953e343ce26dfaa8769eda29809c0cdd0c5c39e51e3605e682a15a957268a6a80156e6edef5f9a2eac4949a642fdce8b260d1
-EBUILD reportlab-3.5.13-r1.ebuild 1528 BLAKE2B 074ac325a57601ca16383a326665aa772d5f6c02b95116e1c4259aea52d2c51ac50b13f0449e8e4d8fe0d93930fb8bfd54e7d340ee022f5863aa9aa8d97d4c40 SHA512 e2853dfa9f9ff29432dd33264b71c7799aea478c27685235993a1afad226d634deb17ba24103e16ac2a1d906b5e5a072bbb31fba624b982b4f71baae006435eb
+EBUILD reportlab-3.5.13-r1.ebuild 1526 BLAKE2B 1206706873e9036bc25df3226a973e4dadfd437e9691ac0825ae77019ad0a4c2c7c9a777d3b339c6793e504b27c416054570012e56cac8fe2cf4c8905c7be1dd SHA512 04e4dfdb6a565eff076006c68b08cf35708b87024e5585920fe0fefce606d51b02fa252d094fe3eb57e16360303773f011fc36d13f24e1177e6a58e8ac08073f
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index 553a9746286c..976d22338f89 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/repoze-sphinx-autointerface/Manifest b/dev-python/repoze-sphinx-autointerface/Manifest
index d5e0a79c90ec..ca1fb212c60f 100644
--- a/dev-python/repoze-sphinx-autointerface/Manifest
+++ b/dev-python/repoze-sphinx-autointerface/Manifest
@@ -1,3 +1,3 @@
 DIST repoze.sphinx.autointerface-0.7.1.tar.gz 7892 BLAKE2B 8c7ca3faed9ede599c4d1a7c36cfb6fc2666d2a88ba75d6d903bbad2306bd6d5f2ff9c39a149a2a9e9171a4bba23a7211a3e8d4c9620f6777928e032e030881b SHA512 e2b2a41647a6e349bd33df8fcc08d2560f2a58b94a054bfcc9176cdcd97513ce78cc31945c7c12fd14f7906d21b23ba9c3fac0a06ed0c92ad7b89f73b5bf7ff4
-EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 971 BLAKE2B 7f6167fef0420ba2a124ad4748d8609be276b48224fa7548fa5f3c4cee80a3771e498da5c6dbf01dc5f203446990e0437c22dc5897a018fe151baad2aca37bc5 SHA512 1df58b45d939eca3dfe9ad42700893f4cb7d42e7108bed7eb7ebd87563eaa5d50067f152548937ef2d312b44fb3d447a92253b453481a5ce631ef7264889e9b4
+EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 978 BLAKE2B 9a3fe1eb06d010ea9bdf3f93ed78880016fdafc69c76062158f928dd4fbeccb108cdc2fb8a4201dbaabee980fa3457435c7d279abbbd715af9b678515f6dd31b SHA512 1828ed67d167cd21c3b2844be3f14ccfe6fcdc4c49e6d7b1bc005d1cea37550f673427de1cbccaf1b1a3466a9630f685816139c7795b0a07aae3c9fd2d8651a7
 MISC metadata.xml 330 BLAKE2B 62f755b2a31b7e0aa7889cdee9c2ae10fbc4f3b8f054a9f6658f4993e82e4ab55e139eafd1fa5314a071fc5ccfe50af0d26012c044facd4227a73566a812d7c6 SHA512 bab37e80962b4bbb37100966f20a648ecc5761dae56d01d09a140b39ee2662a91ea93a8c3e8406c285e94df572645a104baa810c941cf4913e73afe34ca185a5
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
index 25b4a305f5a0..2b3450e358e5 100644
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/namespace-repoze[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index e8e1d5627ab1..688c8f6dff9d 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,5 @@
 DIST ruamel-yaml-0.15.35.tar.gz 344241 BLAKE2B 3e77f5da4e2a7f64099da1d79a108adfb093c5e47baaf11611462637ec6e29091924088e0ce261b21283a0ab07123da45a1ea7b0c522692d1e96cdcc27502541 SHA512 9e335d627db20b85ec0384f16d7ea03c310c01e84517e7b9bced1af9289fe542b87eb31da8ad960b17d26f35f2cc33a87a5a5b976e0e5ca587339b21b4b53fca
+DIST ruamel-yaml-0.15.96.tar.gz 399206 BLAKE2B e17f25d9501dad9fd17688b003d33fb0015b700f3c51d405710ccc0635263ced7a86140a3ed7a4aecaaf9e2e73f2eff17b99e96fbd9d9c1be3e9110c28758a62 SHA512 be76a03c46ce8826eda365791e212783243b64781318a998cc48c201bafb9af6b318e7544241fa10ce211e25bd6b26d3e57ef6a1fcb0c1be6dc4552c341e5492
 EBUILD ruamel-yaml-0.15.35.ebuild 1086 BLAKE2B eaba5af40051c8a044e8a0f8fefcfc09902e7d9aa85d0c2c4c76ffe0aa338bea3d86e8efd3e843d007abfc87ebebaefd88fd607afa4060a3aa8b7716dfefe704 SHA512 684a05a511949ad7ecec491cf454065d5f6ae442e12020a2a3b8ac966bb5045f7ad4cabccba3ed8d2c75b75547a634cd8cd3267e53b990941fdb70a646a56a46
+EBUILD ruamel-yaml-0.15.96.ebuild 1087 BLAKE2B 63cad1654b1e8e61ffb3a551157624b127a27534e95848fb1d4818e3de85c6755503257510c69844abf8da8ca06b8c3c89080d867abc249b81d829371f205d78 SHA512 3805a9192505c37e533a8978e6757d98dc0b2a9ca28bc6ab7239302d8cc12e49821daa067bffb55fcf79e51b97f1be4bb5319194328fb980c931b2447a63db83
 MISC metadata.xml 487 BLAKE2B 3564fcb4d8426e84f8e597771f9d5c8fb89a770ff6324f1af2112ca4e589cadd4f83503c9b9151ba5fb983b3afd837403fae0b0144da9ed3fb9677c0b5cdbd86 SHA512 d0db6519618ae2dc134a7ed8840a7c1dbf1e49c43fe781ccabf8ff8508ac6dcc7fab92e61b8e6cc6179f30aa5bff2c772721ca09fad15d57734a16d372c6f0fb
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild
new file mode 100644
index 000000000000..156a753c41eb
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.96.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://bitbucket.org/ruamel/yaml"
+MY_PN="${PN//-/.}"
+SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)
+"
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	# This file produced by setup.py breaks finding system-wide installed
+	# ruamel.std.pathlib due to shared namespace
+	rm "${BUILD_DIR}/lib/ruamel/__init__.py" || die
+
+	py.test -v _test/test_*.py || die
+}
diff --git a/dev-python/runsnakerun/Manifest b/dev-python/runsnakerun/Manifest
index ea369d87383e..8d3e0505c889 100644
--- a/dev-python/runsnakerun/Manifest
+++ b/dev-python/runsnakerun/Manifest
@@ -1,3 +1,3 @@
 DIST RunSnakeRun-2.0.4.tar.gz 447278 BLAKE2B ea5d8adc37249ff9338f319fe9d9aed4cbb9cf0f78d12266ce02bf47010c543f0f245b98091dc59164333a41983865a6d5b4d51e0db23d4329f119285885afc7 SHA512 2338d44ea57e7e9610e85dda5b2d806795d259e4e33e57e15f0ff8c938ba3dbcfc6df46d69f2fff3558879dd3b14725fdb7e0da939bf803776dc6bc95618ec24
-EBUILD runsnakerun-2.0.4.ebuild 560 BLAKE2B 2eb2a18262eef793f335b87b49b339edeea66d772b480c1e401acdb0dbc29c5005b2fd4137d068c498f0e1fd543b654b4bb683504163c2bd9c9593886331413f SHA512 2b2ba37867e4393d74b427219b1918ff04a689e12399943df85b43abb37416c872522043a7ce4548a9d05e3b8b5d797540d9f5c5eb5e52a0a004f2ed11f4bb40
+EBUILD runsnakerun-2.0.4.ebuild 561 BLAKE2B 29d791fef3e6bdf960035c3b3bcf519c75e03f5a4c9e7147e0c010e325786391442408ed78a59be88fe704816a6cc2a44de7aafa20f9bb6a4234b4d51d15fe20 SHA512 9268f185fdc510723424e00c5ec9f0277cdf706da602a64c7471353401d36740060506995b846cb2c3288b49b35c9162c3a161f1b88fef733ec31da02d86b704
 MISC metadata.xml 438 BLAKE2B f4942e9e7f6229a67d034ff203df14e9fca5ca811f4310c0f41d0306e65b3c0507828b1341965141b8e736b5a06ac62a496055c24b71a9ca811b02e44c1b4e3e SHA512 1c42c0f4bb37c94af1675e60392efa46284a89e381372e26f7038b2c782882caf4edfa2be2f836e36708fe3f838ffa7152db637d161191d80e1b94362e1291ac
diff --git a/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild b/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
index e99e600ade39..4638198dacf3 100644
--- a/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
+++ b/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,6 +22,6 @@ IUSE=""
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	dev-python/squaremap
-	dev-python/wxpython"
+	dev-python/wxpython:3.0"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index db54c470f019..9f2c37d44fc0 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,5 +1,3 @@
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
-DIST scandir-1.9.0.tar.gz 33315 BLAKE2B 70c0cb0819f205b3cee37f471f84be2bddb565cd7341e5a28b9f1263f3176450cd5f2edacd63130e4f3f38940d0d3e1a01239f4729ac05e5cf5fd0005e712f8d SHA512 41dacf42734ac9a53bb5bd5d783023236d68bb4883c853fb2ee34224206c577a4a277d4a8cf8f9be6fd5a8b59d9b4fe4568a0c815a62ec84ce99ded933961ec3
-EBUILD scandir-1.10.0.ebuild 672 BLAKE2B ce62b8a1d9db95f8bce23c8d733a4c0681814589e94b59c3a45181e8fe60f29f7e94d2e55638302b6c5e01fbd531f3225f90160938283494191d2fd383b7e184 SHA512 45e126da273f8f843d6b919867926dd8b00560bd91958e09f1d0867502a4bdf57d6d658a2c0de0f2bccde304081793e4a00646e467034cd48aafd305a51e1f0a
-EBUILD scandir-1.9.0.ebuild 661 BLAKE2B 3e0dedc7c98feba5239b30b9550e092cc293466ce1a90b72a37c66e29bf6c2c9cd0203426e7ba370f22e37e17981f50aa54a5d5cac839cd79c91be03b96f8d97 SHA512 d40bb14f4f9e949bd79bbd57241da8eae2502771eb8ce3b2edf95a04d26bbe5fe17d48de683e6187c92a871d76403e0a37c01e211abf522de78f551806db02ad
+EBUILD scandir-1.10.0.ebuild 661 BLAKE2B 6f8bb77204dcdaf34324adbcbee83af8247d4a140ebe3dfa05783d63f4dd4adaa74e7126bb94eeabfb49ea06f3d442a76a58bd2e88f9f664ece49e826e9f2d60 SHA512 8429f49140d45e5830e0faee535258db16752dcc896d7d0f2db9e01e8e54780a0ad5f82c2787d987680cc984c109e724ede89ebcf7605273bf6eb68c2c0e6eaf
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.10.0.ebuild b/dev-python/scandir/scandir-1.10.0.ebuild
index c61b7d21593d..49ca8d12b077 100644
--- a/dev-python/scandir/scandir-1.10.0.ebuild
+++ b/dev-python/scandir/scandir-1.10.0.ebuild
@@ -13,7 +13,7 @@ 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 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scandir/scandir-1.9.0.ebuild b/dev-python/scandir/scandir-1.9.0.ebuild
deleted file mode 100644
index dddd1a1b74c6..000000000000
--- a/dev-python/scandir/scandir-1.9.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A better directory iterator and faster os.walk()"
-HOMEPAGE="https://github.com/benhoyt/scandir"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
index 6c3457fc1e19..3260089d689c 100644
--- a/dev-python/sdnotify/Manifest
+++ b/dev-python/sdnotify/Manifest
@@ -1,5 +1,5 @@
 DIST sdnotify-0.3.1.tar.gz 2513 BLAKE2B cbce1d3c2bae3b3a02102cfea9ac104e7c2839b784a78309cfad0a66fc8b13bba66ae4bdb8dcf1d2171378e04f2c18e3697b22545a3e3f0593edff8adcc19dc3 SHA512 765e75e727ad5128269bfffd4d3f64666df654adc50965a54f3cd622933aca583faee5453f7fec3a23b6f754f4475522dd96a86ba643984cd72a575ec082709c
 DIST sdnotify-0.3.2.tar.gz 2459 BLAKE2B 1d1846e37889c36cfa7242d14e4040ebb9b73d3e53f5a3423447ae1a4912373e4249faa7803ac212e3c7d64371d1fe9e1be2d56f8604791cead2cbe22e422053 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3
 EBUILD sdnotify-0.3.1.ebuild 525 BLAKE2B ea191361136f0425495192d4ad6f7a58345f7d4a65fc2d9762541e0d02e13889162e5375cf765f18bce4431ff3f07d3a2c0103f4ad6fcb7656cc53c263a6a302 SHA512 696a2bec9d82f030fb2977ac5bc5f8b62cb822a3be68dd5d521cbf44fd76ac78d875abf0ca8e29a17fc6394b3313c0be9e795897aade9d67a0d57f4a7a62dae5
-EBUILD sdnotify-0.3.2.ebuild 523 BLAKE2B 088afb25dd52c9b35ff1ec9dbf1e5e7ffc43fd67bf0bc223f276e5a33ac2a99a8f36059920ecf9419700e7208227ce582130a2399e91b9889330c20a1cdeec49 SHA512 162015e6b2b42663c36b00eb08ab739b43073664c4a876aa873c82527925c171620d29e7550b60481942a3bff1446f3ff5511c626162cc5ccb58c76610ba40d5
+EBUILD sdnotify-0.3.2.ebuild 530 BLAKE2B fbf928b6bacfb44c00524ae1b0970a7eb65884d5737840fc28d8a5ff8b4d5c49872435400a004b5bb3b4901b468798835611a312caca7254d6ee11ce15bec77e SHA512 8fe18da0ec205647ac447df1020bed7e1effe52565b13fd76fedccce305138ab3d33dcdacdb9d7dc5b373095389ded2c8e113cbc16003ad4d0fd1615c510c00c
 MISC metadata.xml 850 BLAKE2B 0673df4f05a46bc8b09c95d748c8d895635f2787ab7b6158d6ed8aa3abd0aae4d493198f0ba1a89088624bb74b66eb37e4638ca0e1121d4d3fc57ac3257fb466 SHA512 208120e5365d7553aa685ecfc1168fc58b215367c89d9a186b6183091bf736b05cc145cf121257e9c7b9571ab517eaf1a7bf7573bddb7d7a8a5c030f903288a5
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index f6cc282c1fd0..877af9d028a7 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
index dd298a37cee5..076f92dc1ec3 100644
--- a/dev-python/shutilwhich/Manifest
+++ b/dev-python/shutilwhich/Manifest
@@ -1,3 +1,3 @@
 DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
-EBUILD shutilwhich-1.1.0.ebuild 510 BLAKE2B 24629636210eb0c09dd5f7bac804c75e2fd405b3482999595b99e9e59c37364870d422e30bc447c96c9c243edebaa846edfaf9561b6789d28482e00aff25dc3d SHA512 90b6e439bb7e9e2897abed7ac15198aa6a24b5528471e222e6007892da521e344ea76cab571df4646fe316fd5aabf3effbca269fb10fbec0a9d921810441381f
+EBUILD shutilwhich-1.1.0.ebuild 517 BLAKE2B 8f559d0044422b7ebfcacefd51a2abed640b815b34c85bfaecd19f74794d38a13eebffe81c525ac15feec2f65f97c7043f88866f2c0eb13422cbd8de94e0fa96 SHA512 a2123cf69adf89a95714d1015cd49682dd1d2d44cf43afea4df405e5bcaca051f56c56aa3a8bc0aad6b1bb87be4adda38ec3bb2c3c43500121c3d223b30a0504
 MISC metadata.xml 711 BLAKE2B cf4caeca6cba1b6211e4910618287135ca84240d348595c91389578a2e2f887c1f88ebabcbf3960d0d6472169cd1b65455d1d8a4b58fcfa530662f75f29ffef4 SHA512 69223961a781434b4877e7648f9f2897c1dcb110a559e64dfcdfb6c26a696f8aeee4be1fa211e07baa01f1c9bf57f3ef44d43502a6635841e14e45ae524169e9
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index 6b16ecc60155..97ffcae4bc45 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 85fd0b35ea88..38999d2c5222 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,6 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
-EBUILD sip-4.19.13.ebuild 2891 BLAKE2B 799512a3976f954dcc293bdb0255522b101ee7cad9b1a9973d76cf1edb2671da8ad275490e86e2d3fa441191ddb7305d36deb8c14f23dcbec0fa80bf457fb75e SHA512 045a51bc5eb0ccc44fc6a1f232e0fcc32e02844f97faa69fe047262e811bfa4b10aa11925c53614cf8bdfa6f2d251348f6554ad5f30c12b583712b0b1d11b3c1
+EBUILD sip-4.19.13.ebuild 2890 BLAKE2B 7e98f818a312f0f2f7267974687fd565785d55f52766dbc0f7112f8d8e0bb27d7fcee86093f1d791317002009750c9883e1688f56b7275f09046ed07c8b22d18 SHA512 71c635af1a2a9e9e05fe52e125e15e1e52e4e261d868617d0f4f2fd48f3049b138b966e7db13ec952f3efd50d6054fd5841c95ae9169e58c1745e19ddeb6cf59
 EBUILD sip-4.19.17.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
 MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
index f27df670d4ab..412ce176ccf4 100644
--- a/dev-python/sip/sip-4.19.13.ebuild
+++ b/dev-python/sip/sip-4.19.13.ebuild
@@ -24,7 +24,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
index af5515f64a11..bdf0efc0205b 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1,5 +1,5 @@
 DIST python-snappy-0.5.1.tar.gz 15252 BLAKE2B eede689d51123968bdea64b8c89dc1fcb7f700fcd4e5869339717657ea6db88cacfcdaf59f00899773c65953c16ae271c5a6e03d6a17be16ca1e3dddf2b37cd3 SHA512 95a6389c58790aaeff61419bb9f183a29ad801733cae8144a67eb6203a8ebf6c6790bea7c025b37588dc98ebd2fed20f37857d2f30199f507f52653d2475c16b
 DIST python-snappy-0.5.tar.gz 12495 BLAKE2B b4456e4b5f2264122787a44e1871dd2cc74621bd6911ff9608b9a58215cc0020079080937b8dc89e1bd7a62834823beab5b9258c53122cd47c6e50c22e2185a4 SHA512 0be15ea133e3a47c6cdb2a340061bf2779d4aae4b34848cd60e6657c168a76970c41f2bae4f57993862bb65c75baa7cf6a562fcbff4c81e22fe7bac69e7d73b1
-EBUILD snappy-0.5-r2.ebuild 613 BLAKE2B 02b3ae508bb39e8c94e3268415dba49e19b848c7e6ee1a03d20f6e9c03af59aeb4426bfb65b333ec02dbc695ded19168f4670e9175108f25ee85b0e4d71c345c SHA512 f94e7a95c740ee8b3583d2ed729ecd8f1463734868e3fc34d986fd3e30d5176c9eae179aa421675f49066b6e4bb3969a35a6a37285b4adba5f4ff98fd4e86e09
-EBUILD snappy-0.5.1.ebuild 688 BLAKE2B 1c741dbf8aff14342547d598cbfd004378b08362e40b7e55d29d35b18c67ad9467d6e8c191c0ea3ad7484cb337ecb82dc0e81ac9562394171d780a81be3e87ec SHA512 27dab4d8380c5fc92bf8d4b1085ff39acf644fffaf470879f7293f0ca08022640a9d7d95791bc1eceb7e238ebf41978656ffdca44de4b136f0fd73e5740f05f2
+EBUILD snappy-0.5-r2.ebuild 620 BLAKE2B 8e66295a06a699e8564a8763bcb8111ecdc11579a85e5d75d4ddf1f34bc4ec5c653af94c743583b8ea38fba6ad5f13dacbe0f103df82de10c6ecb053a2fb6053 SHA512 65e109a895b2cdc630f4004b62a1dedb8a7749c19687eac25db1e47a0eabb6cabe99364bf65204ff25225540bfbd2276277fb607759eb14e96ac3583e2d30ad4
+EBUILD snappy-0.5.1.ebuild 695 BLAKE2B c07845e42ad17bc653082dc251ffaadcc3dc0ddfbf2ae919bc5257a446e7740d1eaf9bf5129dc2f3cccb9a3c3e9052455d9694cd5e84823b45deea676544514c SHA512 800cf4206616c54b57cc7834ca7af9bf763faa5f73eb6cdf116aa0af7d4a1edb8515a5b4000adc8447bb2abd51903d2328c64f6a553a281a941307619cf30429
 MISC metadata.xml 376 BLAKE2B 534d91b9ba78233f6fdcfeb7ae6c8aaf426a4848c111ba297f3814671079d3aee1ae505a93c024f3682dda2042907c424db70e3b0a40f7902d020332889e1a0b SHA512 6760eff3990221e541650ff83fa59902230892c992209ab707ac1e8da67be6c097e50b80496500938073026ec4f81ba4016a7b43a84ddfa0f07f3171163fc1ef
diff --git a/dev-python/snappy/snappy-0.5-r2.ebuild b/dev-python/snappy/snappy-0.5-r2.ebuild
index a3ae4a9d6532..0b2aad954b05 100644
--- a/dev-python/snappy/snappy-0.5-r2.ebuild
+++ b/dev-python/snappy/snappy-0.5-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pypi.org/project/python-snappy/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 SLOT="0"
 
 DEPEND=">=app-arch/snappy-1.0.2"
diff --git a/dev-python/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1.ebuild
index 4654ab7ea6a8..13ca53a22ff2 100644
--- a/dev-python/snappy/snappy-0.5.1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pypi.org/project/python-snappy/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND=">=app-arch/snappy-1.0.2:="
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index 24cef9a5aca8..2d3adf4dfe4b 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -2,6 +2,6 @@ DIST SPARQLWrapper-1.7.6.tar.gz 26597 BLAKE2B ef98640257d06e1814d57812864b2fd23c
 DIST SPARQLWrapper-1.8.0.tar.gz 28775 BLAKE2B b8ef5d3e2d52f4e17c47a7a398d01037dac3f6b62722faf92b6b76f37f2ac7e242ebf3cdfa93788744f632e58caf95207d1c37c462639151e20db74a94f4d69f SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907
 DIST SPARQLWrapper-1.8.4.tar.gz 56757 BLAKE2B 1d181a4269d4d2eadfd860e014f31f9134b500d4df437ab548804166821c574cfaedbe011c6b24328a40296da88378205b45839d225ada2b4afc6ffe28360f2a SHA512 301fce7f58b369009a13988a11d782fce6362d73472811a07dc4d962062097b48470c573f5bd1dc337532db467e75936f9e89fcc64dde91930077ce4a1657179
 EBUILD sparql-wrapper-1.7.6.ebuild 597 BLAKE2B 3adadab7edf7687f4374eb178c3e5e90490b5970cc66d8c265434643fc8049a73d2550612c162f3207fbf42c4fea06aa462a85f604e4617b61437341f26d13bf SHA512 94a99e4200137e0eef68b1a80768d807dae5e0d3d605307d5bbd84ecc0cd00de19ba50aa494337a39805e8388cddae320fac16673eb303176558aae0331e6534
-EBUILD sparql-wrapper-1.8.0.ebuild 616 BLAKE2B 725fe0d64cbe860202d75208725d3b102176bd70b76144bcd247f423d5a1f47af04ad4b2841d17ceb5687b4ed892b2c0aba6fd6a5d176f5bc83bd544effb2508 SHA512 8bec6ed2eb9659c7d647c0e732978519fd2fb6957e36163bb4f5fe7407d313eacbc6717da9516cdeee25038c7fe2281fd20febb217bb746b13e1f6e562d8e5f4
+EBUILD sparql-wrapper-1.8.0.ebuild 615 BLAKE2B f24647b564f2603a415d548a59301f2bde94344fd9df7c881a820215f9126a8709f680b2f553216271a04e705075818b7cb7c6761488fb58229925d72396e3b6 SHA512 0f2897f897cd1515ff2bdf8b9bdb0d9feef23ed17cbf0695311e94532974b77fd340a393266eecdb85d24e03531cfe540806b62a91a433a784c4781fbd55b764
 EBUILD sparql-wrapper-1.8.4.ebuild 622 BLAKE2B 92098e305f4b78f6e8605aec839e770fe87732b67cf4a2549a9acd85846f7ca5b8e1e6d8cf32186bfafb0702159217d3245f2234c3babc500c61e4d1e6a640a3 SHA512 17c64f4fcb1277052a6e9a7558306d3df978e9bbc7f509d0d42f9b99a6fd7a632cc0df4e30c164acc8a9aedf7520a1615da0c49efbfd2408d2cf0ce9be785e89
 MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index 25329b886ad2..eb170d9b9d64 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 020d55301f62..ccfe07e26d23 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -5,4 +5,4 @@ DIST sphinxcontrib-github-alt-1.0.tar.gz 3213 BLAKE2B b2449c0b635769735a23187f42
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
 EBUILD sphinxcontrib-github-alt-1.0.ebuild 916 BLAKE2B b36fcb43ee0d39c34e3a732b549efa601424cd92b0ea6f4cd6b0ccbddbc0e9d75e8a420d76751c8819c3af7488d7930f7d915995e96d63ec71943fb250d3cffd SHA512 ae16c8fcbcad046ce034caf6490e4f4dcfdd31c5911aa2d9809bdfcc415d64e76d84825f76bef1107c29bc0b40063b4b02f4df512622ad98f9b67fa6d8b2f550
 EBUILD sphinxcontrib-github-alt-1.1.ebuild 878 BLAKE2B f8e85d9d37a0d5847c0057366ca60f9d85795ef8a4741cc929135a65a625c01771998ad8bf53e9ece6a21e07a62655597d4c2d44895f3964a011357c2d7df2c1 SHA512 7e4740ce48e88277005751b6bfbf118c7d1f51928e736f00902f99b9645d9e6129e7868b42db16eb2edb3b3294d6dc7797a51369aeb93af02c6ee00672691be2
-MISC metadata.xml 659 BLAKE2B 60579ae24985d8227bdde8c0fd62b1deee92cc7e20875c1e20b54815e0f4c987040cff79c8bc5dd0ad8e0413d70bb4401b696c70626f217c0f637886855f1745 SHA512 4daa112e2ff34c558e96bf4bb6684df4a49ef670d6fffb9176ee2a9370ad878a75041aea9eaf8222794e53bdca7f16201c9c68623c53a43af5f4e80c8426cf3b
+MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
diff --git a/dev-python/sphinxcontrib-github-alt/metadata.xml b/dev-python/sphinxcontrib-github-alt/metadata.xml
index 33f8e973dab4..169949de27c1 100644
--- a/dev-python/sphinxcontrib-github-alt/metadata.xml
+++ b/dev-python/sphinxcontrib-github-alt/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marbre@linux.sungazer.de</email>
-		<name>Marius Brehler</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index e9cf00db2599..3de3544b5b2a 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -2,7 +2,9 @@ AUX sqlalchemy-0.7-logging.handlers.patch 466 BLAKE2B d29b41491882359d22219da425
 DIST SQLAlchemy-0.7.10.tar.gz 3541639 BLAKE2B 641532caccb6fea333198ba0c5064f7714ff75348c00dc762da24211fe6ff210c9e335a5b31ad5429e14b26804bafde6d597203aacddbd98d949d1315851d348 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367
 DIST SQLAlchemy-1.2.18.tar.gz 5675143 BLAKE2B 2e0a54d16b64801cb60b619c39dfba64d3b1705ac43a89f6a3873c9fd1bb9af02d38d1026f309eb3d33ad20265da8b3731d7d7092bec8fa035e4d696d74f1d5f SHA512 a3074e0f7b9a307937f02ad030811413f3c92b7edcc4f1c6eda7c94c1178708f8c920840385a9b33c7952e224fe46dc73223aee00123e863abf6d1d446aebdb2
 DIST SQLAlchemy-1.3.3.tar.gz 5864870 BLAKE2B d109e0daf0afdeaba946c4b18d14428c108ff15041876c9a35cf8e5783f9b9a1896e69760b249c53af35e4575e66f4b59c855b4a244d7f6569fadfb52c5a400d SHA512 f8e0f580ba5cc7eaed985e5a3af8cdcc2dddddcd64bdf02b247242eeab542b5666a93d46166b5edb4b28af3b89df44bccfa92d5bf94cc0e173dbcd369ae6487c
+DIST SQLAlchemy-1.3.4.tar.gz 5877278 BLAKE2B 1200da89ce6ad077cc93c58a4e41f856a2222618b3570badf3bd8543d70659e0313e4add0ef779e98654dbd60f8445ae6839830ac15e72d9c0fa259eac328251 SHA512 6f29aeeceafcd996bbfc781b79dcbe0bbc681f1214cdab2d52b140bbae8492a633defa97dcc720db7a6d423b062834b0805e965e6183f88f99648a8f8f8a73dd
 EBUILD sqlalchemy-0.7.10.ebuild 1580 BLAKE2B 6860bdd76eef99dd397c69450f1fea1af0ec7b1c6b07088b35887342161dfe6a67052a2ff8514ae00f1f5e4323766a8235af2cdb1b4739967e32c8334845e219 SHA512 9c405ee96b959895ab7eb155352186ea5a49a263053a819369cc672f2c835dc64a06d6d41d2bf2ca5a245e986a788d9cc80b679674e4f6f16988e88d7bcab876
 EBUILD sqlalchemy-1.2.18.ebuild 1801 BLAKE2B 6672f802ecd8d243ab6e8ce1426667ad2ca97a73f6b5903b4a599101fec127dfc65c9cf51ce8393c84879c16f4603bd1504acb39e3ae20ea4022eecb91657611 SHA512 4dd721d58adf5969dfa13b8e62be73ec3ab0e445a70f67602705399fcd6b3d3a96839616c14d5fdec966f2d29437e0a600c4438bdc9af53d46b7c333b40d34f7
-EBUILD sqlalchemy-1.3.3.ebuild 1636 BLAKE2B 3f82484cfbcae857d6ec8324d60730766819d88ed21fab915e6beb03b2054043db9edb0e1f09c011b1cadad7cb029aebe4146fe0fef9973feb7c8c0b54cc7a2e SHA512 83b3ae34ab2396f7da75bb1ff349bda530885037c15c5c5b987bc8ad22739e416d71f82da04ac326a69c13e09b73ad2e8cdb0bc0d3034b21d195dec2bd4ecc49
+EBUILD sqlalchemy-1.3.3.ebuild 1634 BLAKE2B 69130eff7b0e67609a1ae606f0689d5dadc55c549c2173a54f9e659a45f5a69244d284c573369388d1f17b8b80e4dad0c6e51686855192e32870a574156ec4a4 SHA512 b1d60c89d643a2e863abaa5ed281021671e2e6d20498782d2d73f37e235404a692bbfb357347c0e9cecca086f2122e7a4091cfd1538460c2003a7258c1f6bc1d
+EBUILD sqlalchemy-1.3.4.ebuild 1644 BLAKE2B f830a971ae3b2aa5885e86eee9dd242cf64e7fab1b1970d9133db7c9a9f6eb7f8181a09b11c565542adc1138fbacbea4960667991b376e86873e40b2fbddce65 SHA512 7699e4f58f7e6fa891f715dc5cb18a552c7b5bccbc95b0b034cebb4c780ee782d335808f440dec70d8d1271d180e3abcc18e24cd7ebe5fda0b8c6065cfeffd20
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
index 0a6116f1b314..0cd3c5f17867 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.3.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.3.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
new file mode 100644
index 000000000000..6f47c9c20bbe
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pytest -vv test || die "Testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/squaremap/Manifest b/dev-python/squaremap/Manifest
index 56f45f01dad1..d29895073bab 100644
--- a/dev-python/squaremap/Manifest
+++ b/dev-python/squaremap/Manifest
@@ -1,3 +1,3 @@
 DIST SquareMap-1.0.4.tar.gz 7439 BLAKE2B 34b5e5eaf45c597c4591eec291f0fa2e001f6df432eda0a3b98f8e596af257f1261d083b25eea25fedd9d415e00cc20e318f94fe2ce85b3abd2c20ccd51f2d3c SHA512 d01e61697571360b58e762787237bb8533b3de238f26323380a8b0b90d72d2f00e2a43e7f6742fbbb3483573493b0d83568e0651cbf9bdd463b911d09bf27e76
-EBUILD squaremap-1.0.4.ebuild 536 BLAKE2B 89663e62039a59b811c2566aa54d439853737f935f07a95256d3ada660ae6520dadc56d10ab1af0ed8582303b4104da7c0131a090c78dbc27c875b964b37601d SHA512 b3c52da42ab368d7afaec6c02caaa7b85c1cc8049b8bb48e0c0be7a5480586e908008dff5165d04bbdce1ed5618c21ef52dab5b0a749c4a881d878fb8387f20e
+EBUILD squaremap-1.0.4.ebuild 537 BLAKE2B 98963d7f9da7b85457eba69c9eca16b33dfff89c322e32ef40aa57671adb859e40def138c8b674ffec25e69036b554c0b82b927dce25fa4bf691ec12a54272f6 SHA512 552229f07fa551813bd1ab1a29d445de42415b5d920129b02ce52687e8177815be1a3c5259259bb88c4305b69938f234888606eda92fb6cd03af474fe82a2a79
 MISC metadata.xml 436 BLAKE2B 18282b39ca0f1b7fc5982d2f29b65148f6333de3a509a478374b86b2f078aae8d0f2d200cbda0616d7d4018cbcaaab3fb03ce13889d3419fdba14a52c245d0de SHA512 dce36b184260ccdea3585f5f688006a438347cbe18b2358d95fce4f96f3675d5f0f9a8080a814ac56bc58332d901dc9272f00b6085b8e3e0f0ccfeb9e25f497e
diff --git a/dev-python/squaremap/squaremap-1.0.4.ebuild b/dev-python/squaremap/squaremap-1.0.4.ebuild
index 70cb764465fe..0262a588d836 100644
--- a/dev-python/squaremap/squaremap-1.0.4.ebuild
+++ b/dev-python/squaremap/squaremap-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,6 +21,6 @@ IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	dev-python/wxpython"
+	dev-python/wxpython:3.0"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 474194aebb17..3ffb468703f3 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,9 +1,9 @@
-AUX tox-3.10.0-skip-broken-tests.patch 2725 BLAKE2B 112b5be6c97c27ab531f88c01d4ba13452cf25bc46515bf6c6751951595124d257f85083d9a99c9cc8956370f0390facd07abbe1e9f21c627c531bff639eeef1 SHA512 67e93d9ba10c464f66170342e8bc20f48e57505b72b845effa7e8defb34eaef90ff4b3495847dc7696d5b50359ab032d207ea88dddcf669b3d315bed31e73b29
+AUX tox-3.12.1-skip-broken-tests.patch 2766 BLAKE2B f2776638f48909c18a14c0e556d7646584b382eb62d17bd0a72e6d10011f25818de0886df79eaa4bada5fb9b43797505b1c8df4fc7d97398741d2f719143c4e8 SHA512 cc14794264ce0d9ca4c36de868e823a46e84bea8867e6bb7b37f5e13723d3ec84af41bc0cc7586789cc14b4f6844a68d2c5057cf77d36950c2fa2e8152e1be61
 AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
-DIST tox-3.10.0.tar.gz 279571 BLAKE2B 7aa77dfee2fe3141626d13f37f2c711cd0891ae7b484f7fe6ab7731d35455a898964c52cedc954a6d4108137e2d73fe9628bb893aa7a337d8e69da15b8516811 SHA512 a1cadf3f8de494b5c7f2e8ae1be11fd42f29ae805b5761f6a22763c303625c860475c5435aaf437e6f2d0213be1ad826d9b6a0950aed21c054a94d492cc85047
+DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B f9523dd73e57889bc345f1e6d9e47a70b5c63727bd029fd0cdeeba79ca0e6c523248c845270035d4e26d70f31ea788fe94e2d69529bb99625db2a1f49880553c SHA512 09987e74d9cdf82fee990dc7e1813ed8df54a8ffbc157413c6fa0b61763853640066c108b78556601d16f278bdd303d572f4721dcc8dbcd7f4183187f4fe4692
-EBUILD tox-3.10.0.ebuild 1422 BLAKE2B a5a50dbb389b09a6d65e07e24ddf0c6b35d41dd4e18d24312a07e29b823ff7ba1bcf50c6798e873727c764e87a899de49c05d7d80907e19221b69f0f40b3625f SHA512 9f6dd4aad20846936bc8937502e475fc17dd90a7c2d439a1ed6a43f2dcf6d21aae023346dcaade87e8fdb46c0be85dd54f8d7a41b0e8442bfb4f2fcdbd8e327c
+EBUILD tox-3.12.1.ebuild 1413 BLAKE2B e1e77b0c5a69bd9b03939d3ef4772cccc1f3fa1c2610f3e5d019bbd3c43db3f3ccdae375e33826f57ceb1ee1f2952ab7ed92148cf2b6545dc8643bedbbaabb41 SHA512 358fff5b4132a1748afce6c1f78d01f9ececee57853fa154d6169afd0a8a64c25ff8a6e753e2e2f5a46c718d3586541e3f8841318ff57b08de97cb0154662434
 EBUILD tox-3.2.1.ebuild 1953 BLAKE2B 20ef7befbe5fced2de522b65745e159fdbdc323c887eaad5feeda601bc68180651716913e8c84a5fe778a52ce3dcd0db2b7ee76309cd3e7583c2b90914c0ad74 SHA512 255146b77fedd2a709cb6b0bffeac1469811028d7dd806219107139bc27a171826dee2cb0d65672e8e206cd8c0d37fa5d84dab8d81b53aa6b5627b39a9e0e376
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
index 56f692948d36..382bf2b158eb 100644
--- a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch
+++ b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
@@ -12,10 +12,10 @@ index 6a8ac18..56dbe95 100644
      monkeypatch.setenv(str("TOX_REPORTER_TIMESTAMP"), str("1"))
      initproj(
 diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
-index c64ec1b..b16a4f2 100644
+index b814b7a..fe7ebe3 100644
 --- a/tests/unit/config/test_config.py
 +++ b/tests/unit/config/test_config.py
-@@ -1886,7 +1886,7 @@ class TestConfigTestEnv:
+@@ -1897,7 +1897,7 @@ class TestConfigTestEnv:
          for name, config in configs.items():
              assert config.basepython == "python{}.{}".format(name[2], name[3])
  
@@ -24,12 +24,12 @@ index c64ec1b..b16a4f2 100644
          with pytest.warns(UserWarning, match=r"conflicting basepython .*"):
              config = newconfig(
                  """
-diff --git a/tests/unit/test_interpreters.py b/tests/unit/test_interpreters.py
-index 1eba27e..af7930b 100644
---- a/tests/unit/test_interpreters.py
-+++ b/tests/unit/test_interpreters.py
-@@ -40,7 +40,7 @@ def test_locate_via_py(monkeypatch):
-     assert tox.interpreters.locate_via_py(spec)
+diff --git a/tests/unit/interpreters/test_interpreters.py b/tests/unit/interpreters/test_interpreters.py
+index ea6f65d..e4f0e92 100644
+--- a/tests/unit/interpreters/test_interpreters.py
++++ b/tests/unit/interpreters/test_interpreters.py
+@@ -28,7 +28,7 @@ def create_interpreters_instance():
+     return Interpreters(hook=pm.hook)
  
  
 -def test_tox_get_python_executable():
@@ -37,7 +37,7 @@ index 1eba27e..af7930b 100644
      class envconfig:
          basepython = sys.executable
          envname = "pyxx"
-@@ -84,7 +84,7 @@ def test_tox_get_python_executable():
+@@ -72,7 +72,7 @@ def test_tox_get_python_executable():
  
  
  @pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows")
diff --git a/dev-python/tox/tox-3.10.0.ebuild b/dev-python/tox/tox-3.12.1.ebuild
index 586d4e574d5c..95e8d9f9534b 100644
--- a/dev-python/tox/tox-3.10.0.ebuild
+++ b/dev-python/tox/tox-3.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
 
 inherit distutils-r1
 
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 
 # for some reason, --deselect doesn't work in tox's tests
 PATCHES=(
-	"${FILESDIR}/${PN}-3.10.0-skip-broken-tests.patch"
+	"${FILESDIR}/${PN}-3.12.1-skip-broken-tests.patch"
 	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
 )
 
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 101e131f7e60..86032ff09c39 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -5,5 +5,5 @@ DIST treq-17.8.0.tar.gz 56439 BLAKE2B 3e39c84453793baf3107c38b656c8968e593845fc0
 EBUILD treq-0.2.1.ebuild 1035 BLAKE2B d7500eb9eceed48f7371482920a71246eab25bbf788be4f25fec1535b8ce88746b7b4edcfa742638206f3e24897bb1805993c4a897a90c7efa240f8475c75461 SHA512 cc3fba0a27c6823ed4552d8495af667a92eb9b10466689bc512066f564bd64334fb296009f2a9bb8b605145dbd97ac89d23d77be9febd0bc4373664657725955
 EBUILD treq-16.12.0.ebuild 1227 BLAKE2B 09bc21da5d1621b544d8bbb011d52a7ae8667a4cc6f9418814a532e102b24174b99edfde6878a4ab70612b05a881a6716e4d1848510c24269ea6d69481fe3b80 SHA512 160d07a1f2ac977907081667c7f248866cc1013776df3a8133b40df7ea7989524daac24e4573a8789fefaf9ac1cea33e001a184ce978e7fb9f745ede190ff313
 EBUILD treq-17.3.1.ebuild 1530 BLAKE2B 4855721f694e126158dd4ef784a5800b393c08ce81a2a759d57ddb8f6b2be94437a558b834a849ac8545d4dda5756b41dadf093df590e12e33afdbe4c44434f1 SHA512 1b80227ed035e6da681fc4115ade6d1654a799e99a6ff2e63ab2af1a28adb89f5f7e4f5fdcd506bddb6defb006acbc734e365e813fdd3c382b2e5418f3fd9169
-EBUILD treq-17.8.0.ebuild 1641 BLAKE2B e71de66ac43d52ad765a4daf7e21892026b0eb702ca60ac4e2fb792602c7d7bec1d40138e04319486898adfd4da8e48fe87d91eefc8620bbebf82e86d6a8f1bb SHA512 1ba9cee9250cacff838d371ead284c48725065aff96f35fe5f4854cb4134365a7e1991c2dd8cff5aabb0cdbd501558bd92193245f4e64fa132688947b7074d88
+EBUILD treq-17.8.0.ebuild 1648 BLAKE2B 9a858c462b850a8233a41ce279bc0f03742beb7c88ecb49cf225fcf96881a99fa6ecad1a66019cbe29cc42115e048979642cfe62a01b0fbc4b2695c8dd79bb7e SHA512 0c0390438677091614e756d78f58e6837432dc923cf3a13e3d8bf8d4f0ce0ea4047f53669282d584002db5e41d5c38c3e8eb8e8bd2dd045a6b1c5731686df7a9
 MISC metadata.xml 651 BLAKE2B 4f61decc98382728f07f30be0ed88039223933a85bf5b838c40c9c47cc1828fd7ae742901b149f5bac870ca89e2485e126ccb195934f35848b0be19c3f5e0894 SHA512 ef37d01969116cb7c54e92840aba9ea8b1e70d49fc0ea512853ad3db2324289c331123f7a1b3026bf32daa2c8cad7c84e80eca189d3c2721329740017b6bba38
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
index 28ad28fd8287..4498125e41bd 100644
--- a/dev-python/treq/treq-17.8.0.ebuild
+++ b/dev-python/treq/treq-17.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index 93d48f0a159f..fe3dc079941e 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -4,5 +4,5 @@ AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7da
 DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
 EBUILD txaio-2.7.1.ebuild 1810 BLAKE2B 09527c0ca4e9379f8a2f8719121d9365d08d39146d6515723d896fcf13e84c58328427555f64c973485a1df497b042de1d27e14c49f2a24027547be468f364b9 SHA512 074f40c0ff1522b67766e8bdc727e21039351cb41e08368f468f342fab8a791d812e8b1808cd0bfbfc608fabdeccc0753d84844d259751f50c15af8ad5c2f79c
-EBUILD txaio-2.9.0.ebuild 1409 BLAKE2B 0e38cab483bfe350cbf1d433c666754b2d6cc67d4d868d38e8b9eb4af1374de61a66a285e2fa0edc766676bbad93c197eb0d95a3b2a6ffcafccf77c53c032e23 SHA512 0a5b1c568edb904eaf3674d7622ec0d285c7976c22652b45c655cd61bdbe096b33d6ba23fce513328dfed7607cf6ed8b1ff5463595c81c34745bd1bccdedcf34
+EBUILD txaio-2.9.0.ebuild 1416 BLAKE2B caf7eaf4cff6b555b159a8ec4acd7c7a62d3b98df420fe79f69d49e003802e5b92ededdccc9699bb4e93c70182e4032c11d2f6cb4b3f87fcdc5f35201477cbfd SHA512 89bc32881e5c70caa604041aff58a69bd26680a0f225147e8dcc1ac3334a37de6f7f0a1cac19bc95b6a412c3e00bdaa3994b3b423e8117fb8c2ca75cb176622a
 MISC metadata.xml 565 BLAKE2B 6ac243a37d1d168acb5af08993ea9ebe89003b5d1de5cc123f00f8bb09df9d106164c6b6fef4ab4923ec85b756efc175ad6ec5235bd0985f3af214003b27a33a SHA512 65e8db68004013282e5db56040eb37ec7d1016c5057accc2a1f512b72d66e0de1967cc6ec2ced38cadcd700e21a2c1b2c0206004eb72c26f2bd4b134eda9f77f
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 78ce128bfb47..8edd4804382a 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
index 2f9ecf80d2f0..1f3f64f99f82 100644
--- a/dev-python/txtorcon/Manifest
+++ b/dev-python/txtorcon/Manifest
@@ -3,5 +3,5 @@ AUX txtorcon-0.19.3-Removeinstalldocs.patch 1755 BLAKE2B db819619ede7aec946226cb
 AUX txtorcon-0.19.3-Removeunconditionalexamples.patch 964 BLAKE2B cde8fdc85b3809917fefc21603a4de86119ab54dabad0e1258c8a387c632bd034decf1ea0d6a0a829246cacefd8651b84d1aaf10b55d2e5423d6ded58b92bfbd SHA512 3131dce9b4f3bf15d09ebc87b323c06bdc30a833ab7c6a964f31599d0b21fd5baa0c696af1356db58677c58d803033e786a80db1d46444d92b91a9fee2736cf6
 AUX txtorcon-0.19.3-setup.py-Dontinstallthetests.patch 680 BLAKE2B b26bd4e41d8f3b8b9e795e77475c93bb8f8a1ce138c1fbf83af9d3ece46f031e94e90db35e0aa057594004e80d4413c4853d7b3cd7c41b784ac5a40f6a843d8f SHA512 95894caa6c9e6f3f3a2744a1388397b0ff7298bd508579411ce2cb93ea6f990e6068806ef8d4a9fe959b235ed68402925c731beb9ff9b638a8d6ef2c10709eb8
 DIST txtorcon-0.19.3.tar.gz 265716 BLAKE2B c0778c918689906c1066f714f4c6621f176cc413b0ebbe628201727cb7ae24c8f1b5a8a5a030b5cb48b2cea96e29f2f7bb5a54744e36324a938841b11f44474b SHA512 748e23c25c0b287467e0fa7db6ad69a8af7010957a846141b9360b71af0d279153ff401b85d135e7e66171e81117ebc56406e64e660aeda7dde8cd430d0a7254
-EBUILD txtorcon-0.19.3-r1.ebuild 1927 BLAKE2B 1f9a2fc26bf3207dc8f2b2c0c6d1fbe5e67c31aeee1b09f918809871df41abfe9daedaf3c4edac502872d17afd746a054fa41dfe12b68f08a6d95b6705bb71d6 SHA512 d25fad260b248ce92a52122295ec320842796ce1ead02713b8fcf07f3ab3360939ae515e706ad680357d341fc34ab507780e95fe74cfb45596dc552702e8fa70
+EBUILD txtorcon-0.19.3-r1.ebuild 1934 BLAKE2B 714ebd0e85a3727d29fb7f7ec8d09fc961ce0294fe15fb8d606c9e9a15f997ba2481edf625c8c2c079a45426eaeef1d50dd50038c3bf80755c041705c1d364ee SHA512 59172af336ce2b5ece53520818381fc778ea4a2a9380c73257c4816643626f517b43e369d154d514fb559ae15044f9d40e8068545eca871f0252f282461e3814
 MISC metadata.xml 582 BLAKE2B 639a0ba4ae0800bb132268203f31d2b5e4ac5b60e8fe6e3a195a83ce27b1bdbdf15deb567e555ba1f8f80135949424273720333893452afbb44efad24b5c0849 SHA512 daf770953774400a5d78293eac0ed1dd9cb61bc4b208ba1f7e48085bbeff90605faccf44df83c7ee5822cffb1158479e85131a5d1cd513acfad812a8c4b9bf50
diff --git a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
index 54860fcdb3df..9d430018e40a 100644
--- a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
+++ b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index dee9fe73bb28..e5d1eed2f705 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -2,5 +2,5 @@ DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76
 DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
 EBUILD watchdog-0.8.3-r1.ebuild 849 BLAKE2B 7e3a8f978f94fb64e99fcf6723ac1c50f1a202e84647f9520afb276f8983e291d8ecf8f1c96467a39cd0c384f2593874930b932ba8c738f473d137aa91c4c4c7 SHA512 cc9daaedadc680b9c05ae3bd81be4fd38f5090e4d86190a340474a3cfe247a2625adc460b96e39f595a1696bb24496c10fe2b6aa1cb16db8caa4c3129279e100
 EBUILD watchdog-0.8.3-r2.ebuild 853 BLAKE2B 283e1d9488a9bf7b9d2a2b26653cb120e8a12e67728053e5e082eabf819553cc63fac344b2f0f1a793291555771b7b725e29424b2359a54eb36110670b7a018d SHA512 14beeca18f04df2958f720cca9214fb1b8c7936f399021aaee95e883acf56fff7b5a551f7897c39a37f5e6779106124e30fad7ba6ff83fa963d4e57eb499eda5
-EBUILD watchdog-0.9.0.ebuild 931 BLAKE2B 951a405c972e71e02ead554a0245107ce757b85c3d6eb6bbd3d092158ad1f9a424dc1e750412201f48582cbc64787b65753842e1f7e27ae9591a072eb1709398 SHA512 ed7f99d9ede6a755b73e0289bc27e00adae62913155a81d15a1dbe63fce01821f7be42ab01cc9cb8b42da0e9c2372e09db877d494d22ef904c184554768592fa
+EBUILD watchdog-0.9.0.ebuild 938 BLAKE2B 3cacbfc4af7cf5e6dd605f3f8acb3a14d2e332379c19d5f8f4698f140e946a13b8bd54208ebb24bf4af2b16c0cb3bc38a58fe3b50d9e76de0cc609663752a3e0 SHA512 3d969bf4becba8d6c787fb68b2c98e32cbeeaf1b93caaa88ef678a238f54766bcb0397cf241414fa172bd71b6451837259974b1ba0ccd8d0c33739a1361617e0
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
index 0d02a7f7efc6..3f69c35283a1 100644
--- a/dev-python/watchdog/watchdog-0.9.0.ebuild
+++ b/dev-python/watchdog/watchdog-0.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 28597ba597f6..0a317649e3ab 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,3 +1,3 @@
 DIST wsaccel-0.6.2_p20170108.zip 21344 BLAKE2B ecb8ef7888fb2ca8e6566d2b3fcbd3911a0df5a8c9f4be86a3cffb95afc31603c2477bd983f9d24ee7cf48c33cbcfb10068c38640ee2a888f46402756313cf29 SHA512 d0cf13360bd6cc0b51b8bee1d36a8ee544816c318e828bf6129ff85827636642cfebae4ef0e99d841cdf64f6c67006a649994804aa42d3d76e977a861aafb3b9
-EBUILD wsaccel-0.6.2_p20170108.ebuild 714 BLAKE2B 7ef33294f7a27e0a8c919bf980cb834a98feaaa718b2410b9c588e18372b3212c0986140bea1881db87eb4905652bb765b5cdc9edb0aa6d56701e68ef9e772da SHA512 b203e9aa57c81b66d4ef13c707d4623a3085ed94de5daeaaab622806fdfe7faa329288459cc04ac7e744b3ddc7b27a0a81406f737021eb30b51ad73d811202f1
+EBUILD wsaccel-0.6.2_p20170108.ebuild 721 BLAKE2B f9eb5a1780b77b914cfd63e4925c06c218642eefdc78d27478652eae684e0e3ef7207acb54dce62559a99aefad1ce09cdbe6deb0fb96a58aa4847349b8fdf39d SHA512 38b0c524f3eb563af1c7a96a812e51105d41bc08f0afff914e0a485011f9177183cc6996797c5c8ed8c2262a6681fc740a05b4d799254e37e1b73dee97147bda
 MISC metadata.xml 377 BLAKE2B 9e994c8b6d0e89336fd1f2998f8544201ccccf3d647f3600e57ffddf21fb75e05bc3f8ffc2634dda9be9ba78709ac634d8d642cf110edd382d24ae055d860fc0 SHA512 cd6ff7d5e94219b550161b57a1c6f3736a8c78906a81a5e293046b9b3b454f97c1fb41dd7eb7034f45ab784c22189e3788f2e8d9c17a725743936796af3a4d6d
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
index 3423950a545a..56673cfd1393 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/methane/wsaccel/archive/${COMMIT}.zip -> ${P}.zip"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index b549e2a0a315..8b743560dfd5 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -2,5 +2,4 @@ DIST WSGIProxy2-0.4.2.zip 18817 BLAKE2B 90334926b726024c1a16b066d11cfe579ad80515
 DIST WSGIProxy2-0.4.4.tar.gz 16475 BLAKE2B 8cc91e8364204a03fb8f80abb926e69112c2224b595c695d25e2fa54553fe9c82e3420f68b58f266d04450dd49a6dbf9257c190da8645dfeee976ae101fc708b SHA512 6ae9fca65fe80f52924f42b26b447631e8c278f517ababc23d26e5f8598d6d9b7975197ec74faf64f2e051824366ac14c5db5727a014a187c70a1b4604105b42
 EBUILD wsgiproxy2-0.4.2.ebuild 1293 BLAKE2B 586a922155ebd09cda769b034782a566fc30ecde3b1843cbd3fe79a83b8ba2301cdc26873ea81de328c44da0e24e3ea007b13698f7d0d4ebd83f73632fa0109a SHA512 3c9bb2405c765a29d2c37ea45c0baa2769eefc2e1dc1c121cc2e43b2701c5d54dc903d0ee5b4c30961fceb916f9b368c51d7b0bdad8d15ca0b85be19d0ab05d5
 EBUILD wsgiproxy2-0.4.4-r1.ebuild 1311 BLAKE2B c5396a4a1329201da256cd167959aa440cd7acc8370eb3415b53aaf06318bdbbf37ad62097d746e1c89491846e9ca7b3767946c3b4df989e177aeb7489223f02 SHA512 aa37ca4f2508f90afee59d5b4a46355db9fcb30e214426bf6b024eef651e19b11a667dd86436365fc3d28c91be3ed07c1d5d590c6bdb9e41793b522941986a54
-EBUILD wsgiproxy2-0.4.4.ebuild 1305 BLAKE2B adf1f8b5434b63019d5911fb0980c70aae06a6b6188992f0ccd6b0bb3bc3c2ea7a664bbf7facbb3d414b74d6c7d04a48a85f0c712441254221636b74781a6caf SHA512 b27af464f924f041ed3bc83e0e9a9745bf834d557c7007ca2adaa0b82948a62f3c15169531ca9e61b6d1bf98760010cd61470f61fee0a3a1312ce2117f2787ea
 MISC metadata.xml 313 BLAKE2B 45cd2545e5d5b03206c8c3f2db35c0a95ce08f6c29503c19deee7ebc90f578a8a68bc9ca98a504661d09866ccc0217067643efb84e99cda9d1678231ce01a79e SHA512 147915d551dc542cb68d4cab97a3b187ef698dc450cb730c80eec846e4d4debc954b68d04f76e1df835fcc4d179d705ee95379b38c7d39d0f1ffce809941a7c4
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
deleted file mode 100644
index ab15f36c7cc4..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PN="WSGIProxy2"
-
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-		dev-python/socketpool[${PYTHON_USEDEP}]
-		dev-python/restkit[$(python_gen_usedep python2_7)] )"
-# Tests needing restkit are skipped under py3
-# Testing also revealed the suite needs latest webtest
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 9cc49cc3373c..642f8e5a2309 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -3,7 +3,11 @@ AUX wxpython-2.8.11-drop-editra.patch 2197 BLAKE2B 055cec606028e20e613109f3edf45
 AUX wxpython-2.8.12.1-disable-egging-mode.patch 1146 BLAKE2B dff061c8680a3c1a9c9731c8d80acc93f8562ed70e8bb98527b78f0f3813372f6179d8f5e348870cec25c24c961213f7e5db4755b8b79648aa251199b275226d SHA512 a834a2c3f009f6855755bd07b54683b8f3d9dc58ee9d0631e51c0450e3bac98245e4dab0e40820ba1727b6a0d8528675443c986d7fa4f7c58d606d60975e4190
 AUX wxpython-3.0-wxversion-demo.patch 147 BLAKE2B a02fcf87c8b153b3a3fd7abfda117f988fbdafddbeefe47e77adeef6201b0c037c51ee7f4b7fa3d57a92e70b7518ce6fd7148f11d2b53d96fe085d8d366021df SHA512 99682f18a520b68b313301784adaf71c1ab9181022b743de82c9cc6acfaa1fc77867ef43c00926f6d7bdde8ed29fac24b5eb72761209a2e2a1d498feee85a0a1
 AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 BLAKE2B 07601322f2e71fb6af40172ed64efe5e0b0d32d30556ce821b0a835ae545c016df5974c5aadf6e8810ffc651b5ca8bda47729b1f7589947d5dfc0ad0dfd21771 SHA512 74fe603daafdbc5a50daaa3411ea40243d1fdee2cb3bbd0e6e99bd73bd124137161cd682673f2c727faf92214bfa4d27c059021f19c92c581485bb1d6a5b49a6
+AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
+AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
+DIST wxPython-4.0.6.tar.gz 68815031 BLAKE2B 49367f5d0867c28893c43d54c4ad6001807bdc95d81327082e3c88fd796e5e2daafcf6b70252828bdcfaaec8b42ba64e881575d209eb4f61a85f58ebd79e8ae4 SHA512 bfe799e1a0987cb57f2e31199cdb522471aaa08bb3b642fdf4130f4219b81487d4b6252f7a8afd3af7cdaeef2e992cecfc581e97d8b42307a4e0a8c9009db301
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
-EBUILD wxpython-3.0.2.0.ebuild 4607 BLAKE2B 9fc253616df9ce7f73e9be44845ed263064c5f23db112b8b9d42cec9ee3af534828055da1dd3b8448ae8628dc392678bbaef32af109fc60b33b9e0b8d3b44946 SHA512 fa4c4287c2d6f9e913eed285a0995346c2202a54724647e0c1fb172f40333c6b4223676430712a072e4083ecef6a81e08f9e684a0c1d6291f5413553d8037d52
-MISC metadata.xml 546 BLAKE2B 02ee62901e80f3a686978dd94f87e6330a88f0f7a6bd34b515b10251c9e837ca74944e9287cba9cafa842744522fde028a553e48b768b174a877a57623ff63b0 SHA512 a30e3f30a3cafb99a1adf04bd5b77b7770d6face33299e226102e40f69312e285d5a4fae6cc58ca8d971d6695cce65a65655f70099af4212a0c6d387cf0fe942
+EBUILD wxpython-3.0.2.0.ebuild 4603 BLAKE2B 2bf6c068b38efcfda0d6a6f95e27d7a6b72ac5dc0f013ce01ee750720919314e60930a5ccc46b13734c09669ccc2cf7b2b344c650867535028f62908c4e392f7 SHA512 68033a3e0b684276f68159b8d9f58d0c35aa082b993598bbc664b10572d011b1c80b503adc4fa5cae2b95d8780724790064ef1acf9062d51031a59b574f98f81
+EBUILD wxpython-4.0.6.ebuild 2402 BLAKE2B d45ecb93d4890b4aa9a32fcf8d739e9bdfe928db2838a412f90e83dac9e8636c1c1ca68bfcf1baab7a0ed2cf5b4137047d6e263eaa4405b2966e2aa3a304a327 SHA512 f8dcb2bc80b1fb01f0dda282e703e4261a916ad392fa2f191341bd36b1e98208834369ebc84d29a884337d3a10d5b88808a7f540375dd6f4d7afa13b775903d8
+MISC metadata.xml 658 BLAKE2B a115ae210604ca2165d0c50cd7eee27170b2f9f235fa159f15812782b741c1481c0f806b951a30c5da43e45a2873ab4d2a09d44de2daaebeacac3e90aaa1a125 SHA512 c9b36cacc2cc3136637483886bbe0198934e5c9dc99f854de49cef263fbfe75a5a8452a9de2752fd55a43dbac4d5bd8bce32d3cadb3f6b14614c171188473270
diff --git a/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch b/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch
new file mode 100644
index 000000000000..795de3a933ff
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.0.6-no-webkit.patch
@@ -0,0 +1,27 @@
+diff -ru wxPython-4.0.5-orig/wscript wxPython-4.0.5/wscript
+--- wxPython-4.0.5-orig/wscript	2019-05-18 22:03:12.000000000 -0400
++++ wxPython-4.0.5/wscript	2019-05-22 07:59:46.522966555 -0400
+@@ -230,15 +230,6 @@
+                        uselib_store='WXGL', mandatory=True,
+                        msg='Finding libs for WXGL')
+ 
+-        if cfg.checkSetup(wxConfigDir, 'wxUSE_WEBVIEW'):
+-            wv_libs = '--libs webview,core,net'
+-        else:
+-            wv_libs = '--libs core,net'
+-        conf.check_cfg(path=conf.options.wx_config, package='',
+-                       args='--cxxflags ' + wv_libs + rpath,
+-                       uselib_store='WXWEBVIEW', mandatory=True,
+-                       msg='Finding libs for WXWEBVIEW')
+-
+         if isDarwin:
+             conf.check_cfg(path=conf.options.wx_config, package='',
+                            args='--cxxflags --libs core,net' + rpath,
+@@ -591,7 +582,6 @@
+     makeETGRule(bld, 'etg/_stc.py',        '_stc',       'WXSTC')
+     makeETGRule(bld, 'etg/_html.py',       '_html',      'WXHTML')
+     makeETGRule(bld, 'etg/_glcanvas.py',   '_glcanvas',  'WXGL')
+-    makeETGRule(bld, 'etg/_html2.py',      '_html2',     'WXWEBVIEW')
+     makeETGRule(bld, 'etg/_xml.py',        '_xml',       'WXXML')
+     makeETGRule(bld, 'etg/_xrc.py',        '_xrc',       'WXXRC')
+     makeETGRule(bld, 'etg/_richtext.py',   '_richtext',  'WXHTML WXRICHTEXT')
diff --git a/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch b/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch
new file mode 100644
index 000000000000..22a56162726b
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.0.6-skip-broken-tests.patch
@@ -0,0 +1,91 @@
+diff -ru wxPython-4.0.6-orig/unittests/test_frame.py wxPython-4.0.6/unittests/test_frame.py
+--- wxPython-4.0.6-orig/unittests/test_frame.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_frame.py	2019-05-24 10:15:51.350004356 -0400
+@@ -50,7 +50,7 @@
+         f.Close()
+ 
+ 
+-    def test_frameRestore(self):
++    def xtest_frameRestore(self):
+         f = wx.Frame(self.frame, title="Title", pos=(50,50), size=(100,100))
+         f.Show()
+         f.Maximize()
+diff -ru wxPython-4.0.6-orig/unittests/test_graphics.py wxPython-4.0.6/unittests/test_graphics.py
+--- wxPython-4.0.6-orig/unittests/test_graphics.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_graphics.py	2019-05-24 10:16:06.520256643 -0400
+@@ -23,7 +23,7 @@
+         gc = wx.GraphicsContext.Create(img)
+         self.assertTrue(gc.IsOk())
+ 
+-    def test_gcCreate4(self):
++    def xtest_gcCreate4(self):
+         class MyPanel(wx.Panel):
+             def __init__(self, parent):
+                 super(MyPanel, self).__init__(parent)
+diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py wxPython-4.0.6/unittests/test_lib_pubsub_provider.py
+--- wxPython-4.0.6-orig/unittests/test_lib_pubsub_provider.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_lib_pubsub_provider.py	2019-05-24 10:16:49.649969339 -0400
+@@ -49,7 +49,7 @@
+ 
+ class lib_pubsub_Except(wtc.PubsubTestCase):
+ 
+-    def test1(self):
++    def xtest1(self):
+ 
+         self.pub.addTopicDefnProvider(my_topics, self.pub.TOPIC_TREE_FROM_CLASS)
+ 
+diff -ru wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py
+--- wxPython-4.0.6-orig/unittests/test_lib_pubsub_topicmgr.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_lib_pubsub_topicmgr.py	2019-05-24 10:17:18.276438743 -0400
+@@ -215,7 +215,7 @@
+         assert 1 == topicMgr.getNumDefnProviders()
+         topicMgr.clearDefnProviders()
+ 
+-    def test20_UseProvider(self):
++    def xtest20_UseProvider(self):
+         #
+         # Test the use of definition providers for topics. We create
+         # two so we can check that more than one can work together.
+diff -ru wxPython-4.0.6-orig/unittests/test_sizer.py wxPython-4.0.6/unittests/test_sizer.py
+--- wxPython-4.0.6-orig/unittests/test_sizer.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_sizer.py	2019-05-24 10:18:03.937181671 -0400
+@@ -71,7 +71,7 @@
+         self.assertTrue(items[1].IsSpacer())
+         self.assertTrue(items[2].Border == 5)
+ 
+-    def test_iter(self):
++    def xtest_iter(self):
+         bs = wx.BoxSizer()
+         widgetlist = [wx.Panel(self.frame) for _ in range(5)]
+ 
+diff -ru wxPython-4.0.6-orig/unittests/test_utils.py wxPython-4.0.6/unittests/test_utils.py
+--- wxPython-4.0.6-orig/unittests/test_utils.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_utils.py	2019-05-24 11:14:09.399035368 -0400
+@@ -34,7 +34,7 @@
+         with wx.BusyCursor():
+             self.myYield()
+ 
+-    def test_utilsSomeOtherStuff(self):
++    def xtest_utilsSomeOtherStuff(self):
+         wx.GetBatteryState()
+         wx.GetPowerType()
+         wx.GetKeyState(wx.WXK_F1)
+diff -ru wxPython-4.0.6-orig/unittests/test_windowid.py wxPython-4.0.6/unittests/test_windowid.py
+--- wxPython-4.0.6-orig/unittests/test_windowid.py	2019-05-21 19:12:12.000000000 -0400
++++ wxPython-4.0.6/unittests/test_windowid.py	2019-05-24 10:18:24.158508491 -0400
+@@ -28,12 +28,12 @@
+             assert isinstance(ref, wx.WindowIDRef)
+ 
+ 
+-    def test_newIdRef03(self):
++    def xtest_newIdRef03(self):
+         """Check that Auto ID Management is enabled (--enable-autoidman)"""
+         # This test is expected to fail if autoID mangagement is turned on
+-        # because a reference to the ID is not being saved, so it will be 
++        # because a reference to the ID is not being saved, so it will be
+         # unreserved when the first widget is destroyed.
+-        
++
+         id = wx.Window.NewControlId()
+         b = wx.Button(self.frame, id, 'button')
+         b.Destroy()
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index f6588d2f5c36..7012622a0818 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/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>wxwidgets@gentoo.org</email>
 		<name>Gentoo wxWidgets Project</name>
@@ -13,6 +17,6 @@
 		<flag name="examples">Install interactive demo module browser and sample applets.</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">wxpython</remote-id>
+		<remote-id type="github">wxWidgets/Phoenix</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index 7e8f2b8afb56..598fdd3d4b3c 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="wxWinLL-3"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="cairo examples libnotify opengl"
 
 RDEPEND="
diff --git a/dev-python/wxpython/wxpython-4.0.6.ebuild b/dev-python/wxpython/wxpython-4.0.6.ebuild
new file mode 100644
index 000000000000..04e6a637c7d4
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.0.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# wxPython 4 supports python 2.7, but because it's going EOL soon and to ease
+# transition from wxPython 3.x, we make this package py3-only.
+PYTHON_COMPAT=( python3_{5,6,7} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets
+
+MY_PN="wxPython"
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="http://www.wxpython.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="test webkit"
+
+# wxPython doesn't seem to be able to optionally disable features. webkit is
+# optionally patched out because it's so huge, but other elements are not,
+# which makes us have to require all features from wxGTK
+RDEPEND="
+	>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	virtual/jpeg:0"
+
+DEPEND="${RDEPEND}
+	app-doc/doxygen
+	dev-python/pathlib2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		${VIRTUALX_DEPEND}
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
+)
+
+python_prepare_all() {
+	if ! use webkit; then
+		eapply "${FILESDIR}/${PN}-4.0.6-no-webkit.patch"
+		rm unittests/test_webview.py || die
+	fi
+	# Most of these tests disabled below fail because of the virtx/portage
+	# environment, but some fail for unknown reasons.
+	rm unittests/test_uiaction.py \
+		unittests/test_notifmsg.py \
+		unittests/test_mousemanager.py \
+		unittests/test_display.py \
+		unittests/test_pi_import.py \
+		unittests/test_lib_agw_thumbnailctrl.py \
+		unittests/test_sound.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	setup-wxwidgets
+}
+
+python_compile() {
+	DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
+	${PYTHON} build.py build_py \
+		--use_syswx \
+		--no_magic \
+		--jobs=$(makeopts_jobs) \
+		--release || die
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
+
+python_test() {
+	virtx pytest -vv unittests || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index de6e542753ab..b198667cc457 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -2,5 +2,5 @@ DIST XlsxWriter-0.7.8.tar.gz 233091 BLAKE2B fb5c3f50d56bf20633ceeade3be070028b11
 DIST XlsxWriter-0.9.8.tar.gz 236187 BLAKE2B ff6f7392a72fe00107d2dfdc17a4d17f6505f9961e518115bf88412194ee8f32364709ee3da0756a7de038f1a699e32c000831b58aabe608564aa7171c20f702 SHA512 05c372c25142dc6726fa5475cdda433f5ecae1d0f92f87c50ca7bc26fb99f8ae369a1a8cb6ec5e909280c81f32c92ac23892fbd6326b8e1cf032abcf42c0d894
 DIST xlsxwriter-0.9.8-tests.zip 28345992 BLAKE2B 0cda3578f69ecb152d6f30da6f2ab9c6eae33f4f303f2c9b7fc1bcd661e07722031b8eb35e7e57ffb04c84f6121f3f304c40379f891a0f9c50667503391f8e6d SHA512 a30cf917642100d3ffb9616809e4860593ccfa271beed0baa757ccf6f0822af05daf602d67773ce1b5af020ead108bf7a844dafb426c020c9adaed19cc7aad29
 EBUILD xlsxwriter-0.7.8.ebuild 804 BLAKE2B 502fefe93c1d1fab6a357726d4a1934ec50cd1c1d99a3bf48d81d780400c7ceba4a5068f06ff6ed715abe3fc21e3660a9a57249a1c4f19c503609ece7776e6dd SHA512 3f3bb270da81cce327bd7c7577357d60843831e4a59116d6bf40bf9178b5251153e0660bb5c57998a36833ef59b79b54d9397222606ce379e0e7b7da3a2e7d97
-EBUILD xlsxwriter-0.9.8.ebuild 935 BLAKE2B 5583a8f80ebf3f2f58c9b282c6fd9d5ee899ed0aabc12b2e3c9166c940ae050b0b01575076972f65aa3f53c05354a38b987b2c12a97b53713766f9b58cc9da67 SHA512 8375a37297c1e12f66d9d14ada8a019cadd237969be80a0aaec9d29cac891ce0034b95be242b7006a3bd37ad1eff4573502e26743bd728ac985879763e68c87d
+EBUILD xlsxwriter-0.9.8.ebuild 942 BLAKE2B 3ad61dc7dd80b4bf97612dc5b7f605e47f0df370505f6ee7c4a26d175827501a16d8e82c39d04de0a6f58f3a95459509a458fcac8cde612970531156a17d5d8c SHA512 65a4aa34ff6cd823c8f374806de3f69c2588b0dff5474fabd0b9fee1adf6cd8970884ac54a55a1245a166f33a6913b48ef8c45e565d6f6361758f8e500bf15be
 MISC metadata.xml 385 BLAKE2B 29615c2fcc24b4ee0ab796762a67d1e1a09b4208b18cc13a000b3e7380d5e56c74020436801a41e33a74b0122c3c2872e22a643c1a2fc724ebb6064170ab5c5e SHA512 62eca3ef002307f383a6c074c3dd956d9035488e1eeaaa4b0e20a6c4d7c328568a2178478e0a97d6b3bfef0c9673a1ae2b58ea39e4e5a2c111b0a34c44398545
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
index 6df715810d92..859abebdd9c7 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/yapps/Manifest b/dev-python/yapps/Manifest
deleted file mode 100644
index 1e64967e36ba..000000000000
--- a/dev-python/yapps/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX yapps-Convert-print-statements-to-python3-style-print-func.patch 1572 BLAKE2B c1375ca4ad6a6d7430044f3bc3c29a7f62f06404d64f689a83cd4ff10781f51d4d0dc287c466a622933af7f360c6ce81ddafbddffc62c57d73ac7bc3008a2eb4 SHA512 36ab43698fc637cd52287c6649be064b04374a22b9e459a53f3e04850d0cf8276e042e45994a3d2e0d0c97e57478321631475170dfe3e8efa8debd3d32ea80a3
-AUX yapps-Don-t-capture-sys.stderr-at-import-time.patch 1088 BLAKE2B c00fd5b4834b600127f7eedfbc4a7f65716a412cb1a2011ce36ecfde10bb54d171028c47ea04be2065b7cafa9e612e16e633ac701166506690613e5569a3f651 SHA512 b3a3de5bc11cfc8926e430ab5d8834f00a15362e7a108ad11d40a2c6f804d51ddffbb467dbe1c767b345c3451f4feef642e1b55a735c5cb85c405e8c3c7c0107
-DIST Yapps-2.2.0.tar.gz 13630 BLAKE2B b1c3370c0a91febc7ab567fa9af05150f74d19e4de18d09e41ff7e361b06f8bd9aed0ad5ac01f9d1c46bdb381af57cfe11603ebf534b10979a16a5211171a31f SHA512 087f99071b2615f5382f453d9b3492675704aa7e7ff54b332d7c4e337e16fbd3ab3c1b3820a7941775c0b3ecf7e255a7773cb47ea20e8adb77dc3dc8d9a49faa
-EBUILD yapps-2.2.0-r1.ebuild 686 BLAKE2B e2484dd44cdb697ee6a60e21aa0f376ae703ba6743168ef5c3db7cf510d986bc23446b5a03441f38ee832cfeb9732d7aea34e79f4778de472e425aad18c6ae9c SHA512 6dd0beb74a1a3f3f7d9f8c67cc0c914f70f31253763dc3ecd7b2b4d1ad49b6a1c2638934e36b3f51e33e28fae1fc66beb325ee7f93472eed2a9f8499bc93f820
-MISC metadata.xml 373 BLAKE2B cddb77338531df2a99d22a48d6d5e18cf9fb0f738ea840ac46945d7ca47626a2f4f57d8878898cfcbc0993286753cbbf71e45c66f88fd1e410471bc6671c16c2 SHA512 546f07634ad9ddbbfd3b95c8494f1592f1f38aaaa83f2325a6d0e03bbe64bad498fefef02082c5df8e075763b719993bd09c980f1cf9fdcde433113280edd74b
diff --git a/dev-python/yapps/files/yapps-Convert-print-statements-to-python3-style-print-func.patch b/dev-python/yapps/files/yapps-Convert-print-statements-to-python3-style-print-func.patch
deleted file mode 100644
index 4bff7f8f40dd..000000000000
--- a/dev-python/yapps/files/yapps-Convert-print-statements-to-python3-style-print-func.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d051588873a54860cfb86ec0d330f7d855336618 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <julien.cristau@logilab.fr>
-Date: Tue, 2 Dec 2014 10:41:05 +0100
-Subject: [PATCH 2/2] Convert print statements to python3-style print function
-
-Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
----
- yapps/runtime.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/yapps/runtime.py b/yapps/runtime.py
-index 58017fe..5d40581 100644
---- a/yapps/runtime.py
-+++ b/yapps/runtime.py
-@@ -178,7 +178,7 @@ class Scanner(object):
-         file,line,p = pos
-         if file != self.filename:
-             if self.stack: return self.stack.print_line_with_pointer(pos,length=length,out=out)
--            print >>out, "(%s: not in input buffer)" % file
-+            print("(%s: not in input buffer)" % file, file=out)
-             return
- 
-         text = self.input
-@@ -201,7 +201,7 @@ class Scanner(object):
-                     break
-                 spos = cr+1
-         else:
--            print >>out, "(%s:%d not in input buffer)" % (file,origline)
-+            print("(%s:%d not in input buffer)" % (file,origline), file=out)
-             return
- 
-         # Now try printing part of the line
-@@ -230,8 +230,8 @@ class Scanner(object):
-             p = p - 7
- 
-         # Now print the string, along with an indicator
--        print >>out, '> ',text
--        print >>out, '> ',' '*p + '^'
-+        print('> ',text, file=out)
-+        print('> ',' '*p + '^', file=out)
- 
-     def grab_input(self):
-         """Get more input if possible."""
--- 
-2.6.4
-
diff --git a/dev-python/yapps/files/yapps-Don-t-capture-sys.stderr-at-import-time.patch b/dev-python/yapps/files/yapps-Don-t-capture-sys.stderr-at-import-time.patch
deleted file mode 100644
index 1e25a0059409..000000000000
--- a/dev-python/yapps/files/yapps-Don-t-capture-sys.stderr-at-import-time.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 482faec17f1c69784d8cc2757a79809458d71154 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <julien.cristau@logilab.fr>
-Date: Tue, 2 Dec 2014 10:40:01 +0100
-Subject: [PATCH 1/2] Don't capture sys.stderr at import time
-
-Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
----
- yapps/runtime.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/yapps/runtime.py b/yapps/runtime.py
-index 29f91e7..58017fe 100644
---- a/yapps/runtime.py
-+++ b/yapps/runtime.py
-@@ -168,10 +168,13 @@ class Scanner(object):
- #			output += '%s\n' % (repr(t),)
- #		return output
- 
--    def print_line_with_pointer(self, pos, length=0, out=sys.stderr):
-+    def print_line_with_pointer(self, pos, length=0, out=None):
-         """Print the line of 'text' that includes position 'p',
-         along with a second line with a single caret (^) at position p"""
- 
-+        if out is None:
-+            out = sys.stderr
-+
-         file,line,p = pos
-         if file != self.filename:
-             if self.stack: return self.stack.print_line_with_pointer(pos,length=length,out=out)
--- 
-2.6.4
-
diff --git a/dev-python/yapps/metadata.xml b/dev-python/yapps/metadata.xml
deleted file mode 100644
index 335bb8d11a4b..000000000000
--- a/dev-python/yapps/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Yapps</remote-id>
-    <remote-id type="github">smurfix/yapps</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/yapps/yapps-2.2.0-r1.ebuild b/dev-python/yapps/yapps-2.2.0-r1.ebuild
deleted file mode 100644
index ce36d639e2a9..000000000000
--- a/dev-python/yapps/yapps-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-MY_PN="Yapps"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An easy to use parser generator"
-HOMEPAGE="https://github.com/smurfix/yapps"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-Don-t-capture-sys.stderr-at-import-time.patch"
-	epatch "${FILESDIR}/${PN}-Convert-print-statements-to-python3-style-print-func.patch"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-02 21:45:28 +0100
commit	2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch)
tree	c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /dev-python
parent	6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff)