gentoo resync : 05.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
commit: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree: c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /dev-python
parent: 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)
367 files changed, 3429 insertions, 2325 deletions
diff --git a/dev-python/Babel/Babel-2.6.0.ebuild b/dev-python/Babel/Babel-2.6.0.ebuild
index bcef916796b1..031b50c20706 100644
--- a/dev-python/Babel/Babel-2.6.0.ebuild
+++ b/dev-python/Babel/Babel-2.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 0e42643fd70a..4f64fc90b4fa 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -4,5 +4,5 @@ DIST Babel-2.6.0.tar.gz 7960433 BLAKE2B 0edc3b3391eb3d479eae9a223668af96e1ec47b8
 EBUILD Babel-2.5.0.ebuild 1467 BLAKE2B be45a8cbb9f853efe59876c739f1f24cdb0ca934a050830348df09a41adeab2f4c1face797c18720aa89bdd0e66b586eadeee534d0fe3be639ecc1e4eaaf9ce8 SHA512 61167611440026fd5976d441a541f0aad1b27f9ac4111c666bd9dbe0ebac217d57759cd7cc74b118117dc431e892b5ec7b0cb8e4d02a410f398392a18db34414
 EBUILD Babel-2.5.3-r1.ebuild 1530 BLAKE2B 33e8d728d0617495f5cef705e2560a4aefeeb43dfe2872196185ecbeaf09b2dc562aea9ec566cc598309a364eaf8547beae86f29d2768a1487f7ee7d7b60217a SHA512 3c7c5f59033e062ba0becb0b040ab823323031fe5f64b02a2bc26808a8065d4ca927881209ac14d0651ba965180cc4346936739b3a079b3e0f5588b39854a3fd
 EBUILD Babel-2.5.3.ebuild 1468 BLAKE2B 507102d8d7e1072805d501d66f93fe504e2ba9025c033f7ed3c7ca689d3454568abd52a9dfe27c61b3ddfd9d9f036dd4c52077b12fa79e6269e9fe80dd55354a SHA512 c6f4229f4a593884a3c63bacb0cde3675acd6ae0b1843042437be34daa2349993c5cb878d4574b9ddc3373b5caa1a961d9183b6a589013204d34cc12a4a012fb
-EBUILD Babel-2.6.0.ebuild 1467 BLAKE2B f7dd63042602b320ce6616f2d41311006813de28d91b6bd6ad36a16c8090fa24b5712b95000ddd9284dfb7376a575c731adf7e7cc196d5f8f6faf3139803cbaf SHA512 2549a3fffba4c7d573366e73f6498c37a2df44cea5277a162f2ca182f01750925561a5d3720ecec1967a5e1b6199da637dff5b72d51037171701df3bae393256
+EBUILD Babel-2.6.0.ebuild 1466 BLAKE2B 1a6aca371bdeeab707688380167ecc4084af5332d394344c0f78b96bd21e44e4a23217b434e759244e4d314a8e8925876e0c3b1c9b013e885eaaeb7cf576a7f8 SHA512 9c00c0d5a8cbb9cec0451f2d2689c999412baaa1d9dee745b214a4f9ab008dd4569a2bdd976524f9dd378c23cb8e3e746cc70de7a72af07eade0443bd436576f
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a02460c387bf..dad6a709fd4f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index 04a104e18b69..b436c80e3f82 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,5 +1,5 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
 EBUILD PyContracts-1.7.9.ebuild 1067 BLAKE2B 564f2e0e6ea2f21e1d0f026e6bb72fc43c3336d75cd912c2dc29a3c96c6cd6c6aa67cca290df02d54ec7caa96c38228d94353008da3c8f4760a08b9388a68437 SHA512 68db35374bd07a52bb816608fbc25bd4d6a38e711673e0d11018c2f6cb70746200d8e222f05d1436e8d1e52c541bcdc248a94e03ac406a68ccc1b9fc1de20271
-EBUILD PyContracts-1.8.0.ebuild 1072 BLAKE2B 8a72ec58cf48c860da7cd67d65524ed56487d86ed931e6f0f6d06b844473f4cac2279e4e572313e505e33948aa120bcbdd3401a55cc295a43eec7b90b53fb9b8 SHA512 b520d83aae8e69d9182934bed690c68c925f4c858c9f322434713e7d40350a99287cb21cd28cd2309b2da44ec7ecec22fadcf0127887780f159350a9d9a4acd5
+EBUILD PyContracts-1.8.0.ebuild 1068 BLAKE2B 8d432118b639b529050a323b3757192a23696efc43dce189f6f2187b374a86bfe1d7ef113dea979de8bff1fb1f80fa61b24444b456bda1229c70967e66a4cc3d SHA512 4b0f6f006b49dc0ae40d5c060cb358686ae760befbdca60efadfdb18af41a87af96649e2a43520ddc41d6a6a793acf55e09ef3fdbd449ede78fb02901c3bf86f
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.8.0.ebuild b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
index 4edfab3163de..2aa6ec67e809 100644
--- a/dev-python/PyContracts/PyContracts-1.8.0.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index 595abcee03ad..bdfc69585631 100644
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@@ -1,3 +1,5 @@
 DIST pyeclib-1.5.0.tar.gz 6682493 BLAKE2B 3f3a595b67a8e216b90c61f8119be6f40de0863a0d77c4e65c41e699aad0d9a5f1d621e8bb9510d78b9eb495acc5fc5af7178afe127780151b9be60ca246fbff SHA512 89831fc8b04a1488504b632f75da8f2f29bc6b4e33b35d0d4305b4d5ec4bc25c0e16d149580badb15be7dbf8aeb2bdebef81f78f7b7871233afaaf96823e3a3e
+DIST pyeclib-1.6.0.tar.gz 6685306 BLAKE2B 0b758bd500afc7f9d8e38513cc41f1916413d8ad6f3b1bd34d9ff46d6d33321391eaf90164e412154a14d63d4ba61502457bb943e124dd7054a5d5ec20732294 SHA512 507f78388e941e4600f4b77f636ce27b7f63e635f108dd5a452b3f98f779e87d94d8f82239d9d5733846faa5cc574c0474e366d99e44b8f03b70707d352f56c8
 EBUILD PyECLib-1.5.0.ebuild 601 BLAKE2B 83d86a6789e013b4982c93262d673dd7f26ad453a9604d0af4b484c53eae08887e136e1771cc30189019f2654d3ae1b0b8096e77bd0359055d58f6a0a64cd520 SHA512 29f85f4f575703839132e64a84f23b57647d8aff5644b7edb70291e0a79c6945b27e9f0daad5436101bf6a2294639804e139843d5ecc147331f12a56d00aa002
+EBUILD PyECLib-1.6.0.ebuild 600 BLAKE2B 7c8eea6ec39977c8ef42d4d3a725df8a225f51339ce4468db5b514fa2340b0de4e5f222c2b413b8bbdf090a006f58beededdf87c6966ab944b1f9f7871fe5c4f SHA512 3fc9955a72b6c3c6c03b8e2eaf6896c47ae997678226f469ce6c3f14c50ed4a27ea271bac9ba0ed4daa70f6008e44359e7e18e5649c6a22e3cd6269f504b0f45
 MISC metadata.xml 674 BLAKE2B 82076810eced6e375c341ec804b814d8d9bbad8e02c22a233f1c7891d75e6af7afcb23e835dd49c366e50c56f715b1e8d45675504bb6080347cf826ee66eeb44 SHA512 864d9c85e024752e0060644f9feca3b0d81c6f64610ca60be06c3218e1efc82be66b24bb61b966de238ab6e9278618013f613693fa1fca082287d4f53b4f98e5
diff --git a/dev-python/PyECLib/PyECLib-1.6.0.ebuild b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
new file mode 100644
index 000000000000..ab29e70bcb74
--- /dev/null
+++ b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.org/project/PyECLib/"
+SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
+S="${WORKDIR}/pyeclib-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-libs/jerasure"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="dev-libs/liberasurecode
+	${CDEPEND}"
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 4bee9ab8340e..286472b78f53 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,3 +1,3 @@
-DIST sip-4.19.14.tar.gz 1049688 BLAKE2B 8e68910f533d0f58bef1f20ec58579ce0166efaee2caef1c64d4e9878b0887040d9284a9fa5ee48d7a4f0949866d0b988b0d962303f0ace03a4ad48bd08eec5d SHA512 afde261331f38eac863d8cea0e343649f460f0b9a603d7fe91f14583904ea4b488bbd88d20fad5c985c43c6c1683fffee38676d94831ac8f2de40d9ed4d0423e
-EBUILD PyQt5-sip-4.19.14.ebuild 2099 BLAKE2B a578672bafe7a45d1650a64e3e0bc39faf237b0fd8fbac8122c4fd5caf117825199ba5c477ad727bfaff0d394e064b34d42d0d8b4474c21b99016ec7361f8f23 SHA512 c94768f4cdd1e2a07810f3e8a221c8d8b224b736f95813f4ec9c1630446d5bf7001ae16812e5469bb32e6420f054c50e948d7d27bd435218f1096cf73502c32a
+DIST sip-4.19.15.tar.gz 1053921 BLAKE2B afe0f1c2faf839305d21da05a667e649c37ab42c95df86d237bbd8f39a6b8bb7224da547467311bf82a85ce8f0fafd8bb6dd7cbf6050f2b157773339438d6277 SHA512 9518a5e90d54758b13dd8752669d4deb175cea8d8cdf810deaf554cd157d32ab7e394d23c774993fac3b7c02d56445b80962457d59f5cda543917a0251816422
+EBUILD PyQt5-sip-4.19.15.ebuild 2123 BLAKE2B 2f67b9d51eaacc89582a6ea84f94140f79652804a9c0480e26acb72362cc552d3eafde1a8fa4528ef92aae74bbd89518b17b0186732e373b28ed4bda6059422e SHA512 6ddfef96ce24694c2035a6dcd232e6f3a23f32357f35c1126310432d828db82a94638e3ecbd3dd4bb4ca624d50956859f1fa50fdb72a54f63b3cdf6fb2853123
 MISC metadata.xml 654 BLAKE2B f52693b58abff10e80d2fe004ccca0b97aa157e07c27005c72fe79bc9ba3894c33042c9be2d10f8fc15aa8f0451041b60255eaad96ec78dedc422e7ca2f58564 SHA512 4ad600dc1af2a9f6494350a028909e51deea7b18bf6a50a6f1860163310bc0534cd530ac5d6dea043e7b7e532fd2219069e12b33271cedc00c7a9dda9161711f
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.14.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild
index d71ee7c69488..7a8d6adad884 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.14.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild
@@ -3,17 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
 
-MY_P=sip-${PV/_pre/.dev}
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/sip/${MY_P}.tar.gz"
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 93bf31da17e0..e05cc05fb8c1 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,9 +1,9 @@
 AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662fd63590e097fbb8b681ac02cb3d96c9670ab1a1bbe873c1c1320dd78cc4c738f9f714c8ffd5be732bc15f084ad7ca721 SHA512 bfe80fa6018174a6981777031ffa97bc834e17848580d02c994c61507aa4ea16091e582b6bbc3754d469de1901fa8cf2e3e12240cced44fd0dbe928bdd360925
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
-DIST PyQt5_gpl-5.12.dev1812231618.tar.gz 3120289 BLAKE2B 2d48eaa39090ed60f971b84c96d148fba05c58fe15196f9a99c7a6c8302f364623dd0e1f0cc16d6fb527606cabf6cb072316319252b65f44c9652c1d95ca9fa6 SHA512 6a95fb02fe1eea3e7fb9a03da457a036f92f5404074e7234eeb52e5941bd247343e3d34d4054dc5a604b380fc2a227f7fe5ae250fcd4449da4a3fe856ab8eba3
+DIST PyQt5_gpl-5.12.1.tar.gz 3147086 BLAKE2B d5a018f1fca401b9f70dd16e2a28ea380c8a83f5e18dc8577e317dae5904a7b95f8fe979bf7f574f95e71222c514565fbf051b1de87f97cd2ab70c09d04e86ac SHA512 f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
-EBUILD PyQt5-5.10.1-r1.ebuild 5734 BLAKE2B 4830d56f6c211d23c85b479504d93426382a2bc4531ebd383e9039189c9b894a23ac6c3ed3e6faeaea2eed8fa5da040b282b1661487b852a56e7285b71d1940e SHA512 e6015c904e41fc24508377cf9dd1dd72907d41f239211132805ffbd432b5dba7b1dbeeeab8d3c269e23f3a599a9ab60b1386d60060203f1f7afe4e83d3cfa458
-EBUILD PyQt5-5.12_pre1812231618.ebuild 5669 BLAKE2B 5dc7ddd6bf0d0df02fab060b50730d0d96c357e4157e7f7475bbf72c36803f5b55cc461355526ba7827d284fee1f3e28e1300e3cbfdfeeeeba683337cdf9e48c SHA512 a0c5ba28d3eb81e51ca408db1da1266848a4888e954919e38d542122820529806a28fbc23d5fa6d605e02cbca9a1a2795ba7a8c6d6ff0fe235723b4f6789b4c1
-EBUILD PyQt5-5.9.2.ebuild 5662 BLAKE2B 58bc9d3d91e3c7e8c8e49bb4095c37c8428eba4568b9136a16e72c1389dee408ea7a209f795e660200eccf530b7b4f285066d7b92d479cc37946f05b7d3eec85 SHA512 46118296b6ff41478121464896050e58e552f8e8e16de232f44211d86516a111dfd0bf02c10ee92f3dd19e9cea05f43982287b59ca1e16d4ba1125d21ebce010
-MISC metadata.xml 2525 BLAKE2B 86896a8756022dca6a547db2ab96c775abde3278ec815d277df048179ea4c5b2ae89e5162cb8b835accf398bbc36119a36e8a9a05cafe2a32d9dd11e67149f78 SHA512 2f47008d13004bfb56d30e08230c7142fb65968e09e1bbf0423d475c6236783e0197bba65670cd2358ea96a2f682004584607ab8f9c66ad22e7d92bb1f23408d
+EBUILD PyQt5-5.10.1-r1.ebuild 5791 BLAKE2B fb4f08b06f4ca2df8cfb9f4383153f7fca7bb5ab0df857945663ca4efeb3722d708107aea9ec6e700b263eb7eff4460dc1833036b8bc9bd856c8abc495d69a63 SHA512 b4b4d05135a9e39a67cd7e8f3e5ab110386439c85721a56f5c08281d95280617a8510d6d0095c389b49c0b82e83caf3d0e9e378892efe6f0578cd6cd41ad6be5
+EBUILD PyQt5-5.12.1.ebuild 5791 BLAKE2B 9b5fe87ffb7d2d501786ac67e4736e9dc2222d496be144aec9ead9a3017e599a0dd48fcc4b50990a6e30b97834bbdfd3f89aae00cfe720a89b9e6950c54865dc SHA512 972bc5b07516a2926e22b6aa68bf8f3125b468517f05825b5ee2c9a9ce3669b295c43e03120c45bdb468561a21a1a58e2da6673cae020dae39620eddefe7f851
+EBUILD PyQt5-5.9.2.ebuild 5660 BLAKE2B 92c6ceb0c5332a6104828fed577d76f77e1c1b0d93d77ee28b83ae08e75f99c7475783ad24522dcd64e54e17b34a1b36dc2ead1f6967a986ccbefd26a9b7c432 SHA512 95831e63830e5a3962e36adca333784954c9b219a8bb818d04ce4a8212ebf14a5045e48822c8de48f4e381c8a8b26bd50164807855eb5dbf3cee2ce022b2b6d7
+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 8b331f240fb1..62e0077bd41d 100644
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
 HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
 
-MY_P=${PN}_gpl-${PV/_pre/.dev}
+MY_PN=PyQt5
+MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi
 
 LICENSE="GPL-3"
@@ -158,7 +159,7 @@ src_configure() {
 		echo "${myconf[@]}"
 		"${myconf[@]}" || die
 
-		eqmake5 -recursive ${PN}.pro
+		eqmake5 -recursive ${MY_PN}.pro
 	}
 	python_foreach_impl run_in_build_dir configuration
 }
diff --git a/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild b/dev-python/PyQt5/PyQt5-5.12.1.ebuild
index 7db840ce9df6..37381dcdb825 100644
--- a/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12.1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
 HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
 
-MY_P=${PN}_gpl-${PV/_pre/.dev}
+MY_PN=PyQt5
+MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi
 
 LICENSE="GPL-3"
@@ -57,7 +58,7 @@ QT_PV="5.10:5"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.14_pre:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	virtual/python-enum34[${PYTHON_USEDEP}]
@@ -90,7 +91,7 @@ RDEPEND="
 	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
 "
 DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.14_pre[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
 	dbus? ( virtual/pkgconfig )
 "
 
@@ -117,7 +118,6 @@ src_configure() {
 			--confirm-license
 			--qmake="$(qt5_get_bindir)"/qmake
 			--bindir="${EPREFIX}/usr/bin"
-			--sip-incdir="$(python_get_includedir)"
 			--qsci-api
 			--enable=QtCore
 			--enable=QtXml
@@ -153,7 +153,11 @@ src_configure() {
 		echo "${myconf[@]}"
 		"${myconf[@]}" || die
 
-		eqmake5 -recursive ${PN}.pro
+		# Fix parallel install failure
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${MY_PN}.pro
 	}
 	python_foreach_impl run_in_build_dir configuration
 }
@@ -164,9 +168,8 @@ src_compile() {
 
 src_install() {
 	installation() {
-		local tmp_root=${D}/${PN}_tmp_root
-		# parallel install fails (same issue as qscintilla-python-2.10.8)
-		emake -j1 INSTALL_ROOT="${tmp_root}" install
+		local tmp_root=${D}/${MY_PN}_tmp_root
+		emake INSTALL_ROOT="${tmp_root}" install
 
 		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
 		local exe
@@ -175,7 +178,7 @@ src_install() {
 			rm "${bin_dir}/${exe}" || die
 		done
 
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${MY_PN}/uic
 		if python_is_python3; then
 			rm -r "${uic_dir}"/port_v2 || die
 		else
diff --git a/dev-python/PyQt5/PyQt5-5.9.2.ebuild b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
index 2a9f2c434ae8..a4aa37a0d7da 100644
--- a/dev-python/PyQt5/PyQt5-5.9.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index 92725cf1722d..3ed574acb761 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -38,9 +38,9 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/PyQt5/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/PyQt5/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
-		<doc>https://pyqt.readthedocs.io/</doc>
 		<remote-id type="pypi">PyQt5</remote-id>
-		<remote-id type="sourceforge">pyqt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
new file mode 100644
index 000000000000..9c2d28ac6dd4
--- /dev/null
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -0,0 +1,3 @@
+DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
+EBUILD PyQtWebEngine-5.12.1.ebuild 1707 BLAKE2B adfb1b414e8501b0e384aa251f1e3e97d6ac709e8f68131a774cd5b2c1317633ae971d613b9ee545ba9a9c2a9c0a4a64ab4e32f67d4039db855a06e3fc531c4d SHA512 5f4007395a5878d7be14ec9b3e1afa5c0e21322f01911d79511b18a7f1a988fcea2df7ec35a9d68249849c054f6ee4ef06461875fdb8cb676c2429c86972af7c
+MISC metadata.xml 1183 BLAKE2B 3f8f174a06bb6b662a853d1b974ca117724fd464043a3e272348fa297c19ae18ddb4e572f9c31214cd1fbb79b89b1ccfdf5c2ccfec5519ae1cb0985b718c3a5a SHA512 3172a5090e929699886d0bd4e15d6ef18b069910b572aee49908d62f96ed0401036c20767bd8ab7d7a041ea176be3caa28002e56ca9a1b911907dec8b60eb48e
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
new file mode 100644
index 000000000000..3ce48a7c942e
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
@@ -0,0 +1,73 @@
+# 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 python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
+
+MY_PN=PyQtWebEngine
+MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.12[gui,network,printsupport,webchannel,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtwebengine:5[widgets]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--qmake="$(qt5_get_bindir)"/qmake
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${MY_PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/PyQtWebEngine/metadata.xml b/dev-python/PyQtWebEngine/metadata.xml
new file mode 100644
index 000000000000..c63098a37ce9
--- /dev/null
+++ b/dev-python/PyQtWebEngine/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>stefan.strogin@gmail.com</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		PyQtWebEngine is a set of Python bindings for The Qt Company's
+		Qt WebEngine libraries. The bindings sit on top of PyQt5 and
+		are implemented as a set of three modules. Prior to v5.12 these
+		bindings were part of PyQt5 itself.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>phil@riverbankcomputing.com</email>
+			<name>Phil Thompson</name>
+		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/PyQt5/</doc>
+		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
+		<remote-id type="pypi">PyQtWebEngine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
new file mode 100644
index 000000000000..ed6eb250bf92
--- /dev/null
+++ b/dev-python/PyUtilib/Manifest
@@ -0,0 +1,4 @@
+AUX pyutilib-5.6.5-tests.patch 1413 BLAKE2B 8cfb6abadbd0c83adccd69cd18dd85aa2c58ad6d8610de0912397e626704ff6921ed54869c0ea2e7dd1567070e5061fa424d7749236cd2e8321d17a6b60ad4a8 SHA512 00d838e4eab285e7eaa1fe802abd1fa22f3a662fd10220cc3811fab6d9025dcb327811e13ee13f2102ff1ff2b8b132a10c32cabfb94080940dec691b6a890298
+DIST PyUtilib-5.6.5.tar.gz 1504220 BLAKE2B 2d00b8b9a0a787413dce5dd4380382efa4c8788e9a8f5188eb0decf9e55bc07ce5ceb8e6f32ed2fa7cf58c331fe936ea07d9b599ff8e7e9593327d3c0f05d4e9 SHA512 5e7f86c29ff81cfffea5862d09ec8d026739f09b172606acd4d08dc4a9bde28c8b63b8e51634d17c3161b46e7e8c8881050044baa22bc07b0926efe46ed7331d
+EBUILD PyUtilib-5.6.5.ebuild 1082 BLAKE2B 59e6fa198c51f701b18dbf351d531056d330320e3f7c5ef2023185a1e93493a60c18905c0d7ad9775ad5389c39835ea731238f540c14cfd3a469565af4af5839 SHA512 fa645cb3436c97a1aa54bf94549a24082417acfc55c8b90017bf5d4d27bf5a02903e3e4de4a426c3ed13dce6708307d4089b317bb42513c7d7563ac81b9810ad
+MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/PyUtilib/PyUtilib-5.6.5.ebuild b/dev-python/PyUtilib/PyUtilib-5.6.5.ebuild
new file mode 100644
index 000000000000..0f3cc65d1085
--- /dev/null
+++ b/dev-python/PyUtilib/PyUtilib-5.6.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of Python utilities"
+HOMEPAGE="https://github.com/PyUtilib/pyutilib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/pyutilib-5.6.5-tests.patch"
+)
+
+python_prepare() {
+	# shells out to run nosetests
+	rm pyutilib/dev/tests/test_runtests.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if ! python_is_python3; then
+		printf "# Placeholder for python2\n" \
+			> "${D}$(python_get_sitedir)/${PN,,}/__init__.py"
+	fi
+}
+
+python_test() {
+	COLUMNS="80" "${EPYTHON}" -W ignore::DeprecationWarning \
+		-m unittest discover -v || die
+}
diff --git a/dev-python/PyUtilib/files/pyutilib-5.6.5-tests.patch b/dev-python/PyUtilib/files/pyutilib-5.6.5-tests.patch
new file mode 100644
index 000000000000..780c586759af
--- /dev/null
+++ b/dev-python/PyUtilib/files/pyutilib-5.6.5-tests.patch
@@ -0,0 +1,35 @@
+diff --git a/pyutilib/dev/entry_point.py b/pyutilib/dev/entry_point.py
+index e571cc7..e0200e9 100644
+--- a/pyutilib/dev/entry_point.py
++++ b/pyutilib/dev/entry_point.py
+@@ -23,7 +23,8 @@ def run_entry_point(package, script, args=[], **kwds):
+     script = str(script)
+     assert type(args) is list
+     cmdLine \
+-        = "import pkg_resources,sys; "\
++        = "import pkg_resources,sys,os; "\
++        "pkg_resources.fixup_namespace_packages(os.path.join(os.getcwd(),'build')); "\
+         "sys.argv=%r; "\
+         "sys.exit(pkg_resources.load_entry_point(%r,'console_scripts',%r)())" \
+         % ( [script]+args, package, script ) 
+diff --git a/pyutilib/enum/tests/test_enum.py b/pyutilib/enum/tests/test_enum.py
+index 52451ef..66313f4 100755
+--- a/pyutilib/enum/tests/test_enum.py
++++ b/pyutilib/enum/tests/test_enum.py
+@@ -11,7 +11,7 @@
+ """ Unit test for ‘enum’ module.
+     """
+ 
+-import unittest
++import unittest, sys
+ 
+ import pyutilib.enum.enum as enum
+ 
+@@ -355,6 +355,7 @@ class Test_EnumValue(unittest.TestCase):
+         for other_value in self.other_values:
+             self.assertNotEqual(test_value, other_value)
+ 
++    @unittest.skipIf(sys.hexversion > 0x03040000, "can't compare int and tuple on python3")
+     def test_sequence_other_values(self):
+         # An EnumValue should compare sequentially to other values.
+         test_value = enum.EnumValue(self.SimpleEnum, 0, 'test')
diff --git a/dev-python/PyUtilib/metadata.xml b/dev-python/PyUtilib/metadata.xml
new file mode 100644
index 000000000000..2541628cf9a8
--- /dev/null
+++ b/dev-python/PyUtilib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/argon2_cffi/Manifest b/dev-python/argon2_cffi/Manifest
index f823244f011b..0a33d95dc8c9 100644
--- a/dev-python/argon2_cffi/Manifest
+++ b/dev-python/argon2_cffi/Manifest
@@ -1,3 +1,3 @@
-DIST argon2_cffi-18.3.0.tar.gz 1806363 BLAKE2B b60711ac929792ccd87a948f213288d4d47f45bf4bb52a1f6ac698d229e0953e37186c4e7d140231c205777be2fe31982a808cc676c13f12fe8602381665b74c SHA512 482a97ca17a23e4c1f93a0642e5aab1f2556d10f8a24d74afd051e6b58533c4767465abbfe8f1d39c150c5dbb191ad138d08e70633721753c7d317dbaf1cb375
-EBUILD argon2_cffi-18.3.0.ebuild 1172 BLAKE2B c2ce2a0410afa76935e54fdf7bb73ace85051817ce2716558226addb678b933f0dde93e9f135db262e2229145bb10b0d7bc889e4f669a424b0f36123ae9d8adf SHA512 66999c73637722feba791a9e9ac9d63e6fce862e758b2abd3f3695a9abba74674f9e340170d0c98f2169578e47f9230b2fc75cc8b61c87c2ef6da97a4db191b6
+DIST argon2_cffi-19.1.0.tar.gz 1808120 BLAKE2B f30afe3c270fe4ff41ee97418a49480d7ec7235db659d033926cb7380afb664ab61cfb41fbae2f8581c6873c474746431a1360abc134244803acab73836ed533 SHA512 9bc10f0dfbb199e0ae0c9bd6a7c9183a5b0b108966d89bacf8ee744a926d400bccc14869b889a2482be4a5c48bd7ed0464cf316ecad74b758a5493beed7d466c
+EBUILD argon2_cffi-19.1.0.ebuild 1172 BLAKE2B dcbf978bfe30bafc835d0d8609073ed99a9b936838a01326e16e7f73fb68715d1f8d34d8aa674f7d4a37344ba1065be34890859684d0f51c82bb61ab80014985 SHA512 07f25990ddf6c1a8008c0cbca312b8a8e1d91e871f76d18dad9993d2631be40d1780d48dff99e39c3ba7f9b62e15ba6b8680eb56ceb1052b39354679a2417c57
 MISC metadata.xml 727 BLAKE2B 8ca033f1a646a7d55dd8c78f483998d8ee34863d372c88b0d9e42c7d1fa7a14962b9a2e9c19aa13d0d35c7cd0e68599419a9641982dd376d76ade5c98d3cf338 SHA512 770cffcd4f6ecbf4fe93463bdb1670a9ec882844da62ac8ce18d606efcda6f314a3942b205d6a4ec54aee6b53f784faf6d19482601c9b570567217c31c6846b2
diff --git a/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild b/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
index 14c6988af3e6..74c7ac49809d 100644
--- a/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild
+++ b/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index be2899e959e5..3fdf08a5c5f8 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -3,5 +3,5 @@ DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b
 DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40cefee847061a2019bb27f0982091e7628737211421ada351937caf9c6734cb445ee6462ce84b381030b013bd05 SHA512 a6f307d312a3ceb721071b5212297c73d2306894b5fafd39265578041a2859bd6f041ac43a654bdda4175a70a4e90e0db1ee35cd43fa620cd5c594b5d1988a74
 EBUILD automat-0.5.0.ebuild 1220 BLAKE2B b4d3ccecec979fd015d59acef3a304cb17e2d5400578536d7a8c25f5699104ef6670a4e582f8feb8d04a7df255b95d830b8a1c3477f1a8622a7cff340c71b225 SHA512 88099c32c2730c19717a0a2a5020d7be29c51bd3581138b4a0d67b4563e9e6c921cefd828a3443039dd28874ff9fa85d19d4f8f3ac9bc9df6e3fdd9478c38897
 EBUILD automat-0.6.0.ebuild 1238 BLAKE2B 7cc573a302a0701e9bb40aa39dd17d04ae681b8eb7f13e2fdab5bbe8039c8e6bc6f5fc664d82ff5008df01848eec852e3d2da5178e9a7c7f4e7507b8c5644e01 SHA512 c5ba1ec51df7b90b5d9b9a69670194c91090583687309c81ed14a7eb47556747ed3a91fef6dde183bdd4d8e3662b1dd660f51971220a4e4edc2fd172863394cf
-EBUILD automat-0.7.0.ebuild 1440 BLAKE2B 599de0092fc4a004b9c7ddf47511a3b7c9ca4e85770dd347cca3d70b4b711b715488f58012f6eaa40ad43124f0d51df995d78b80bd03856ab480e451824c0cee SHA512 7e6479cb62370918228fdb9a3386485457eebb338b56ebea9961b37c1eb9fcb4036e6a35b7332bc930046e4d2f9d9d8f1f8d26c5079b822a90a542d320349733
+EBUILD automat-0.7.0.ebuild 1453 BLAKE2B b88b2f689d457a55b89819d27e63b0266b097c19d3e36b4d3d91f594a10f3f4573b9599fda60025ac588292146484a4ef20b8403fd77b272a34e93ba916a2d89 SHA512 9bfae1781d8ea2fde61093d99e87c8c40b93cbc7639c969676b518bcf6bc97b1e4e9ae7d1890515e1d9ceb1f928da158deafd87bc9282f149489988519316d9d
 MISC metadata.xml 622 BLAKE2B 10fa7f62095186a07a588b374c55dc084a483ff8848caff3322822964d57175a729e82948f984f4348a1cd0e5d7bc08c1d548ef674fb93aa08bd55343c53ba63 SHA512 f9feb6bd4b545a707d0539d42d20a0371eeb8a9e0984e922b3a0416a0dda97b6783c21cf1ec63868c200535d9a46e80b820424a1d7199074419780b3e7328333
diff --git a/dev-python/automat/automat-0.7.0.ebuild b/dev-python/automat/automat-0.7.0.ebuild
index 31c408a3704c..96fbe84f14f0 100644
--- a/dev-python/automat/automat-0.7.0.ebuild
+++ b/dev-python/automat/automat-0.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/blaze/Manifest b/dev-python/blaze/Manifest
index 330e6becfe06..14b22bc72ed3 100644
--- a/dev-python/blaze/Manifest
+++ b/dev-python/blaze/Manifest
@@ -1,5 +1,5 @@
 DIST blaze-0.10.2.tar.gz 9681767 BLAKE2B 9972d0f9bb00ce462f20673e9e164d504bc1157730bcb36a42b53ed1523a73bde36a1858ba7df1f813c126291251c6170da8ac70aaaac8932206de5f3e063a10 SHA512 01b7c5563f928c336f13eb13c6397f1089bca7c1cf0824da672acdabf28b18356c52678c58b2fa7af303601c6013e9d6f4fe26359ee6ab9a01f8b735c7d24a56
 DIST blaze-0.11.3.tar.gz 9691443 BLAKE2B 13734e3b2f63ad044991644a4c8243b449c5179a80efdaa5faf6ecf443434bec7a00953f0f17d73885b9e9fa506e72a9bc369380d2d7a561f5da064d8339e03f SHA512 030079e5d3f17355dac588154ffb7ba7993935dfd39bce141341b6e2b9a17f812982ce83776ac1e4224649a343b58615621347ba65e5aba2ca2e568d755f276f
-EBUILD blaze-0.10.2.ebuild 3169 BLAKE2B 251c9d778c6a20502395e5eba9d9269a3adfb3a7adc532ae0e41f8c5ec0495fdf9f61dab81de53967d62f80ebaf139e25dcabcb03175a432faeb32ca89454157 SHA512 53c7041857c51de3cc55485f4a235f92c44320ac1c802fa37b6bd716ff0a2e5e275d2814eb7324da169761f096f440d2601b504ecbd2ed5ae50ca90a4778dd98
-EBUILD blaze-0.11.3.ebuild 2169 BLAKE2B 0ffdeef67fc94e45865f17599c467ddc7429784a8d37cb3ee0ad51564c5ad25929541b4ea938aa173d3618bac3c0c95bbcce2b6f28edcbe8908bf61c6dd2b392 SHA512 02d0c9a2e02bb78fdf3d96773d815ec0f735d9b8e00826004f3710f47a099f14a5b36049dcce369ec6a8a14bfe780b94f7759f12968077506325adf79eda9a64
+EBUILD blaze-0.10.2.ebuild 3206 BLAKE2B e1790a98246a6a6328100d66f61ebd0fad12bccc41831f1fa215eb4547e5e2dfbfbd19f00c4e3be97e910af7431b420fb43dbf1cdd2618efa83bc506e0a5d2ac SHA512 3be5bed5d7b44209dba3bb415b988b508ff14c6ff86613902591f8b9df18c2655dbcbd5272f8e460b772af0b4432cd090a082f8d71a37b9707bf3d722b077f81
+EBUILD blaze-0.11.3.ebuild 2202 BLAKE2B 473734a3828913b560b46a06eac8a2c62f924d77dfcfaa944d44ce138c3aff17d10a6e9212729e437f9989c0419327d920ca263af511e3ce9f59bac0fc22b5ca SHA512 0bb369c4439cb51f144c2b9dcffa68fe0623593d3b7eace9e3b92c4a155a8e5c876f38f1ba37a04a996ce15062cbeff801c7d76cb291c2508cc1ae21e6500b7b
 MISC metadata.xml 619 BLAKE2B fcf9cafadca88ba8f5465f681c3fc87159a1e8f7fde68007f85d5f424682fcf4fae81b6002c73043f1fcb6c492e618277a2daaa7140086324ad31d84cd97004a SHA512 2fe8804a4e526991e088834f7d3a49a1273c8da255df259a3552b4a4613bf0386bf464e025e191eb0087258b53a003efb0b6ed1afdb5ceb5e9e7c1c9ebeda7b8
diff --git a/dev-python/blaze/blaze-0.10.2.ebuild b/dev-python/blaze/blaze-0.10.2.ebuild
index 8acdc8f11a4a..2cf0f016591c 100644
--- a/dev-python/blaze/blaze-0.10.2.ebuild
+++ b/dev-python/blaze/blaze-0.10.2.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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Next generation Python numpy"
-HOMEPAGE="http://blaze.pydata.org/"
+HOMEPAGE="https://blaze.pydata.org https://blaze.readthedocs.io/en/latest/"
 SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/blaze/blaze-0.11.3.ebuild b/dev-python/blaze/blaze-0.11.3.ebuild
index 30747c684559..db12f7afa146 100644
--- a/dev-python/blaze/blaze-0.11.3.ebuild
+++ b/dev-python/blaze/blaze-0.11.3.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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Next generation Python numpy"
-HOMEPAGE="http://blaze.readthedocs.io/"
+HOMEPAGE="https://blaze.pydata.org https://blaze.readthedocs.io/en/latest/"
 SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ced2814a25bb..2b7e15b57889 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,9 +1,6 @@
-DIST boto3-1.7.19.tar.gz 226568 BLAKE2B 3f56b738d49cd8da02621b5f00160e8a6bc06fa785b870cf0a413c0c9ba2e04dd772f4246fe943dc9fd7dc14f1c587377e3ffba77c2b1a092247958dbc573fdb SHA512 80975e234caabb0f9c0166cc00a3bf88d61ff1df386fa4df83599245a04d323d10b770e1f4171e7f856ea91edd325d1207caf023a2f43e5dca23236fc48bcb6d
-DIST boto3-1.7.35.tar.gz 228201 BLAKE2B ae164f4eb8a77d15ea142f0a88422645b306f83c54d094abafd73e46e0615fb7cde9756781d4150fa6ef408738481fbbd959afee0ca125cb1f2b8f82189f86b4 SHA512 c007317bcfd167fc78ae216ea2db5a9ae76dcd4e76cd80bc2e4bef11e4525f1b0c87d6f14cf66dff49bb5e0c4c22b2062a514e8f47c83cf1a1bbd592f6aa7658
+DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
 DIST boto3-1.9.4.tar.gz 237313 BLAKE2B 20ab73dd02864b455a2bcc567b6303ef8b0503c4dd80efb442bf7ad8167329c938dcd41cbc61d4ab50fd02cbf8758c10aadb9b13d9c795330fe1faf9a1f7352b SHA512 7f0eb3b5537aed598d75a05474439819dee8c0030dd1eb685281e963ec465699ff9120394170f1ac7b53493de9b8702ec789863839eb3710ff3d60e2dfc1f1ac
-EBUILD boto3-1.7.19.ebuild 1227 BLAKE2B 19758ee9b4af55e2ce53fed273ed0e1dbd0982005405a223f29832048dafc2e8e9d85349100ebc2fbf90d0ff76a584bad252677478c0099c9bd38fe15b346005 SHA512 e4566902a5b11b9062dc180081d794cd643468e5d53fef4d9ec2c58edf20d0574fa2f8a9ba0ffe7b61717a3fb978b50127a6cf4ea9dcf5362328545057cbde0a
-EBUILD boto3-1.7.35.ebuild 1229 BLAKE2B 2ebe447e5c8f930c614e9e25d92cb64ec4d955f764087c8e57a954fa5249a4d8eec0e2187a29cd6ab0b0ec6e76812bac00fe4918a6ed8a1c94c0cb5ba643a06a SHA512 3f57b544631b64b391730e140ccfb98ee5721004687dc382bb82d42b490b7bb68b33d69c11c0ba36c1b32f52221a4e625485bb97bc3c596144ea3f35b5e2add0
+EBUILD boto3-1.9.122.ebuild 1235 BLAKE2B 5e28f0f48cdb64c291cc7e4c0ff220484802c15614b30772e1c67a6d92e6bb45df37355076e3621197d24996e1e2d0a596a0f7a01c79c3c279f0439050cfa25c SHA512 758059555d34443cbd36e5150bf49a905ea08c54099abb46754578e2d5ed2b62df4b443722ebcba0530be8aa3e350da27866e8ac0ff87d8d7fa132a99825d90c
 EBUILD boto3-1.9.4-r1.ebuild 1233 BLAKE2B 7ca57d32e15043db1182069001efd146cf5a1ecbc8e0160d0f1e3ef3b171113a7ec814361c2ea80922d7fb3fcb56803f6a2e69561c5e5b1849d738f323029b1d SHA512 86deefa7d553b50ade8f9097a7d29cde60374be2b43713fdaf1d91c9cd15082f898ecee2954d7455d680bb2b602063579d5ea7dcf07a20ec199717b53cafccca
-EBUILD boto3-1.9.4.ebuild 1228 BLAKE2B de6d5b56edbe0b4c9a8fe6cf28ac04a01c62ac4a60e1182daf7d5a4b3a5d9251952e85ef45d62a4953845219d38253ddb22aa303bb6e26ecaf0af3c258d11705 SHA512 13addc19481acfaf316e1d0f45e92a6077b3c1065e45c6e35889d91995f1b195dc45dc8cc966bdf983968a12994254395b885ac8163aebdbc10c87da41e16d25
-EBUILD boto3-9999.ebuild 1238 BLAKE2B 0825f1f43734f041d3021aef6bd0f7d87eeae61e83780fcb73b4c76bd07261093e6784c6f5f38bc439c9d841dcdbfe6af8ce2e35eaf62d0c58e4f57610338e6b SHA512 e42c9722ecb568be46ae76d950ae30e436d9841123b51ecc34dabe79b5a3c57421b6c6cb0e30b9faccf61a83e6d4f82947e5f1e6faa6e9dafcbfe1dc61b156ac
+EBUILD boto3-9999.ebuild 1235 BLAKE2B 5e28f0f48cdb64c291cc7e4c0ff220484802c15614b30772e1c67a6d92e6bb45df37355076e3621197d24996e1e2d0a596a0f7a01c79c3c279f0439050cfa25c SHA512 758059555d34443cbd36e5150bf49a905ea08c54099abb46754578e2d5ed2b62df4b443722ebcba0530be8aa3e350da27866e8ac0ff87d8d7fa132a99825d90c
 MISC metadata.xml 326 BLAKE2B 0ee2d830daa48d21aa34b2bec8f8b9d6ff03edaffc6bf8f5b47c05b5a83aa0947e22651dcf9ef4d8153b3b0f21913069a77bcfb7b25f55a67c147938bfd6c0a5 SHA512 0e38efcdc960343f3b92fdfca7d91719b2b3b66969cd100fd8e0d53eab876e062ffe2cfb370b605881631f1077861cd6e0aa1b103477933bfa949d297193e109
diff --git a/dev-python/boto3/boto3-1.7.19.ebuild b/dev-python/boto3/boto3-1.7.19.ebuild
deleted file mode 100644
index 5b910efcf468..000000000000
--- a/dev-python/boto3/boto3-1.7.19.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-1.10.19[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/s3transfer[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.7.35.ebuild b/dev-python/boto3/boto3-1.7.35.ebuild
deleted file mode 100644
index a73739389847..000000000000
--- a/dev-python/boto3/boto3-1.7.35.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-1.10.35[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/s3transfer[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.9.4.ebuild b/dev-python/boto3/boto3-1.9.122.ebuild
index d62092d13cee..20d001cd0c85 100644
--- a/dev-python/boto3/boto3-1.9.4.ebuild
+++ b/dev-python/boto3/boto3-1.9.122.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index c4a2a2204096..20d001cd0c85 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.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
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index cd1bb35d3a62..da1bb8558745 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,12 +1,9 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-DIST botocore-1.10.19.tar.gz 4372030 BLAKE2B cf4782e603c3483583edc2bd0a310781a00678524b4966b504e34db24b0f177d2d63cc76a5b2f1efa2d831c8ca3bc93f6bbbb628344da944a59b784cbd2e3062 SHA512 450f66d182f0262ae5fe040fc45c640c13fc2b9b1e4331e3be18ebd7b52b0008cb39f7293e243b101797a84b390399c09952f82880d925ebc076672282334577
-DIST botocore-1.10.35.tar.gz 4451806 BLAKE2B 1161e5dc23a2a540b9fa237eb5c3029c6822bf76cc833be44366385482617ed64458a04ecd67ea9884d8b8a5b74e4b2a6232fb2f8d960118fba70860526fb4f0 SHA512 ea9e4bba6be53696fc4e3cf68e67f9e6eeaeda813c48d725e20f7170228f1cf8b55a023dd5fdb020290f5d6ecd10f75217e9327c928edacf8723dbd4050188d5
+DIST botocore-1.12.122.tar.gz 5492931 BLAKE2B 05371245cd0de404713f920d0651f9bbdcabe9508c5e27f692adc4cda7ac2f7fba24b2b95a26b788e4960b01553c1746f08b9db4f38e4629c5703fd6872893be SHA512 f92581ac6b8a46d4af8b55b391e6e75c452f83a4ffde6c940c9f85b2215a3eda44e8b2672f469769b4d9a0d7ac2823540f45c1822279b6264d016986f2b06c53
 DIST botocore-1.12.4.tar.gz 4800384 BLAKE2B 121019d3c33872fdd874ddba36ecc8612a6354068ce7b759cbe7f35a9787e84c34d3a71ef3fdd2d721d3c3973a7600e4398cb7cd2a3ba698464c15137845bdf3 SHA512 8d196984f5623df403a8a23a9b7e7061e59c0ca56103f89d749d6ad7d92168ccae267f85312f2949cee322776d7948f1ecfda3d9d2783e8ba92fde7a178e8cac
 DIST botocore-1.12.81.tar.gz 5383717 BLAKE2B 0bafd6038cf4a5d1fa4f0597024b09eca48ab95d071cccd09b1910ccf839719114166fab7d78bd2b30dec4b4993a0751d9504260636174df5f76f02495e79960 SHA512 d3be22af53a8c6dd55be3fa0b84a55cdce22d30d6e6f04b0bb69539b8107c86de6b5494079e3af40f9b5285ef10c21e69c85295e5cd7c6dc5ab5be91718a2ea9
-EBUILD botocore-1.10.19.ebuild 1454 BLAKE2B 5db9c134b89b9e494a97a73d615cb49198be13a18f29a016b67ef764887cbe51da8714249e7144eaa7c905edf554de6688f51e723370378c28c5e35b5662b7e3 SHA512 778b1031180cec26b341cf18560d77a816efd5eec0a89552affd3d686d8fd2b0acde1acbc8cba10a50fd4f659df169148c187133e662f5c9ca09684e957f4a21
-EBUILD botocore-1.10.35.ebuild 1456 BLAKE2B 27d13171ffeb862a0412c1d46d25312b7f0eef4525c2caeccbe4f2f5bbc003f99e0caa49adb33b3c35a5f3ece93f8b55d6917c9535be6eece68ee33e389dee79 SHA512 3d97c0cdfa7565e563603568500a14a71f0581b5cc965e9bf83888cd3f34e664c244130866a675a0f26b693923cba7bc6e16025ead0ea3633966c7cd765d1e00
+EBUILD botocore-1.12.122.ebuild 1501 BLAKE2B 7b47013920069e64ec32bfcf2c15308d42971e4ab2a1af054cc4f48eaf24ae0246141f5a4849f3326513b9b05e67bfdc1901a7c6c53c1660c018a363541aab6b SHA512 1c3cbb251517ec70e380d1be890486ff67e40d30ff4ca747eb32ae3e52f29e379934c659619318ad7eed5d2037d6c232819adfb3fc7d24a95f5b633fd393cb22
 EBUILD botocore-1.12.4-r1.ebuild 1499 BLAKE2B e98eb7a5dad4a72079a7cfce071daddfcd9c9d211a2eb95fa53e9ccb912fe1cc46b9da2bc73a2cd6b7c132e883748a160bdf43c954b1817fea6d98b6a2b146a9 SHA512 2d6a8a434e28c0a9c375cf6f3326044cb450bc57149fc53a72a8b9f77dd9ef41aa699f38ac6d7c0f0ad2a2fce8360c1a838851d63ba5200d1247b1d1c747f5f2
-EBUILD botocore-1.12.4.ebuild 1494 BLAKE2B 36263e1b3bc056f6a5fc0034e3373d30920976a8e54113bb6f7b3fdc238f6acd6acb76f4026cd5f8302aa6d4ba50191d72883896282f1a2f0b55312cd389ce4c SHA512 ead62975b9cc2ef72e396994d62eb2a3e1c807d6d6a69b82cd07ea7db6b31bb5e88ea4af1fc9e4306c8f5fe84c2469501cf04e790c85ea5067940715049def57
 EBUILD botocore-1.12.81.ebuild 1501 BLAKE2B 7b47013920069e64ec32bfcf2c15308d42971e4ab2a1af054cc4f48eaf24ae0246141f5a4849f3326513b9b05e67bfdc1901a7c6c53c1660c018a363541aab6b SHA512 1c3cbb251517ec70e380d1be890486ff67e40d30ff4ca747eb32ae3e52f29e379934c659619318ad7eed5d2037d6c232819adfb3fc7d24a95f5b633fd393cb22
-EBUILD botocore-9999.ebuild 1504 BLAKE2B 7b62171c506bd723e08802eca7dffe53c5998597ba816f3c40bcd5bfa0a25b4d5c018db587e93983277f04e0a1ff733b3be8553d700517dec52753293bfa6b88 SHA512 dfa0ecdce69ab3958a17aafa59d12c0ca67feefe4af29b5baa3cb587f4ab05a460031d77837c43f77e4aa2b7352e61ac0f3e711934811206b274f8d7373c9d90
+EBUILD botocore-9999.ebuild 1501 BLAKE2B 7b47013920069e64ec32bfcf2c15308d42971e4ab2a1af054cc4f48eaf24ae0246141f5a4849f3326513b9b05e67bfdc1901a7c6c53c1660c018a363541aab6b SHA512 1c3cbb251517ec70e380d1be890486ff67e40d30ff4ca747eb32ae3e52f29e379934c659619318ad7eed5d2037d6c232819adfb3fc7d24a95f5b633fd393cb22
 MISC metadata.xml 375 BLAKE2B 562696aff0128b74dc4c2c0767fe03d53ae116cbc4fdb3a8649e36a8c689dcbd2a90bb5f46dcfa6a3cd71c9150f923281100ec098fe2212dfffa96d74e472d3f SHA512 c369567feea497a744245642a9a307b2a2ec06035fffc3b9b72d9f7ee9fe2f342d62cd1d06a668b47ac1b3187fc28845bcf3c220d942cfb2ac89f72809fc4a86
diff --git a/dev-python/botocore/botocore-1.10.19.ebuild b/dev-python/botocore/botocore-1.10.19.ebuild
deleted file mode 100644
index e10e6f885dc9..000000000000
--- a/dev-python/botocore/botocore-1.10.19.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.10.35.ebuild b/dev-python/botocore/botocore-1.10.35.ebuild
deleted file mode 100644
index 5771ab5e96d5..000000000000
--- a/dev-python/botocore/botocore-1.10.35.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.12.4.ebuild b/dev-python/botocore/botocore-1.12.122.ebuild
index 82cc15e1a9c7..ecf278301165 100644
--- a/dev-python/botocore/botocore-1.12.4.ebuild
+++ b/dev-python/botocore/botocore-1.12.122.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 822a910e36e1..ecf278301165 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.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=7
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 72965646f1d6..ea2106c3aadc 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,8 +1,5 @@
-DIST bpython-0.16.tar.gz 201898 BLAKE2B 907f6a506d2b52db01e7b84c615574a7daad36f630646a345c963e432cc394330339390b6afc2585845b19d6c00d9c0b95e06b9d3b0fe85fe20daad3f5cf208a SHA512 1173d720aa679e4a6079c7febd36abbffa901604c99c6d1ce1e940a8fbcf8a4ba7bc526de0ef5290e3859a4384d1cd5cbef62fd9f056ddcb545b64d69d103a5b
 DIST bpython-0.17.1.tar.gz 213638 BLAKE2B 42530a38f8cf714a0415957a46374b83ad14dfab89a76317507763c2f83b3dbc8f71c7cc967ec353fabd38b6631130d34df99c0d53f3728fa2390d4a6f64b25d SHA512 5b5e861646df90510db75520dff9533b71501d35b7af1d152adf2c929b171fa6a2b1c0a6b7eda0311f9315703db161c6a78698a6cd434e5321464d6d1c033e4e
-DIST bpython-0.17.tar.gz 214230 BLAKE2B dc26de037eb5698c04afb74472fe9483e1398f4f40b7da21520f2e7e2ba6e510bcbf200938d520d95b976a6fbeb31af7b1b1f828a022835edbe40d381c82797d SHA512 17c25f4ed69eb7cff27ba0a488434623a7105c60bbf1e6f608c91babf240741ab7a7097ad347f897cd5f39f2fedb944fd69d8dbfbc66da6b910e1a14ace6fd1f
-EBUILD bpython-0.16-r1.ebuild 1485 BLAKE2B a72e900479e3b3829178b366c20fda4c8dd3e4946b99d833a1fe434adeb6710b6558cb1fa570b4841e24872b339f6387670eb6ed65ba5ae5c3d5632450957e2d SHA512 cfb08bb15b596c181c5557eb68a923d6d288f58ba41c39fe970344b7897747064970a7305b7501f05b406278b87da5918abdb9fe2fe4dee52aaaba7f6ad8e85c
-EBUILD bpython-0.16.ebuild 1481 BLAKE2B a371defabbff8bcdea78fcc2f77685b05bcad1745ac02609b9dd2dd1076de65b80248ae005b05b86196dd64a2ff643002128acc1c5c25e415e8eeeca199b6175 SHA512 8df71a507914cb393b40c93ae2a7cb2955954912733849817e69aa265808a4048cb291abf347f44f2316ae22dafc8c5adedbc70491f647274579e71c4669160f
+DIST bpython-0.18.tar.gz 213321 BLAKE2B 476c18fbec1d4ef3c5e206e7586b0e982656160474b64ceaecf5b49f560115af0e51d964553aad25bc765f7b431bc4f062581f9f30c0cb2e8da51cdbf2bca5ca SHA512 760143c286e686d4b8d706e38f3b2d2e7c865f960fa8d828ec08a7d0dd198bfa09686ab3c4b27ea365400d60c45b69a3c03ee726879a8825cc91af2a75d28dab
 EBUILD bpython-0.17.1.ebuild 1508 BLAKE2B 7ed8a0f4f1bd66e6570022921992ba82936c036c74816dd5518fe614ad869d5f9d89631298d2ebaa3272df5509034cfa365962e1bf6ad2246d4b305ad7fee129 SHA512 18c5e7e1cbfa3d0fff17a2841ce2e9bf7a444c65d887ce235a6a7b5679bd153df859077d98afee9125a2d8c36c4bd1d2feb5c1c59d2e25d901c68f453f4bafd5
-EBUILD bpython-0.17.ebuild 1485 BLAKE2B 17f87275b35d9a7bd67a18596a7fd147c56cd232699c4bd8351aa8126efad9953cbd7ec0b0e48afd4bf54e2bae9b87ad2ef2d1f533b4eaaf46ec59cbe2fbd95c SHA512 e6e22c56c69d8aee1817ef4461ab1dbe0df2af0e9ba339457b9b78ff479cbb6812ac7bf98279a756ba54cb7be8cdd16bc11345d4c350a51e15fa379897752b40
+EBUILD bpython-0.18.ebuild 1507 BLAKE2B eb1061268b270606aee9b2af3035f1751a5d56a36436ad5795a5aa0ca11d011d73110fa1a4206590ab0a44eeaa1bfd29ead9627f42e0184a5cd877e54c68b9b4 SHA512 3637cdb827454efe6b6fa63fb4ed5c19a591982f93d606d60e4e52cad1f344bdd422f3e599198ba24f7661555c48cbce7e91b351bbd1fb20065757d1e15d12ce
 MISC metadata.xml 636 BLAKE2B 8a0306ee698c4f53a67ea4662791444115ba8e0cd14294614b7ff1dc6ddc28023897e3e3c4d4f0e8f8920c8fe6298ef8b866ead41df4871d2461f9c999e6c498 SHA512 84dc3ce1791ba626a1920d6ee3e5501ad6eb49528b7ba055811e1eda46a354d8e704a31b5c4ca7be5b4512f641098311ebb1c6651d889cedb6071a97a0aff9ba
diff --git a/dev-python/bpython/bpython-0.16-r1.ebuild b/dev-python/bpython/bpython-0.16-r1.ebuild
deleted file mode 100644
index 70407a76fccd..000000000000
--- a/dev-python/bpython/bpython-0.16-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
-
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bpython/bpython-0.16.ebuild b/dev-python/bpython/bpython-0.16.ebuild
deleted file mode 100644
index 35036333262e..000000000000
--- a/dev-python/bpython/bpython-0.16.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/curtsies-0.2.10[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
-
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	"${PYTHON}" -m unittest discover || die
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bpython/bpython-0.17.ebuild b/dev-python/bpython/bpython-0.18.ebuild
index 5c37145681cb..f93dc731b5ac 100644
--- a/dev-python/bpython/bpython-0.17.ebuild
+++ b/dev-python/bpython/bpython-0.18.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
@@ -36,6 +36,8 @@ DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
 # Req'd for clean build by each impl
 DISTUTILS_IN_SOURCE_BUILD=1
 
+RESTRICT="test" #659110
+
 python_compile_all() {
 	if use doc; then
 		sphinx-build -b html -c doc/sphinx/source/ \
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index b40d73e87244..2b200aea6684 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.6.0.tar.gz 67655 BLAKE2B 1d3a2915f8530da2b56583565ba03b1b05f38ce4e763c10a0a7f72661f2d22800a5d1b72d1e1497c537150f883dbc434bb8950275ee28668df21a87123dc8898 SHA512 8e26a102c38a916818ecf1a5d6a0f6f01de4285a98dce7abda6f2a401f8e5db380150b24bd2bf6f430a53324be5f1da28d084d8d4ae3969ec03914b88bc3908f
-EBUILD breathe-4.6.0.ebuild 593 BLAKE2B 3a13aadc699b57b16f6b0f2604d3717e01aa4bc46d49e96469b3fddd3733820baeff52edaf864fdf4ad16c884ea6094953d18d51b7375d4d9651f984b64fda2f SHA512 0a79f5ddf7455ba3233321af545b235e77cad6f214302c4ef95e0bb682d607c5bab293acf9d79eaa196440cb8262628f99e47f4ea2644f975baf228eddf95dae
+EBUILD breathe-4.6.0.ebuild 601 BLAKE2B 97edafab87873b5efd05f05d12e0676216691ef31d4f07bb0d82a30041e3190f6e20aba8ef239efe4ce5e37a919052aa31710bd17ddeee7c25363259c94f251d SHA512 322d5ac524a186aee5af5e55c886f14f505444ede91df75a1bcafcb9eaac789c0a9e8482a2ce60ca3d41cd6ff2f7cdc75c85db534d640a8a92ec8eae7e030e38
 MISC metadata.xml 796 BLAKE2B 5f7541beb0113e83fb387eadfbbefea4bfe9d6a172c61fd60a2de473ec9e61f1a941d768350526de1464ff0ebbc58dabf13e7be3e38cac1d3a3cbcd791260d40 SHA512 734fa318039a2831c3cd35fa9f710739406b627f1e0f1d34c772d1d9dae53ea6921c21a236cabf00e3a1d3d2e95f053ea39436b1f539d9fa0c2bf1abbaf9018f
diff --git a/dev-python/breathe/breathe-4.6.0.ebuild b/dev-python/breathe/breathe-4.6.0.ebuild
index ba5765578580..74728917ff6f 100644
--- a/dev-python/breathe/breathe-4.6.0.ebuild
+++ b/dev-python/breathe/breathe-4.6.0.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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="http://breathe.readthedocs.io/"
+HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index c983a2c84492..df6593e26bd9 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,13 +2,13 @@ DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d
 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.0.1.src.tar.xz 12488668 BLAKE2B b80247b5caf81661dfa715d9bf454b8023221bd27ce49b6bd8cd66f40ffe01448e40fb828fbcc64e49f059af7a7c5a95a0737b0b998454ac5c1dd39388150fa6 SHA512 df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194
-DIST cfe-8.0.0rc5.src.tar.xz 12864516 BLAKE2B b1c982d83e0a911a7375d07f9f2f52956b3595674252e6e7d8d8ef4015b51171c59a2d3306c00fcd83ae2fff2eb3d58cc9d4cdeadaca02c4fc3a6242f57959fe SHA512 40f3b6069e40fc4f831662912a8f4c3ab1579587bf48c1fcd9e80287b7e26e8b70becfce525a0b55b1b8283f20a9d67d232cf5ce10189a39d655e2fe3fb3dd73
+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 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
 EBUILD clang-python-7.0.1.ebuild 1103 BLAKE2B 880675335893e206636b121e60d025df935a8ac0c08d77c2b9d399f1152e8067f7fa4a95a06487aa51bc5ca53254ec8d661ebaa68c03286e19f1eaa2f26cb6e8 SHA512 a12d2a01febd8cab4e04350e897aeb59865f2a4a891a7aaddfe38f7bb2556595d6e367a9463bd4478b3aa691e41c031e8323c0bc36130c4d96449c0a84999e5c
 EBUILD clang-python-7.0.9999.ebuild 1059 BLAKE2B 1ab0d9234fbebea281bf2235f870e6cd468063f2ec5c20f7af3b797e6135aa6730ccea8cbde5ae5993394da1563897f5b45adba1d644257f6bc300b6da5500f9 SHA512 23882089855c9485ccf23129542f3b6a5e891776cf422c9b16a0e534e4084f59d5bfe4526d2510cc094ce8cab311ec141dc76ee45cbee7d43665aaef58c9fec2
-EBUILD clang-python-8.0.0_rc5.ebuild 1106 BLAKE2B a02a1b4e88343f276c1b5efef16ff11963cc9c3a6b27b25506e3bcc60225991e93fa56728c11f059957881c062d133166b63ae1fdcf725d0dc565ce9b981aa31 SHA512 ea05b647ee32b17b215f2039e3ad93f76202fc80277421e8a616ab044c8179b879327d3221a628a4634754271d8d430177b10208a88b271f0b5ecf3d213d9f81
+EBUILD clang-python-8.0.0.ebuild 1103 BLAKE2B 8258eed1efbd477658d3a6e61836bf7d49bf9df3af481863975708694ff49e3981f6d3309ffd0a8e4b3cebc6284fff78a89027f562f7a36bf1f6eb6b54b14688 SHA512 dfa1cb8ee06be45e4365c8c453f1eced329c7747a8e4be526edc8000cc019960d510c3efb4f7bb77b84c4f258180c9349d090a78b12140875fa032f0e572a1b0
 EBUILD clang-python-8.0.9999.ebuild 1056 BLAKE2B 9f18a22421c36ba3796b6fe759e05d5ee5b8ca449e292145c7eda6733c614ffe012f40d0e12ce336ef496a9889463f090fb96180c146975052adc73d8cacd690 SHA512 39239de81290208b734fcd8035a9b8dbc75a0ae9a9cbcfbb7432be5f83b71f2254389ddd139b1c0c9ad59eda86269932a720a02f6dc277ee15178298fbf49a1d
 EBUILD clang-python-9999.ebuild 1034 BLAKE2B 3a56c0e391daf98889ba3959f8aa5c944c9930ac482c8beca5f814978507f9869a213384224c6965ade96a3f0b17f83aff9924f07d5ad2d03ed7df8660a54df6 SHA512 bff0eee11762f352ab6616086b19506a2ea0530284f50da24538eb8078d2c04af1d1aa2a8616adecb6bdeab8853728b2f4b5c3133fa15810f00a64855182c486
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-8.0.0_rc5.ebuild b/dev-python/clang-python/clang-python-8.0.0.ebuild
index ba2878b26983..9a7fbe1d66a9 100644
--- a/dev-python/clang-python/clang-python-8.0.0_rc5.ebuild
+++ b/dev-python/clang-python/clang-python-8.0.0.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
 MY_P=cfe-${PV/_/}.src
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index f6d35cc6bd88..fc2e2ebf155e 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -4,9 +4,9 @@ DIST click-5.1.tar.gz 275592 BLAKE2B 0a58e210003f88081fd2ba8e9f401c74d8d61758ae0
 DIST click-6.6.tar.gz 283420 BLAKE2B 1fdc90ca65d18153d6260b6753e14a1d94cae77ab7f52dcda4fb439f9fdfeea8fdc33b1ce60e93711ba40ecdc508dc3fc5f8aadc371bd85b7dca1bfa070786c2 SHA512 5650cfe6c8b55a7e823e22248964143278d61383dac63497508a864807f1950f9dd5d76ce6a501e589dd81fed6e2a1248d3f8973be25a91950896b7408dc88bc
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 DIST click-7.0.tar.gz 289077 BLAKE2B 0e180eeb1d7d9da34c33f95398c2b53dce124317bd2777ad545c1d4b4f3a96da0e281fac46c8fe6446848f25f7b705d2348d3ab6f5786219b4214650424ab260 SHA512 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a
-EBUILD click-5.1.ebuild 1205 BLAKE2B bd6d5fb8ca349249840a8db62756295ce6d79d214d90e6f655b9edf5d5ccf86e53399508d01725270bfb5960156f0381fe046c5bf7929e0c91d0ad7b9010a0eb SHA512 dbc45857683e0cb698b9b95f743a13f0d7f77df33eb9d58397404040dac04fb8b0e811afae51ce886a4ace5c6136c3ac1d4ab3dfc53208a5bcd2f74ca5dce464
-EBUILD click-6.6.ebuild 1192 BLAKE2B 6506d88b1792f1a1f5107537a8ed73c34bb4b8dd87b27036df1fa6945f0359ec3482d4a7f33f2c78f3bc438bd534d4483079d1eacdc274f9f64bcde43ac8e91e SHA512 9523bcfd4ac931ab76891ed4a7409bc1f9df8a78a5f180aa26e47fdbcf23989f5854534c0440ae1aabfa07f0186236001f3a5c40e997d8582283990369d75272
-EBUILD click-6.7-r1.ebuild 1411 BLAKE2B a3a7ddead3e59990b4816ff70a2b21f54f1365ad8894da5577eb312ecf9f2d187ff6184176064d04d19ffcfda50a36dc850b066ba0c9de91d5d42b3378a5203b SHA512 626698fd9c56d08591dee76d8b5f525e16ae8bc708ec460b1a24782ec7e7442b35a1ed1d4f78a6598829e296fb312535715395991a0c9021b76b75343fd29575
-EBUILD click-6.7.ebuild 1299 BLAKE2B b06ef47d14e3fa73a2392febdfce4b1de139a7c26262122bea89e402e0a4c8a8c861a6190ca852e4b721bc97b772a760a5583c91f4625c2bc40ec7ed1989d429 SHA512 347af3d728b0ae9c766880daf863eb2da95d6c94aa71cb93fc3402aa4e77105cee2841d8f1d5c769379c22dc351238f827c36c3728125515a4194adae474bf0f
-EBUILD click-7.0.ebuild 1168 BLAKE2B b43094e14340b39c2066631e9dc5e2b16c4ba70dc233c070237ce65c891e74b9a3d7fe6d82bc16a8917fee984ef14ac55a04ee04bf0612b50b9ce12e921280cc SHA512 b124973a55cb88621d3dd69fbdcdbe2af635eebd460df99866ca675d200df5a4cb08bf2af9e93cd23b55830c92ddacf05b402934d227c2fc41f9d41e485538da
+EBUILD click-5.1.ebuild 1215 BLAKE2B bb6cd14bbce64aed09579c7d09b53be4c4b24ed07a579453c78442c07146625a9ea803f0acd9475112fc25c0b7ea9b9a143f3ceb5de8f2537e0e7e205254acaf SHA512 7a78e9487f73ef3a7684d334075f57ad53284d887948292693182222ba0ac6c222ba75ad2096b804dd5fcd81c8561c728514924153c5dd7623d5696c21926caf
+EBUILD click-6.6.ebuild 1202 BLAKE2B c09dc4d4342facceab181561037dfadaed45b9fd1619782348090fd50c1bb88a255109294dfb936bdba3ed753a6e88380f498ca9f58eb3187f1ab88382d95701 SHA512 2714175f7acf74a5d427f44cd59ec6fb481479f8e4bc71b8e1e770ae28e80eb89f3497a5680829f62fc0da2b5f60b18ebc25826a6d8e2bd9a38c6a42f9803d64
+EBUILD click-6.7-r1.ebuild 1421 BLAKE2B 3eeeafafd45373523c59b03058e8825600f791e756c439e2faae6358b4f1ae2657e4aa5a3c9b2542881ef8efea2d4ed619c640a1406167903ac55d898feb4900 SHA512 ef7227460b5ce92eba4f244da7f2da0e32ecc5794dfd639c8f82dda4d7829de7b9099a9169578c044d0baca3a16cf6b2e8211f7bdd0b3f529e5a8e13bb89191e
+EBUILD click-6.7.ebuild 1309 BLAKE2B a5ba8263482f1a98e5d8e488201fc8ebe6ca6dac029d70c1e360bb3141e654529268922440ab24881a32de8690a22ad1ccb1d62ebc0497a56fe716dca212d742 SHA512 ed9a6807654d44e6a2f56a469b7499e5db46c2791f4fea99e4b68fce3f98c792690c3683935ac7f6e7f1f902ebbcd9550649c26a7c0fc44d3c275705b93ac7e0
+EBUILD click-7.0.ebuild 1181 BLAKE2B f517fd31fa03d616893949365ac0164b0ab7751f59e8f63606717a67459598ca69c57a49cec86d74abed3250278df2db7282720b99b819f8b6a9129a49fe57ae SHA512 63794a1026ad1991fa133def2a8f4853228077ad221df4d42bea69c84b9e2abe98319ab59823a4cff13d461e43b57faeaf456138b09d7def11e11b7da8794c6a
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-5.1.ebuild b/dev-python/click/click-5.1.ebuild
index f6772af7b4c5..8c11aa82bf9f 100644
--- a/dev-python/click/click-5.1.ebuild
+++ b/dev-python/click/click-5.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
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python package for creating beautiful command line interfaces"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/click/click-6.6.ebuild b/dev-python/click/click-6.6.ebuild
index 5d3769cf9729..b0a4f62d0539 100644
--- a/dev-python/click/click-6.6.ebuild
+++ b/dev-python/click/click-6.6.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=6
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python package for creating beautiful command line interfaces"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/click/click-6.7-r1.ebuild b/dev-python/click/click-6.7-r1.ebuild
index 2f650c4ca676..fe54c2cbc914 100644
--- a/dev-python/click/click-6.7-r1.ebuild
+++ b/dev-python/click/click-6.7-r1.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=7
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python package for creating beautiful command line interfaces"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
index 74c2f3587ec8..095acb38811b 100644
--- a/dev-python/click/click-6.7.ebuild
+++ b/dev-python/click/click-6.7.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
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python package for creating beautiful command line interfaces"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
index 6b7015bd45bb..2677e18f964d 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A Python package for creating beautiful command line interfaces"
 SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index 97b0b1975a07..da632c86e469 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,5 +1,5 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
 DIST constantly-15.1.0.tar.gz 21465 BLAKE2B fc3781e521f3a9988567c437e456e2f8215b8d61115e076d4f9fc52926125540f59bad457413105422d31184506bf7fd3fa38711dae8a8057b38941f2c5584bb SHA512 ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3
-EBUILD constantly-15.1.0-r1.ebuild 693 BLAKE2B b6279a1ceb6cdfc3e592cdd5b5d7c2d5d6f6792a4b328015e04c7cda66ced2af026b8c04e8c9f20d6f10f7e9452962ec2c0db1ab3a5df389715bcc5f4ab0d66a SHA512 938d08f68f32da5a8c25692345e73adab4a5404dc8ba38643e1ab290fca4ad1ba8f984bd24f0bb723bcfae959d9703c5c431841535a2c64550b1a0dda5030455
+EBUILD constantly-15.1.0-r1.ebuild 706 BLAKE2B 18f9e38ca011bf1ba3cf080d242afbf33444ca4afd0250ae44b2c4148e6da0ec21eb4d594f0ea796d2f1568eac7245b662d6c317ccf55fb824247b91c88dd208 SHA512 f8d6b30b320c857c66decc0227ef8a406981d6e44e0b7897376dcb1d19e41331c65e98d6d81236301f9765e08e9982d1cf3235f09b9f108627866ef36fb4d1ae
 EBUILD constantly-15.1.0.ebuild 566 BLAKE2B 4f01bc98dee8711bacdccc142d6e3fd9d93d003c1615107d434fcb0038176f24b2295af83d5a1cb79ed908f76d75200efa9abc53d695a4a4a20c2601b65cf69d SHA512 13ce8cc80e673a10fdb4a37c9a8f1477178aeac8920ef194e993970efeff715598e0a3df52bb4faeb726fe5a8ea75a00c6518860c6ce3bc14089aa014f9e4392
 MISC metadata.xml 714 BLAKE2B 696bd5218dd217515c0b9d6ac7afc0da90ac2ed404120221de9b35a84621533cf1aa8d55878c722f55a59c2a36a4216a092c88efa0936e94dc980a1ed577c990 SHA512 850ed41a1f806475ac8a877f78d4c4df161a81ea47fe08df8e0fd9161f6823ca401519b8c007f06f5db182924e906ffc9ca912b72b4f2f9e66a5ad80d8f67f66
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 07d7abb44261..348fedc80de9 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 270fb3e5cb2e..b9a0fb9b0fc9 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,5 +1,5 @@
 DIST construct-2.8.21.tar.gz 706022 BLAKE2B a7fb81185b380b444bede5dffce11158d93f0076cc3fbd836cdef3cf8425e2bcce0cf7b8e2d2654effc8beac3d3d0f722dd2786103f9b85f05b98216fc7684cb SHA512 f8e2c8d0f437cce760b1439fc68e2b10dccf852e1bf3c42e0569a3e32fe218d2a4d4cc662229455a910fa8a7cf0fc0500cb0d38ad0485f1b9fd954334f343562
 DIST construct-2.9.45.tar.gz 1042299 BLAKE2B 4d646c3a340b969e83e15436422732f4f4380ef24cd0e9f258f3d3666f17b08ab628d19db39bb8fcd3f370c2b0c93a8329fba56727f28d7a23d868d001610927 SHA512 78d64f3e567e6c9cef842d3e15f416d48856d229a8c6f21e282d3123a86fdd243b20dba5040c6e1d28b67422881351b303262132263efdf94bb73adde0d5dfc1
-EBUILD construct-2.8.21.ebuild 707 BLAKE2B 0e09aac84537b73ace39640bf2efbabe674648e967835494902a6f8e8128b3a875aaf725ad0692434a091583b8bcb7cb2c607071e18c5886a36cb3fea7806aac SHA512 7f5cac789374c33634d1d6087bf42caff51be9b2fb4d1e96ce111c6379aaa52565bb3569cc57e443531e6219d9ed26e64feea9aa7097df69f0bc2f14d806ad49
-EBUILD construct-2.9.45.ebuild 979 BLAKE2B ff167dfaa966aea94c15f487afca3933fa2bf52df193852bbefcb8791b322ec9f74fb084679646623e317b996d33c1d98522fe433a9c512182ba4b9ed4f249f9 SHA512 ea324d13cc112a15d42699ae855f586eb8649f3ef3b8710db0f63aae0bcfc296319ae1db1952295f91048c86175bb04ae305f40ab1768b7d2e6d38b9a0fcd7fa
+EBUILD construct-2.8.21.ebuild 715 BLAKE2B 4e43747c868baa5df069f9764342e745ecb75af15e752e8a7f356473bc63b57ec049e8a0ae5107312612e3a6873e54345f7ed65b06514f257852582bd379437c SHA512 f1835685864e4a6cdb0cb468f30fcabba9908f26f73f5c28cb622e718fe6401f006e795ac6c0c5a981b59e0c2d6c43b3ea1edc1a9747615586826ad5a836b27c
+EBUILD construct-2.9.45.ebuild 987 BLAKE2B 0cdf478f05d11028578a127d8f0f23c1ae8ae2d2ca0a0e28c023553bfc20f2ede7ad827da18b39ce374f5a38453040bb874db92b6138cfa821a57c6c6c0929e6 SHA512 ea98d72639801db478ac144411cc58e16c916ccad61828b7a2d370de65ea8255a04e4555a8e465a23a3289dcfcc8df25df43fece3823e60b7b8185df3a8863d1
 MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
diff --git a/dev-python/construct/construct-2.8.21.ebuild b/dev-python/construct/construct-2.8.21.ebuild
index 2e90888369a6..1b79847440dd 100644
--- a/dev-python/construct/construct-2.8.21.ebuild
+++ b/dev-python/construct/construct-2.8.21.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="http://construct.readthedocs.io/ https://pypi.org/project/construct/"
+HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
 SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/construct/construct-2.9.45.ebuild b/dev-python/construct/construct-2.9.45.ebuild
index d1968273fd4a..1a9b1fe799b2 100644
--- a/dev-python/construct/construct-2.9.45.ebuild
+++ b/dev-python/construct/construct-2.9.45.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=7
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="http://construct.readthedocs.io/ https://pypi.org/project/construct/"
+HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
 SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index cdb367c52642..1b35c04e96c9 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -6,9 +6,9 @@ DIST cryptography-2.3.1.tar.gz 449577 BLAKE2B 66a94f68a6f5c14ff1e3316ea740bda8c3
 DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52
 DIST cryptography-2.4.2.tar.gz 468645 BLAKE2B 80ecde87cf1568239977fbe4f835db98f689a7dc3646d44229b5b33932885c288d4274427f5d04eb74e9e064b01b11b7eac40fc6221ea2241371bca618cc66df SHA512 800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28
 DIST cryptography-2.5.tar.gz 487694 BLAKE2B 9502e7b7987ee0101ad8e5fcd09208034222a7f20b6b3bc3126c8b59081c9d8ecf872985d5fca191fc132dd6759afd4d11c0e0d39268627f35990c005a2095d3 SHA512 5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f
-EBUILD cryptography-2.2.2-r1.ebuild 2212 BLAKE2B aa1f0f4adf0d87aef5cff265df415696247a185a82a4827afc4014b1c3b1a9e62da6169179096f724adaf21aae824a9cce3d31a8ea225bdd2eb815020fe37d61 SHA512 bf1241583761b05298449e603e1755d65944c156bac7ac76f955f90e709ddde24538216995d9272e5cd5b5dc43568fb795d026798cf663f3ef126c0a3310125a
-EBUILD cryptography-2.3.1.ebuild 2204 BLAKE2B 4cf0c0fb964cf00b57b078c568780e2fd41460c22b878158e9195ffb113f72783e9fa5a88c06c0f2b7f6f185990acc004ba331abaff481bac375cd90a10bfa91 SHA512 9b53819c9827a046b710bd520c45b922913633587db29436bf40eedc5a7c9408dc3ab8f39de34de632503d6955eaa0a2673de67f63ae6fb6a9efa42b211a0b59
-EBUILD cryptography-2.3.ebuild 2162 BLAKE2B b7b99f45e7cae87e2f286e1edc07fd96d79bed983642e2f08500b89ca8f6102596b79a000d1de33316b3ae56e4fab1ebc632db974ba3f4c0a23637e8a53552f5 SHA512 5999a1de82114e5da46ab9bcea4de62e6552c1323e410fe1d829c1ab962153b3b14befc6a60fb6f748c03a4926a332e5e084bea67597503914f0e28283546cc2
-EBUILD cryptography-2.4.2.ebuild 2159 BLAKE2B 576b8dd817d7a90ffa61fb16d3f647d688e1c3f3f1b60bc27f730c9a3cae762d1b60e4a0ff2e764578fc752d7b1495f9a498bd151227b676f91607500bcee05a SHA512 799c0ac2cc0d17354aca91b2cc92201b8ac4ac64adbbbcec45126a42eca97a750c0678bcecbd24fe77164a5a548d5337c812166238a53459593d1954c7d9f2e6
-EBUILD cryptography-2.5.ebuild 2174 BLAKE2B 166efea0f2d4447a73b0f9528eb1dc2e238c2cbc7cf9f19b180f05e02d218397cef8dc9c0c19499fa231c3921fe360089b7963389b94798d39652baee2c60127 SHA512 d5d17d90bac76c028e30fe550d5ac7782efd89b23bed560eb86cafc2715f85ad74bc89250133af27d785189bd67f3ff86973b605566f9ee942a9016b80f1cde2
+EBUILD cryptography-2.2.2-r1.ebuild 2169 BLAKE2B 70ed687d01e2a93f63c7b81ac73f9bf633ec63d5ddb4bd6626fa51f0926eb0c7f6c734654cfed65ff56f307c976c02345f51e49356a11dc9a081b4e770b8d8f5 SHA512 2b1dfcd666431e86770dd26352fdad20ca036c51cad9c079c82978622436feebb930f300d9c187c839bafb08b8bfeef55967fab61b03c34bd0e5c1a5474d5f97
+EBUILD cryptography-2.3.1.ebuild 2164 BLAKE2B 50e3d608b512c6c82125588fe4910c1bde86774de6097d0387df311503a7f7d7122d2f2c5315377a24699ddab7755da3b6706d801bb755e929d5174ad38d4ab7 SHA512 3c28c6cd526f2411d3ee2e67e3313b08d675cc9a624a5951b535afd7b88acec17d747f136b327bbf2339084cead0dd5f90e1ff64995a579e0e78b39fd6fc87ec
+EBUILD cryptography-2.3.ebuild 2119 BLAKE2B 9d2e51f0835eb4e5555d954d0f4e923b5b8e26197429364492f860122b694a016b0fc3d6931d5d3f01354efabeab28ca9cb714101efc28d5e49d3423f3f768cf SHA512 53a1390bfe6b83f67d272839cf3cb554824d55367b0445efacf359fa2690b7ce0a6ba16333b79b0a73d8667da5265faf6fc9361d0cf4b4ee9af00819f4500715
+EBUILD cryptography-2.4.2.ebuild 2119 BLAKE2B 9d2e51f0835eb4e5555d954d0f4e923b5b8e26197429364492f860122b694a016b0fc3d6931d5d3f01354efabeab28ca9cb714101efc28d5e49d3423f3f768cf SHA512 53a1390bfe6b83f67d272839cf3cb554824d55367b0445efacf359fa2690b7ce0a6ba16333b79b0a73d8667da5265faf6fc9361d0cf4b4ee9af00819f4500715
+EBUILD cryptography-2.5.ebuild 2134 BLAKE2B 4425d762042f363a25095d039c453914df8e300dd8aa04004db613c5f1dc8415368d209a34f2b508c17b51a531672b036f0fb4438dd4e4fc2f478837bd28c77b SHA512 00290c7ad79950f2fac145cf325da68723d029fc1944ce061dd77c19587f3671cee4b7ae624001c30f228d7ba1cab5ba5cbcc6e9be930aa4f3da2d236a38b98d
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild b/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
index 449719f769ca..a9ee41ff6db9 100644
--- a/dev-python/cryptography/cryptography-2.2.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.2.2-r1.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
@@ -33,11 +33,11 @@ RDEPEND="
 	)
 	libressl? ( dev-libs/libressl:0= )
 	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cryptography/cryptography-2.3.1.ebuild b/dev-python/cryptography/cryptography-2.3.1.ebuild
index 1a58e5692ef8..0a3fea875041 100644
--- a/dev-python/cryptography/cryptography-2.3.1.ebuild
+++ b/dev-python/cryptography/cryptography-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,11 +32,11 @@ RDEPEND="
 		)
 	)
 	libressl? ( dev-libs/libressl:0= )
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cryptography/cryptography-2.3.ebuild b/dev-python/cryptography/cryptography-2.3.ebuild
index ec123a175ee9..d7f68b52d822 100644
--- a/dev-python/cryptography/cryptography-2.3.ebuild
+++ b/dev-python/cryptography/cryptography-2.3.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
@@ -32,11 +32,11 @@ RDEPEND="
 		)
 	)
 	libressl? ( dev-libs/libressl:0= )
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cryptography/cryptography-2.4.2.ebuild b/dev-python/cryptography/cryptography-2.4.2.ebuild
index 4af6a76f62db..d7f68b52d822 100644
--- a/dev-python/cryptography/cryptography-2.4.2.ebuild
+++ b/dev-python/cryptography/cryptography-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,11 +32,11 @@ RDEPEND="
 		)
 	)
 	libressl? ( dev-libs/libressl:0= )
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cryptography/cryptography-2.5.ebuild b/dev-python/cryptography/cryptography-2.5.ebuild
index c6cccef62a59..d75305f32e0e 100644
--- a/dev-python/cryptography/cryptography-2.5.ebuild
+++ b/dev-python/cryptography/cryptography-2.5.ebuild
@@ -32,11 +32,11 @@ RDEPEND="
 		)
 	)
 	libressl? ( dev-libs/libressl:0= )
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
 	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
 	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index a49c49959669..327749602784 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -2,5 +2,5 @@ AUX cssutils-1.0.1-pypy-test-backport.patch 1215 BLAKE2B 8a6859fb3721a1c36541c81
 DIST cssutils-1.0.1.tar.gz 353621 BLAKE2B 142320e2358acb1b5b95400f42fb5eb40840602bd204f68a1896ea92b35dfe2ce6f316d84cf5d21a2ef8047f4748294b908057fa12cab352b42d7ab2ffcfaa6f SHA512 932a128443cc31f689d91c7c75a04ddc79824b4e5c0779e48d30fa0a3a760cad82d8208264ec95a3b120c38962f2eabf6b3456aa8f81d24e9c9718e95fd6bf83
 DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda
 EBUILD cssutils-1.0.1.ebuild 1303 BLAKE2B 0fd67a170ef9be0cb5bc2142cf9e4a72c01b6c9d692524f25a4c40bd23028c38b67cca1aca670edf957240b8fbbd8ab9cdea4f03f78460eed33307e0237758e0 SHA512 4c7ad7e7330b3f4423d9900c7fa0aa144eec3d3478f3562bff1969073882955df1954681c4f649c272239ddd33d1ffc671127ac281fddfb2234b9e4d27ee597d
-EBUILD cssutils-1.0.2.ebuild 1250 BLAKE2B 780ae60403e6bfe7031d4edb993805d6493dabc21cff135d9132088d2cff69836100ca0a08de4157834c6034e97509f1fd5b6508679728a71851f5a377aec5ab SHA512 3d81ae75d85e948e4f00a4317c75db64e6dc8484bc352443243843a4e185ef5098465942c5ee22ef4e056187f70508046f2a0ec760e8f07cd99033959dbdcf92
+EBUILD cssutils-1.0.2-r1.ebuild 1249 BLAKE2B 1740cfe820676c1a1c7b2fe03b9bd010e8b65db86074ac8aa1e5ecb3586d90f1ab0d6084f5d84bd027a4295b3c01c21679668dbdd61eac46cb3553509319344a SHA512 f933ca14c5ac0a8e01a5ad4be74f464b6b9ca1a16021610da36e4d430e8f30c2cfa105d51083e8021ff838003fb85c9fcae91da632c3ef59bec09f59eb90eb27
 MISC metadata.xml 669 BLAKE2B 1d3cf25cab5d7a828451da5ec24ccae08e31141e6ec2ffe3efaead8284a4a7763a1c5d053138bbbc2f3846a45dcb6bb353efaffdf0a83fc110f13a6af13ed1ac SHA512 3fe0661179833d29c8a5e5ae2b7d872ad860354c58bff8e18935f5876fd95cf8fdfbb4ebda9719198dfce891647d04f263d213b74eca635005098a89a0402294
diff --git a/dev-python/cssutils/cssutils-1.0.2.ebuild b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
index bcb2600b3e7f..0542c6dff73a 100644
--- a/dev-python/cssutils/cssutils-1.0.2.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 0e3a731bf768..ba3702bcf093 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -2,6 +2,6 @@ AUX curtsies-typing.patch 330 BLAKE2B caee67d514f926271fcbe498a06cb811ce48035317
 DIST curtsies-0.2.11.tar.gz 46740 BLAKE2B 103355b8467617ac4890ca0d2c444336963d91934539c79314f4319b9fe273973c6464247cf2f5d07ae2ec5fcf45f302c80fdc94cd159715cd204d12870a54f1 SHA512 1fd71d9bc4125a427a5990c6fcef4f73f6e677096eda8d29f7dfee7fe6fc3a350fc66c4383d5e9370a3ed19dfa211285f8b99c425b154e22d3cb4718e1f1d05e
 DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
 EBUILD curtsies-0.2.11.ebuild 811 BLAKE2B af43ed770c79d81b365fb99c57aedefa2b76917dfbcc692b87c3e4e8f661ca128518af275c69a7abcebb741deab0277d5562307ac7335aed6238bf045c0f2a07 SHA512 e147f44ca548af38f2b12638d3c79be5763f09f1f684bb67da08fd03322155b6b560e096b6499be906cab32e42b84b09d6beafb0425a48ddd4add943aa87468f
-EBUILD curtsies-0.3.0-r1.ebuild 971 BLAKE2B 66817e56558163f7b71e76d9afe95d792248f54e1c7e7620cde4bab99916e8cbe477e542f227adce579fa081d6fa2fd639ba8109c27bb0e5f66d68472121ca2a SHA512 9fc2f463fb42e5a653ca5ced30a3f2b4f65a724453c03c15e352818fc1540853e3c8fc5c99c1de4229d30120c41a691bc9325514e6cab65ad1558c0612436bd2
+EBUILD curtsies-0.3.0-r1.ebuild 899 BLAKE2B ac586d9b5ce48d9e6ab52db13872a3e23d4d1f97e9d7d1d35a26dfdd596d7f3f6a19ef2b5e770065bf0287653c3b41852a781161013ee791dd85ff0fa0232ff1 SHA512 b78b754915735183078e75ebc6a087aae84dfaaa8ff1e14b63da31db400b10a2db30caff5c5f95338630bbfed625e33555009a5fd7b4c32401b5f21ac41aacff
 EBUILD curtsies-0.3.0.ebuild 813 BLAKE2B 82a61b80ae0050ff4ee92de7dbc6a28bc67bb6e71c87201d84bcef8b1fd638d008b519583228e3af20592a78cff40e736872ae6e313fef44cfb4fd447405507f SHA512 2e90c1b2b073aae72efb869af2bc96d15cf612de8a46bf4c9a0daf82252a2c12d279c7ca99bf417904f9c061e72ac03c34fc5ccb08eaa446ec2a64a91b39bbf1
 MISC metadata.xml 387 BLAKE2B bdddb5521d99066f5585c1180d4cab02d11d48f1118f2548bd0d4889d83d9c59a4fde4d018950b34c4e930c33b034439d500fe21f861ee139a8e5d997cce73a8 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714
diff --git a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
index b12c3e7ffddb..47f4f1a2b20a 100644
--- a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
@@ -19,8 +19,7 @@ IUSE="test"
 RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
 	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
-	python_targets_python2_7? ( dev-python/typing[python_targets_python2_7] )
-	python_targets_python3_4? ( dev-python/typing[python_targets_python3_4] )
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python{2_7,3_4})
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 0e6592d5b34a..8ffc16a5e87d 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -2,7 +2,9 @@ AUX dask-0.18.2-skip-broken-test.patch 1349 BLAKE2B 8ebe780c900407dcf9052828059b
 DIST dask-0.10.2.tar.gz 357356 BLAKE2B 6d00529eb550de682221875d8c4fbf4c0447168b6c87327b02d0320cdd37e6490f67e7f0a09f814b9cdb453080785b011cdc50ba9b063c6569b4825833df92b4 SHA512 92bd671ff1483fe87edd34330dce321b88362d80ef4d836ab4eede87fdad5f657c51d03a9885a53924fb3becb504a8843cf852be08c88f5389f04c3f1b8aefe2
 DIST dask-0.15.1.tar.gz 2147022 BLAKE2B 79c3355e8f3c202e598b32ca057c237d07db283b04b99ea713a820869207af9f46cb80ab58c0a058ac327873851f2d89050a4b9d7ecac3c1e1173f6be5349848 SHA512 44e7119c2a8d15efb89e265e5752edb117dd06da8a5e7511b68c5859e9068aedb3595540645304f0322f869c83df79a497d731bcade79612f8fd3f4eaaf3763b
 DIST dask-0.18.2.tar.gz 2324709 BLAKE2B c74507b63299388b05c94b1e59cc45051a55ccc70e89eb6eaafeba7aed2aa496c03ff9468467a9303f4ab630810838a8a7ea75b96d6a85d665d0cc2744792a54 SHA512 d5d59f13c33e7d70fe63da1f40a82296dfed34a009f70dae9db6157f8a20dbf7a7913e667882eb21191d5c3e3e8c440a3686d8d1b2bc206fedd025f24b23f005
-EBUILD dask-0.10.2.ebuild 946 BLAKE2B c07be78c3879641077aee95e11be90880e27e81eab40a849f81fe44491556a3b000e5ec34a32094acc55239ceafc7c046eca49d8c2bba331979311e9d878c2b7 SHA512 611c1b6d68e0f6c74f90d2063d69e3b3e149aa0b95596c71b1cece2f8c1fb5e9fb5ef971ac857943d2e19eb52924152acc82150a45ed2bad59e2d14ed1ba46a9
-EBUILD dask-0.15.1.ebuild 1092 BLAKE2B c1713589564dc2fc2b83e30d32de2dad08015631ee385822078338246786f96a642c893366843f7045ff7b3918f52879187490d90feec279b27e4cf8bf68a3c5 SHA512 0d25a6946282883a334a93b8773f8fb79df65595b67dcbf854b425a264f944285a93f572a3595ed5506a89b47307f9a1e635ea60bef068ef4439bc29c0bdd4c8
-EBUILD dask-0.18.2.ebuild 1213 BLAKE2B 617dcc661b265b552789150eacfb6dfbace2675782fdc67c7c97173ad3db9bb94bcf66602bd2167b79c7bb3806422c8b0669066e8b262929af943bb5f9a9b2af SHA512 126085967eb2ba6867ee2358f939fa5ad808c6c17e1a51076e7bdd41f010455ebdbd8382d36eca2bb54dfd3bcdd0bc99f271e8147dfdb4cc1ce078bafc41ca9a
+DIST dask-1.1.3.tar.gz 2371430 BLAKE2B 158a18c5126157d8b6c4e34dade437ccaadb721cd3824548cfe2dd659357236adb5919501b0996b3a944b5640f1cc48c769976b51c3c411315e37e7e6e8b96c4 SHA512 7efcd3fb497b81986126bd365fa54f19870103506b5e6645b029eb9d12bd7619073e95d045b0fda9133ff8a2bfa21df64fce135d3ff1b2225dd64633839a6166
+EBUILD dask-0.10.2.ebuild 937 BLAKE2B a163c1267df8a827abc0188b48515f482135003b707865f8fa58674d09a994d7fe2fbacc2433d63342dbba78054ae04459cfa04746bebb08e990011653b132ce SHA512 44880d3df0f853f53d5911fa0a30ea57db33ca56e35ef132d53c48c0e835e065f2d69a7f9876be7db92f8828e1272395b2ca68be88bbfedf1bd5776112ca7a65
+EBUILD dask-0.15.1.ebuild 1083 BLAKE2B 9dc02ae8541e98cd9dd1022494ce4bf14eca89fdf8efd4fc4b21321d6a18a5e8e16da8615126b62f17b9eb85a029ba050e2a04d85418fbb7d6f48d1b0c9eab3e SHA512 a0056d91333c2fa02f07c7534cff77fb1a12c31fe2056bde198a9683b3f9695197dd29f22402bf417b3039debf79f8830b88ca1f5188d2b555eaa40c886455bd
+EBUILD dask-0.18.2.ebuild 1204 BLAKE2B 8e792d092bca04356ca07493272720e3cfab0638cf5ec057fdf588cd2e10a7ff2437cdb27e23ca9c3139da6df4c30f7abc7aa9941f211efc8310d1d57a98552c SHA512 af9c9e1a47835a8c0d7d49ecce0e7f330f9d0a7eeed7470f82b66bef8fbe063cae5d5e483fcb2861ec10c160e8ccb80c11dd0c45c5fe254036fa720afbf11808
+EBUILD dask-1.1.3.ebuild 1190 BLAKE2B 813cc209e57bf1a2f9136bea1773994d4a67d3517d2170834d56a4e4f2d7e788241a6e39a1c120ff41465a945589703fb15bcded343a3beb00e7ef4220e38667 SHA512 7c3199215fbb1530af51b0ec882a8d40806d949b88f5de29beb2e3697a9694f26741f71e87a4ffdcf8a3dd52c27213dd068f4332aa088ff195a7e5c58172553f
 MISC metadata.xml 777 BLAKE2B 5574aa56065f36366ee721e25b1bfe06127a22a94666bfdcd1b62e4d03456948bb22db23f64ac7ffbab9816ad508f97fe23a2c9a0e34cd58a61946c6098585d7 SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850
diff --git a/dev-python/dask/dask-0.10.2.ebuild b/dev-python/dask/dask-0.10.2.ebuild
index 49e11ea9e0f0..e64f700a33fb 100644
--- a/dev-python/dask/dask-0.10.2.ebuild
+++ b/dev-python/dask/dask-0.10.2.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=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="http://dask.pydata.org/"
+HOMEPAGE="https://dask.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/dask/dask-0.15.1.ebuild b/dev-python/dask/dask-0.15.1.ebuild
index 3c38e399ee6d..3162fa77848c 100644
--- a/dev-python/dask/dask-0.15.1.ebuild
+++ b/dev-python/dask/dask-0.15.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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="http://dask.pydata.org/"
+HOMEPAGE="https://dask.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/dask/dask-0.18.2.ebuild b/dev-python/dask/dask-0.18.2.ebuild
index c072dbd8800e..cb88b275c74a 100644
--- a/dev-python/dask/dask-0.18.2.ebuild
+++ b/dev-python/dask/dask-0.18.2.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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="http://dask.pydata.org/"
+HOMEPAGE="https://dask.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/dask/dask-1.1.3.ebuild b/dev-python/dask/dask-1.1.3.ebuild
new file mode 100644
index 000000000000..c38d12676298
--- /dev/null
+++ b/dev-python/dask/dask-1.1.3.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=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="distributed test"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.7.3[${PYTHON_USEDEP}]
+	distributed? (
+		>=dev-python/distributed-1.16[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.18.2-skip-broken-test.patch"
+)
+
+python_test() {
+	pytest -v dask || die
+}
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index ff6009a30c6c..d67693fa607e 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,3 +1,3 @@
 DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
-EBUILD defusedxml-0.5.0.ebuild 747 BLAKE2B 46576d0153dcc610b06beffdfa296073454e3f66a65df6826eabcf58caa7d1664ba68d96d1cdef9ed4a42439a4b117b19202304caae89842474edfa7e070da6d SHA512 0908b2df179d7b8d363b28d686317e8b93ae315b7dfbb75b711fd15bfe59f3c66dc44977a943583cf4f17450941ca28e73b11ff153df4078d000174d9dcb5080
+EBUILD defusedxml-0.5.0.ebuild 760 BLAKE2B 4403f40180e218945437eda9fd5698c0a4a2a370824064532f357376a11621b00c2d92756994099b5325c4d2fabf698a201bdaa01fbc06a1ce2c281189a059dd SHA512 52e015a4114a30017a7b6ebf6d3be4f0fd08b1526fc1d9a6296d1bf2a558766054ec36ac74941a696044b2b2e7ceb4da2f005426b6e1359c6f5401f80b9a0b3a
 MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index ef86559ae681..6704b3094ee7 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
 HOMEPAGE="https://bitbucket.org/tiran/defusedxml https://pypi.org/project/defusedxml/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux"
 IUSE="examples"
 
 LICENSE="PSF-2"
diff --git a/dev-python/distributed/Manifest b/dev-python/distributed/Manifest
index 9b0693e5d6d7..44e69ad28d7c 100644
--- a/dev-python/distributed/Manifest
+++ b/dev-python/distributed/Manifest
@@ -1,4 +1,4 @@
 DIST distributed-1.18.0.tar.gz 395888 BLAKE2B a1f84f93130b4e878d2b6a2059e71330fd10ac7be2c8e1d3fa06984e34dda4984180f496b9513f531ae21f3cc978f71f8e9492fcd5d644613a7d9ececcb5ecb6 SHA512 3603b22a454c7010c64fceb79b4aa024476bd038f4c27585c8f2dd51a2e4ace1c900dfc7c3bf096d4274be985003b72e9bd16af7b351ec9a65c6712a1f5e39d4
-EBUILD distributed-1.18.0-r1.ebuild 1297 BLAKE2B 38562adc1140514c30b1e0326170699fb949f3bac851943fcc4c349e52d3c9eb12c6713d7d2bd7449fc0659093d28f5bc07c9f0ebec4954b009ca9761f8c85af SHA512 d35a78cef00ec48dfaedb724b2caa6ada34ba038fde3546212ea7d5e2f7878d9b60a2ab6b0d6132a0bd39172b6a5e3e5f5ccbf2e3e8321ea038d009ddf1eb25d
-EBUILD distributed-1.18.0.ebuild 1316 BLAKE2B fb4c90d9d4b517247ae8d154c6033748a148bfe4e6d4417aae8416ceb5f5fd11a504537c348fcec9abf48717f8a3de78d6a416837f2059df4599c4894a78d009 SHA512 a6057878289ae55a9bda3d131a8b1ca7bde52c46cb9fb6e226f1a01007d2110e6c4cd77533c407793bf732fac57e7ed8e664cec72670ea903483abbf9be1675a
+EBUILD distributed-1.18.0-r1.ebuild 1305 BLAKE2B 401a749d7583e968e4cd8e06ee500a9e21a2a91db2244ad744010f26efdf43e2f8616876eb651832b17e20c8d9bcbbd441cdcda2a6b272ab61d7e39b5759507a SHA512 8d742d6f1004ef2d22a02c4124dfeb325cf03cbcb38063a4d51d30e72e88ced60a85be5279101531bf03c75fa3e8101439e888f9bf715589fa541b1687b427e4
+EBUILD distributed-1.18.0.ebuild 1324 BLAKE2B 1036787f3e78c6fd693ac2272654d79f4038f1d20dbd52d19a244aa9ec98910eb432352149d6ae54832c1f4c61019dea58633c77625f88b36b5ad89e930aeaa9 SHA512 50c88ba5d99e098e8c6664111f89d8f0d5b9da52415ab8abf5c4143fc987f7e7ee5b44a19de08cd5dcf78d0a5b2e5e480041f44735adc9c90fb1212b5476c10a
 MISC metadata.xml 511 BLAKE2B cd7c1cbc44915c6a922c188703d69260c85f0f1d4a97606fccec97b2d11deba4ef25f91dffe7fbd407a93dffa4f69f50f9289d948ebf4764da2980acdebe5ffe SHA512 b512481cca22a1dffd5620312825bdec9348b1a469be61874211dd25befb2111fab1ea79596087f5226b053a2ab660174508828d5300de9ff24119880995a296
diff --git a/dev-python/distributed/distributed-1.18.0-r1.ebuild b/dev-python/distributed/distributed-1.18.0-r1.ebuild
index 1001c57f9899..2b2ca65337c2 100644
--- a/dev-python/distributed/distributed-1.18.0-r1.ebuild
+++ b/dev-python/distributed/distributed-1.18.0-r1.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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for distributed computation"
-HOMEPAGE="http://distributed.readthedocs.io/"
+HOMEPAGE="https://distributed.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/distributed/distributed-1.18.0.ebuild b/dev-python/distributed/distributed-1.18.0.ebuild
index d4748591aea3..37bf5e6aafa2 100644
--- a/dev-python/distributed/distributed-1.18.0.ebuild
+++ b/dev-python/distributed/distributed-1.18.0.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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for distributed computation"
-HOMEPAGE="http://distributed.readthedocs.io/"
+HOMEPAGE="https://distributed.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 46f7972eaa23..9a7df1fae709 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.0.4.tar.gz 28772 BLAKE2B 1a337c0a5c125b89adbd3173d17390c5cce12c8549a3e7d90d88fd71f53d1b4c7bc3d1fc87f7bec33d7b4b1311539deaa9414b143daf40108b15dd78370450d8 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6
-EBUILD distro-1.0.4.ebuild 584 BLAKE2B a8891d81d850a655e87f3217bc89f7fa8b9f0a49e84f416ab46e050d8d87334a59d4ac3621b29a844ed9dfdcec6cb69a7262d038d0aa4193f0c9174050e0d4d6 SHA512 d201207a85c964cf3e9f611ca57fbf7eab21301d78db413077e3f60ca072633a4c78583584fd740d0a4b186890f409df994913b3056ae535b8aee6ab8a8bf8c3
+EBUILD distro-1.0.4.ebuild 592 BLAKE2B 0dba1ed77462c4d9744f87a24113c1927474f1190da4326369923cf02bd4281d6d5ce8a266b01dfa9ee59dc3124e6258fae79a45ae929aebf40f792935863956 SHA512 71c38cb10ff266836ce237b6f858593115731bdd70c56ae678697ee73dbea217b04c75cacf255c6c23b98171ccc5e3c44f1574f7d71ba21a608f41abd5e5e72a
 MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
diff --git a/dev-python/distro/distro-1.0.4.ebuild b/dev-python/distro/distro-1.0.4.ebuild
index 5953b7c8d536..245633be5ec5 100644
--- a/dev-python/distro/distro-1.0.4.ebuild
+++ b/dev-python/distro/distro-1.0.4.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=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
-HOMEPAGE="http://distro.readthedocs.io/"
+HOMEPAGE="https://distro.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 794428f46628..a9426d100cd9 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,6 +1,8 @@
 AUX docs.patch 697 BLAKE2B 049d893d773ca447315ca5aebec808e6933dc39cc6ebb40b06291e5f80d1c7292fc7565e4ed66264eab29d36dc0b610cd6f2864d040c641d82bc921dbc8640c3 SHA512 e9f0607d6f770d451c53e851d6141cd0cdd63ee59e654eab0c3454b9f724f36086115760614470dd42e8f8afc63b018bd695cd596d2ac71530e4a5eaab379779
 DIST django-auth-ldap-1.2.2.tar.gz 131086 BLAKE2B 78f93eb24620907f5b5671972e2b80ec6e59cdc42a455c298bef4c3215616228735a0647b0646b683357bc16ea6d03488aa86626e2ad51211a382ee2d0482909 SHA512 676d1114faeb9a2956ed51c586afea7618c1bf62867d3525596599391f8327b8f22a075c4203311df88279c317ca37b9097b59e55a64330afee6eb1c5a9c9ac3
 DIST django-auth-ldap-1.2.7.tar.gz 131431 BLAKE2B 03fac590118d25ad0d9d8a3ac5dd8bb24f138f193bf27ae85d4e2776be79bb31ca7efb278fd05ca1d45976116ca7ec79ec3b510ca380dd8912ce47f1522ad348 SHA512 2ca29bdceb4b2540f7c90c9dfdfd7a02f91e72cd44ae062cebff84199dab737ee69ada56269189ec0dd70ee7916c3373acba50866280ad080c4c68dd69dffb09
+DIST django-auth-ldap-1.7.0.tar.gz 48897 BLAKE2B b4b196e4cd0882a48d2437326cda57394963fa44a64a3cf5a0ff668bb86243da3979e2746e096a458a5bf1d3c8be687f3d3fe456f5a6b0ada11ebd1f4787e323 SHA512 6478b2ef43e6f49acff3dd2e3a2a462ae02a3f1475d5615ba2f14bfd5efe2b232a3d2008902177d90822fea6b096a05814a5f028f4eec5ee09c5e5a62793e73d
 EBUILD django-auth-ldap-1.2.2.ebuild 1095 BLAKE2B 4812e2d22c451417d33e8986519c63b580e2b6e296947e1028e8c936991abd85da12ca6b34ba71902ca039b24e805879935d028ed90bd369a15c25bf41abb351 SHA512 5f7ea4e4d09077576260829640c5513428fd7355943ec2a1e93df8b5dc697090a3c3241786d33344f12f2b0b556322098c3b52513aaab7b18f8821dcc6e8dbee
 EBUILD django-auth-ldap-1.2.7.ebuild 1053 BLAKE2B 00ecb60473127200ec35f775961382d1cbcb97318ea791a24b45d8f18d13987b2240d88fe3d547b781c499f3bfe853071d9d169a0a520cb90a6926431f466ead SHA512 d83209650888a3490b20b64e24e137b487f1340b06d4057e83d550c962e573c55d15acc3700c2b15d73b5ec21ee9d0fba8b1d14e4aea5a0fea9a32b482e9a989
+EBUILD django-auth-ldap-1.7.0.ebuild 824 BLAKE2B 14457834fdf184d103ae94ec578ae5b1208d99a3e6a6e6ef537b673eb9957193cc2e13480556fd3a2a8c2b46539f911cb8e08bc3f9700e5acdcae960bd4f83e0 SHA512 edc90be8109f5c5d370404272564785877fdabde5e4dec0568795ae3b8fd658002b181be9d958cef78019648b9d43170810843a4beaa9549885b2e8c918ee42d
 MISC metadata.xml 398 BLAKE2B 89e1948a1d118a27477e02fc01d630aaf7c9199cd913a08efc5510fec05996e1aef84fbac359d09ef73a5de083b1920747928c3626afe7aa9c1c9dfa720f16c1 SHA512 e3350f6ab3d2c07965eb2c6ba1d82a929bea8e9974d8a2cdc12acde88aab50f2c20105e90e847a23e5dea5f97a7ab6a7a0c9eb75e193eb90ea5453c53eb36d41
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
new file mode 100644
index 000000000000..12370642b88d
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
@@ -0,0 +1,32 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django LDAP authentication backend"
+HOMEPAGE="https://pypi.org/project/django-auth-ldap/ https://bitbucket.org/psagers/django-auth-ldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]
+		>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]"
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index 8eaa8c2a732c..e87d88910845 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,3 +1,3 @@
 DIST django-cors-headers-2.5.1.tar.gz 21976 BLAKE2B 554b6c6ed737d8bfe34f3c87f67cf48a5bb5b838c3054d908ceae5c8716a51a69e55b82e9dff8bdf186f23bb24ed32ab4e7f898b23f27a132330cae5323ccd86 SHA512 b321edfd69103e3389acdd3a552e9a36c8c5eb78be01230c5389716d2d2fc81c7cf64003b6ba3e6f46bed5f6d6b8b68b1dfa923a9e8f98c7261412e17f7854a8
-EBUILD django-cors-headers-2.5.1.ebuild 536 BLAKE2B c082dfaef4cd09f5fc9e6551f9776848c64349374c01036407dd915c77d4784377189e624b55ed3c90124eba63b6e1628e73433b61eb6fd3af6f1c516a18ceff SHA512 fe12b5ced1204b33dddd9518cd35b76aa4ae335d5f2800d6d422bd990269a38bc41c48a95aec432ca25788611be9a407b62d89d4c93c5bbe6169f6242c4c6f6d
+EBUILD django-cors-headers-2.5.1.ebuild 526 BLAKE2B 19350fa886ed095b1f4df584128693338ffd4070593e6f945cbdcb45b3bde89c2f30a56e673d0a97031bfbf9dfc1831bde3339b5683f8f7fa2cf5e4a151a0cd2 SHA512 a1c095e20005240ba1ac4e7470835744e871dcd966d361dc24e09babbc773c286c1c0554eeb07863f5de7bd5595100e80c695ab0029d124f9144e7eaf296aea4
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild b/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild
index 0d7334af7fa7..119420548730 100644
--- a/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild
+++ b/dev-python/django-cors-headers/django-cors-headers-2.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index eb2a110d3398..e6bd45024ea4 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1,5 +1,5 @@
 DIST django-debug-toolbar-1.11.tar.gz 321727 BLAKE2B 89eab65bc0306da9fd81affbffc312eb99d04f19c66d9e5c6016df323a987e1b3fe1d177d409d68548aede869ed6d3e71adb5f4f4e5cb85a9ab431eca5664033 SHA512 8085b02fc25571e7b3bff02ff2bda8bec81a6000c6ed9e2aea10ec45eb1a3e5adf2ee95fcfbb0a11660fd716ebf2e35a9bdefbaf767b4afc732368a197857e62
 DIST django-debug-toolbar-1.5.tar.gz 315928 BLAKE2B 8dde3c655baa6bd5f3b5d3ae0ba57b8c5746fc41bcfae9f506ad5c49ff64cdb51f0b9d67ee42695f884493cf21bd76fdcf943d88d97641b5d804d54c59163562 SHA512 9a421b80016bdaee8dd3ba2a9b7c3b788b54a4f464cdd5697e36536268e4d3d926bf77088a715e87f192dc8a20a100d8adac68c9c26a1191a5343e377240bf64
-EBUILD django-debug-toolbar-1.11.ebuild 1318 BLAKE2B 32be3662dd3873e5169f3e4615b21a9574883a0e3d5c5cd24f7827ab4612e0d2402b4d70b104d648ba7564e9e4d7b0fa51e09a6efab9e1709c269d267a32df8d SHA512 3f249a51f9bd3e91fdad3e96ec7fd88bd2cb0ea2503e72091adbeb07f0523c9672128cc23c419c8830402a40a5b3b5b1771d44d3356a0d5205cf8f5d77bfd1ac
+EBUILD django-debug-toolbar-1.11.ebuild 1303 BLAKE2B 3226beb9e96e3579ef308a3ea0e105a044e9a921a5ebb053285c77f86d49a0fc9ef5492f9a14864af5f3d3257359b5f5f2bc5bcf53260728b161a30fc7cb8fe1 SHA512 f0f15e3736bbf6fe7e079d39b14b87ee1ac0951d58a6377dca2cfb2b2829fb51376b23baec210ff1d64a7d3654dfbab5e75c5f4e68736fdc97e6a45d98adfa1f
 EBUILD django-debug-toolbar-1.5.ebuild 1318 BLAKE2B 120586a6897ac11e76e0e796955df8dce5edc3dfa092e24b9be1dca6b5ef3db9523c4ae767e511699e9c95f1a0e2114a1217c50fa0bc51910ed0507a4a190b30 SHA512 543abc477ffb68d584ef125c28dc59b8f18991366fe5da69f034b6a0584845b088b78c7bc93805f81bdf453b67de992b24afbad58b073daf9750a424ee668880
 MISC metadata.xml 356 BLAKE2B c0d02bcf9ab38d7939a3edaf8eca080283ccee6f95f1e04ac96ce5870845e6a84d6672d6ac923c74d18c340326bca379691946aac7a51bdee8d6f4adcb45a50e SHA512 12686662e852b0283d2212f0db83c832c1248723a7cd751990e43b1641ddbad2cc2c71c17ac4704c01beec9a9366fc726504c10e9a9e56456b544a800cfa7847
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild
index 08bd4b0acde5..6ce87590e4aa 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
new file mode 100644
index 000000000000..eb67321ca2da
--- /dev/null
+++ b/dev-python/django-redis/Manifest
@@ -0,0 +1,3 @@
+DIST django-redis-4.10.0.tar.gz 59208 BLAKE2B 76a6887fdcce7decaeb2c4b76ff0ff58b8b074e902f6ccfc57dbdd21aeac82fbe37367caaf0af1c6facd5b87db6bb053b2fc553ba87b3cca970f2c0b1f99e35c SHA512 39e2d72699ceb2b0887e7048db22a4067001fb5e2c10ae2c5d2d8a0ab71e862773e443ba3a109f7b874b994a842e89772b3e33152aafd2a98e1cd906d5d2e690
+EBUILD django-redis-4.10.0.ebuild 498 BLAKE2B e662a976908ae7a931a4e3cc55748605ce1e379bef8a9b31d0bdf20162455bb51e5ec5deae431f61a319650ef2ea4d6664cc6c2847a6665c167b850367c95463 SHA512 fb93326b120880402991936e82f5123fc28fb6b7b3d884d942055210691ca3008b5b4507217e264f1d0003f33cd90964673b9cb7de676a183126a453df3cb324
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-redis/django-redis-4.10.0.ebuild b/dev-python/django-redis/django-redis-4.10.0.ebuild
new file mode 100644
index 000000000000..982a5193340e
--- /dev/null
+++ b/dev-python/django-redis/django-redis-4.10.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Full featured redis cache backend for Django."
+HOMEPAGE="https://github.com/niwinz/django-redis"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-redis/metadata.xml b/dev-python/django-redis/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-python/django-redis/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/django-taggit-serializer/Manifest b/dev-python/django-taggit-serializer/Manifest
index abf2cd90d917..bb17e9ec05f7 100644
--- a/dev-python/django-taggit-serializer/Manifest
+++ b/dev-python/django-taggit-serializer/Manifest
@@ -1,3 +1,3 @@
 DIST django-taggit-serializer-0.1.7.tar.gz 5589 BLAKE2B 2e9fceacd1eb1908848da99d7ec6b708f4c37f64c7ccde9e1082356e7695430c4c1f436a7d1a37200a249d2736adb848c1ce4fe26f63a6b1748080b62c1215dd SHA512 90a3e39cda13826bfcdd0a6f262108112d261bc5e03f8ed973c0af0e1a6d8efd80e1e0926682754df4efdb697cea5453df39de70b0067c02bc452a8462ab2574
-EBUILD django-taggit-serializer-0.1.7.ebuild 531 BLAKE2B 434b7c2c57d7b98dc52f3cbad74aa3d051fef27d1be167985ca33bac1924c357e024999ef721f559ad2333e7c9fec140c5dd67bdccbb7b505f4988323d1e3498 SHA512 16fe71477fe74f5a34ec9f71b24effded8d4fa4a7754d5b52d2810af7be90665fe76673f142066bc6984caf4a94ac5e9b50b4655e717817b9a0be30f433148c7
+EBUILD django-taggit-serializer-0.1.7.ebuild 521 BLAKE2B c9aab1696af92116a4cd0d5d1aae2b3febfd34b66e7887aef06d8fdd1319572f84ed1f00daf7345c55453bf10edab9fe56c022b9011520a450a68aad08625234 SHA512 fd91fad50625b6e0d5bba368f711c1ddb5032a2c5299ed469655a44118e945c041174212f472cbcd0618bfed1e9c322c8e5118d85c5f677cd5d114b176aff238
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild b/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
index 0336b6ed1059..8d2105e43381 100644
--- a/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
+++ b/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="the django taggit serializer for the django rest framework"
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index 866440512b85..b34458831642 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,3 +1,3 @@
 DIST django-taggit-0.24.0.tar.gz 44534 BLAKE2B 7a7c756cebc57bc870407d85b81c527ca7cfa5933050e02e5ea5ad18e2879732ea8993c725a4a8b1ded95bcefae3a8f4afa7c38d323bde347be7fb8a5d36c229 SHA512 669fd69c8c66dc4561fa87e94c7277d3de9aeb14136e8911b542dd3e6af84751781f5985c63deba5defedfa80e6650cafd608e206932ff4dfdfc80f796035a8c
-EBUILD django-taggit-0.24.0.ebuild 507 BLAKE2B d1b900a26e9f1c861504a241e31fb2062438d181268d093a08bdaa572ad40ddc743e12c662f1fdaa541677314000ba49d2a7da3a6b90d5b87a0cdefcff93206c SHA512 8e0059c73225b14baabd2edaeb37df2b2b321fb2ffce0c92d104537816fff88aebdb8bc6572d5e7fd8712b2957c217042127c12518cc4e90bb27f57be53b161f
+EBUILD django-taggit-0.24.0.ebuild 497 BLAKE2B 24e1a1cc529a1b31fe53c9828fcc2fa85acfaa6dd252abf133ad688db0e331a211ed85423fbc96efbfd488248282c1afec4c6ef8a0ac99fca4c4213afae37472 SHA512 17d7705c6ebcd8865bf09007004c7ec399485574ea1a520b94deaa3c6b4858d86d89136958ce3d2e62ffde1f89a6255579a5dfa1ab193ae0e74a93e53190fb2f
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-taggit/django-taggit-0.24.0.ebuild b/dev-python/django-taggit/django-taggit-0.24.0.ebuild
index 82fb91bb0555..7f27c6e5d3aa 100644
--- a/dev-python/django-taggit/django-taggit-0.24.0.ebuild
+++ b/dev-python/django-taggit/django-taggit-0.24.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="simple tagging for django"
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 5382f4486d9b..97e4e09a81e3 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,3 +1,3 @@
 DIST django-timezone-field-3.0.tar.gz 6217 BLAKE2B 4f4214ecd142284f7da89711535834c8d4d931a2532ff54181e6b072d7e636bcfaa1fe0cab5421d047fdd6d6ab472246054dd8bec8bb0c987df6e336aa269e96 SHA512 624e5b1e6b75ec40252ea7137608d9f62a5fbba1a136068c0c4c5e6192afa9756456cfbcba5ae3b00980f8e0ab44e507226815b25196bb58a39789a75036789b
-EBUILD django-timezone-field-3.0.ebuild 567 BLAKE2B 441431ea96d7b2668341bb1458844376ef7b630db21d3d89c5f8c376740a88edec296e3590ef1e83a05637b4107159518ebcea9af024d73d357f4b92fa3ce73f SHA512 cc15d09b3549c3cc55a8b81589e1561c4e084dbb71e173f0bd75f91042fbf1e4fcc9c0819bad52c4a31616d3f80bc991431da234c9c8394b34724b601f2f95ac
+EBUILD django-timezone-field-3.0.ebuild 557 BLAKE2B 42279c6d4e56304b97a4843df734c5db1075ebaabb44ba7ecbce8bae495e663c7f7270f1d4850dc1a9da0f37e2483e0a4d078db17ee94529dd43db9794e669d4 SHA512 4cf09d0e66d11e58af5f60650e2d3a432e90f63a5328b7da53804c18c0b3e0a58bb9bb15eab033f81e1f9b4a6dd069b6e9775ebac167762ec091d6503a02e584
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild b/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild
index 9385b768fc8e..d045284b7615 100644
--- a/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild
+++ b/dev-python/django-timezone-field/django-timezone-field-3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A Django app providing database and form fields for pytz timezone objects"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index b3916a76e6d9..6d909761c181 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,9 +1,11 @@
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 DIST Django-1.11.20.tar.gz 7846576 BLAKE2B 11423edda7f2f08cc894957da65c746c99ce7ce5399ff236972cce627e347cbc4a43c7ff75282318fac2ac8f65fc4db691ac9fe8e04059b0de4f1bfe31278382 SHA512 5a0fff6c9b90a08e98dee6d4d090047adb900a8f6a061f98e685e8998bfe3d97fe7a90aa7d4d2feae67026fb6e4441393d50cb5ab295604ed362a080b987f062
-DIST Django-2.0.13.tar.gz 7990057 BLAKE2B 8172d4ac3e74ce41403d3825ca102673e78cfc47c799a05de6543d3e06b69f97ce475b314d78d88226564cc2cafa1cbd1f6237232967ba15d88d94fa83514e1d SHA512 cae1977bec5b23475bb8b3b67444bf3b12edcd212db11e22e4d10456b1ae5d8dcc1734f1f07cb1e19dd39577684b03821cfc247174d687e29ea8fbed7b628727
 DIST Django-2.1.7.tar.gz 8608548 BLAKE2B c391fe2ed0fe9a4f4ef45cf828a0a85c16d5ede7c1bdc1ed5fae1185f04052290817900e97f95fa199425c344d91a9d32c7fb7ac8aec5d12152e7f8a39f8136f SHA512 bacbd52c834a14267588f7bcf57f52c246beb9971352e60eb780e28872884e0dd3701256dcd9600ae0faad29f42460391ea973e9fbb3338c2c08baf0d5ca2fe8
+DIST Django-2.1.8.tar.gz 8613572 BLAKE2B 543e41f1b4031b624f903f075e95af7e010510f4c265aebd35a5f6b3f074703b3a4b54bc7f2a9752e717ac99d20c42d6e34e556ca619a531cf8c66622ce1419a SHA512 f84fcdf919091a9db6289f25da601ce447382f79118a99f8f316b2479a9325d629f725edb4618300f76e23bd68ae45ff4c6b6576988f109d1a7ba715c73327c3
+DIST Django-2.2.tar.gz 8843237 BLAKE2B 6e2468e655cbb1cf4800dcad11ddb47267e90f6be87667b913703238c8ade13ac4f77ec8fa3b6aaf4b25660d7d19bbbb9935752661f5b94c4e1bccfae324041c SHA512 cab4e31d9ad7bc1765dd922913ade5ced7308cb687374c650358585070f2d19feca47c9135b56e3d686df08a9a80b0af232b79cea18ec229f2a9737af6c1f964
 EBUILD django-1.11.20.ebuild 3225 BLAKE2B 680a455b510afd47a56289169e22fcd160543408f6d28b22423fe461ebb952695d6764c22cf1a7f3ff0c75820b774411eb31b3fe3de8fc0384ac05ebc1abbb65 SHA512 62aa91d0b0c41d46735ca622b56ee29de303d018ce5cf3f48abc0bc277c81af66320f90c6390c0b51e9c04f37f83112f4d4017ca7588abd4667a9fe4562ea5a6
-EBUILD django-2.0.13.ebuild 3054 BLAKE2B 5604ab5ecda09fe388695b010bdca03eb5e35b1695e067a6344461ff414afb9816ecc43578465215416df637816fa8dc99ec456984f6fa966a511e1d784d6981 SHA512 1d093fc15a04482b7f94e340eeb2fdc2bb152c2bb4d50089b1ceb0e906866d78b26847810a3fbfc41e6381e5d61d35cc3927593d8c0ab8433436bcb9487a3326
 EBUILD django-2.1.7.ebuild 2481 BLAKE2B 25ae3441ef0e80a1b9a16df1a315180cdb9cb475231e6328457be807dfa0e5d944dd20d80da6de742dc4d4f91bf779ef63944bae2720203214e409cc4910d2cf SHA512 83b8407d681a9eecad1b6e70db357029024d059133ebd48d9e35488e2895ee4f298baecca2e5b4f683a74258b4844ebec9fb2a342325ffc6f98d17dc28fbcddf
+EBUILD django-2.1.8.ebuild 2483 BLAKE2B 22bb56f9fc8637973dbe0b59348df886100af5d9f6b99b36bbedd3e3a9b2f1ee35f777ac07e4cc53ad14ac60481416e65f910447d70f6b1c15a600f942798e43 SHA512 e6521060728d533a6548fd4a0747764340e71c01b8449707ae61a0721d310c92bd85a6e38809100687a7b303dd6518d7db86126f4172d5788b254b99e3226534
+EBUILD django-2.2.ebuild 2549 BLAKE2B 0affe65919234add35a7856b4d77cce102b0f9a91be30628efb31ce4929fa6dfbc7ce18d7d7e0473de969a2f00782108be1ee2824c33b2494aeca8e6823fd33a SHA512 c091c4db1e733b9f2bcd5554883cc46c217575f1f6605cdeb9aaa79c13792015490e5c5d037e6614b788652561bf66f0dac57e5412f8117a9da33167b50c8d18
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-2.0.13.ebuild b/dev-python/django/django-2.1.8.ebuild
index b9fce6b2cb61..fa8668065c0d 100644
--- a/dev-python/django/django-2.0.13.ebuild
+++ b/dev-python/django/django-2.1.8.ebuild
@@ -1,23 +1,19 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
 
-inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+inherit bash-completion-r1 distutils-r1 eutils
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="High-level Python web framework"
 HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 # admin fonts: Roboto (media-fonts/roboto)
@@ -25,14 +21,13 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/pytz[${PYTHON_USEDEP}]
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
 		dev-python/docutils[${PYTHON_USEDEP}]
@@ -44,16 +39,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-WEBAPP_MANUAL_SLOT="yes"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
 )
 
-pkg_setup() {
-	webapp_pkg_setup
-}
-
 python_prepare_all() {
 	# Prevent d'loading in the doc build
 	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
@@ -68,7 +57,7 @@ python_compile_all() {
 python_test() {
 	# Tests have non-standard assumptions about PYTHONPATH,
 	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
 		|| die "Tests fail with ${EPYTHON}"
 }
 
@@ -81,16 +70,9 @@ python_install_all() {
 		local HTML_DOCS=( docs/_build/html/. )
 	fi
 
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
 	distutils-r1_python_install_all
 }
 
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
 pkg_postinst() {
 	elog "Additional Backend support can be enabled via"
 	optfeature "MySQL backend support" dev-python/mysqlclient
@@ -102,9 +84,4 @@ pkg_postinst() {
 	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
 	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	elog "A copy of the admin media is available to webapp-config for installation in a"
-	elog "webroot, as well as the traditional location in python's site-packages dir"
-	elog "for easy development."
-	webapp_pkg_postinst
 }
diff --git a/dev-python/django/django-2.2.ebuild b/dev-python/django/django-2.2.ebuild
new file mode 100644
index 000000000000..7e60a484fcf1
--- /dev/null
+++ b/dev-python/django/django-2.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-sqlparse[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index ba02ed408544..7657a8c4f6bf 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,3 +1,3 @@
 DIST djangorestframework-3.9.2.tar.gz 785546 BLAKE2B b00e502a483894bfcebb9075a2534a68d0c48093b60482dfd2fd3b5653731ba5d535259451fcdd2f25f16832ec9e5a6b5e13b5e43095f770b88a0f251525a69d SHA512 cf3b23de7b27bca082df571a2cfcb1c593bebd36830b60238a2efa794ded762b22444a00885acac7d97db393943063a9f7a81e9dd32628afa7f1308008520a76
-EBUILD djangorestframework-3.9.2.ebuild 483 BLAKE2B e6f4f5651e38866664d7e1a5ba817480070866e2c767433e05f9800d2cf776f28497746ad854393714f12fb9b965c85775795ce35d7dee8831c99c57701f0280 SHA512 6345e2a86d72a899f7517a2788b3f8e910b67a80a7c766c7dfc909aec78efa126e2882f8bd56c9756e7a4bd3fb42b6b09b0a536b267fc96589dad4af2fe642bd
+EBUILD djangorestframework-3.9.2.ebuild 473 BLAKE2B a231eecce309105cc1f08d1d107e5933e52600a9b5d1a72cdd73cb32c7102fab3ab7a87fc7afa62b25d5e4e218d81bbcbab4ef1c3e17798a6307fda0bf249666 SHA512 cf9c1b97baf9159c7d4b100d82cc54ff71389f15d16c5ef797ff0c4b46233a30db1b7d25ae7ac479e184326bec7c9cba16e815d399f3d546fb004b02c0f6d803
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild b/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild
index 745e84b017a7..dcfdf435c871 100644
--- a/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild
+++ b/dev-python/djangorestframework/djangorestframework-3.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Web APIs with django made easy"
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index d81f6bee77c8..dfa5456e6a4c 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,9 +1,6 @@
-AUX docutils-0.11-python3.3-odt-writer.patch 1057 BLAKE2B 989caa2722c62ef70b2a76f9f79101c34d722e8b8dc56cfc49f0321a27de0204c17903b21c7bb4b22cc3f7dcc82e45667148f2794d7c6a7e3a5691c76ea6ebd6 SHA512 c92a00f5bf2b44f66a1aed1df21280e3f190f3a9d8f87cdbce6851068eb31feeed04c0b057b0685cf2783e0a2bf0a2daef9cb1c4a5dba57b09bc32a5c199398f
-DIST docutils-0.11.tar.gz 1611755 BLAKE2B 78e377bccb949d5ba324b90e0a316b38d8874dee8b82da254b1e442516c8b5788cdafc92feb42a50bfbd5e47ea62c64a90c821d2b7921318a120f9d5600ec6c3 SHA512 8e87581b27ce4fb5e97dcef56047f4bf3a076b98e9e42f5dc66f4c370e5893d1571e46f00fee6f1c8b9f8c8a79e128e4599b9ee213ad1dee2bf16a0246e187df
 DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41b5bc1184bf39452f2c90fdae35d77fb52cab3b9fb5c4202541a01508d268c92c98845bbfd1d38e215e4228234d SHA512 0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9
 DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
 DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
-EBUILD docutils-0.11.ebuild 1865 BLAKE2B ab64496926dfa4984d2c43aa079e8674288ccfe46aa177bba9526737dd87e6c0c608bc79326fab385da3e1cdc049b1afe27d4916ea832db005efcc917c3b97fe SHA512 5e2853a6ca36e893eb6df7392745091970c8a2008b39fa3ab9a5599c2100c889fe2ea1bf9e66cb28023214896c2d84403160fa0b9f4913caf80b962f07148c17
 EBUILD docutils-0.12.ebuild 1812 BLAKE2B 69fbd3323beffc4f47358bed59b1cbe1047a999173c244de9e1847eb1c7d7246b75f089426fc9b05c0f7be9e7cc02f99dce8a3ef2cca7fe76f1cd5764af4d0b1 SHA512 551c27aadc5132f4d0d1d38c900b711cd5e1bec371bd0f7a588a885409f11500ce4d7386982643af2a095cccc6655311ae06cf8901e506be428049bc5ec67468
 EBUILD docutils-0.13.1.ebuild 1826 BLAKE2B 7ce8a58e17edf3ae4fba6a8adf45b7e5f407f4aff58b82d62a0fd40285f17f83cc7824268e18dc3e6640478d51c433f708482ee40f2fea469a6806577b1f7c4e SHA512 82b9ad9c28a2f9ffccbb5025eddd339d6fe2366c32a95c819e06bef6a480635ecd4fea5c1aa7857386c83c36c046bbd046535a21132e802158084c5b2dba99ea
 EBUILD docutils-0.14.ebuild 1829 BLAKE2B f9024102fb34d40f25aea36eaac36543c49ae1212f6aef877eaab77b33b63a1efff878600197fdaa91173760755f015494e55ac46ec13983d5cfac042348bcd1 SHA512 7b474fd874db0fe94177f8150fb6d97d1c4c7da4844c9f3927aed0442336cf924f15b1f651566ecb7c9577f64880be85ed774bbcef9027a6d32de75d666dce56
diff --git a/dev-python/docutils/docutils-0.11.ebuild b/dev-python/docutils/docutils-0.11.ebuild
deleted file mode 100644
index 80f1a11de170..000000000000
--- a/dev-python/docutils/docutils-0.11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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=""
-
-DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/docutils-0.11-python3.3-odt-writer.patch )
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${PYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-python_test() {
-	if python_is_python3; then
-		pushd test3 > /dev/null || die
-	else
-		pushd test > /dev/null || die
-	fi
-	"${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch b/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch
deleted file mode 100644
index e84256f3dc43..000000000000
--- a/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/docutils/writers/odf_odt/__init__.py
-+++ b/docutils/writers/odf_odt/__init__.py
-@@ -88,16 +88,20 @@
- #   that support for the ability to get the parent of an element.
- #
- if WhichElementTree == 'elementtree':
--    class _ElementInterfaceWrapper(etree._ElementInterface):
-+    import weakref
-+    _parents = weakref.WeakKeyDictionary()
-+    if isinstance(etree.Element, type):
-+        _ElementInterface = etree.Element
-+    else:
-+        _ElementInterface = etree._ElementInterface
-+    class _ElementInterfaceWrapper(_ElementInterface):
-         def __init__(self, tag, attrib=None):
--            etree._ElementInterface.__init__(self, tag, attrib)
--            if attrib is None:
--                attrib = {}
--            self.parent = None
-+            _ElementInterface.__init__(self, tag, attrib)
-+            _parents[self] = None
-         def setparent(self, parent):
--            self.parent = parent
-+            _parents[self] = parent
-         def getparent(self):
--            return self.parent
-+            return _parents[self]
- 
- 
- #
diff --git a/dev-python/drf-yasg/Manifest b/dev-python/drf-yasg/Manifest
new file mode 100644
index 000000000000..e8f2902500b9
--- /dev/null
+++ b/dev-python/drf-yasg/Manifest
@@ -0,0 +1,3 @@
+DIST drf-yasg-1.14.0.tar.gz 1270930 BLAKE2B 11c075fecf1e0742765ebcab27ffda719867e4d49f5e6f337d2d048dea26e3fd1585f42a2bc58808395ff3ef2e1c5aae912d5ab547f91be5b3f0bc3a0ebae98e SHA512 283307cecfc0c8fe97a8742780184bd73b547f9cd4e28bafd35cb1447519f65a432f112627fc7f5e9560185014d0477a9bf507c1cb9afcbdc3f58a21a7dd351f
+EBUILD drf-yasg-1.14.0.ebuild 957 BLAKE2B 06d20c391a3fe65a2dd5d2bf4c3cd307f87c55cad20be6a6a8385a0c18f59d9731e56b166c018f075c2fe9c2d766a7a4d8ddb01beda5e33b8a9b2283f360beb2 SHA512 b2bfea296c5a9ccfd78967c64e85f5df7600e25756b3f3a9ab0dbba61ed1d088f86dcc587e8dacac87cbe6ffc0fe163cf6a1ee4202b163db485ac2f4a4ae5888
+MISC metadata.xml 363 BLAKE2B 7adee65506aa3e63d7eedb2ced7a91f3ebb34fd2654da96656b31242cb4017da34e9986246be218841eb0046beb590fe3381dbd49bbdd79eb4e965b27223f109 SHA512 1cb8c63d5549c77ec884f5d668e8270ab7f73097ab25d1fc19fea3150b3ed56d7fbfb899d5418c3343cbeed6bed219edb892d3a4b630e900ef00db19103b3f3c
diff --git a/dev-python/drf-yasg/drf-yasg-1.14.0.ebuild b/dev-python/drf-yasg/drf-yasg-1.14.0.ebuild
new file mode 100644
index 000000000000..8a923a2a9c52
--- /dev/null
+++ b/dev-python/drf-yasg/drf-yasg-1.14.0.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=( python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Automated generation of Swagger/OpenAPI 2.0 schemas from Django Rest framework"
+HOMEPAGE="https://github.com/axnsan12/drf-yasg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+validation"
+
+RDEPEND=">=dev-python/django-1.11.7[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.7.7[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/coreapi-2.3.3[${PYTHON_USEDEP}]
+	>=dev-python/coreschema-0.0.4[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.15.34[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	validation? ( >=dev-python/swagger-spec-validator-2.1.0[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/drf-yasg/metadata.xml b/dev-python/drf-yasg/metadata.xml
new file mode 100644
index 000000000000..d162bd623caf
--- /dev/null
+++ b/dev-python/drf-yasg/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<use>
+		<flag name="validation">
+			Enable swagger spec validation using swagger-spec-validator
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/enum34/Manifest b/dev-python/enum34/Manifest
index f017e4e71a63..ef0f7b12aa83 100644
--- a/dev-python/enum34/Manifest
+++ b/dev-python/enum34/Manifest
@@ -1,3 +1,3 @@
 DIST enum34-1.1.6.tar.gz 40048 BLAKE2B 3960e78f27f3ebf70e9aac5c4ced87d974cc61e5d9afe5d787188e3e877eece18153036035187e4d7ad63bf2a54c1c393f0f46f5ef7bcc9b67658b4ea441bb7b SHA512 51652525adc37bd1af1d81933f965dba9c508838d9f759c80ca1392991515a29c2c0263264a4e175b37a6ba11dca68c354774e448b19ef1bdba96be5474d93ec
-EBUILD enum34-1.1.6.ebuild 814 BLAKE2B dcef3d43f9070371feb1ddeebd0c9fe26ea0d8a148f552945b81a34d4d3fd05e957ea4adc89bf8bf4cf659e2a42f4b23a02b1ad6aed3dfde1113f039fc196ef9 SHA512 c2f289c5a6d1fd50b2018dbb325208f4444fc111006c304b0ecdf57f2e3e005fa4ceed9b960370331948437fcd5b9308c911c4c64b9308466a76ddd43f664860
+EBUILD enum34-1.1.6-r1.ebuild 808 BLAKE2B 3f975a152e1242b1e83c8b628a297d569f3efb4719013e410b0483916f55c5c3bea6ea480357b2f90d1f02d1288b0f61f8067ddfa8f67066ec38149348e84aba SHA512 1fe90afefec3d8d101b2172601b61738b52d86e4237512b18c50f316e83c95cb425f244f0512c41ff271b3f844c3603c852a042fcf72aa67455d96468a2d0a14
 MISC metadata.xml 319 BLAKE2B 37b3564999c86bcff651225939b50aaba7aa54775af2bd02f23296204b49dcf8bc0434e48e05d820cda9c127983606ab1ecbec35a16dd7deebc9e32e3ed18422 SHA512 bca4e776e7253b8b88225336218101fe4ca88d41d0e597af7f0ca1129ee4916ee5a05dddc6ca1649b7cc3f62db654c9281b2616e807d6c178260296eebdc245e
diff --git a/dev-python/enum34/enum34-1.1.6.ebuild b/dev-python/enum34/enum34-1.1.6-r1.ebuild
index 2edcd4a2718f..35d4b638747c 100644
--- a/dev-python/enum34/enum34-1.1.6.ebuild
+++ b/dev-python/enum34/enum34-1.1.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index d0f9a2cc9e93..6f0dc33c7392 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -3,5 +3,5 @@ DIST fido2-0.4.0.tar.gz 141714 BLAKE2B 3d57ef1598d2c84cea8a98e75cdef96b77807d4eb
 DIST fido2-0.5.0.tar.gz 161562 BLAKE2B 20d4f6c4e54366a26d5a56a84a6ff84bec0f0e22107aa612db721df8a5186a2129373ae609fb58a27008dc700b4b92d607fc2bf16aab7ac6bff8d9e7219204aa SHA512 fa83848e179b9208e2a701a3330faa1dde75e5e23133540eaec896145dbde376bc424a5e59865d3cf90c5765882e22530e96df2491101d2b5dcb22cfc4bcbb87
 EBUILD fido2-0.3.0.ebuild 820 BLAKE2B 5a50bac620a129267b34b051c0a4d310ea57829fa8b3dd7273e6e2a1309c6e773aa452184d12d7cbd7ff4351a4cabc0327e49eb55744479ba142acac5157e3b6 SHA512 f0a4f6967e6e88178b9aae95de79153b037bca6766ea89e9f6ab36eb6cb2fc4364f716eec4793637f96a045faecaf02fc7c97684b901d9012d56b576cc43e88f
 EBUILD fido2-0.4.0.ebuild 1107 BLAKE2B bb336bfa532dc089e7360b95db4a0b773bff7e1d1072ab1feeae983493c44adb9a7e4edeeeb36e603618c21b3530bbef71f21da1af061508c1caed04152c8f53 SHA512 8fb6bb025ae73ce657a7bde95b751ca97fef4da4e2eeaa37a6e2d3313cf64084c54ecebb7f62fcd4b6d065bdf3819eacf31cb85bb727969667c8283111443920
-EBUILD fido2-0.5.0.ebuild 1106 BLAKE2B e613eaa7a00cfd82838b5f850029591ac886ee277d4e522da1ff39c68d7cdd1d7dd4f224bbf7c64f252d46e2e92849d0d6a9da9eb77ee6670722bbf5e4d914f8 SHA512 9c7908459a16051e3fbdd85e12f433f2acc31222dcf74215277954914efe7c242b9731b462bbd16dec5321d560b21a2d71bfe81e93661dd3b5ca71b3eb1373bb
+EBUILD fido2-0.5.0.ebuild 1110 BLAKE2B 37181f46902ce517c629089cc8ccbcc0dc174119e0579b255c0c51142eae43b434ab094ba6efc379a4ede057f6735774f26833a27848721752e6a3775d1f7764 SHA512 40051c6acc3750aea30d5370cdd3de49cb1cdf7cd2133e20390f4f1bec708e844232d4500ad9acdf64043579a610145824d937f6444fa741ea857fa0e767f7be
 MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
diff --git a/dev-python/fido2/fido2-0.5.0.ebuild b/dev-python/fido2/fido2-0.5.0.ebuild
index 18a4bd557e0c..20a1b5019450 100644
--- a/dev-python/fido2/fido2-0.5.0.ebuild
+++ b/dev-python/fido2/fido2-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
 
 LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 8d01c8770eed..a4a3b3c10307 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -3,9 +3,9 @@ DIST flake8-2.2.5.tar.gz 28333 BLAKE2B 016b5b05b7448dec762e7d5e06fad9d631351d02b
 DIST flake8-2.5.4.tar.gz 81663 BLAKE2B 89bd5965fe1f6862cadbfc7b614a819a13d4ab147994485542ba519d6151ab11d4b496066c74141020858f468050e7b6dc3d6ce3a89ddf809e9cdc6d130984ef SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28
 DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1d6ee635591628fefad43ee1116256ae7f240496d93941800212ea2479be73fb9ee9bd03c9a54ab70bbce452f SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
 DIST flake8-3.6.0.tar.gz 144684 BLAKE2B 3a6edf83860c6c6a59c150cde47b22eeb17b9e83cb23e4d8f747715b8867093a7f1d1e2bc55c9f9cf43b69463746026d839b0177f2abef746581563a670c3ce0 SHA512 f4377bc7806074a88f88b3652c3061583e576ee515b2b741cee9c6dc18f84f34a7807c93fda9dca3d8b006e379dcee60bb3ae20e6a2e62fd216a82a2b36f2eb5
-EBUILD flake8-2.1.0.ebuild 1073 BLAKE2B 1f90fcc6a57da202d9b8026f89c5657a85efb0e2a5fad78057362647ee384907208fa8de6624f5375739c0ec386959e2936fc985d100f7ae2dd40f150d2b918c SHA512 0f7cd9b30bf9b095506af3796ce2927d2b14572a9f42e34021a205c090388ef08a6ce091aaabd19441b32e18c0d43c94cc1fd274f80e104c465d1bde88b46f1a
-EBUILD flake8-2.2.5.ebuild 1099 BLAKE2B 95b243ac6b57a1876810d4189dfc2b70aecc993194b62e95a17d6e410cf1e3378adae7eaa7a4027ac55b0528e0315d74149d0e2512c55450801fa382715b46f1 SHA512 552e6145ec0ad5a64055722fd6c93019e4a3169e80ac57eccad3838fb9b9b32cb1a111307fa6e6f5e1e5331b10d958b9d269ccdb5a791d75588eb8f15777e571
+EBUILD flake8-2.1.0.ebuild 1076 BLAKE2B 331e2ca9fea257777fed28c0935bbd9a610be4c6dafc5c6e48c407458c752a4ee169a1cab02e1ddae26c3fabe7a05cce04613d30201aaa0d5312c3524cd13cf4 SHA512 65f8056638d708d9c87d796405bfd236795ca488d343ccbfcc64eccef4cb7a2c0fe8b108376eca83526bcd20ce63717140c34ca6a2ca3de000ad80ae35b0ea77
+EBUILD flake8-2.2.5.ebuild 1101 BLAKE2B 10abc6ca0ab941fe83941e9489c9a85b0b854e1a8d5f9a0634a81f9491a0a057c1b2acb8d8ec006759cc8905308b2afce097e50dd95573cd1911dc60d31956ca SHA512 bf6274e8c39b2979321678165c78e598c65ae34354f7a0bf4da6d8acd15d6ca40b8966daac04bbb18dfd6e863b2bd1e8d5ec4d59dc80edb30f5955850870c970
 EBUILD flake8-2.5.4.ebuild 1604 BLAKE2B 1e0c65296854971216aba308e2bd8d99760d44a0a3338d1f1fa6cb83a6db13e3696d06671cce0717575b0d71aeab328bf1745f4414a04f9cc33d23fd9c7d69c5 SHA512 6a56bb2adb6a82dde6f2afe9226119203b9df5b8c0a43a4ffb400dc75f6c2636d9289d78c8602d9cce83b22113c51e5a9de5d29bb0bc23d922e2ce29724a0e2d
-EBUILD flake8-3.5.0.ebuild 1637 BLAKE2B 250dba56f400fc9761907c2d70bfb251a2abdd820ea698d48f4898b405022c4f811da90336df9f81a5534ca82cb3bd19301cbc979780b720528ccee9c9a88c9a SHA512 1e0467aab3fb0738bf798f915cf6c4a024c0895998a4c27043a30161068d85b4adcbd33ad13fde458288f5439c3839444fb2122b3dbd6dc2348df71984abdb26
-EBUILD flake8-3.6.0.ebuild 1646 BLAKE2B b61ce7b2376c3abe6177c4f8dbf4b3658141720d05415e55f9f87fae374e2c434c610253a4d17b0d5ffa6b35708d245dc78d786d6baa9cf25f29b500caa87bcc SHA512 8e4203361704b7878d615cd8182eb743a9527aa7f6fa7566ada7207ffb08b6124b44c8162451a1105b0f68586347291427a19a1e5a403da1db8fa13b1e359b1e
+EBUILD flake8-3.5.0.ebuild 1593 BLAKE2B a088c2e751d1cff224c6d4ad436892de28ebd421d5d77b1041e22979c9aae048d4b65f0c2f6faaa90cb82b670354857796aeeef0144c02c50baf2e1a57f6440a SHA512 16f48b86db95e5120590e1aafc370d4fa73fc44dbceda870915e136ed48e2b2aab236cb41d26ee5a4087864eef33ecc01cee00b418c38a74e22ea3ddcca8061c
+EBUILD flake8-3.6.0.ebuild 1605 BLAKE2B 839ccefef333ea048984d44c7cc52f30ad02d855f0c12f74ce88d51763d59dd7da4048bc01d0d9be3586088740994973bdc25cdb1a0858b5778afd61d8e2e0db SHA512 9078429d876c2c504d7f6fef337f4aad2b0204722a63b62f71e99e694744eed10fde3bc66125fc21bfa225ac8040a24e407733a4f67d921a092f3f8fcf540940
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.1.0.ebuild
index f526a8773e6d..5a0f93d75042 100644
--- a/dev-python/flake8/flake8-2.1.0.ebuild
+++ b/dev-python/flake8/flake8-2.1.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
@@ -11,7 +11,7 @@ DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
 HOMEPAGE="https://bitbucket.org/tarek/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
index d6d365f53664..8ea3ba97b85c 100644
--- a/dev-python/flake8/flake8-2.2.5.ebuild
+++ b/dev-python/flake8/flake8-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
 HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
index 7cae569b8d27..d80a4ee8b4a4 100644
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ b/dev-python/flake8/flake8-3.5.0.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
@@ -22,7 +22,7 @@ RDEPEND="
 	<dev-python/pyflakes-1.7.0[${PYTHON_USEDEP}]
 	>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
 	<dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
 "
 PDEPEND="
diff --git a/dev-python/flake8/flake8-3.6.0.ebuild b/dev-python/flake8/flake8-3.6.0.ebuild
index 7cda3bb34738..4dcb1e7eda13 100644
--- a/dev-python/flake8/flake8-3.6.0.ebuild
+++ b/dev-python/flake8/flake8-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RDEPEND="
 	<dev-python/pyflakes-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
 	<dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
+	virtual/python-enum34[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
 "
 PDEPEND="
diff --git a/dev-python/flask-paranoid/Manifest b/dev-python/flask-paranoid/Manifest
index fe605371179f..bf45d750acb6 100644
--- a/dev-python/flask-paranoid/Manifest
+++ b/dev-python/flask-paranoid/Manifest
@@ -1,7 +1,3 @@
-DIST Flask-Paranoid-0.1.0.tar.gz 2619 BLAKE2B d161f711a2b4b0164dbe6b85a8b650703f6154a23b271305a37fdfc5f938963a2135b3b20b66833d8a993175098cafebcdae70361405d59ec25e72030a03ce59 SHA512 435b679d7ad027d813b887bfa1211318aa122c6bded879dcb3e803535671e21f81e52fd5abb3b82c998d862441e6b5123290f4bb2da70a4dec391b05601eb639
-DIST Flask-Paranoid-0.2.0.tar.gz 2630 BLAKE2B d103651dee2560ff6dfd0014da5830848dafe92c7ad5857bc46fc88dd69ab37d4a9443f4682ce8e94b965de646406d4cfda2dda8719bdf767824bf9a2e20a1f9 SHA512 3a5c48815715d3188d12c779dd229cad5a97936832727d58277b0b717d0995ac1ea7cac6a8061a5bf656f8f976cb06b27654f6a4c06e2747a56f45ba92391f49
 DIST flask-paranoid-0.2.0.tar.gz 101084 BLAKE2B 5f1f92679da5f374699c8acc97300085840d47e57f48d935cba60e78782109f70651bb7f804410dbb241b48c96ec08498b8b2cc8c18573f14d0bc7972b746d19 SHA512 0d642999fa4d5b795c3dcecc586fc1600cdfceec4adb38bb87ca8be9825d9ddafabb07d98df573a89e61a44a0abd27cbbd21524237b0e23b337a7d5e32ddfdae
-EBUILD flask-paranoid-0.1.0.ebuild 525 BLAKE2B 21c5b0167a1c4dda1a47f596098b61ca58c029b0e875dc5554115ab4205071403315f27a995a348cae0ce7f5aa5869b11ec2f300f21e0fc4da45a6e73a97dd62 SHA512 b1185ba641172a4194f5b7881544782d7e799eb785e59438fcef13efc837341d158f0007b240bcf5bfca82a36633fd6704f5b031ea9018e2c3ed392ef2610666
-EBUILD flask-paranoid-0.2.0-r1.ebuild 651 BLAKE2B 8adf757a26e6d362693b8b0590034221f24b777f5987cbfa7cccc7ea2fccd6f02afe891bcfb0691734a0443342eb95de3a192aef62c2a83eecc60eb47687c228 SHA512 da9a33db190ac9116278441c1c977f9fb06be0d99232945b65177539c97dd58a4635f7fb32720a77bdaf3578e58da4f67ed78dc495d71dea0b1a203eaf0cc942
-EBUILD flask-paranoid-0.2.0.ebuild 799 BLAKE2B 77682966adce60052c097ff902e70b6435a643320f1acd85f7d85fa6f86a7cdfce736e4eb055029d8113d46d5c9039a2bcd5cf1e5d08ec0504237f091ad2b58c SHA512 7694f19973b33db2a0c1fb94b96972783b05019862fe9f238bea244df37dda064dfae1ee78f33b45eb6e183f0969e936cc1332a9ad166ea543dd5f76f3c491b2
+EBUILD flask-paranoid-0.2.0-r1.ebuild 646 BLAKE2B 17f176f46914e13153062b50a5bf630009d02adf0ea429ec22465bbeb7f1386b21fba9f2703ce50ae4aa5adf005b33e4dcaf2a12fd3044b2e2dd72feeafef6a4 SHA512 9b56f5d70a6f646826702ee24c9b9b60f116c0395bd9d0909a8531a32f641ddde7d9193ebcf65d1a9f14d4011e6c5ca7ac990e3a516665391b65e1ebdc576be0
 MISC metadata.xml 431 BLAKE2B a011627716653140fc147c2bc05f1c949b71225fd5d83b389371bdbf51e1fea614dbec9269b95dffca914c6e952e712d400f3d63ad38a8c4debd994194080cd4 SHA512 52469023be87cd14845fffb7290a1c0fbf087bd60759fe87ae2ead185664f7006d899494f1c0d6c29dce49900cffa27526241fa9ac715efe27d23e0bd5dbf415
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.1.0.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.1.0.ebuild
deleted file mode 100644
index 20a4cfd125df..000000000000
--- a/dev-python/flask-paranoid/flask-paranoid-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Flask-Paranoid"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Simple user session protection extension for Flask"
-HOMEPAGE="https://github.com/miguelgrinberg/flask-paranoid/"
-SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
index 25fe0e5e498c..ea57e7de83f5 100644
--- a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
+++ b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.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
@@ -17,7 +17,7 @@ LICENSE="BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.2.0.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.2.0.ebuild
deleted file mode 100644
index 5fedbe3b43ad..000000000000
--- a/dev-python/flask-paranoid/flask-paranoid-0.2.0.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
-
-MY_PN="Flask-Paranoid"
-MY_P=${MY_PN}-${PV}
-
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Simple user session protection extension for Flask"
-HOMEPAGE="https://github.com/miguelgrinberg/flask-paranoid/"
-SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/tox[${PYTHON_USEDEP}] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	TOXENV=$(echo ${PYTHON} | sed 's:[^py0-9]::g')
-	echo "This is the setting of PYTHON: ${TOXENV}; and some stuff"
-	tox || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index f177cfe633da..b2ac5aaa2453 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,5 +1,7 @@
 DIST flexmock-0.10.2.tar.gz 44425 BLAKE2B e49db5b7a4a739f72a2560c52d0493cc284641f7c54d11e67a4c40ae3681ed2ca22fdc17c9f8ffc667bef409e1ecb5e36acdcd73a968984a38992927ff7c416f SHA512 6824da47af260a93ad685b66bcbd2d9a93f98eec218242e0dd9ef885594d9218e4c7170c832a0b3ea3cf201896ec1efc2afacbffe1fc5dab032240369d7b3ac3
 DIST flexmock-0.10.3.tar.gz 45017 BLAKE2B 03e6a709bd6c7889fa91692c27041f3d8109a57aa188a7043d5f45f757dd2bf929f80b9e57375bf7835ec4a88f032ed026c183320098546862f30c6bfedf6e8d SHA512 9c19e7a6765e57789065e6f5940270f5c0395194eddd8fedaf0abe52e0ffaaa33945385e981285caa1b7facb58be92b76dd0f370c242216626a30ab97b926bd1
+DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
 EBUILD flexmock-0.10.2.ebuild 595 BLAKE2B c4b1e7e4584cab3fea285d4959731d07f285e65409964e0584b3f395b4b6c6b7cd1e783ed0e0a0f31b51d2b0212aea54859a82139e17823b3904430c97b6b4f4 SHA512 834cf7d3c5ca52147c3feb85761b39fdbfa046ab2ad3db290bfd47eb783fa6d0877450e92599870bba5247f5f6837230a3aa81fb48338071a743317274595c35
 EBUILD flexmock-0.10.3.ebuild 594 BLAKE2B dfee14fd63ba83f07b346c00b112868638f48a8d9c04420ba15adeacb34c3e3af2447596a2dcf18ec93696f011bd35b587416eaafd2b7d86967990d95c6e4211 SHA512 a0969d41f5dd7529d774b47a20407a59cf7d76043b40b6519c3a9385779da90c324aabc03aebe8157215f5c26c92d32439a6b82e8cce9d78b973b5e4573344e2
+EBUILD flexmock-0.10.4.ebuild 591 BLAKE2B e7d7c3d45c688e1247c3c9d8003dbfa7add133320471ee2e82dc37bbb7d523ad702f013ef2351873681979b67da58406d73b98bdff21e6cec2f65d8879d3cdf7 SHA512 5df9b99bc95c8ac850e4511f2cd410663d0b38822f68af61bcd7b6cc78144a089efded0367df6b73583003cc8223948042ceb6eeea1347c4601d1a6c15af1692
 MISC metadata.xml 603 BLAKE2B 7bc248befb25b5071da321c7ad0cbefb6c57ee6f4fb9870a27c4888dac3239c90cac23a7adb0cfe41f7301edcb453463decf1c1b2be644a5e0c2fac5a41c0c0a SHA512 30088206cc5e7f24858f474160bc646e4744a0ebf14ac39048d5c31cf767da5f97d02559062c1002abba59d0a1ecd08861e52c3d2a29ad6b7e9d1d35c06e96f8
diff --git a/dev-python/flexmock/flexmock-0.10.4.ebuild b/dev-python/flexmock/flexmock-0.10.4.ebuild
new file mode 100644
index 000000000000..59e66efe32a9
--- /dev/null
+++ b/dev-python/flexmock/flexmock-0.10.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testing library to create mocks, stubs and fakes"
+HOMEPAGE="http://flexmock.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	"
+RDEPEND=""
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r docs
+}
+
+python_test() {
+	pytest -vv tests || die "pytest failed"
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index b44f91af14b1..50e53b15d40c 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -10,6 +10,6 @@ EBUILD fonttools-3.20.1.ebuild 801 BLAKE2B 111c4345dc971f388aacfafb8fe10e57ac2cc
 EBUILD fonttools-3.21.1.ebuild 813 BLAKE2B 7d50f4981fec9c2b725ae11989cb808f7b8ec2b0d5f93a67181cf7196f0c90e08582088e6e8a5ddd77fd1ee396a09e368cadbde5f6d6d47a871f0da3794c203e SHA512 97978de7990b309cea4026e22b5ac2731b4240e66c6fb358ef4a66326a31d691314c269bba341896fca8c621cc49d9042e5f1e126c44e5ee8379babec3564607
 EBUILD fonttools-3.24.0.ebuild 813 BLAKE2B 7d50f4981fec9c2b725ae11989cb808f7b8ec2b0d5f93a67181cf7196f0c90e08582088e6e8a5ddd77fd1ee396a09e368cadbde5f6d6d47a871f0da3794c203e SHA512 97978de7990b309cea4026e22b5ac2731b4240e66c6fb358ef4a66326a31d691314c269bba341896fca8c621cc49d9042e5f1e126c44e5ee8379babec3564607
 EBUILD fonttools-3.24.1.ebuild 819 BLAKE2B 3327bdd4ab04453596301759775fd0c67d4eb7b05369f3d285f37ae27b31563dbee1dc95fd435d94c9e2e0d214ca814f9caf08e0af5e19e1686ac453c70348f3 SHA512 07a3a4c6ed81a66923e1b7dc60cdd71d9350d910efeb8b60b0ac905899d5904336d7a16196239b94dcf3b8398e93da1f1953750f0256bbf69dec7963b62c62e0
-EBUILD fonttools-3.24.2.ebuild 811 BLAKE2B e4c5dfc73ba8a96129286a18c87df17487796fb96428b1065ce0635810dc54f6f72929716889f9d54d7550dafd539384411f5f9991a80b473f1002bd68cb8851 SHA512 0f35d9ed391a07526d3ae7cd5472327f9f174d8f013198caf61e85c493cf5e281c12b20f178eb3a3ae7a73a65b19213778bb3265c3a646b2ae1e990859a72a3b
+EBUILD fonttools-3.24.2.ebuild 810 BLAKE2B 6c25c0f4db0cda55841ee89acff31f9bee7927a0ba109d1d7aa004991d7981342d7bbe5d2b6ce1c313c0bfaa63641a6b933e667d7289336633ac382e9806cf1f SHA512 ec471d26cd94af455c1481bcd96478b4b9a2bdbcea9c9e7da727e25abb5dd0ad39dcf47848e4a76183b4d0cba9ce69ab8f306cd522bc7f805aa7fcf5c4adf675
 EBUILD fonttools-3.28.0.ebuild 913 BLAKE2B a142a5199cfe3d2d7e37cb543be1e87f45300a14b34291230db3cd0123c4628eba4cdbd62f9c798a214527c01afe25ac8a8731ccc29665352a144ba18c778daa SHA512 56a731db469587f1b48be4f7e812dba389000ef0daccef18e9618e7d55d835d2ffc2c350787d83a92be83dd581c2bf2f2e5d5918e09badc3bd0ab508164f1798
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.24.2.ebuild b/dev-python/fonttools/fonttools-3.24.2.ebuild
index cf0cb84a05f4..90dcc1ee592b 100644
--- a/dev-python/fonttools/fonttools-3.24.2.ebuild
+++ b/dev-python/fonttools/fonttools-3.24.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
index 9edd53fd28a6..554351806f39 100644
--- a/dev-python/funcsigs/Manifest
+++ b/dev-python/funcsigs/Manifest
@@ -1,6 +1,4 @@
 AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 BLAKE2B face7accdd8bc2c5d3ab9dbcf9fa172695901768849d9278b0b384819b4c6ca3409f8dba3d9ce058f16e88f0696d1fd7dd6d3b7ba119989fb8b3e97fa0399635 SHA512 f4f93b2587fe2b0a41dda070d827f663785c367fcb3a181c0f461175ebeff47147907cc901954cb98cb7cce25754535663fbefe9227462fa2963d3ed572a852a
-DIST funcsigs-0.4.tar.gz 25697 BLAKE2B 0b57ac0ce3aa8ff16724af9be94f297c15c94ed9083e2dd78796f134054db0e5f8213d1671352e0122a90bb2e8da78937c7a44f2e231b64de29afbb0dcf8b6d5 SHA512 64d821e94049ae906b9e5c8a2590f80a7d1d819554258e20f4170207576e5c8f65d32759a3f65bcb05fe721fa502658ff5767cd435932ea926c792c62ebe96d5
 DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
-EBUILD funcsigs-0.4.ebuild 645 BLAKE2B 6a24bab1b1d13f1a234e56f8a6ee5e50b418347f6efd3208949f1c9c5aee771028fc1d24df5c31ec9618050bb044a0d1c8e451c6783bdecd9c61bb2d0ec98da7 SHA512 a23d3c084c6d5f9893cecc4e82c2598d4e116cf0763229d75658ef23ab8669d3869d30ff864f53520cbdb22e2359d66b6124aae80cb5458972d40ca117eb0014
 EBUILD funcsigs-1.0.2-r1.ebuild 949 BLAKE2B 6523415ce7449027b83a98d2477054453143518fac88f4abc8f88d5386c96ce90f227fc08dae6100ddf1722b5b5ba9ac6e2db8d356899188a9b34f2646a0e687 SHA512 9c0fdd837c323421c25a3d930fbcee390701616b10cb0f0a8dd301e45ac9d99b82085d0de97583d86de439323cbb5ae6a51a3ad885b03a0e9b99966d6450bf38
 MISC metadata.xml 321 BLAKE2B 8aa6245455756e5d3a197dfb37bb706551ff8ea0c6beb047d0c59c54d2ed74853e6d9857d37a531a5313a7a85a0849f5e0b308a58fa98a3cce6040b5b91a1a80 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8
diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild
deleted file mode 100644
index b9a168f60dff..000000000000
--- a/dev-python/funcsigs/funcsigs-0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python function signatures from PEP362 for Python 2.7"
-HOMEPAGE="https://pypi.org/project/funcsigs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 5dba1a737b5f..6a759a1947ea 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -7,5 +7,5 @@ DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f
 EBUILD future-0.15.2.ebuild 495 BLAKE2B 6796334fd8cb1a1e2c90a4a55c4262bbfba55eab6defad0deb788466ed93790887b38f1e3d63f41baa0b586d7cab5e5731c08cbc4f958ae9799ef7c085ed4b8d SHA512 39de67be4877db5f248267e72642090763473ea15935e69ec069a726a5d4836c1de9efc46626e422d4bb18299b5ddcb5e42514781020417fdfdd6038350ea2b3
 EBUILD future-0.16.0-r1.ebuild 1277 BLAKE2B 1fa567c5e96dcd183accb7f30d3c52bfc3fe74b35c534d4261e7545724f9158ccfa850d303a4483b1d8e50dd1d26aba06f8e0ad83990b611ed1e534f1b2c0bdc SHA512 f99a558be25f3b8c2df29fffae08a681d88dd53b2cb240bf8852ea0274f286cbe3207022b3fff8d715635014e3d46a2ac416a9fccd26fea59fbb18361fa8a081
 EBUILD future-0.16.0.ebuild 610 BLAKE2B 62777ba338901883572fd237a80f2e1ef2f9c5fac6770ec2e9ebc879fb64339d691a00404f256290120a377669b709ec860b5125030f449fe1cf4bae1bf29c68 SHA512 a8da9953ad31e8dfbd5dfe406e3f3091a7688931ccc7a6131617b39b3d716e07c4629f4abf3215cf18d1652437f3cd0985bc5fce2f4f52bbc191ed8e8748771c
-EBUILD future-0.17.0.ebuild 1046 BLAKE2B 40c3555f42a822a230722dff69a6939f73f7572b083a94312ecbb1892776bc7b56d01f590fa5214a3971c2e788c8eac10071e87a053151c815b67aa3e17e6b91 SHA512 e7ed938621bafad80cbe9e87c3641289257ba1a77436b29f57f357ea2e1b7f1f9e314bb58971eca5ad4473cae3c6f527b9b79250b96b67d5d5cfddaea2f176d1
+EBUILD future-0.17.0.ebuild 1052 BLAKE2B b7b61961be754f7d70f6356c367973c5c4101a4faaaf02645d1116cfbc641c07a5ca7854ccc25b7271c3a0f58d509e253775690c2a5201671cb1e4db7598bc31 SHA512 586db2b8d2993b1d1cbe3c32e4c848c04b5818bf03b1b8613e93ea4b2997521ad9e6f493bc9b90ab721a90302c78ae11d7409b84ff30d5708a1bfa77d85af847
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
index a82e69d44141..f72f804eea6b 100644
--- a/dev-python/future/future-0.17.0.ebuild
+++ b/dev-python/future/future-0.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 8ab592a4c6f0..adb41a95531c 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -3,5 +3,5 @@ DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218
 DIST hyperlink-18.0.0.tar.gz 97625 BLAKE2B d189445c7375657614c38db9045d96789b78a2d4ebe67e23b897a450588fbe1e3916707bb67916eb893e93a716125e606ff8be27e63f3db4e63b8bda1436fa59 SHA512 21b5f88f7aaa3f2b0b60566fdb0fefdf6d42866060606dac181c8e3d357c76a5c23fa5dc982812af2b7d49dc1f9d623bd5bea89bf2cf31916c855bc4ae85589d
 EBUILD hyperlink-17.1.1.ebuild 753 BLAKE2B 61b2994479704ec998887e1cb7ec7f12caea553c774b75312ac121a5268b8ca673176a602ff77c9dcf4a01eaf53e90768cbe94908c5c5f596359dd6eb3108f47 SHA512 1c7b2b09cc674fa8c3bf71f2aa1af3f1463f6de9d2d486d9543bbb90d69846b91b3c606f8679d8097b622ebc6eed636dcfedd879770a9df172e962adcdf0043c
 EBUILD hyperlink-17.3.1.ebuild 777 BLAKE2B a21e08a88bb98add80782f3e0bee5a3555d42e325d05e262075100d732bf43f2a945b2b97a6bff37becc52b5ef5905a3ac8175008ceae573ff97ffba3ce63dc0 SHA512 137f7c7cc48d23ff84bc98202c7a4998ce03d4381f8a60dcc16362e9c8fe301dbb7ee9a424020af8019354c7c2645ccad2c9eb7ff15ed6dfe446065b882eff3b
-EBUILD hyperlink-18.0.0.ebuild 709 BLAKE2B 472c2d3e379fa761be0b2f5c59044f914e9f276a313170c28424db49b4983838279d75fe56b98a4c712ecbd5130fb63c6d93409beed182660f487f6d5ed23b8c SHA512 f8575aa2d7a7b954f9c5f32524c0a69faa64f95d3e5670d2ff3f6b2209f8d6711f8621b7f672c0aacca6912d756a0e0569bae3ae51d2ef78528ec1ef30174336
+EBUILD hyperlink-18.0.0.ebuild 722 BLAKE2B 78478f6d7b399dd90c4e641693eeb27033e3d4bcf523774c0d7668878e23f02e2239abed469b814d6e619b95700912a28604d0133e6d9c385e6c4c7f6e5187a0 SHA512 271b2a83b732c006f92cc7f9d36ba017cab68face2e22531d6f065847a34d0f31558e9a2d6ad2caf2bc9f8c1260b7b02d9d07c570580aa25f917f7c2032f15e8
 MISC metadata.xml 751 BLAKE2B b9e49354e3472ca16622fd269867df7f0c5f372afa5f93c36c2646f35e0fe1e1fcd6b25c66ef73e13e442019be449ea72b26fda807e3d220fa254c4d7a691f21 SHA512 7cd14daa771935591e7a130d9dbcd20630074d49ffd738d964b631798a0466392e0b669cc009f3c769614d704925699f2bc3239bd5e78ba0c2cd629dccd72591
diff --git a/dev-python/hyperlink/hyperlink-18.0.0.ebuild b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
index 91efd49bbde9..08b080aed792 100644
--- a/dev-python/hyperlink/hyperlink-18.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
new file mode 100644
index 000000000000..2813e592c3e6
--- /dev/null
+++ b/dev-python/importlib_resources/Manifest
@@ -0,0 +1,3 @@
+DIST importlib_resources-1.0.2.tar.gz 23605 BLAKE2B 813f913a779115575f3cab6f5be8f9e7ea706a6f0e47bc0bb29439901515b435c33975f6b1fd96d74140e488b0bd98aca3331e0d69940153b348891fd5f4f400 SHA512 3b7b254abdf2cb8ee0abf1608123c49de05d1eada081567a0e083d1f496f37643b81e771490b414dcf56672a7e7ea9aa6dd6b77ea8206d3a97e81ad69da7e927
+EBUILD importlib_resources-1.0.2.ebuild 573 BLAKE2B 9c8bc90c48618c297a23b686a0be60c4bbf4511831c67e7d62e172350baad85fbad75ccbcc482c422479accbf6fa78f3c3b89874810a3265db701c00f945d6ec SHA512 1bb242265d0edf1c10d75114e1586cb7800dff63b2d242664111bf3d138dceb9b5165fa211ff79c284f13b894298353285614dd28680e561f7da56692fefd15f
+MISC metadata.xml 778 BLAKE2B 36b7d03e0d72ed317bc10345d02b1ebb1386920178d662b7620f11917170f864e977a1b200630621bf178438384ca4598c562c9c4b7f07542cd5646a5285ad51 SHA512 f9b46228027302f61f527e6c8638150573cab5ead0d2942ec2d32b8cb9712e45a14e6157b0f8f1daee0e3f8e097e5abfd9b5f2bca948abc46a6863d785a85dc9
diff --git a/dev-python/importlib_resources/importlib_resources-1.0.2.ebuild b/dev-python/importlib_resources/importlib_resources-1.0.2.ebuild
new file mode 100644
index 000000000000..830ec759d0b0
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://importlib-resources.readthedocs.io/en/latest/"
+SRC_URI="https://gitlab.com/python-devs/${PN}/-/archive/${PV}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/importlib_resources/metadata.xml b/dev-python/importlib_resources/metadata.xml
new file mode 100644
index 000000000000..af87c20668a9
--- /dev/null
+++ b/dev-python/importlib_resources/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Backport of Python 3.7’s standard library importlib.resources
+		module for Python 2.7, and 3.4 through 3.6. Users of Python
+		3.7 and beyond are encouraged to use the standard library
+		module, and in fact for these versions, importlib_resources
+		just shadows that module.
+	</longdescription>
+	<upstream>
+		<remote-id type="gitlab">python-devs/importlib_resources</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index f85cad75ef03..17a6b8992584 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,5 @@
 DIST incremental-16.10.1.tar.gz 16066 BLAKE2B 86bd85f9ea1ffe92a572b1744588f34f21e4bddc4aa80373dba47a59961183a77a338212500829440d216582ce15ab1412e9994f89486861297407f22eb989fa SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
 EBUILD incremental-16.10.1.ebuild 603 BLAKE2B 33e9d1714f0e9cdea94740a63c297cd889edd71bbc3353849298f4f2e6a82e522447931515c5ebfe2e3e179d2eedc3893edfa3918a61f8bbb146daa78579e4cc SHA512 19295dfb2b253ab2f233952c6eb38eabdd8b1d6d3cfb83953c1f21e1e306ced19050bf43a5ebff5b117b9965008f9320fb6840ee573056825201f59f97c2ca49
-EBUILD incremental-17.5.0.ebuild 631 BLAKE2B cf590c1d95010156b8f5b6612069ddfdfa826d67ba40f38a7a7713c12c22c4bdc1344268dca7d78c1ddc79e72e2f5e9bd28d6d56623c212e284853f1fd55490c SHA512 5846257bccdb6ab0d23120bca9645a2dd45583be46d79e6efce02ebff3de0663183eccb30da79e581c658cb6657628b6d8e58a181ebe792cf3064e70151d04f9
+EBUILD incremental-17.5.0.ebuild 644 BLAKE2B 272d3a19905b17c3766b71af06be87cfb1a98db4f443ad9883d803e5cc0b6be7cb0dc962f927a7dad048835c768be351dd4061295367eb1457b552b9e41617b6 SHA512 a252153a6bf6c7c33cd02437083f50e73e8e0986538c0d01f7f68b26266f25c29140d9d36421ba114da91e9fff8ef6b2e6f49df5413685c6d42414988505165a
 MISC metadata.xml 554 BLAKE2B ab26ba9e5a69a853b0c0a167dfad54de819a17ad44a47a9987e8cb632bf1551151a208500f37c96543d7f577e99d6d47b4157c97b71d7ae60e88cc086a1ef1ba SHA512 a3bd82ee309e301f175da663ecda74af803631324b0d1097082ad04e6bd9e2537208fea8ebf753f38341429b1d2bfffc887ced6b707655ec862541ff93e83c6b
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index b3d2eaf2b65e..508865510681 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 9810668c5193..3c0311f4c215 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,5 +1,7 @@
 DIST ioflo-1.5.0.tar.gz 765559 BLAKE2B 56b3e26b6155cf8fbc5f159909d3a82a6c9b47251c799e4f6ef300015d0b55f54882e26534314fc3c04e20248aaedc9a35a1ff1c574cfb5dd3d1f7aa887340da SHA512 114dd5ab3ab5bbe66be7e639c2018256ff1c8ab18ba73931733dbe23c8f65631fd630f278b0a186303e288a6f49cd6df224dda462973cc258b3d07114e70c991
 DIST ioflo-1.7.4.tar.gz 834916 BLAKE2B 241026d18f8caa6acc09f312a285a3f824128d6018ab19a8704296f916514f7795b8f2359dcf46c04d01735140a75c980458d5589d72de59fc73f13c59b50b14 SHA512 415b43b66c1be479e8ba4fc993f180418f95f1ae0d16ff8c496476da7a04f6caa0f918a064c60034cd926f4f49c1112946b911b57339a76ee5b0d2564ade224f
+DIST ioflo-1.7.5.tar.gz 838342 BLAKE2B 2eff6af7586400ff562999679b861079184757c951e006d2f300ec894dd17fa9c2ed975781109f6d3bd2cabf0e038ccf81d9f9aeac742313eedaabb59b5a1c82 SHA512 886767d72c4067727d47652fba157a76ecd8a6a5478a761feb3923992ffc585addfe892027ade104c5d44a56fd1645c0548ce3b554553f58e1104864c359470b
 EBUILD ioflo-1.5.0.ebuild 487 BLAKE2B 809b8f7fc482a9ced7f0148e79fc8dcfd58f41d747fafa12248ba82febc237a2a1d8aa77468fc279d4e55d98b4694d5d47b7e9a6957635fb2fe19aaa1bf06cee SHA512 44c4dd772945ac479e121b205989b988fd81ba2d3548636770e47a17a279490b042112c9790cdc7820a1b96ea95e695d1bd114e7451b6b0966bff2bb1889146d
 EBUILD ioflo-1.7.4.ebuild 604 BLAKE2B cb2ba0e2611345c0138104785dec78835314305ac8f271f2785df299474ef12cad2297fe416653d3f6dbe6c35856168f54f8f886baed88a3f2772bbafe469357 SHA512 1294d8d3209796c8d582fddfb20dcc6f629105931af42f87c765a74045e3cf60ca7f9a7c95e177a549da13a9e607af02edc594d9e7cfdc30090dd9044644715d
+EBUILD ioflo-1.7.5.ebuild 601 BLAKE2B 88925fc81d9817288ab1efc2d52b0301ae4c8689a35e4c4b81c809a50cc367dba3f3a460dc059a810c3fa528923cc623da9853c15fff74e3441d3d07dc49bb83 SHA512 bfe75412e456b1fe293fbe5e29c88fd7b418966e190bcc537bf06e3319cc14a214a400a9e0f268582dabcafa24c6fed3438d821c34cc5b286884a30ba2ad482f
 MISC metadata.xml 442 BLAKE2B 26c46608c3b6b62389b07f8a089a0dd6ba91701b3e18758d39a82980a16ce7fd03f4a080e15dc37006919904764a4fe9ce31183d31423e2c177c7c154d2cdc0a SHA512 8d6a727c351749f21566b4085b2355611b40e7a962e99d1a0e52d19d96f3d64db66c17ef01d08b82b4031bcdc637ae0a074423fd1eb92323334d6ee36d004742
diff --git a/dev-python/ioflo/ioflo-1.7.5.ebuild b/dev-python/ioflo/ioflo-1.7.5.ebuild
new file mode 100644
index 000000000000..7c1d5d221669
--- /dev/null
+++ b/dev-python/ioflo/ioflo-1.7.5.ebuild
@@ -0,0 +1,23 @@
+# 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})
+inherit distutils-r1
+
+DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
+HOMEPAGE="https://github.com/ioflo/ioflo/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -e 's:"setuptools_git[^"]*",::' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index b5d3c149c27b..a9f0fc0970c1 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -5,5 +5,5 @@ DIST ipaddress-1.0.22.tar.gz 33051 BLAKE2B ae9145a275d373f07ad3996b9c06007259cde
 EBUILD ipaddress-1.0.14.ebuild 617 BLAKE2B 77e3ecef32c54642bc2e5ffeea21ea424118a86eea0cff1256b2515e7781ce7cb0c619e462753dfc92160b55ae6ddcd30576cdca424176734774e0d20872b8ba SHA512 7b21d5cd33817248dcf66651222695cd198009682bda5ed82c0013593557fa85daf7677218c58c1a635e035f4adec9ee093dfc719389f7aa6d0517156b06f08e
 EBUILD ipaddress-1.0.18.ebuild 656 BLAKE2B 6391c57a20088a880d68452cdb1bdbcd81750328444b6383119f359a92ee3c9855965ed472d939c05772ab0e7599d507565d59b84be4a18f667ab6b74b340975 SHA512 78f7b945c912c19172352c9134f7fa9896e925803a3bd8d0145b51e90bf8a1600ebf8e0bbb9418538968b84f03cc909e58ce28c6787ab24ad5f87203f5145290
 EBUILD ipaddress-1.0.19.ebuild 669 BLAKE2B 5a2533360d461f56ead14f2ebe99684c27c4dbf359bb0fda9d3f3cddf1337b71d132ade9f27406c9243d393e85a0861ff6996fd3bee0e9a8f647d18de68d9d43 SHA512 ec4ee4f51587b10b024e345897f433c225bdf6e2da75a7f8ab63916b2bf02e44eedf9ece7bd4ddf643925aa56a4a5d84deae34ce4d836000e7ed50299277506a
-EBUILD ipaddress-1.0.22.ebuild 746 BLAKE2B a244adec0f6d055ae5aafd0abefe3bb27d5fd42b3f0252ade14db9267708b7d02755b5eab105ebf866063170b8c643c583529d1c5a85e418d867e52eaf962fdc SHA512 81b9212c6efc88e70907c615e24f9f207bf0730c65b7d9e4ff66583b82ed672b7e71f23172a06d06498f550c96e30974cc148ec6436c894a1e61a531ce09f110
+EBUILD ipaddress-1.0.22.ebuild 745 BLAKE2B 41897b72967cb9a422946deb80c9d6b3368e114def5af59ffe462ac5951ea9a954f208a09622e667d089912d1ac93bbc6155543ed51ffba8f2f773c25a877ad4 SHA512 a8905d8d83dffe8128fda7a30980bfc698c723c6cd71cc0b4ce669eef401b292ebb89a99a7f01887996433378023c5581d15215693938eadd6d1d9ca952cb7a6
 MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
diff --git a/dev-python/ipaddress/ipaddress-1.0.22.ebuild b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
index cf9925aab3a8..2ab6c998d15a 100644
--- a/dev-python/ipaddress/ipaddress-1.0.22.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 8189f3cc6103..ca62b14e52e3 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
 DIST jeepney-0.3.1.tar.gz 22271 BLAKE2B a8de58e4ef4c4d1874c8995e3726a4bfa26a8db4a63040658c4edfd1742fa1c22de52d8cbee4913b1973279938544481fe2c2aef3138dc0ef724f7a99a39c617 SHA512 ad1a2d220a7626a3bdadf6fba6a591d1b498a9f6bb34607860213efddf49bbe67a4dc2d504decd906c560c519302f1fa45b85ba348156e8bec288f525d502e82
-EBUILD jeepney-0.3.1.ebuild 1041 BLAKE2B 16c36ad2c2e2086ec4682a48d4d00eb572a2aee5d83236023e57f5816c5cb6c0053750701664cf52dc9b340e587e1e1190f8e067e9f0eaf3e0aebd8be4970b0c SHA512 a4ed7d484e4047007b609f8fe5a53e3e32bab810ba12ae53b1cf167ffb0cabc3b9d6eb5079270b3a394aa3eb73657c680d994b718722a29ae257562dbd987a9a
+EBUILD jeepney-0.3.1.ebuild 1074 BLAKE2B ecf7c009279c7f1b906d1f5c4a4d8e964c2fbd23b8f53b45d77c7c1874e8676182265da493e292a223883c6f03bbf5e570c422a339f67a9a509441f2dd244006 SHA512 630626a7428a37dac4287b0cc17a3858423e9b1a89e09fb52c632e3c1e77fb0cd93c969296658fecdc6b7a965fb04e4623b1c26571f135072f52755063f02149
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.3.1.ebuild b/dev-python/jeepney/jeepney-0.3.1.ebuild
index 92b469a0334b..e516ffd9fab0 100644
--- a/dev-python/jeepney/jeepney-0.3.1.ebuild
+++ b/dev-python/jeepney/jeepney-0.3.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=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 BDEPEND="
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index 746faf33ca87..6a2d5fb13491 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,5 +1,7 @@
 DIST kazoo-2.2.1.tar.gz 108037 BLAKE2B 23b6b762469df40304cb0d9228dee63875e7c062557e0dcfd383db792c7544b19fbb4fc91a62035a2455b5a2715a57bcd4a68521cf698f01815cec20765420c8 SHA512 a2590441a9e3bfb3d14913051453e195d275b82bd6a4ce5e32d0a7bbc09b00e475ffac68fd06cb065aa439ea580b61bbeaa3ccfefa413723e46f4b1d3ce05707
 DIST kazoo-2.5.0.tar.gz 147189 BLAKE2B f90662d78698d4ba8c9a88cd4eba826df104dd746323ce92644707e22ab711ca5fafb79bbec71c4059637232eab4b510b9544871201ba8d6758618d5a79f97c8 SHA512 cb85a33f2d0aa71fc5a82e7046e5d331417df865c1a4bc18266cee65ffd6c36e12cd4058ee591214ec83225a9b3ee193587f3d07b5c1436cc715a403364ec1af
+DIST kazoo-2.6.1.tar.gz 157425 BLAKE2B af05ee5fb1d532ebc3352de004062f1ff976825f564212f2db76efc153566106ffa520745a8e8cc6a78ca2bf0d17556f978a6b462e4153e9b3ee5258e78a1d82 SHA512 613e8271bfd6c8f5ee976b6ee460478c7faad46b32995125a64312208b38755888690cd46b913ff44ba52aeb36de3ec3dd8e222985af77e99f43963a3eb48d48
 EBUILD kazoo-2.2.1.ebuild 1118 BLAKE2B af9d452abde829cfd924d4113f5a65e20733081c146ad3ce2c8efb43fd248671cee5c2f3317483a16768c03b1eb87af2c1310c4caf3d087605bcb79c26950c61 SHA512 dc78320cfc9400e0076cd2ab73b98dc2ac7a1947ce09e63faf4942ec1854b62f1762490e8549fc32908d28417f3b41a2db728524a247f0bcd649c9081c6d52c5
 EBUILD kazoo-2.5.0.ebuild 1118 BLAKE2B 6666b94b93970afaeee99abb8e75c66d13c07160d85cceabc7a75c77cbc4840e38d681fae1337517c9e0498d78e7ca348d3075e25e757d574e367fec607165d3 SHA512 001fb52d932b5d228369e37c62aaf370c008d6c77eb6c7805b785e71c4aca42bcda1d10d0a9c12e72ab96f2c9b9b5c8b9a8cff0f17cc0b0b7631a38622392195
+EBUILD kazoo-2.6.1.ebuild 1392 BLAKE2B 7ae9f14177458c63fce41832ca33d35bda794939c873e493c48ae5d6edde51ff347895e43bc101221c0721decd4484e538defffbc76c4d561d90d7c25a23d57e SHA512 b179681cd656d7f11a6cf65c0e20a0e9e9fc655b9954af14f0725283018dbc942966f2838bce94045842e121e46d1f00412b6d4831af56f0bcfc9971a6fae898
 MISC metadata.xml 467 BLAKE2B 289e2184ed4d8b4435da2edd6698d915a26f2dfbbba93aba0aed35a2adc5f5ef20a95d70e673de980e08d58252ea8f540b913a35a46eb1327821dca49ad36f60 SHA512 3028edb8107a980e1573f283e9f47a408b9c4ef9bea0ee452f25d908665220ea6cd43b70e2d85d339d553e60426f9d45a093eece38cd0a67f2f416db7580a6d6
diff --git a/dev-python/kazoo/kazoo-2.6.1.ebuild b/dev-python/kazoo/kazoo-2.6.1.ebuild
new file mode 100644
index 000000000000..d022ee5b2a43
--- /dev/null
+++ b/dev-python/kazoo/kazoo-2.6.1.ebuild
@@ -0,0 +1,52 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-level Python library that makes it easier to use Apache Zookeeper"
+HOMEPAGE="https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.org/project/kazoo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc gevent test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	gevent? ( dev-python/gevent[$(python_gen_usedep 'python2*')] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/graphviz[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep dev-python/eventlet 'python2*')
+		$(python_gen_cond_dep dev-python/gevent 'python2*')
+		>=dev-python/objgraph-3.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+# requires zookeeper running to test
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html docs docs/_build/html || die
+	fi
+}
+
+python_test() {
+	ZOOKEEPER_VERSION="2.6.1" esetup.py test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	local DOCS=( {CHANGES,CONTRIBUTING,README}.md )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index ae26fcf2aeb9..886e71ba739a 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,8 +1,10 @@
 DIST keyring-12.2.1.tar.gz 42242 BLAKE2B b821f17a671e89a28bd2953456bd0406e4f7fd142f1abf2e1f752e8f74f072c8fa995b90de62ac34586dd50a4dab47dff3bbb19157d76bb2f93a61e176dc3188 SHA512 8806b4433bc9085ae133300e68bc614281beea70de547f75afafdf6de2ee1b436f3a4cd13d7684cb6e4d5aef0a2eb9119d9cebbaf239a9ee1997ece4a56a7371
 DIST keyring-13.2.1.tar.gz 43140 BLAKE2B 74272b93ff80a03615879a5f416ad6be1012f22862972a7f400609ea3fb984c45ed2ccb44eca30d253d0d39e0876f1ce25ab9aa6267a06a7c67a17aac27cd31e SHA512 3c15c3415ba4b657b041d2395536fc92ba656dc71f28669235f13a630946ad1b332d1f5b031a55776ce8a2120d3d2601462708f00ee105f46a27cf043c1bd906
 DIST keyring-15.0.0.tar.gz 42547 BLAKE2B b9200f61fcf227ce82ed05db15b8a03754a2d2f0ee7a32afe4a99a6bb4c511e311d7c529d5173756173622e225ae4fa2fcef6409b21dc3d8735b5e8fab73bd1a SHA512 58001d61bdd442196ec4891000cc532d1dd9b85b18d100d8dde38cf1cf733ef6d6541513d73435dfe41e9cd26c6e34332d518a06a7fbc498b1b8971df6640212
+DIST keyring-18.0.1.tar.gz 48559 BLAKE2B fb9e8df5ae04b4c1d646b4129cf34d420fd05783724dc2d10fccfaf11ddf1a17048c2695477bc1f4cfcd6d08ed48b6d552d19862a0510d8e12fef4e17b13087b SHA512 62091fc304ff0d4a1dd5db3e1fbae7e02edcb60442f19d7408ba2f115226a8282ff67df55334f019da3cccae858cd5e4b0c0ece22a7c66768bbb85018728be30
 EBUILD keyring-12.2.1.ebuild 1017 BLAKE2B 568cc5619b1b2645c999d3175720469157ee2d55955b8364422a2bf72c8d4631c24e9bc71e0ed3db1ae625810e8a5cb0c33fe6ade88a4859b1e4b8447336fb4e SHA512 172ef757531fcc524676747080b0a383c11c54dfb48180aecc6d82dabed7f803766804703aa726a4755b4c5df108ce6babb56096ad4cd325d71a17a877af242e
 EBUILD keyring-13.2.1-r1.ebuild 1184 BLAKE2B 96c4fda0e3a375cca0bce279edf12f44f5fad2164936928d049f77e720b969062e4c829cb097094c6ae3e138ca1086c179249162c33f8d2a7743a1d454c7f51b SHA512 b0b840ce19a4080a4e6eb56b70ee98d173b7086808e70ab631c041396956c5fdf7cadc8a1d1cd456527984cffd7d0e79191225fd5823f154eec266eaa1c10b18
 EBUILD keyring-13.2.1.ebuild 1019 BLAKE2B bc4e761d749dbaded425683e054028ef234bcf7ed33722b0dcea89eec54f6a58dc6d065657df8af185795651ca1c5e6b01b23b2fb964aee8ae4554c771196f50 SHA512 ac5b4ce8872dcc73b36ba8429dee0af9282e3fda7ea7f33661809b033ccaff9e064562071402fa6e43bd8bffb07cb1dcbe08277eda1b15b96aa86da74b9ec8fd
 EBUILD keyring-15.0.0.ebuild 1190 BLAKE2B 5c41f74fe95dec4d8bda37ef215f77e921472d2a204e25631e47b56823f73c0d1f742ed9bbff8f2d2f36efc2c73bc9be940a889609cb5b7d28a9b24cf05da4a6 SHA512 c05684ea5b24771c121c74ccb3b526d555baee2f707a0e95a0b5d731ccf0602b647dc8a58ab0fb0bb0779561eb619f69342098298c719bd0894fe9ba1cf2c297
+EBUILD keyring-18.0.1.ebuild 1206 BLAKE2B c0dc73a01848272014ea98f38e02dfb45f272c126952f6f561356e15a6f20d596e70e388fef61db866e3277395542d10769fce65aff1e4a207484bb6385e6f2a SHA512 b3de38dc1b61139771ffc7fddef303be3c04f459d4af5358496c72dd381b35782f2682a11e25be52dd17912658cf9816db413d41122f8281b997359477eb568b
 MISC metadata.xml 773 BLAKE2B 0a0957f622a38547688b83092b5961f3fa8f3c7a71cb628c6e5525b0a95f37345b5de0cdb5f5a80ce30a96150c6409920dcc391e230d8fbc6ea385b055a30add SHA512 939015ee7c67aa097663ef547b0726f7c7fc95d659b5f71f414b503e61f28604c05a252a084b65044ee2fc331005c10b5c8af4b4b361527b4a42e061e88b5018
diff --git a/dev-python/keyring/keyring-18.0.1.ebuild b/dev-python/keyring/keyring-18.0.1.ebuild
new file mode 100644
index 000000000000..8dbccefd2219
--- /dev/null
+++ b/dev-python/keyring/keyring-18.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-3.7.4[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	# Skip an interactive test
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		--ignore ${PN}/tests/backends/test_kwallet.py \
+		|| die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 06f2604fdbee..5ed598726ee8 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,13 +2,13 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10
 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.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
-DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
+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 904 BLAKE2B 74ccf4ce59c6aba63fec1f0dfed1e49bf751abf8cf61626f95534f46ecaece80b793481d7cf8115193007c9c13139018f28b6e4c86566d8481614229a84be5c6 SHA512 13a3ea3609045b3cba077e931b5ae52837c4510640bd5b6df7df6819166e069f3d4eef85ecd5dc1043868d7889539383f64c9f0655de0d88129e6b0d7a4f8986
 EBUILD lit-6.0.1.ebuild 1014 BLAKE2B 549c00ba1da9265ef26ea04d574d139f1fbab99f79ed60f270ff960f940df4507376fe31d48776241ecf4a4cb84f134abec61c000a27756ba057083527cd6607 SHA512 729a2b96a49758b18e59ec9df38ddff9890953283185cbae0abeef1cf4f11c2680485f26ffa70a85b326a389a3230e459700366b06f6bcee5a4be9854afeef62
 EBUILD lit-7.0.1.ebuild 1017 BLAKE2B f901810a470fdf95f71bb19e6be4a1321e7abe84054bb529541750dea272ffb33c4eda1e131d2b9984225f25d28036876b56d8bb0c9a76a623f7d678098b4932 SHA512 ddb2c555b404d838b4717506a3bdbd40fe5a8d1490175ff65c12601ab1805882b48eb585a1ea1ed761638469145d1e5ecd0696bb01c4ff3d83c5e817a99d5c9f
 EBUILD lit-7.0.9999.ebuild 963 BLAKE2B afea4754348b5b93f93ef1723974f218ccf92bcceb342ba5f453e8d82399358689b4bb30d04e65e63de761ccc92bd2c776d6233c618a12abaf4fda1a770974ff SHA512 dab5c3d116a590f677a9d3773d5652e7a676d26a4477ed10a4f8248f93297881ec1bd9cd6fbca6c06546d0926bdd5aedc9f478736550114bdb777c61ccaf5bca
-EBUILD lit-8.0.0_rc5.ebuild 1020 BLAKE2B 7c3cd9a7fa0682dfc62ae3be51e04bd65c2f38e1027b14eb452d8f7d73afda2b878e64097ed982a707a40d85979abea1747187d503c0567a18b30571b5321336 SHA512 af4806c74ee9f8cbfe0ac97f1f7bfa3fc8c78b283ab72f88c438dae96c010d9fd34b32a36cb09d325c9fdbd13fe8a87a0026926d606affec8c9e16557784bbc8
+EBUILD lit-8.0.0.ebuild 1017 BLAKE2B 5842735e86e51999d8c0bc2616a138392ecaf289518aea104f08c196ddc155cca5fc7b4b4f33253f63e3fd03a1318a44cdf1f60fe7110ecbe8e8e9dc5a368198 SHA512 625f3b917d6d9577985ab5bcd7f0d1dc6dc918ab2e44a1486bc872376d7601a933962d350c2708f93169eb0da59b1b336aeae59174a39b74b68c46b752b4df0c
 EBUILD lit-8.0.9999.ebuild 960 BLAKE2B 3c1be7024e1f32c6c1c73e03f6a909d1f16cbc0750a4dec454806dc39c2fadf32f006045cbf71272a0a35c471a68daa142e96683610573627d82b81fdbc7751c SHA512 d1d2099ef259dc024f91074b5fe5cc6f9d1fa834f8922823dad0b67c8cb92f454e9694aee0b325762ad6aac2ca1b47c497e25027c1c82a186bf937b56c2d95cf
 EBUILD lit-9999.ebuild 938 BLAKE2B fb5fe20c62d06e44e847f6e9f16429e9814d2872281295eb12ea25baf2448be889ec3bac37ec4350971b44c6785aafe9795fd68cbfda1b2cb299f41f28a254fd SHA512 a21a7a2935e8d8c82f319bf65e1b01e135448c2d342baea28b05451f4f9de938b52d3a8e63d544ec35cf4e7ae7bc9bf432eea3f4a44d044631c9ae7ea6fbfdcf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-8.0.0_rc5.ebuild b/dev-python/lit/lit-8.0.0.ebuild
index 2252897106f8..c03a771e46df 100644
--- a/dev-python/lit/lit-8.0.0_rc5.ebuild
+++ b/dev-python/lit/lit-8.0.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 multiprocessing
 MY_P=llvm-${PV/_/}.src
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 352854749ba2..a3babb737f04 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -3,8 +3,9 @@ AUX m2crypto-libressl-version-check.patch 5125 BLAKE2B 969595234bc845f5a5c31f0fb
 DIST M2Crypto-0.24.0.tar.gz 184457 BLAKE2B 15a11dc1b13359041875e8321d0159a1a393b7f85dfbd38d650721d8a2eaed2cc2199859c3e1e3c890033711e0b137f4c78b90f04681ff44a3356558b9f55aea SHA512 c23ae0f8ac790d4ef108a217a44e994341f6bbe4e12a7fef2518d8def82331246a145e19a2504b82b790a3ad4b467d2facc8a73bb7f1190b56441d8482c66aca
 DIST M2Crypto-0.27.0.tar.gz 1119288 BLAKE2B 90e227aef9a5b4c7f5ab9bd62fbe506ea0931a6c338c530adbeb1a8303a31cc7755d13003532fe0ee4005f1997db23bed2d03cd54224dc7d89a6f23882197800 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2
 DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598
-EBUILD m2crypto-0.24.0.ebuild 935 BLAKE2B d15257bc6f02af9dce4514f19e7b2e1ba29eb3e1091acb8f03caf2db32164fc87548f5b55e37e8d616b1fb3ddd19a43cd899aa248ef9300a910af644ab6b2e4b SHA512 39c75d9af3ed016a8c3e363350a4f37ef7c31b8867684f66189652127494f4a53aea5edf451005a3c6b901241797556ab237521f80f6ca9860b6b2a4a97b7dcf
+EBUILD m2crypto-0.24.0.ebuild 931 BLAKE2B 1432ae4df72dea3159ae0944e1dcd53d7e8c65146cec37c6dea9f88e72b8e97a4072f9093c87438dc6837d07058fc2adfc859a6462d2dc2cb71a875efe5bf618 SHA512 286f19ab8c176c57c775c0ea5ad4a800ca23155bd2b088071ea1f4a1cbd057352738e72a559565cc08ca37b0776c669150d8edda987e228fb78a864efca2aa6b
 EBUILD m2crypto-0.27.0-r2.ebuild 1361 BLAKE2B 85800c96f50f5f080eee9aa96523dae8f6ace906568b6fbfb1d04bfceedce813bd24eb315364909c0bdae164a4856e369fa64dd4b01f2f2e65eda6e5696b0833 SHA512 777df5b5eddf9cf1e4db99c680b3bf08a3a99c3100b701dc41b1c7943fdc8f6da5b212a9668ae3e3cf820c39cab24b5e034d8546c0a360351a51cefc1b841320
 EBUILD m2crypto-0.27.0.ebuild 1298 BLAKE2B 97104e95a890d7dd30a9ccbbe4328e09e3d99ab86736aa68dbafb3e2334174e9f2a64964351f7cee426b2433bb008b5bd816a454c30714aafc9ef0d8bbd8cb6a SHA512 a4ed82f6f69fa6edb4ac6449c4472f76c7ffd438711376cfe616b0cb0b3a06639d7f1ea31dfbdceef8d17847982997b0ed722df3d53193ad2471553b2bb3bb7a
 EBUILD m2crypto-0.31.0-r1.ebuild 1343 BLAKE2B 3841013b68a17cef27f7f22ad136ad734fe36f76eab57a4ba07c8a15c34b5ec354f3705c3cfa97e0befe357233f858110bf7d95c9bb560cf3bea9f437dcd15a3 SHA512 55950b02e614de392cd458dce92964a2dae8c573f5f4e0b78fc948b7b9d41c92fd3d4e097eb46aa0e81798e0312db05fd2ffc7d62daa4daad45bd417c7e1ea30
+EBUILD m2crypto-0.31.0-r2.ebuild 1330 BLAKE2B 4221a0c9eeea8ff18aeb192a256e2faa27b8060e4718916a1c2ca0123631ece5ead39463b895e38261b98e80da1b0c84fdbb078c686b29d63bd21df1ef16406d SHA512 d93f14be525f8dbfb06332d8fa202831ada32462b80268666664754541f5791e6abc78000ac59adc85971ede44aaed008e83aa0c65d5933dd645e3b4caa6d434
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.24.0.ebuild b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
index 07d6f143b4f6..6fa7deaa9ba1 100644
--- a/dev-python/m2crypto/m2crypto-0.24.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.24.0.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=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.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 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
new file mode 100644
index 000000000000..ce9ae0aabc25
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4..7})
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2.0.9
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-${PV}.patch"
+)
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	# https://bugs.gentoo.org/617946
+	# TODO: Fix cross-compiles
+	local -x SWIG_FEATURES=
+	case ${ABI} in
+		x32) SWIG_FEATURES="-D__ILP32__" ;;
+	esac
+	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 79461fe80094..3ffef991aa54 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -6,7 +6,7 @@ DIST m2r-0.1.14.tar.gz 15926 BLAKE2B 48d8961b6ebf66d494511f6bf755ae2d2de0740aa27
 DIST m2r-0.1.5.tar.gz 13202 BLAKE2B dcfc5ecdcb2c696c1eec8fe3eca4cd7e238f605c399b750286d9eb18ecbda9d80b608fb362a85959769253c5f5bca7e392ed5b61a7804b25cab5e7bfb5edf574 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84
 DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044175f4ecbf885b80019d62f5fe80579420af373ea3d62fffdcc62344d1035d901208719be1cfd56654a01 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7
 EBUILD m2r-0.1.12.ebuild 1220 BLAKE2B 782985c6a75f4f5749ba2c05fae107b0d160af5d6129daef80b060a7f59968ee6e7250913ee85a735c7dd598059722a682c9f04156a277d06566f8c782f927ab SHA512 770e059948c3ddab9c6fe61862fe6a5c71d15e8e404e52b87b3dca3cc4a85f00f0bdd219e82de8c4481e02ad20329007abb7690303dd25d4c423e3d5b1166340
-EBUILD m2r-0.1.14.ebuild 1269 BLAKE2B d7a6cda9c82ff13193af286595f69ffb703759d95e0fbc711e583931f4954b4a2588707aec6ef83eea4f4b250d7deaadf252139ad7f696ae1a36c5de62be756b SHA512 b179a40be312a01dc4d3b93c1e56e2b46ae25f7b2fca4022d6f6ed2b2c5c6ba3d090ddeb56eee1dfc54c809c8ec8d7896bdcde2f37c06e1966797ca81d32ed71
+EBUILD m2r-0.1.14.ebuild 1282 BLAKE2B 645d488db507af5707a67b7cb1ade91f8f9001e9ac6d2e4aea9d6f725b44266a6f6f50d2ccfb19ed4149d44c40d5a63a7f5545eb5998ae6663fd409d0bf71b1a SHA512 036421d23969bb6fa04cec3866c01be9fdd06bd6de4b7f35774008bc75c95626232fbe4153dddba537ba724cbf1e8422b89569d21cbdfd9314ca892176d4196c
 EBUILD m2r-0.1.5.ebuild 1273 BLAKE2B db1bde499f58a814e4d198c7329b071f97a8f657f8138851a2b419af4d9643bf2a7032dd3192c531abcc7ddf59e24d026abaae94ac1e022f3453dbec12b836e7 SHA512 06ad005f6d85f9400f74e8d3e8d38c0537cff9d7c4b35270802b334eb32df4d4608d1f0f0c134daa2fc814959b6ed607da519a4b2fa7841e4b416a9659d67f2b
 EBUILD m2r-0.1.6.ebuild 1273 BLAKE2B db1bde499f58a814e4d198c7329b071f97a8f657f8138851a2b419af4d9643bf2a7032dd3192c531abcc7ddf59e24d026abaae94ac1e022f3453dbec12b836e7 SHA512 06ad005f6d85f9400f74e8d3e8d38c0537cff9d7c4b35270802b334eb32df4d4608d1f0f0c134daa2fc814959b6ed607da519a4b2fa7841e4b416a9659d67f2b
 MISC metadata.xml 554 BLAKE2B d275cbf42dd1621fd0dce4fdb85cf0832e3160cf7468e729d39f33afae099b354ccb21e6de312888ddb6d2e97a487a02cd9d97dee033eee960d0ffbeda70c704 SHA512 ff9d0efa78e4931a4f0ed8097cfdb1d32fb1a99f825199fae42838ee534c045c30c440e9f8bdc41639adfa99efb672a587d11f84f1bc7215f8e59655e1dcaa49
diff --git a/dev-python/m2r/m2r-0.1.14.ebuild b/dev-python/m2r/m2r-0.1.14.ebuild
index 21107e515799..3b969a248c3d 100644
--- a/dev-python/m2r/m2r-0.1.14.ebuild
+++ b/dev-python/m2r/m2r-0.1.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 92674dda48c5..78528174e8ad 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,8 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
+DIST miniupnpc-2.1.20190403.tar.gz 94204 BLAKE2B 6dd23a2b0b497a95bf8a92d63b95b8d3c85074845d1f2d9380701107e12262cacc2e80d4c324b95aeca76412ec85d5e6118eecc2131f352c8f2a5d489f833d40 SHA512 810ece8f3679c8caab447a621a7bc128a2f1780b455574d3514933c0601223cb14033e97f8e667c596632a75f651dbbb0294523d873e8212fdb5fd3cef61e65f
 EBUILD miniupnpc-2.0.20180503.ebuild 755 BLAKE2B 09f856aa3c72074d75a01e1b1d15d48da5d2dc82f05a1167cbf0f04667db97f8688c6b7f54f3286743b12caa861490201d0d0727a21bb0fad8e2739bdf90234d SHA512 a4f28b3223ce19f6c6cacc4b299bb667865b60979095737577fdca1b94dd9d72184db42a076450607309dfc90344905e521aead19f99d82382089c39322c4cee
-EBUILD miniupnpc-2.1.20190210.ebuild 753 BLAKE2B 98e4294f982823c049c5f75af388d42bca2ab99379234e2863fcbb9e5d2a733c895c37c08b6f7974d5f4bc62a3429bd0f1ec65484381ad27b843e88f3949cb22 SHA512 e15f6ba80032ccb20735de328d204c5761072be243c4f8e1fa869732df34cb9e9485fc3b0aa9a80008d083e76ca03bf1b4c2e8484eb6f919ed934cdae5aeaee0
+EBUILD miniupnpc-2.1.20190210.ebuild 752 BLAKE2B 6f888e83e28f1060812f5e464f3f09e0ead876cd8d2a3feeecbd184823b7f3d347bf4a9bef20f16f426b323e607c0195ff1d7f515297c070cddb52b1d817cd28 SHA512 8409024efe04b785ec6fee373e014f6b619414fc3c7151c4c4255103e9de1971e9a4c5a4b490139b9cdbee01e2b573b0067a3233c3ab0f8bf2fb004e9b4960ca
+EBUILD miniupnpc-2.1.20190403.ebuild 756 BLAKE2B 7979b77b8bc3245374322e59dfed7907cb867cfdd52b307f00a38ebab6409899b9d578412bea3942d43b419cf77d0f522097afad0756a1c4a8c3a12262728fc9 SHA512 ccc13cd1a65667178455b4ba0ea4c549b173511811385dec71c319c161a15086b6ee433c63bc3f400921878d9ec21887a6c774d5835c0d32d1163b289fe4f3e7
 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
index bd9ca5ee4a1b..b1bb86c3c437 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild
new file mode 100644
index 000000000000..4474c7bf0051
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190403.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="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/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 997073bf4e80..390d51064258 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -2,6 +2,6 @@ DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2ca
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-6.0.0.tar.gz 68178 BLAKE2B 64a389cfd3449c4711228fcd3092f6d7f62968aeaf0574fcce4bc3223da8b7633d0cbdd727cf4d56f536aa925dbcf78b6b8c3a2a3ba3ef8a0b677811367d087a SHA512 68ac1829a1a27d3f1de1f95c33a9c3f236fe80f597b9183707de0d9cd193ca5a662080e64c54c376ae59fd0a3a224ac62a9d39be4d0ba425103c4fd6e93e61ac
 EBUILD more-itertools-4.2.0-r1.ebuild 1054 BLAKE2B 365af190a89c382bf656cf635c5accb705b0b482d496b890a1bf363454d41d3db7d7e3044db3cd22e23635f1d98fcf02080506c2293849c86fad084d11a414c1 SHA512 e9e3c839fa11b532f7759119ce33e244a13b415ed750019b2d0d79927433e938ceb55d14a7fa89cfefbf93a10653fa70ed742edb02dda6a01d3b885acdad67e5
-EBUILD more-itertools-5.0.0.ebuild 992 BLAKE2B 4e857558be86e28a0c4f196c32afd6426ff9236ea8fd0e27f6d222145ac9cb1d07c7c5a440cd5450db44d81fa2ddc0e6e812832cd8a87858aaedf7838ebe27e7 SHA512 15c6850bca9ee1e504434f7254f14b2a857ec2d7d60194a136eb22b86ee9ff01f6d4583a6e4743caacfffaca3cb22606353158dd4ad12bc3e8b3ea67f32cc49f
-EBUILD more-itertools-6.0.0.ebuild 919 BLAKE2B 56434a62e3cb9d022d62d799184fda7092554c359af179945347ace456cddfc4e09c6440640e0a92fb008714657631a215ba6d1114d931b6fc17ea536d3b5798 SHA512 bb7e3385eb07405377c7f256df9c1d992030f0c37662609a56d90420134f6babfefbdb831e96e6cf7cfa71eb91818aa94d4e2d3fec6148d72971716cac2adc66
+EBUILD more-itertools-5.0.0.ebuild 999 BLAKE2B bc131529830522873488ad55b801adb049c462a5300e5c246dd46ad310bacaac659f3b9bfa4a6563bde050f8e44879afade9cc3134089f437bd12042f7e80179 SHA512 493927126226f50cd1659eeb4c9d884b79a1672c2bdb6e0057d722e6bcad0457066adc13e43e6a31a2c3a6e3d7d744cbfd87ba3832d84327193e86ff153757ec
+EBUILD more-itertools-6.0.0.ebuild 929 BLAKE2B f300d8cf244f84321e4936974c93212a3c214f8ce044fc7584722999d8405b090dad0fdbcd7b4b6b676a1dbc5b1e0677dce2012c3ea724abf984dea431743473 SHA512 3ef6b99b42c86c04d93d254365f96c43ad12ee17d3f1b6806c37009e772c51e4f421ab05918e6457f4d63a9437e6e360b3a8fd288c9bc7c96342ee980d570e8f
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-5.0.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
index a4f82f008ae7..7fb03d48ab89 100644
--- a/dev-python/more-itertools/more-itertools-5.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/more-itertools-6.0.0.ebuild b/dev-python/more-itertools/more-itertools-6.0.0.ebuild
index 1c297107e810..2253816c60f2 100644
--- a/dev-python/more-itertools/more-itertools-6.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-6.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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="doc"
 
 RDEPEND=""
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 994cfc8a8306..39e3fe142c0d 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -4,16 +4,19 @@ DIST mypy-0.600.tar.gz 1097269 BLAKE2B ee3327cdd7383a93f319335017815bb3341d1b91e
 DIST mypy-0.630.tar.gz 1172089 BLAKE2B 672f05f5fa45b922ddebb5ea802358f8a63eecf2671540e9fd53419e9bf04f9513815bdb9cca546b4f9483443ea0d4b55bca259d972f124a33f3a77c4b853e17 SHA512 42e2874c2334d04a08a4ac95ea3adae6e910a7811abc9f8a480ae7b87b3034fa8096c12b4dba1d3a9722a2857da8bb76813dd1d858b828934273c1147bc7387d
 DIST mypy-0.660.tar.gz 1274856 BLAKE2B da59dbae31df1c2c8530fddf44f02d608cc9019c9294919e015ef7e62ac8680162a044a98d109e5aa7cdb1f1a611b09659f828c2366ce5a850c23d5f68a11047 SHA512 4d18fb8e04ba2e4d290582ecc2af660ca26c4ef3ccf5ee5455f4be9fe9dabddafe644ce6463a8079dbfb04c463b759283af23014065f290edfa0255879bd0076
 DIST mypy-0.670.tar.gz 1376917 BLAKE2B 1c7de26e48d91a1dd8b007607e6e8989e6b622eb62ad98b3c575faef1373ba510acba546977d26984689c5cd245ea341022ae68209d498d8bac78b01760daa24 SHA512 1fb994410acb3ae3ef6c4380f1b76d2f65790fa7822067dfd75eb34d0336547f85810e475563c797dca268de35b1594217cb3edfe32033eb012d121a3a2e6406
+DIST mypy-0.700.tar.gz 1413962 BLAKE2B 6739960bdb5984115b4bd84ec3ca63e6b7a4c4494c48fcde8bab4b3679814e3ffdbe1319a4c0e221e3cab6521d95568839ded58c29dc6f2528d15d684e3c870d SHA512 934adaaf8ef48a843c8cce159502a2d4ca9697cf44bfd9a1c0f77e05da9bfb75ec099819e5543a4bc2492c670ee1f1f843df82746aaf7573776006d7dc6b57b0
 DIST mypy-typeshed-0.570.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.590.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.600-2dc7d39.tar.gz 425045 BLAKE2B e2ef63f2ed988f77f52e2a01c158ff8e3fbdec118c1f613ffe6c57d025da8d5bcf6dc0e6bcbc1bb8655fbf340a0f358535d7e1ed214a5a1af8e3188f2dde5459 SHA512 9c960c2dcb2cd5ed36d77efa47a5632698e841b685386f8d5a31200c61235b68d627fc450d070955ab14962d6a70a2d538929e2dc845512e83161c0299d91807
 DIST mypy-typeshed-0.630-8ed0159.tar.gz 451750 BLAKE2B 8d59204bf71fadc36788d93e817fe22cd498dfee08709f4c72ba67bca34d0db4792ea1a01f5632b5b52e94298c183e804357c9bb043e28e0628d82320d20852c SHA512 6c5a03853da452f6540b8411bd702ec59e70aae8ca6f923c16959bdba1ee97a619704c5825faa9e428151898b648f0436f9c9dd0c5ef20f5022598e3b88afcb3
 DIST mypy-typeshed-0.660-f343150.tar.gz 456324 BLAKE2B b7a0f7e3da84b4be8c4cfdb43a62887ab433c22395af2ecee558440b15b9ffadf824c1eb3e8084d8c74ec61301a14f73a7e1ed4802522481e3545872be3f1010 SHA512 c64dd1aa2eb1bb6a0bebe819f7f9ee1b81fb6f6f1da5a2246f5b60aea97a16d86051dcef176b673afe9788bf16f5378d03c5b071f72b9aea727737ddb5adbaca
 DIST mypy-typeshed-0.670-3eb66ba.tar.gz 462981 BLAKE2B 9e321e71637edf6b7b08bdad3ffe76798aec2ad9ff7be0d1649e29ae7543536a6a6d413d9bd9bc4b15e164500e95ee3ba2ad58abc8f984499493c4753dd39337 SHA512 2b3d59451caaf4779c6543cee70461afd9a95b809ba5db7b0fc43e02711d8c4b28c98f680d9ddb9f0c01dcfb5011b6626fe746187c47e737d87689245da9344a
+DIST mypy-typeshed-0.700-f7c00b8.tar.gz 467098 BLAKE2B f10c9c6b3cfe9bc8518950839c2bb00d22521b6696a155cf721d34aac46205a8415f569d566f20ce865a44c23e5935748e5e488aff22950fbdd12bad4e679a42 SHA512 88e1ca3bc88f349a26cbd97303398de270eaf9332432b0402d7b44794cadbca86612df98ff1abed2a146450df760278946cb8eecc660f3dd5e00439c60807362
 EBUILD mypy-0.570.ebuild 1563 BLAKE2B 63d388c767582831259a05e2f5d602d708e3a69b5a7c15ee1215298168817c1a7408b9058c573aa6a79a3e59efab4c480ec233e8d90b72df176d1db60634b2e7 SHA512 1dc8d4fcdefe9d78bb9eca659a4f7e31c48b3ef9f7ca477daf08bf0ad3a18a62db1f68f0a84f6f76a18f1fc6c493fb508ec96ac24f827f671abe285dd63412e5
 EBUILD mypy-0.590.ebuild 1563 BLAKE2B 63d388c767582831259a05e2f5d602d708e3a69b5a7c15ee1215298168817c1a7408b9058c573aa6a79a3e59efab4c480ec233e8d90b72df176d1db60634b2e7 SHA512 1dc8d4fcdefe9d78bb9eca659a4f7e31c48b3ef9f7ca477daf08bf0ad3a18a62db1f68f0a84f6f76a18f1fc6c493fb508ec96ac24f827f671abe285dd63412e5
 EBUILD mypy-0.600.ebuild 1582 BLAKE2B 0385941aaf081377960c898b49222a79048e76203de3827b4a20fd8856eadb046ff6841dba3ed7362752355a56d880d9bb208749af15848fbc3317edd890f654 SHA512 543de4441dd2efd08fc5088592ee19a7da95193c06a05cdbfcfb0732380a2be0022b17622e33b80f51f522a64435e88efb21c332722e30743d6cb9a97f8e9cbf
 EBUILD mypy-0.630.ebuild 1591 BLAKE2B 7b2d320a099f1dbd441952aeb2622a7f98133b7e04643574dea58b20a69967614dce2f0df205bd894bdb185986bbbdce1a7b0464b4c3bc69ac37d6a1fa66f634 SHA512 08709bdcbcf8413357417a37c5adc2136aa6dd685e5ad13bf36efd651b685b9e40ab0076df3cf4d6be969de26871a0fa7d6b72ef5ec2efaf04b4a3ba9c6079c5
 EBUILD mypy-0.660.ebuild 1823 BLAKE2B 3f82e348c8f6179a40cc49468d9a1c59e2c98a6526d081674d1e0463e7f6045ee9c926630d8df24b34c366742f4772d4eb8498b0f122417dc934de9bed86c797 SHA512 a4364d89c52536f6542b39bfd45417ce0f7328432a5c468a14a41ed0c8a5fdb8bf2f8cab2d239005548e630ffe9e3adc3ec2340c279be2415056cf9ded07a2cb
 EBUILD mypy-0.670.ebuild 1823 BLAKE2B 037ba694acb544fff2f5f6c602e302d2e4348fad705acc19ebd0b8ca1dd6c326c686a86a403182afb3e8ab19f0d2eeca64244fb2ee2d69e194bd8ca87abccc5c SHA512 7f44a70ec9e0b4a4a97bd8a657aa7fa9a2e5d15c71bca119c09f129adb04ef02173697a12efa38da7442eed9a222c84621610d96dc2691d505f84a5948419bce
+EBUILD mypy-0.700.ebuild 1823 BLAKE2B 7f0efc2bd69373bc10872089728dbe2606d9754f43a54542f944dc1188a65293e9ed67a321def99340ba7d3bcb8aa79aacdfe578c87e19416f9405041b48f685 SHA512 74f225f3cf4f3b8ccfdade61706582571bb1b35eafb11d5fb86c1a723a535047d662cbff30da76efabbc1321ed5a1881a782d735c285002f076803daa98ddecf
 MISC metadata.xml 318 BLAKE2B 26aeab57c568a3ebc431f846d61405428034bf9cf8333e5f52f43ec68d51fbbc2cb71deef622c07291312f63f46f29007ba4b02c21e90b4af3db039a43fda4ed SHA512 9e3c8432730d94d7ad9c65ccd1a48d7afc1b43662097f0844048ad107e81ba30e03bea99f64ee8a4171ff0504f1ff04d8d9a84407f414ff228cecadcb80c7c43
diff --git a/dev-python/mypy/mypy-0.700.ebuild b/dev-python/mypy/mypy-0.700.ebuild
new file mode 100644
index 000000000000..caf10d3393dc
--- /dev/null
+++ b/dev-python/mypy/mypy-0.700.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [ "${PV}" == "9999" ]; then
+	inherit distutils-r1 git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	SRC_URI=""
+else
+	inherit distutils-r1
+	TYPESHED_COMMIT="f7c00b8"
+	SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${PV}-${TYPESHED_COMMIT}.tar.gz"
+fi
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+CDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/psutil-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.3.1[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	"
+
+RDEPEND="${CDEPEND}"
+
+src_unpack() {
+	if [ "${PV}" == "9999" ]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		rmdir "${S}/mypy/typeshed"
+		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed"
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/mypy_extensions >= 0.4.0, < 0.5.0/mypy_extensions >= 0.4.0, < 0.6.0/' "${S}/setup.py"
+	default
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index 001f957ff497..3c5159c96b02 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1,7 +1,5 @@
-DIST neovim-python-client-0.2.6.tar.gz 50170 BLAKE2B d241ae0019bb8a4f08abf11866d7c964425d96756452e7bafb95fbce1795657c6911cf6bb706f5efa46ac3f5bd2c4af23ade9b9677d8f1f94905d72a39ddfde5 SHA512 a493c1e6be6a196d35e69e6b6b6a7752e939a254ed423079468c0e13ce40c2646ee8d65482648ea37a9d9c53b4f2c50cdd5e6c8dc130e63a7e40f424c4f4a9c0
 DIST neovim-python-client-0.3.1.tar.gz 51626 BLAKE2B 80e68d02d41c7891fb88e9386866f87a1c78acc9e279de4ce4c7022333f8da3b68ffe7c598c84ff9c6386458639b6ffb4aecbfe72288866dc147ffc6197e94e2 SHA512 9c1599aabce9f0e1133364f8e91dd1b57cee107a11d400f530218ec7ad157c2f58134c1e7e8fc27649b4d8953e27c51bf6e4f0e7565d8c3dab94788759eea229
 DIST neovim-python-client-0.3.2.tar.gz 51954 BLAKE2B 8e0a5eb510797db260ab501b751921f5c98551a06cf874eecff270f5f92da5d24539b857b4cc08494be9dfed139fd3bcab1cdea75ee87d99cece8e1f48f7a1c5 SHA512 c6d7c1a2955c63ac2f59bc57e190886fe0ee0238951ac26205b537d394b2ce2fee3611e8651ae1da5e6e7b3a1bd3bea36912b918b26e01bbb3354ddc2fbd77fc
-EBUILD neovim-python-client-0.2.6.ebuild 801 BLAKE2B 7c12157d4057993215cadbc12798cc67029b0740076892053de16feed7221ef62cd29f460be4314383b597f74ddb53679bc59898a289ff7f44ae3fab175dff12 SHA512 d28b9551284ffa8598b046cfa6cb87d30a18843861b7fec91d3b505fd0c7de9c98652dedf66fc2f8b796c091f42230378166a7d779d83cf44984d5ddc1726e93
-EBUILD neovim-python-client-0.3.1.ebuild 777 BLAKE2B 5b54d636bf4f1ce02f25afa3267e37b813adc057513b78bf886ad4a432f6621e86639205a82e68883ef58d665233ee84ed2b5557ee6e01f2bd76e162fe39401a SHA512 87e726b122b349c19dee6c138e33a2a01638f3981d5ccca2607bea8c445a615aba751f2e9c17822c77087d3413a4eaf07e8a02f92c44601e0e3bec002da16bf4
-EBUILD neovim-python-client-0.3.2.ebuild 779 BLAKE2B 36b8d873b8ccdc37b889580f52883b5fd92522b1e4a27fce28100a941555532b7d83d0be7c3850fb8464d652411bb49e2667500188deb36c228b23e74d2cdb1d SHA512 33249a808e2d3d372f96f8e6521bc2469720796946cef10f289ba43568b697370731e7b80846e5a367d148ce90d03bfdc391b4baf6cb58b58e4367588f81537e
+EBUILD neovim-python-client-0.3.1-r1.ebuild 769 BLAKE2B aa656d215da1e7753508bc5ea5ce14b991a54ec19afd52fd322a747f5b925dbd46591acb8f62eb760c7f65e2c9ad88b5ede7333680a4fa0fb1e08d66a8cc1178 SHA512 62c9bef7294ab415e2023747ad31a8c3cc6b37fda4abf57ce090c5baf96d86797ea77f4239619b84bb930baa8eea699fd3ee02beafdabd5c5e59f88c5c0ab981
+EBUILD neovim-python-client-0.3.2-r1.ebuild 763 BLAKE2B f8ec332f852b10133b755492d608f868e832241f8da1cc99e6d6dd5213ce14fc0a9622fef88a8d2f40184313d50db252cffb3796bb69139b8809360e45e7c5a2 SHA512 665bce60d5fce1cefa52802f6d9882a71967671b9eb15c594daea41929da220055c467e158e5746c20610d8cad2362281ca8273e0dea01c3300f1e919ae04084
 MISC metadata.xml 451 BLAKE2B c2317fb2bf039a77c223c958dd1238ed934621c556c9c8f565bca643a73e79bd036b71bf104146e810300bcfc755328365982d44fc4b4c46676e64d8720ae64c SHA512 cf9f4169ee1ea2adc6f88b17461202cfe120c20a5367ccc0da4099b8792841d13057d8c133c85179b1c5b00ad4bc9954a0e9202b3810a6342f8e052ffa3dc2f1
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.2.6.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.2.6.ebuild
deleted file mode 100644
index fba1505898d1..000000000000
--- a/dev-python/neovim-python-client/neovim-python-client-0.2.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for Neovim"
-HOMEPAGE="https://github.com/neovim/python-client"
-SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
-
-RDEPEND="
-	${DEPEND}
-	>=app-editors/neovim-0.2.1"
-
-S="${WORKDIR}/python-client-${PV}"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.3.1.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.3.1-r1.ebuild
index 751a436d4fda..5e5ba983bf68 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.3.1.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
 
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.3.2.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.3.2-r1.ebuild
index 6956edc96bf0..52c62c1ef2dd 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.3.2.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.3.2-r1.ebuild
@@ -15,13 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
 
 RDEPEND="
 	${DEPEND}
-	>=app-editors/neovim-0.2.1"
+	app-editors/neovim"
 
 S="${WORKDIR}/pynvim-${PV}"
 
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
index d7891091b21b..4ce93ffad2ea 100644
--- a/dev-python/nose-show-skipped/Manifest
+++ b/dev-python/nose-show-skipped/Manifest
@@ -1,3 +1,3 @@
 DIST nose-show-skipped-0.1.tar.gz 1768 BLAKE2B d79272ac7fd065fe28b589b3234abf527911326d1fea1c23ba0840650d2741846b188788fa9cbeec4a56a78737ccaf8c781ff1f9ac97a5b1d1d79161ba3ab0dc SHA512 b6f3cbc8fdc6af7f6298ad54a5b06bd053d27197368eef1e006aff438d517dba549154eb3be35996b0bd1c291537729438f52709b76c507e20c496b6e504f5df
-EBUILD nose-show-skipped-0.1.ebuild 633 BLAKE2B 4662cd8d2cc32f4aba39de63eafde0f67c74d49b645c4df8fbb4ef850b4b5d5cd7a35f191d1a991e0d5fe4c8aa78ef6f946e7ca026a3525f823a277719e9b21a SHA512 5ee14bb695efc2ee03fd1f8f555fbf51d3604cbb03faf32e06287989ffa9153d9fb19b6d59547e792702150ee059b6f20f2e53fd1639e4fb40829a6adcd83246
+EBUILD nose-show-skipped-0.1.ebuild 629 BLAKE2B f9ceffa4cce7f57929afb4ced9a57639377c1252d1c4d27fc04ef8b2f2346ccc58468955125ba85638882d9f7eb2315ddbb609eb4cf18967b0197a8a279a25a4 SHA512 5c5b2db6da020f26c8444c8251a96ab39110679df53aaa034a3fae02fa630fcf8700c01f69eda494beaa6bd35f9c5217442d938fe180db2e4e2fe0a6161d6493
 MISC metadata.xml 521 BLAKE2B fe86fa52febb5f3de9c44e66437ce7c0f05d88dceb9708cf7f316d6e4002dbdc53496d2bf0f568fbc67a92f01a0f439b4e9f0b561cd49cf16e0591034b3bdecd SHA512 de78277716b856994885a2eb0d7906f3643e1b76ad263385063770581c8c11cdea081cdcd1724182ddef0c799438f5bf94b7de885b4a3f314df6efc935aae2a4
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
index e05014376fab..a4389011ac3e 100644
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
@@ -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
@@ -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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 5c0ede102887..ad6ef901d0ec 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,7 +1,9 @@
 DIST objgraph-1.7.2.tar.gz 545016 BLAKE2B a124e5fff089704a7ec24a0e4983e8ab52a074a557a5b885f57819bf2ea5cc667ef0b007931b32be131ee56cb9d39798b20f999670ce7112b4f906c151298ce8 SHA512 22012031723060b47058c00cd97035b53238f8cf49c4e51b1f7735bf9c1d5aac9a5f0bcbe605317952f9b9390fc3bf247211082b4540e05cbf76670c27861ac2
 DIST objgraph-1.8.1.tar.gz 549402 BLAKE2B 8694f051c9771f27aba0d6927ca15b230a388a6b9d153e9b7ea8e9878283165a4444850e9774c58fd0185b5debfe8aa85d6f94c838d0beb477ed98820312e205 SHA512 c09e66aecc5dadc5a6e3d93e0f97fa6e816c5cbe968540400ed3d1248b958c955648cb2b4247ba00cd2388302dbcc178c55686cd2b95858b965a2717c6ff0c90
 DIST objgraph-3.1.0.tar.gz 629772 BLAKE2B afa34613d8b05399dec1429465d81b026000ac22c0d345289ce7b2c9c7cc0a0bb6db0054bc7f92ab8d0c69e2d40cf860dc46350951251c106e7718daa8efa0fc SHA512 4b997ff1942556fdeece39080ad00d915136d314add94e61e4b3102e332ce3fd029f7082fbbadeffae63f157f05f8af4871dc5b7ee26926d790fb043ad8f2130
+DIST objgraph-3.4.0.tar.gz 634554 BLAKE2B d1e58370a50a9c9d8647c7633a780069581eec61cccef56e83b015f26a7ffbba6b872673d72dc138339b3c97a3f08c02067e203ddb1d1048ae6f3611e0837fca SHA512 f1e2b9f22dfdce56988bd40aaa865572c42688e73800bb7c188b903c67ef3726c03ba058ed30d40792133a2e2fe74d5ecda91be3de8cf7b80188ac0b9f6ac393
 EBUILD objgraph-1.7.2.ebuild 508 BLAKE2B 1c2845c5e133b1d133cbc3600bfdfe3aa3c677ba5389ade4d42040ee2cf0d512da18ef481e8f52e6fddcf10a94859868663193717c3df485af9a8ba940c613de SHA512 360edf2e238396fcc41df3aa253bf4c5d7d3ecd87d2f4630c8be7a7bfce6fcc96afa34b1d86fc019d7da640d9a85c6d2f8c7f6b3ade3025f078b177df7f77d83
 EBUILD objgraph-1.8.1.ebuild 508 BLAKE2B 1c2845c5e133b1d133cbc3600bfdfe3aa3c677ba5389ade4d42040ee2cf0d512da18ef481e8f52e6fddcf10a94859868663193717c3df485af9a8ba940c613de SHA512 360edf2e238396fcc41df3aa253bf4c5d7d3ecd87d2f4630c8be7a7bfce6fcc96afa34b1d86fc019d7da640d9a85c6d2f8c7f6b3ade3025f078b177df7f77d83
 EBUILD objgraph-3.1.0.ebuild 608 BLAKE2B 1f45c168e97a5e26ddb0a2fb5f5c8271b5484f81f2564e8d5239fd561fd0622f24800460e129a78079b0a72a89e85b7f069cf460c5828603317e2ce04159a944 SHA512 b9d3901305c729e1b05e350ebc44b13d696fc5788728e72f82eb3bb06983ae868845fc7bae96561332b220a1c0ed74c50c59bcbe48278d2bec27f1d7891ab391
+EBUILD objgraph-3.4.0.ebuild 643 BLAKE2B ae17ecedce7d3c29b3dc2a482971e622adc5dc933ae25bce2e37d1da5f5453627c966a11afdcf6f55a6963c7318a50e78e9b17642f2949e4cda746c22b98b8c6 SHA512 9664b2d2f1602b011b9f06a52c722fed921158c8613f68b1b14b4146eec9561a70db51daa5d7ac9a15ee4f5d59ab8e68208db36a67ef1a11d60cd4d5857e9d27
 MISC metadata.xml 422 BLAKE2B 079428e0094ac67f67e608a3f99dc09a92b6db7de99db8603357a134476f73d135a8605c6c86c5acb8c1d796168badf635ddd526b7710d40cda49451457fba48 SHA512 efdbee08e75b435bc2c976b80ff251eeeaea1e806f8cbcfbc288711f31831b4aca279b303d3e261447c3a8eecd5997c8db848812951c86c02f01b74a9c1de146
diff --git a/dev-python/objgraph/objgraph-3.4.0.ebuild b/dev-python/objgraph/objgraph-3.4.0.ebuild
new file mode 100644
index 000000000000..9a701f9fbbdf
--- /dev/null
+++ b/dev-python/objgraph/objgraph-3.4.0.ebuild
@@ -0,0 +1,30 @@
+# 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="Draws Python object reference graphs with graphviz"
+HOMEPAGE="https://mg.pov.lt/objgraph/"
+SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="media-gfx/graphviz"
+DEPEND="dev-python/setuptools
+	test? ( media-gfx/xdot )"
+
+python_test() {
+	esetup.py test || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=(  docs/* )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 145e28722e39..93a80d66cbba 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
 EBUILD olefile-0.44.ebuild 673 BLAKE2B 0064dca7e792d7c31e961678463ea800e3eb80cc0872e81f5b1ee2a74aec8816638d79c86ce6890085c617566197734e0021efeeb1201bb4a6e50f0f4854a668 SHA512 48ec67dbb3d4c1edf906a2d80d0045271a82e4e671dcfb3751bca236a0bc45e7c391f76a69446444eef8166bce2e4205d8e4798234ef5c358cd67c5dcdbfbc97
-EBUILD olefile-0.46.ebuild 692 BLAKE2B 8c5f845e329b9b33e4c2ece6ba7ee5c64c2fb93793dde6693c780aa554c919d0116834165ee029580e1bc9a4bead5eb94287dc62b4602cd58393edaa978f35d0 SHA512 6a1756f93fd316856e9824db06786cecad5fa72b4d66c4b9a9b1f7bd6f5ea4ce09fae9ba1dfd4b1ade582ef79bd8f42f11964294ebebb298c90e2d959a4ba852
+EBUILD olefile-0.46.ebuild 690 BLAKE2B ab1697300dc34a9ce2fecdd79d7161a6d93f49c01af9e7be8d7d0bf34d2f68270372404563fb7c3024e29c285009859609252b4ce9427671ac016a7240e3444d SHA512 1027b801cf52f7bd62f62aa2a1c266a9a87219f04f483ec65d81e5bccdb1bace50a2fc72c93da964febd3972288f5987e54433a306bbab5beae5e50c6950b568
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index 7fc749c528b7..15761cf7af35 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 5b14ab6d9c35..1086fdbb43c0 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,5 +1,3 @@
-DIST os-brick-2.5.4.tar.gz 173675 BLAKE2B 9e1906f718b79ed3b0b332864fc6263af7d3c9ef0da2d93b2b099e48faf805a0250c525589280b9416897d3751d01d0331867c10ee971ccd849b60f34ac2cea5 SHA512 bf6a696ee48591e49ff6e1eea7d74eb4acd0457257c7733ae649059f307170f4f7bd4154ada3498a801c4e54675c802eb9df096d44063b018a2628bc654ae17f
 DIST os-brick-2.5.5.tar.gz 174931 BLAKE2B 0efa117c756728062ef0ae3bdff4ce8127bd0d800cac906960c9f2d5fcd79820e2b72753744f8acfbc52a8dce8a357583283e2adacb692cbb391c5b198b4a919 SHA512 a343cb9194ca1b497bdec55853258b8d51b109abbb3ea406aab672e87c5c68d00511928d8690bca88c37e65bb4d8bfb4cab2cd3ba6fbff2794edbdcb681e0cc0
-EBUILD os-brick-2.5.4.ebuild 1470 BLAKE2B 041a7235a073214b604b51271698a307640794b870faa4300a311631598cb1fdb2cc93aaa6d30567cee73f89e3a201b4e3894d0c1ae182f053b59014a7059624 SHA512 285d75dcf94e3955c6f3b0f530e622e41b3c779dd86b8065a63faa8c233b4a9d077c539f897c22b660894d35a28831f3a3e6275b6842c6d4fecf086991962998
-EBUILD os-brick-2.5.5.ebuild 1472 BLAKE2B 86d05a04e24382895c43b44dba2f0763b9b4aa135e08050a974cccbf066558fe280c528fe6f4dfe126b27ee68448bae9ad7284950b904dca0f0f39b67e92927b SHA512 a08588a63e9515bcaa03056e82a3289b07b54cfd41d0e334c5edfd1aa41a34cd898ab85966180110ac85aeab5888afd76017973fbc1c3111be33bc1ad7c442a7
+EBUILD os-brick-2.5.5.ebuild 1470 BLAKE2B 041a7235a073214b604b51271698a307640794b870faa4300a311631598cb1fdb2cc93aaa6d30567cee73f89e3a201b4e3894d0c1ae182f053b59014a7059624 SHA512 285d75dcf94e3955c6f3b0f530e622e41b3c779dd86b8065a63faa8c233b4a9d077c539f897c22b660894d35a28831f3a3e6275b6842c6d4fecf086991962998
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-2.5.4.ebuild b/dev-python/os-brick/os-brick-2.5.4.ebuild
deleted file mode 100644
index fe3071c689ee..000000000000
--- a/dev-python/os-brick/os-brick-2.5.4.ebuild
+++ /dev/null
@@ -1,44 +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_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-2.5.5.ebuild b/dev-python/os-brick/os-brick-2.5.5.ebuild
index 0229d3350c19..fe3071c689ee 100644
--- a/dev-python/os-brick/os-brick-2.5.5.ebuild
+++ b/dev-python/os-brick/os-brick-2.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 169ec79abb01..9a1a3197ddfd 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,6 +1,4 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
-DIST os-client-config-1.28.0.tar.gz 64102 BLAKE2B 955f3e4387d38ef99805c9fa53032c974b68d2128c89b9525570f1736f74d4a757e43ec50957bd5fbc7c6c1bf9a9b97577058f44aa9abc77d58e917cb2670151 SHA512 80cea066eeb8dce03afa91a720b2e3449676f019f33c8ab0a3c0ecd5cfd49cd5a061abde1a4f0eb1ff947e505de74d94ba3ce71e763d2e2e4fbd1c72b313d1d9
 DIST os-client-config-1.29.0.tar.gz 65974 BLAKE2B f8632f4f4ae95941e81b039ea928bb1013d4208b93a3cf67abcb689aeb8f2f128ad309b4c86ead98ede98c2a9c44a5e0db49a32bd6e73490ce50a357f1f37bba SHA512 1b50777fb1476a58ff0b6ca9fe3015d4002eee312bc970d23284f2a05c5b27a96204c3e892b8262c8d830b1681fb7376387cc4a032736e31a3c353a0a348e752
-EBUILD os-client-config-1.28.0.ebuild 2283 BLAKE2B 9ddafe2421558c8d6af8e2ed744603e7cd98c05b7833cd5b81ae4e32f9037bf30f0f648a96d0ee44166be9a9dd381a39478101c0dd295fcbbd419927f8ac8a10 SHA512 ebdab2b24800e9467de664c7384ceb0f7878d3ab85a5f987f7b490638a32e98fae1ac0b4985dd03835c2286f6530660aff9cfa425517368039b8a13d4978d995
 EBUILD os-client-config-1.29.0.ebuild 893 BLAKE2B 55d489e118c1786d67d316d101e25b833d053fc67d4851abe71541541d3d21b1832deffb825a748b96ac9f7e7e5f0bf39de1967b9b0eb0def9836603dd6ed7c9 SHA512 9b8bfd6f50e6c9d27487e59f1394bee9a12b2bb0f54790e32bac2294bb34e82445c66b50b6910a1233e86fd817755a1dfd74cf9d164e6a40e373b8efcac42472
 MISC metadata.xml 450 BLAKE2B 107120c3a7de0bdacbcc1d06d9daa9dd5379da49a46cdd8d7578809654eeece85ffd309e12b5044553ebfb8b46176f614aca67d141db99e4a615f98eb140f8b5 SHA512 776aca3159f9e170b02e6d6ef52fd088fc77315fef951f24d6a4477b7a95f109dc790daf814a373df04e263c68ff4f9acf0b50c221e1ea4b932804c4355ec4ef
diff --git a/dev-python/os-client-config/os-client-config-1.28.0.ebuild b/dev-python/os-client-config/os-client-config-1.28.0.ebuild
deleted file mode 100644
index ed735bddb12f..000000000000
--- a/dev-python/os-client-config/os-client-config-1.28.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Client Configuation Library"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-		dev-python/extras[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.144[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-		!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.1.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/test_get_all_clouds.patch
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 33ca2840da78..8eb33a4d33b0 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,5 +1,3 @@
-DIST os-service-types-1.1.0.tar.gz 20838 BLAKE2B 8fbf5b5bf9d7fefcf88f51f98a6e0326bd42c0f452d614801543b45c79cc5220aeb15d4e3225c83636cb462e03914cd235942f06a367b0a4b67805c503b63d08 SHA512 d6a5e9ce633a92c61c7ca2b44e7c0bb5fb7f28efc3bdb7e240bb8c1d06f02ce1c038e11a709508dcdc4bbb8e1245297b7dafae5b49535b69359af576bb147130
 DIST os-service-types-1.3.0.tar.gz 22961 BLAKE2B 6ad32594c7fd86f61b0e9018901da740c6ce7d30ba10610cb3fac1900cb8188084ed754a36b608dc076582f438a8cdff0f655cef2ee406de4186c12b5b454f1c SHA512 6a90cd4744902dc314ae2af09411947270a06db548016a0d8e424e6dd44520b20a24e061425e7dcebe4c62fad4c0bab4636e9537644d87f66e652ae02025afe1
-EBUILD os-service-types-1.1.0.ebuild 564 BLAKE2B a5791b59b29c762c385436d98acca32edfd16d3ce1b0a26616603e29095e80a41693816e1daa27407f58f5726556561ed8a4323d934471588efab0ee1d719f3a SHA512 d42fa5504bfc576c51846a83ffbcabfc58d650f78cab539d1e5948081d687cbd6dffb1230f27f983a967c227df582a8a95baad0e6392e2a4c90fadfe98f6fdc4
 EBUILD os-service-types-1.3.0.ebuild 563 BLAKE2B 9426861ccb5e0d24db74eb6e5843ad2ba8a22192e34565a27a30314d56ef0d389883b2f5db63efa4f275a4ad417943fd9b700a923865e42246b61e9c66ac1ebc SHA512 a3a7c6a6c4679296e0c232e717a3dfec9499524b981a8c88f1582edd2b0d9f6423c6a6d6ca3ff03402878c406d1c3ff478922bdf1499f9ecf4c2d225bdd58179
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
diff --git a/dev-python/os-service-types/os-service-types-1.1.0.ebuild b/dev-python/os-service-types/os-service-types-1.1.0.ebuild
deleted file mode 100644
index 4e2b9f6d145d..000000000000
--- a/dev-python/os-service-types/os-service-types-1.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="A library to handle official service types for OpenStack and it's aliases."
-HOMEPAGE="https://github.com/openstack/os-service-types"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
index 685ad756c860..48b702741cb1 100644
--- a/dev-python/os-testr/Manifest
+++ b/dev-python/os-testr/Manifest
@@ -1,5 +1,3 @@
-DIST os-testr-0.8.0.tar.gz 42102 BLAKE2B 030ee587bc6465e414f09d177abd4f75d869da7e8339e1b396da31165212cec221d156b4cb095b1466b19f8baf2dc01087559b1d6b73fbfbfd41dced3df033c1 SHA512 62b5fbb859c1a3b44bc0d57cf4b2cd0a5e6eeff540f5507efd079a73e0f9ee70813e47537b456f1bc600c87da55d05fd23aee0c215b8558cc0b5e71a55950af4
 DIST os-testr-1.0.0.tar.gz 43382 BLAKE2B c5a9b22700ce40acff8ceeb796d9fa0b840038cd285d80630b16c3399e8c188d87dc54de653d06a2c0918185e9ffd4695747f59d4d42eb158f9ea18bc361963d SHA512 2189abc76840d935d63635874ebdae7c325b392bc24a52e07e1046b47a17be6fd97ba17dc5593ae7a1e2bff9c5b0dbbfd8ade8a2382dce2223ee4047b3483cec
-EBUILD os-testr-0.8.0.ebuild 1254 BLAKE2B f25d3842a9cde73b46744918443ce29c985045ffc6f4b007927553c52ca27b4d6ce4cf542b3d192c236bd53f341611f23b22eeb56a33f12f5f4e8f9031c03e65 SHA512 d3382e85e03ca1f2e83a1e73629a1b59f13f842910c88456172027c1dc10a15db38b6a68154f2a7f44aff52f1fc4fd3e815c3bbcade36940f08bb93f4de8b93e
 EBUILD os-testr-1.0.0.ebuild 1225 BLAKE2B 3ccdd5ff9232874f727ef14559c18bfd4cff1f03c0b1556623f0cdae3798fc752a4714e93377a668151be1c44692829b7b43f7b5b8d497c27e7a200f44876efa SHA512 d361e43ce462765a34d3caa2c8c7d388064a67d9f8ee485f76603e1a83c27ed2cd6928149dee71f44fe795b16a3f2c42e5949a546141d918c71ea1f98170083f
 MISC metadata.xml 383 BLAKE2B 1d861bbcd12c0cd7c1d3798cf03163ae3a114349b3efc600179c47d71a275c211d65e8e542dc9b5c22b3b4690af4048ba85a573c7a40b8373f2783d154c050b9 SHA512 6e205857c3d2b3d94baceef580f343bee82210bf3003106ac58ad48d0403aa32c38332aee7b030eacd7d0bd272d7bcb34054e5852bd8b4870cebd0af74eb2577
diff --git a/dev-python/os-testr/os-testr-0.8.0.ebuild b/dev-python/os-testr/os-testr-0.8.0.ebuild
deleted file mode 100644
index 2d40ad42d518..000000000000
--- a/dev-python/os-testr/os-testr-0.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/os-testr/ https://github.com/openstack/os-testr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( ${RDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-3.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
index d20fcbf10a6d..71bfc3df5f55 100644
--- a/dev-python/os-traits/Manifest
+++ b/dev-python/os-traits/Manifest
@@ -1,5 +1,3 @@
-DIST os-traits-0.3.3.tar.gz 17374 BLAKE2B cc5707317448f66aac84e69340dc1923436846553b059753217ae51971289dc2413ce858f46fc809e80b1754c917fd431b4134b3886eaa6ffac81a4962c30730 SHA512 bd8a7a29170aee1be59ed21684ed2a5dbb1440841a54b522bd3ec31ef61c9fd4f6eecca812c8a8b927c285142801c3da190d7bb47c7b315312e10c1c81d50e27
 DIST os-traits-0.5.0.tar.gz 15775 BLAKE2B 288db72d500a3187a8520b9674982f3233f8644a537ec04971453ece394344b7310cbf133785dfee7122e1aeadebee7fd91d18f57a6ccecf0f176fd569b2bfae SHA512 2dd9019b13fc3394bf97fa9ff6c82d02d26dc6ca8ba8b32e619e9f88a9fdee0d3082e3818ca6a51eea9eb45997dfb48eee6976190b27dff6ab5b892747ce2a54
-EBUILD os-traits-0.3.3.ebuild 743 BLAKE2B 8477c162056c97ee2d1fbde0bfb05256ac0df176d3f5bbb934a464d91aa0bb4270828b7e33b2c0c382c8a973d09986adfc4ac83a88210c219ade4c1057068561 SHA512 d8e2e9af800940e588c4f14e9bc47d65a4ce3370802de0eec9743f12e54f4848741e87086d783b492fc8419e862d8e879fb85640fc34f343bcd0c7d8beb2e5ad
 EBUILD os-traits-0.5.0.ebuild 740 BLAKE2B f74a9ea086db339c804a591e883284fab12589b2e71ab6e18e5786bc7fd53566ebd42aaf0adc75d0dea5832674fb96c0f231ff7f614cbb6583043c33ab36a10b SHA512 cf0909a66344292194aca6294541d34a22cade5e718f688257a53eaa2274ec3af67880346cb93ac01921fe7d6b16c70684b3edf4dfe69baf8e519badb82f629f
 MISC metadata.xml 385 BLAKE2B 2ba965a78d301c8f0b65378ff482552eba70236b457b96461367e0ffa5cbab79ddac2296cab4184803f7970e4162faa0ace82762ff356eef2e739625bfc99878 SHA512 9dc66a1191f15d9a8569e229a59164a7527c2ad27c06f67d89a9a25910bdaafe70f6c9269a2482d5770105ce58a64705dde15db56b34f2568add1800df0cc42d
diff --git a/dev-python/os-traits/os-traits-0.3.3.ebuild b/dev-python/os-traits/os-traits-0.3.3.ebuild
deleted file mode 100644
index 3b5b610f897d..000000000000
--- a/dev-python/os-traits/os-traits-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="os-traits is a library containing standardized trait strings."
-HOMEPAGE="https://github.com/openstack/os-traits"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
index dac64d76e2a9..04dd7c8ad067 100644
--- a/dev-python/os-vif/Manifest
+++ b/dev-python/os-vif/Manifest
@@ -1,5 +1,3 @@
-DIST os_vif-1.7.0.tar.gz 55976 BLAKE2B 8adb4043f872a76c1120774bd0453f162aa1a3877b8495b1ea32d7f2ca03ae7401885ca190b5f35bb11e7559f08a9a24ee6cee41c6603c7bbd2a987e974106a7 SHA512 815f7ba169ef4c1235ad70f31ec065179fa021701c69304385c1a95a1125db9afc1be9e6ceddfca44fe6ea1866dfdb303f7ded2914a3757b095118e41bfdd19e
 DIST os_vif-1.9.1.tar.gz 63535 BLAKE2B b4c017b129c2540794f85292341a165761d00439d24727fe2f421c96a7e5d6e79e8572a217064e01e62bb137f136fcfd1d51ff089c48026de82d91a8b9a22386 SHA512 d7aeec1bd277a91a1f4fbda69e5408f5648ad49ffac17d1ca54148ec30c31bd64639151988355395166747df91cd89cbed1863a2668a5bce89a10d2aea55c288
-EBUILD os-vif-1.7.0.ebuild 1467 BLAKE2B 3ded081386d3f321bd91f24b40472e600177885ff9876b8d2a2be3b54807fc0979f2d097a0214425f4c17e488f80b57625d8fb13a3d2ba5ca0b890b41f71a8e9 SHA512 62f01c13b0257c998e103fb53fa5f6549532d62f66f96ef1eb7416970721c4c9b4617b5114880cf16f3ec9e475b258b3536b4f15905b834c85c9df45f7adbb3d
 EBUILD os-vif-1.9.1.ebuild 1321 BLAKE2B 9f0f09c15c503c9a6df236088012ab2b0ae65f861f32811e3b1376d969bcf8c54490e407b040a51b01537c276f4db04af111478bd35e7a1c03e8ee9c6750c9e9 SHA512 66a406cb572cc19878437111ed99acf8c617b1c8bbc3d82f6d76baf1db6da033a494f35ce2b60c75ae7be3c9185e3678304090eeba28f283cc89df022369905d
 MISC metadata.xml 379 BLAKE2B 9c4bc302bcb12ea964647546867a2f00cc84eda6f1193a700cd248248c6c992f6183c735ac55f021a8b89974ca336d4d840578444f02d1ac85cfdfcb8d48bc0c SHA512 3667aff7bf331a2383c2e4a854ceb0b1fa214bc605e98bcc9829dae0eb5e870ad123e9a2989a345134db916541005f54dce777c680e32ec6196785727a89831f
diff --git a/dev-python/os-vif/os-vif-1.7.0.ebuild b/dev-python/os-vif/os-vif-1.7.0.ebuild
deleted file mode 100644
index 4775e0d9203e..000000000000
--- a/dev-python/os-vif/os-vif-1.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/os-vif"
-SRC_URI="mirror://pypi/${PN:0:1}/os_vif/os_vif-${PV}.tar.gz"
-S="${WORKDIR}/os_vif-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^pbr/d' requirements.txt || die  # pbr should be uncapped in stable/ocata
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
index f132c7e886bf..a23e3597c2a6 100644
--- a/dev-python/os-win/Manifest
+++ b/dev-python/os-win/Manifest
@@ -1,5 +1,3 @@
-DIST os-win-2.2.0.tar.gz 192662 BLAKE2B 4da623f2f3fff0466156468a09477d29cda391275935dc56be06eaf7562cb153d7d00771206385b3cfada2fe86679e1a80e52e32f539a5c4e62bf9aa10967079 SHA512 02bb9b7ddaa7b3807ce66ce32242fe9938f28bde6880cf9ed461072e764e41a34a1238ccdc8b67ebc95a07ac003bb0771b8943602582ede6c8a41440f865060b
 DIST os-win-3.0.1.tar.gz 202691 BLAKE2B 934f90970ccdb7890379ca6f3545936db65f104414c4de51dd8956345b4e5330a3d6db286b6fc2cbc9f218528751fea56b7836d81cb9da1f271737817b220101 SHA512 619b893f4595fda57c2d339b10bf4a7de48c711829f1e2407f981c943b76999d1ee84c15a5b91b03fcd946f16754501cede2081c5ce0ae3ffea0e6f4faaaf23e
-EBUILD os-win-2.2.0.ebuild 1317 BLAKE2B 29d61ac1b7fcef2fcfb2c7ff64b02c529044a0a01bf0c44e9c73fc0c0ced3d47b2171404e6da81532a439316f8613c4720799b0f6ac0fdea3fdacfebe9467b93 SHA512 e54a571099aa7daa338fec6baa128863bf41d592b0c8a21ae3175a8de381625219278e72e4aeee6bf94a370708be6b87188d45c5e27d4afd06a2a84e06865b49
 EBUILD os-win-3.0.1.ebuild 1209 BLAKE2B 17e8eb7ab70235245c72cdd31d39c7fc140701a9a30c514bb272f3d3f0fa1923e84d65d8ce7f04c9ee3f075fb0d3d9391aa5c3f36fd05276eb5bbbbc40782785 SHA512 a9e38ec14a2b3fd447950ef0d3af286eb92fe946c4037e23c1a1b8a746945e2a3389231d77458139dfc353f025010872d37f6c0ff0f2f9224a2bc5f3c40eac72
 MISC metadata.xml 480 BLAKE2B b17e3983e5660147a3a55a76948e00dd9e0fc800e442cdf92e4e17a70737740b749a86063f3f644b092df6e0d00d4e9c36d11f6a8ba697f214c08fd79c560008 SHA512 6454d56af0f829cf94cd211f78651a6d611eabebd8a3aaf5cf2cb92aef29107ed6efa5e974b5f9e5f6f53ed29565c1c6ac0448de72a3f21efbf73ecbcad2dd3e
diff --git a/dev-python/os-win/os-win-2.2.0.ebuild b/dev-python/os-win/os-win-2.2.0.ebuild
deleted file mode 100644
index 8906f8520a4c..000000000000
--- a/dev-python/os-win/os-win-2.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Windows / Hyper-V library for OpenStack projects."
-HOMEPAGE="https://github.com/openstack/os-win"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-xenapi/Manifest b/dev-python/os-xenapi/Manifest
index a4dffe94098a..6025ffb2c24d 100644
--- a/dev-python/os-xenapi/Manifest
+++ b/dev-python/os-xenapi/Manifest
@@ -1,7 +1,3 @@
-DIST os-xenapi-0.2.0.tar.gz 73753 BLAKE2B dbb42c1fe15a55e39622876293d7797801ee4e67d152957e32e88a1d1a4503a2d70ab144216924c7d45935bbc79109a76535cc0b121df63e82468a37cb353cfc SHA512 6eb7a8b8137c6c28cf07af51ddfed9aa08ad5af3cafd48ed72d9fa909d0dd2416e17eed8a587fc5cffac55704652e24ef8e759f60806b569f2765a5fff58884f
-DIST os-xenapi-0.3.1.tar.gz 121953 BLAKE2B 4c2091fe0d7610dea7e973a6db68b0edea62d7323d09b0e3cc0c3a43b9a5a4b4509e29ee9e48755958f8d99dd5db2bb6ea13a3425c0156388e19ff986f86fa24 SHA512 24c1fa9e7b3e37b7847d7f82a533d9c92e7b551bd69681a985950d92ba22974a495e10ab7acf0f8f6a9a6fc9bf4c71820f413f948684a5b17d010dd076749cf4
 DIST os-xenapi-0.3.3.tar.gz 135902 BLAKE2B 7ba2a7a386d3bbc0a0e20aeeae7b34c22540ed66a97ab48819eeb5995b6a5c8de09f59f0ab31ecee543147c75b33a5b590e6cb228f2f2f7aed861e3fe03654b4 SHA512 ec7b89299cfb4a76d0184bbac933e30857e45082cadf43c6b3f74d0c241cbb1013959e6338f85cb2af71c815a6ec6166d8e173898539c9f68eca128e2e908ad1
-EBUILD os-xenapi-0.2.0.ebuild 990 BLAKE2B d96e4aeab528ad5b9a4a6e3abc75a98f58a774a2a12ccaf6f6c621caed71fa0810bceff018e007a2c86dfe704d9e66a078a3e80de48980d25957cbc5aab7cd6a SHA512 32e9af2a80f638343f7b2c8fbd597b64193cff8ce8cb62ed1091bc63a9055b3a8e1e70f6c9fb3e73a891a6916a796384b656c59ffabf9125581bda9be679129e
-EBUILD os-xenapi-0.3.1.ebuild 1083 BLAKE2B d2313af6029c3aa86e120dda43a70fd6179c8bb9bc6b55b316609e4877b7fdebbe267961834d56295ee540232d68d8450f4ca9722b1cda6bcc426c5bad239666 SHA512 3ede959c065dbec6cfaa75e47c3f48b2be082aa52c46ab63055fd978627455facbce1c2c1ff72020a6e17d7cf32f2d2b7e71ea22bb149bf685e782f0ad9971a4
 EBUILD os-xenapi-0.3.3.ebuild 1083 BLAKE2B 101720607a6844d913182fada82a32265ec133c7b1c9181de667bb19a7c011f10135d870b5e326abbea21664b11f8ba542b46b74e27b662a78ebc280c284c392 SHA512 c2751d6dee67abdf2a5074ea8692f95f0f7e3fd65f41fdaf91353539b87be2140e1791fd9d856637737ed6009de400ecf9c91da96c2bb3300ec71b359b8ffcdc
 MISC metadata.xml 385 BLAKE2B f9d38f905be85b349d2afbc8c957f4da69f640e1156cf17ea94d64df946e836e7f1d5629f03eff601e625330320e99a1df11dea785bd142e82492beeedbe7a13 SHA512 b8a779ae9c1158dc5d435fdea67f528af82d880b858cacd091d6d9b0e1812cc0c909b46d76396785aeee8f26cb00d5ca53ce38b063c42ae05deb90efd01b586c
diff --git a/dev-python/os-xenapi/os-xenapi-0.2.0.ebuild b/dev-python/os-xenapi/os-xenapi-0.2.0.ebuild
deleted file mode 100644
index a139b9757d2c..000000000000
--- a/dev-python/os-xenapi/os-xenapi-0.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="XenAPI library for OpenStack projects"
-HOMEPAGE="https://github.com/openstack/os-xenapi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-xenapi/os-xenapi-0.3.1.ebuild b/dev-python/os-xenapi/os-xenapi-0.3.1.ebuild
deleted file mode 100644
index 4d44ba6e9673..000000000000
--- a/dev-python/os-xenapi/os-xenapi-0.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="XenAPI library for OpenStack projects"
-HOMEPAGE="https://github.com/openstack/os-xenapi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.28.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 04c53e4f8283..1e913f6c7fb4 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-cache-1.30.1.tar.gz 53406 BLAKE2B 1b518c7f7af4b95fc71f76567f8742de7c7ab520cf4a1943fc7ed7bd9f3dcfd4150f83774e507d4135c7b567e53c3beb79a0cf6295c23e23d88a49d9ce63d2ed SHA512 8ee8ef32d07e8112aa7280f541446d13b3bba90fc7314eee60972180b0382a413e02cfcffbdd5bf4313aa394a25265665579f43f702a4b3754dc00f50441ca38
 DIST oslo-cache-1.30.3.tar.gz 53116 BLAKE2B 0b63f828f61dd82b69efe7a6e345974c56b2e980d88f159dd7c3ba5484cd1e8f78a393a7f73a6f2152db1c30178a054e2f20d753a286a0cd8f7d83af7f623bf2 SHA512 3ab9842cd388a846fe9004b97364057245936b9af185ba0f68e6d6bcc750dd957eb873d45e686cddeec94fda6872b72e4549c71ebc9e1de4755504c2a138b85c
-EBUILD oslo-cache-1.30.1.ebuild 1042 BLAKE2B 4d82c2dd4a0093367c89e2ce5b30ebf1143d72095ac1d8c269b36e64f4cb0e363951752cea9b394ec278711212f40a13cffc923f48ad9e85d3889cc041d27a51 SHA512 c6c825f55d65dc3150e4a5e8d325f54d127af5d573332e67ebe4c8c9e2a9fef1094dbd3da948e9890f345356d121c211bde3ca21fec0df9934aaaf8a4d318211
-EBUILD oslo-cache-1.30.3.ebuild 1044 BLAKE2B 79d39645f2b468e0d1329808882ae4b62acea6eb3fcf7aa2ba205d6892c25c8cc0aae7117bda7798d06d036e5047a0025c38a518769e2c3592b09b328b9d8e4c SHA512 d0a630a8c4426db273533583efeff4590fb8eea5339075484002418d2c85b71f02a0caa21e1af7e1071c279400eaf34184a6f95705dd4c1c8fa02c902533edc5
+EBUILD oslo-cache-1.30.3.ebuild 1042 BLAKE2B 4d82c2dd4a0093367c89e2ce5b30ebf1143d72095ac1d8c269b36e64f4cb0e363951752cea9b394ec278711212f40a13cffc923f48ad9e85d3889cc041d27a51 SHA512 c6c825f55d65dc3150e4a5e8d325f54d127af5d573332e67ebe4c8c9e2a9fef1094dbd3da948e9890f345356d121c211bde3ca21fec0df9934aaaf8a4d318211
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild b/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild
deleted file mode 100644
index 476fbb16b396..000000000000
--- a/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild
+++ /dev/null
@@ -1,39 +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_{4,5,6}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Caching around dogpile.cache"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-cache/oslo-cache-1.30.3.ebuild b/dev-python/oslo-cache/oslo-cache-1.30.3.ebuild
index 71b251dd4d54..476fbb16b396 100644
--- a/dev-python/oslo-cache/oslo-cache-1.30.3.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.30.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index abd33720928e..87b1a7120e1e 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.concurrency-3.25.1.tar.gz 49218 BLAKE2B 95fccb051ef782a0b6cd01801e9b44272a8b04ca52fd0f00f91a2aa3514885c302a3f251885f59c32303708c91331f3f59ee06ebdce4751d013559a0e7d19b16 SHA512 5c306e742c652d66209a3218ccdc1d1f957ec6fde0b0bcb9411a71e470e8c0402c4cc1a40a05094ce591942ed16b8e0a7b456d60a64e0299ef32a257b37c8388
 DIST oslo.concurrency-3.27.0.tar.gz 49604 BLAKE2B 04a7ed66c6d7cf37014080113bd3782cf186f57f486d6834fd28f3d518141f8dcac6f5e67ffb5ef894bc6f5085a90aa41a041e35b72325c645f7567dd743a912 SHA512 fb2e1377a8bbad451ef0a2713dfbcd58ec06d455e97fc4d8acf8bfde8eb27d59826d68dd3411bd60b6d6b5e68ff629f0e6e4781b17dd4349bc5b87f17c8b9d52
-EBUILD oslo-concurrency-3.25.1.ebuild 1851 BLAKE2B 82e97eaa58e8a776e95c5652d7a1c360c5bb6088eb22037ca88b502575bf54d105afbdeb2657dfd235f8ce47a726b01b931ea57ab5a3f3ec5ec895604b2797e9 SHA512 74a287f8ee7553ba191ccdec0b28bfe11e6fc319a00b260d1d6c2da9bd47cfcc9ee8e8790a206dba70f3e8360f8397aa01403810296b28e4fe51354ae93895d1
 EBUILD oslo-concurrency-3.27.0.ebuild 1849 BLAKE2B 31fd8e782c76125cd56020f60f5c882e2eec26c603dd9f806b2d7f335f91f1064c3634bf3213d7d5e64e4e6d13112d79158f211a4f584ee425efa2f3191203c2 SHA512 e2fbdc05833904ceb9d07015046259ba0a26fe772f1b86f17e9e58a2ecc9136d62440e809f471c8a9ac6ac56cb2dff37125c64c8bd43a2422e5db4e83a63c74b
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild
deleted file mode 100644
index e4343f6c9327..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.25.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-		<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^futures/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 19c3f96f9fa2..4f646de9a0b5 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.context-2.20.0.tar.gz 28203 BLAKE2B cbb3cb6f30b1b16011caa6fdec36c19aae571125b88f642bfc52c5a8a63a2b17eb308628d9a5f19b8a0c3bd28fb0db54e5485abd10c90c9495de05263ac25709 SHA512 ce7bd92c7e22e02e91bdc86e9b697f746233a41081b4f3ebb9fe30fec8000c69f732f55de0d333b349b8e01e638ddc835fd3cf0d8f7a11aa3454466a1e87ad08
 DIST oslo.context-2.21.0.tar.gz 27605 BLAKE2B fa2be8819c3b5c46e12eacae12c665e8168c4d8ac88fe7e8b8c3454093ea14d1a5980d1ecc377eb7294d913e117cf5188571be3bf678f270712e09c5230f2f7e SHA512 af25aebd306d0a3d60032778e6e3ca10b976e758c10e5d02302ebfef6a6183c8f9a102e9b4c2c8400914d71976dff284654bbcec63c15192dcfd2605928596eb
-EBUILD oslo-context-2.20.0.ebuild 1210 BLAKE2B 870c16d4fa4236a4e53ba9e9d978d89ca75ab43a4a3486d2d667479e81364d04ed337196df8554527b62ee5f658f3df5b129b217ef8dabd4cebdc82f98a702f3 SHA512 d93cb0fa3a4c273b5ad199ded83c254318fca14d5335bebafca8578340cf6fe0eddc23bf5babb7814ab77f4fb9b2acf4926638095605beb872530cacef209339
 EBUILD oslo-context-2.21.0.ebuild 1209 BLAKE2B e98c472414d21cd8916a74c7008c19c141894087e71a9e643026101699ca5af710e6ca55991ccee573beb4b25359175d1850cffd9f0da6f5835eaa4b8bbb516a SHA512 37579e2b5bdddd3cc27b1e296dfb1050227ca6651e58a611efadb46199efd087432c86b633ccb73e39db3cf0d1caeee62c2dd34d69b78263f995ff2974056cdc
 MISC metadata.xml 700 BLAKE2B d0e048afd7e2d85b6cbadc1927d2cf83469e0c8bf31d6aa6516e8d9f6af5d07e387c975c54c2bd877a22f2a964ab6b99d7f2c70130efcb80af68368d2f4c769c SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb
diff --git a/dev-python/oslo-context/oslo-context-2.20.0.ebuild b/dev-python/oslo-context/oslo-context-2.20.0.ebuild
deleted file mode 100644
index 5e4b1fba4338..000000000000
--- a/dev-python/oslo-context/oslo-context-2.20.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.org/project/oslo.context/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.context-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# This time half the doc files are missing; Do you want them?
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index b792051e69e5..24094d6a6ffd 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.db-4.33.1.tar.gz 169088 BLAKE2B e386d8c71669569256d88e2ad654e017dfae5cfc0635fa7c7f9e41a11d7114f6f7d0e826a6855113f8e672d5e57ed8b645e8c6d3a54c30aa78d45e53894fe8bf SHA512 b627bef035c13aa32afded20ff1e5198bc94d5ce96384c7eff44992d7f5c7178bb5e9ae398c53a04be6f280f433c688ae28fa72d6c617fc7c9299bd7c6a02eff
 DIST oslo.db-4.40.0.tar.gz 171545 BLAKE2B 34172325f99938595b36cbbabea421f8e51f8c5916a908ade56a2cd072ea532ec08b884c2ee74481f3651855f9c1432be145df3689569b06a6597e9eb9bdd6d2 SHA512 b1a0db1d3624ffc86eb41b49f76a4afe3737d943b6465a1b66a2aed18524c463e52130f1d6fe27cd382f04633df327bba07254b6d4bfb300cdaeb51b608745f0
-EBUILD oslo-db-4.33.1.ebuild 2048 BLAKE2B adc2f36e20a57d9d2e2eb5a381605e9d11a570f3d9548c2a00be23515892e868eda985ebc035ff2f8ac278fc31e23fa61f3f4ada123859658dc33fe8cccef473 SHA512 1358383680bf61163ae593e281944801b69dacc76deee9b601f4739e4ab8b3413df8eae01ed167424131682c3e1b8ea9d53a3bbade5c30b3ed012be9a16fa626
 EBUILD oslo-db-4.40.0.ebuild 2210 BLAKE2B 3eba92b84c51624e5080adc78c605d2d1e4cce89703fb5f43fd92cdd85f4dfdd1af347d83c7ffd8c23ac85a163cbc19c955165a6a204ac66cef3cad0d7701997 SHA512 178bc1a918a586b55a6a7196a01e934e51cd9bb9968b2f4c1476ce8ed364b7b2559c11795af9aadbfe91b8405cc83d04aea18a3b665e786c919b226269dc356f
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.33.1.ebuild b/dev-python/oslo-db/oslo-db-4.33.1.ebuild
deleted file mode 100644
index ace830db7864..000000000000
--- a/dev-python/oslo-db/oslo-db-4.33.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		|| (
-			dev-python/pymysql[${PYTHON_USEDEP}]
-			dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
-		)
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 5e139d5ceb13..59450828d5a2 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.log-3.36.0.tar.gz 81964 BLAKE2B f08a5cc5160da123e7a0acef96f94a20b4051c415056e639b4eb20a10ca725da2527a5c6c25cbce8e532606ab390bd273be54b691d52e6e93a1a51b59f8ba909 SHA512 47234c4bef09e105709b765fe0d5b297312ac73169a438f2759cbff335f059afdefc323c290a32bb587dbb6d2095de536ae7111a31e6c5b280e760b9b6b971c6
 DIST oslo.log-3.39.2.tar.gz 85121 BLAKE2B 782323490b619d28b1ff5df0d72e752431b01156e4c6fc8c1ff6191e22960398560dfc3c871edf65d33b92a75a3af61c85a5b1b66bf56ed8237a638355ccae35 SHA512 6b5fad426387d65559be2cd014054c123b9db57158969229ce184919f36ea355b181e3c0c06c78d8e1567108bd05af38ec2695354070826933888332699261ed
-EBUILD oslo-log-3.36.0.ebuild 1963 BLAKE2B 426e1a0f1964bcbb050a7b72ef0478ffdb4e8e7bc9c868ec513b251aef6669167074b8e3bd7b00da7e8087df46fccb9811b00c25aa0907bf455630743d7140c8 SHA512 13b992598b34a13cbedc798f3865ffee31cdf291a0c448ebd8d3441f6372eeeda9229707cbfaf2ce3da5bbe1a49f86053f0bba0a3bdc496206fba9f489bab9cc
 EBUILD oslo-log-3.39.2.ebuild 1962 BLAKE2B 36a435fd92779d37be1c00779605f8465e01c30afb19759fbb9396af8c7a8d4dc1c30e2916cfb03fa1e75a79fb80f5bcfcd62010dd5abc7ed10fd1372740c27d SHA512 ff712a73bda0655f58c048d421d6c992b6780faf94fd853cda2a50ee83291638944caf60aa34eade307794f8fdb72a4176aeb2b520f342fcdde4ce52a0c5d023
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.36.0.ebuild b/dev-python/oslo-log/oslo-log-3.36.0.ebuild
deleted file mode 100644
index 6f194882f3f4..000000000000
--- a/dev-python/oslo-log/oslo-log-3.36.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( ${RDEPEND}
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index dc9a8eda465f..8d6fd9ff20bd 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.messaging-5.35.1.tar.gz 325408 BLAKE2B 89d16f094962d3603634a0925d0d2f569fcff0e59da7ca99462d0c0faad7fa47b0eade2b7c24b29585901c1d04bc6f4bf91ee04b4dfad0a63eb3100261e99e39 SHA512 0022b394812384d13189cab9eb99f45eae2a134e50a4d7ec2473ea35fc2712d2bf7c2b2dd71caa01a38dc47f7f9793130176cbd1afc041675ecb20282e1a653f
 DIST oslo.messaging-8.1.2.tar.gz 296052 BLAKE2B c24d8bc22f1e7bb8fd4f58bf15c349a5fa5e41b98031611a0820b66ab7cabb2742d49995e5c730d1bba2c04a36ef4a055de0aced5f1100a7930052a4f4efd5fb SHA512 f7bebc525019f19f6d25178f4b2ef811c3073dc2b10600a9a01aa23dfadad4b428baeb929963df31ee7c775bb94c47493699e8031d5dd9cea5d865c28432d3ba
-EBUILD oslo-messaging-5.35.1.ebuild 1994 BLAKE2B ecb9b4136c852224af543bd87dbbab446e29e44601d655a2de24b9b8e817df13a647e4dc2e30d02b1a3d5802a4cdf9dfd9f02890412d6e35f0adbe5dc5a11509 SHA512 cce69a82969b6b0ae8897a17b786e7934098955642cc20255ef60f7399e8a9cc35b1fdb8f9ca9ab847adad76888c827d9966c268b7e8b8e6873ab18cbc647a11
 EBUILD oslo-messaging-8.1.2.ebuild 1945 BLAKE2B dda4bf4a1a7e9628a9d28433bebeb7b3f17c4183d5b7bfbb21ba78a27ec1a5e9203968553971b028f97865885d0d08cbde41b5c1a34e56c63adc21596f50678a SHA512 2313c3e4c174a36fcfceb61d37b732ef8bd5110c02c4a65d643a14d25eb5cf250043162f73baca2d55bf43cddbef3d5e5ffabb8b13862874c8fef7f18b6e76da
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.35.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.35.1.ebuild
deleted file mode 100644
index f12b4dbaf332..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-5.35.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.1.1[${PYTHON_USEDEP}]
-	!~dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 65000a33bd41..a6724688a047 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.policy-1.33.2.tar.gz 74863 BLAKE2B c509ae19786bdb58760413219214a6d928097003f046d51d9c42e2c738585fe7a324e875d7b0fe9b8084c4991cebdd530f382c025742f055ec9f157a48f8e969 SHA512 c6479993ac7ea8671632178e339d2842d185334557691ffa7ca30bc641313f080f7849e7141bbda941fcf22349ab076ab4ba2bd8dc9dae59fab6446988700848
 DIST oslo.policy-1.38.1.tar.gz 82871 BLAKE2B e47e96230874d1c287a1d4e930c9a5dd4ab35ccfee62b1c93c9d046adaf877c7e0cb65f9c34ef378c2a212d6986b0c1abf86af0ca6671c17f7dc8e85e1f1e706 SHA512 6b80a45ef550f5562d0c5cd3a0a466163d741bba7f9fb430c4e9d5273e0811d468d9c0c19c1e6168b38b4436279b81a1aec379d6513cf12d59f1a50fd7a4eb91
-EBUILD oslo-policy-1.33.2.ebuild 1172 BLAKE2B 0db4f48e6d24283ea638e380acac5063dcd2545c57c11ca3724258909094614aa589ebabd390d6d5234959ac2b1d44a3ae8515421562c5eebbb0164ee18c2766 SHA512 b9f7fcbac5ce51df25c7724e436d96d8a5616af0d470cd4ddca5e316c994cae5f1683412af3d2acbf3c1ceea79f876ebda96cb47f673b833a8f58e4f06106000
 EBUILD oslo-policy-1.38.1.ebuild 1224 BLAKE2B 15e789d5928d904820c33673206d42b890f5d8c41f2ebf5c5bdcba92a7208b0149966c28b7fa1ee506675a4b38f2f5513d0a4bf90d3d51d7a5f519a6b72c87fa SHA512 336f7d15f73fbb1f16b6805c7435345d37f38b95bcbabd2753334076a3d80b8bf1c755eda3baeb737082463e460ac10ec9009e486d53bbacdf32d15c2ccf073b
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-1.33.2.ebuild b/dev-python/oslo-policy/oslo-policy-1.33.2.ebuild
deleted file mode 100644
index 9fdb94430d8b..000000000000
--- a/dev-python/oslo-policy/oslo-policy-1.33.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.policy-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index 2d4464cde2d0..ffe0c992eae1 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.privsep-1.27.0.tar.gz 32766 BLAKE2B 307bed6c5dac28eb38cb4bbb1b001cdd579ae1148c63de43aee7d740901cf53a9b6d619baf5cb5263b30b398017f3411d0ef065590f0710bf0becb85df08b879 SHA512 1a7980bb0dff17314081745b60037bb84a0ba0ac5f2784b4cf4dcadc2cc9cea0158c7c64652823c7ac2e9071db8f915cf68ae2b08c634d21ec51ff75c017a3e6
 DIST oslo.privsep-1.29.2.tar.gz 34376 BLAKE2B aab2807ec44cb984f7b304f46ffae39d2965dbfb876f08e3a6fbf24e9e70d5f0ae7a2aed9d47b126c48641c56004195bcc4ff015865e97b966e7f6b172f9f5a3 SHA512 8130700578cc1b54530011da259c795b6eb24ceba959f927934cf21e439d1412d393dee9f7bcb804ac52a4ae716284df8950677d5386905ac68bd6c37adfabbc
-EBUILD oslo-privsep-1.27.0-r1.ebuild 1731 BLAKE2B 4b36c5f7468f1be33d9799bc8116a638cb55ba1c05a5ab62bb76410e57b65674355bc0823a550d396c66c27236ab841a0f890fc15081cf82562c597bb111013b SHA512 3a5f5942a43db41ba9982c4ff0599d50e2ac15a84bb611d5795806105638b8a50f554af9af4a8ff63184782fb78d208082357e7304a48a9b80faabb7f7d16649
 EBUILD oslo-privsep-1.29.2.ebuild 1772 BLAKE2B 95f59da2215ab2e034e3ba63f794a90cbf319b64ee4b471876c3abcbf7ad1a1b3fff1cc0d284429536291a923ee11677fb139a46e7b817080981db59174dde02 SHA512 5d4c4f03e4e2273664fab38ccb17d9234ea2f85ffe39f1bf010c50363efaa1373d7e6465dafe4dc410ff0477fb5bca0f63a559c18278e1bf485c85bba16843f7
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
deleted file mode 100644
index 836885efd6e4..000000000000
--- a/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack library for privilege separation."
-HOMEPAGE="https://pypi.org/project/oslo.privsep/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
-S="${WORKDIR}/oslo.privsep-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# python_test() {
-# }
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 287b692f6f94..db733d015797 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-utils-3.35.1.tar.gz 85615 BLAKE2B c2eea32d6844c59425a6e8783c1285dc47f2863401e6739bd7418c23ad1446613f41cbcd2e2d85d260ff8adddb681d9f1b5547ac521c2d9b5e2050324457bf97 SHA512 069fd262cfab3f5756b1135552c19c886fdbf72885f12b2ae84c67af1f50306ccc2c5331b1774fc49fb764107ad1c3e94305cd6fb6a25888ee8fa446facd2cbc
 DIST oslo-utils-3.36.4.tar.gz 87872 BLAKE2B 15f4fe90e5335cdf146ec582a506f2ab2bcae9989feca24caec7c12a4136767e93acb117345ce62013cde64938994eeb0c0809665cd155d5e0aaae7dc6aad879 SHA512 d5a81b68cc00c25eeb2e6d39b8fd4a47cb958c32e50471845b14a06cb5f420ac58986106893a27364adba968adc19f864624d69bae316202bdaf2c156458eac1
-EBUILD oslo-utils-3.35.1.ebuild 2695 BLAKE2B bfa6e720f9e962ef0fb3cca8018ab9e2011fe70b217553e899fe68f7a41e483b8f90aeebb84ee58c0709fc0d595756ea7a878d152a9bbb5877676acfde42bdc3 SHA512 e79ff79d9528448d0df4c560d4da7f6922304da2030f30a50799ff8c7a103654ecd65a4668e2ef4fd7ce875d2a381714d5ee9e4a5ab5ee7257b3c2d203d0863d
 EBUILD oslo-utils-3.36.4.ebuild 2731 BLAKE2B 91bb41690f0bc3e0e7f1e7198dceb9c9720fdae7d956d3788e3ed9f0a6a085e22d1db4bd6417001728dd6faea7f3f0e734a8e2a23ce7a069a1bea45e1fa6d729 SHA512 50751604048fdd5fe01b4ac643444764232e444ba4079de955bfcaa6999881ecc67b99b0dfd5a150ce115a68620bb72984afe319a93db15e7f0499d7544ff43d
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.35.1.ebuild b/dev-python/oslo-utils/oslo-utils-3.35.1.ebuild
deleted file mode 100644
index 1c2d39f41d76..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.35.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 0284bc966e35..bedc1ff93ca9 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.versionedobjects-1.31.3.tar.gz 148869 BLAKE2B 90ee5fce0dc51f4be1e9dbe2e4cab501e7fa1625591847c6a37dad34e570f9739317ec5e1d08ce5a90c6fde3d639852d1f0ed6e6da33119c8d805146b7dfab40 SHA512 2c131ca04b3967a98ada7052fe176faee18d0fb36d53c94c6c098d88e108c865e4a967c8300fd2781bb18741f280781e398ebdb9cbe3c8b8aba516ab7800217b
 DIST oslo.versionedobjects-1.33.3.tar.gz 150086 BLAKE2B 7248c5cc114962ed33c70a3c6e9698ed784a2a995d949830f5e8f3f97953caf793a37c60074e848e8c4518aed2de29ed54ae637166f247bb7e6f95af0d9c6e87 SHA512 0d1d8654b1f971bc922d57771c159608d30fd7474448d425beb7c5a98b9810c6796c7e0b21436f75a266f54913fb01ce6b8e8ad4402e09453b797854f9fc4575
-EBUILD oslo-versionedobjects-1.31.3.ebuild 1360 BLAKE2B 34b43bdac5c6254c0e02e339b31cd1e99273dcaeee1fbae03e69bec960afd5c79344d8aba42795f4cbb34b53ce4e9ff1baf0d2102b15e9802990637cc38cd763 SHA512 4d7342075ed48a432b262ff47081ffc28cf3216282e880c72acb36e54b49f2c37583fa04f8211b0c07729b6841742a8ca6da87ee6c741aa7019b827de12eec4c
 EBUILD oslo-versionedobjects-1.33.3.ebuild 1360 BLAKE2B c3dd38aaff1eeb2bc8c10224a790801f8113f568cbd667860fea21ebd84f5e336379b99ffc995b2634948741e037c0bb96bf5697189052853c3d5f3093a72d59 SHA512 f05336a2f42b51dded28c104f644ef333423483eed54b56a54d266a91461de1a2178a1b2dbef7e373cbd9d24c7ef6a93afc7e6220280327ead3b4225f9b9dfdc
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild
deleted file mode 100644
index ac8ddb666dac..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.31.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]"
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
new file mode 100644
index 000000000000..76f2a5584a1a
--- /dev/null
+++ b/dev-python/parameterized/Manifest
@@ -0,0 +1,3 @@
+DIST parameterized-0.7.0.tar.gz 20751 BLAKE2B d9ae50c8f3ad142fb18511aa151b386443d9100db69d5ac3c1256be98f6a5c669f1ae08172b13f8ab2441fcdafa548c42899178d737be1db9d65fa597322397b SHA512 b76e18a7eee62fcab4385fd5d053253c096d4c3fc3a6300e8539afc4d8decc995e533085297c52f8a26411d2591a326033a740cc30a250d510aa1c11ee904246
+EBUILD parameterized-0.7.0.ebuild 594 BLAKE2B ff3c23d8d8cefb7e684079e74f3e4816f19e0e5882e06b1787e28bf5ce1811da8f17068a56ed3406bc77bfa562f0759056eee1b6fbabcfca840ed8658431b661 SHA512 a2076c28930692c187b81e7cd7e0d13a4c7fa7a8649a2689c887be9f4e7e1758f6a368eb231a5c59dfd4a987f57ff6c2be5f4284ddb29b5dd2fdf31599425c8e
+MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/parameterized/metadata.xml b/dev-python/parameterized/metadata.xml
new file mode 100644
index 000000000000..f728eac91cc9
--- /dev/null
+++ b/dev-python/parameterized/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/parameterized/parameterized-0.7.0.ebuild b/dev-python/parameterized/parameterized-0.7.0.ebuild
new file mode 100644
index 000000000000..a1dba074f48a
--- /dev/null
+++ b/dev-python/parameterized/parameterized-0.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parameterized testing with any Python test framework"
+HOMEPAGE="https://github.com/wolever/parameterized"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/parametrized/Manifest b/dev-python/parametrized/Manifest
new file mode 100644
index 000000000000..bf7edeebd1e9
--- /dev/null
+++ b/dev-python/parametrized/Manifest
@@ -0,0 +1,3 @@
+DIST parametrized-0.1.tar.gz 2246 BLAKE2B 2d6296434aaed324c3b15492d212a9bae025ab0614d349cd1ddc621189a91e593ab84b7a7c4089d6245bf4b91dd48586cdb0d9eb562b99d8de697e66c19a2713 SHA512 ee9543b1c2f4e313ea3a74d91b97b6339770101b70317754006fde7568292d3f175d923896742339302d5e1e625b2c0f2beb05863c659ac3b81869a3f574f25b
+EBUILD parametrized-0.1.ebuild 494 BLAKE2B ce09c14a43cc77942ed338d2986b67b794b7d266479b579c6aa19f65e541e89ca347b859c27b0d4440231a2cedad2bef45c5c59c33dc1fbb2ad96903b31eeaca SHA512 8db74c1e69cc1ff3de94bd7ee1d3022f97dad87345c047e70ce7418a76debfa409edfac900f7c984e03593299492928abdded82aafe1a0a35defca6949518f19
+MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/parametrized/metadata.xml b/dev-python/parametrized/metadata.xml
new file mode 100644
index 000000000000..f728eac91cc9
--- /dev/null
+++ b/dev-python/parametrized/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/parametrized/parametrized-0.1.ebuild b/dev-python/parametrized/parametrized-0.1.ebuild
new file mode 100644
index 000000000000..37a5a5ee6702
--- /dev/null
+++ b/dev-python/parametrized/parametrized-0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parameterized testing with any Python test framework"
+HOMEPAGE="https://github.com/wolever/parameterized"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index 22aa72e4cab5..f8bd5ff33258 100644
--- a/dev-python/pathlib/Manifest
+++ b/dev-python/pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib-1.0.1.tar.gz 49298 BLAKE2B 918b363ebd4101fce50927dd83200cf94b44d820e9f422489be8b06cb5dfe732aa9373b936606a07efbfe0c624b685d1c9efe8851ba74aa60df9f45c08cd33be SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b
-EBUILD pathlib-1.0.1-r1.ebuild 515 BLAKE2B 89480cbaf34d9f7822198841f974c0c58de2676c05402f7e1d7fe3c6d9be3f639a1f111fdddce804f176d436fd6c50d67f3314271c726acf446085737c8ba4b5 SHA512 e19e4327966ab93e448a5b108ee3c3145dd05d3eea776bd66f6255d38cd62090652c4f8209d87279a20f352ab466c18252dcf2f3f8f6b8d2784ac8e8dbfd0f5d
+EBUILD pathlib-1.0.1-r1.ebuild 509 BLAKE2B 350c8545522d2e8b55101441a8cca1704213ef0435993283af365f38ca748788e69f24def3a8bca81b64bea3dffeaeafa4454a693ea360b22cefa063cc595c67 SHA512 cf00c0a6497138a4fb0730ad1bfb54e30f9e12d6d54a503ad3d9bcf398495214f881d5180c95373bb9ed8559100b60abd2770820ec2835eb17deb6b44d835099
 MISC metadata.xml 310 BLAKE2B dfac529133f0a3fe4c0fc865d7f7cc9d70a7b37dd2d8fcd4f1c87a44ec6f9ade254454e01cfd4dbd57a04f9643f079bdbc358d84cfcb0c09cb416d3ecad2db99 SHA512 462b029410c6c013f274599ee749a79541f9a40a1819b168963421d0b8bfbeedae5590a460c7295f0e9a249fa9298e7526b0cace165a29f82383d8943bd9842f
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index 76c5d4e59714..25e9597a73dc 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 # In Python 3.4, pathlib is now part of the standard library.
-PYTHON_COMPAT=( python2_7 pypy pypy3 )
+PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index fcef9454d5ec..1d99473d032b 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,5 +1,5 @@
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 DIST pathlib2-2.3.2.tar.gz 33764 BLAKE2B c652069d60f489e482c6d75c0a201c5ac67c6b18b4acd6c8b00f7f12832f7165a45293d93ca7f6c45f1451c842e59931b6b8c45608de1bac91ad822cc3536105 SHA512 46ba0cc8b26006bc4cb914118b7c453dc49cc8a80147ea7a4b3d5a17e97d5538c5d73a3029bd7e5b59f42f256baba30ea273382e57468df1a459ac6f7c237ddc
 EBUILD pathlib2-2.3.0.ebuild 1060 BLAKE2B 936400ce062dae53fed477ce5f201b60e2bc255bed945a8e3bdb9f56d8a91a4e7fc7a53ba8a391ec9e294bdfd3f22732a05e8fdcb937e693ceffcafd53b264e4 SHA512 7d39226f0942a6e513d7053ce397b4e67e73f82621e356a83ca0234906bd93ca82e058ba4d72acdb8abb1b12db29a97ccecf47eda96e8d942ec9e9cd1dfc2fe2
-EBUILD pathlib2-2.3.2.ebuild 941 BLAKE2B d20483b9647119cf780b423a3b98166a6fc932b12474e9c969ca31ac6ff0890b13e7e7083df614b2a9c7ad722dd2e180fd462650ce08958849eff400aaea4f6a SHA512 3d0d2a68145c09070f31c7b011adf0da1ad6368534c74f06fca791ab87cd594727ab50f8041c98d82d2c6726f8d27b560e2b9d79343e65c7526853e3ffe31955
+EBUILD pathlib2-2.3.2.ebuild 940 BLAKE2B acdcf241a88e498e51a80375425894c112505189bbeccdff9b0015650e4cde2d68a25dbe5a2db5529a925963615258883928e7c2fe88dead293ec91c98f14862 SHA512 77b530a86e8878421e5fd69f9ced897fb44201e3c27438c645d17fc62f4ecda666c8808d0774eca8aac25f3b94921f59a38707d36bc12b92c9f8c464bd2f8dcf
 MISC metadata.xml 439 BLAKE2B a6ff80028323e5e3a48832388ab9d88a6633815784b079543d2fae49a43a5c6aa25ac15453f4d564e570558fb62ce387cd5b3450d552c009e153002e5b43398b SHA512 e1912b7e9c099ac259aed03a38b7bdf27bc817e188901d79b89500bf1d2ddca1881ff55f06310758f6cf6d0fe581cf5ac28f14f64972060fa1d620699cfcbaca
diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
index f1245dbb34d8..0c644eca4dd5 100644
--- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa 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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 318091942ed6..2213ca7702c3 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -4,7 +4,7 @@ DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
 DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
-EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
+EBUILD pbr-0.8.2-r1.ebuild 2103 BLAKE2B 2d4fd9eb6ec4d191e31c72bc70bba9e6287dbcdbe98c4755b621763c9d2ba9cfa3ed65b80b35a12226378cc1f6e3a2539edaf9ee61e40aa2031ac426435dc980 SHA512 08c2d0457c5f496d4870e51729d09e902b248aeb27276a3046bbaf12892e9af55819102f75a1f103e8bfa660551b80d4cdc3b5b2c9527b78583db904ea87b1d5
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
 EBUILD pbr-3.1.1.ebuild 2828 BLAKE2B 7fc677aa10ce15627e6e6f6857f0d5b1fc336fe139e42b3ff1aa62d2d898eeb6a92a8e7c22e06e5f597025a4ad16e60dfdec60758b6b5f36569bdd67a39566c1 SHA512 58894ca83de7006ee6486d75ee1673c970ccb207d50c84332b215086468e3288b10a38245a92c8a6330f2a26fddd001b70a9d89b8144009459180474774c1cc1
 EBUILD pbr-4.1.1.ebuild 2601 BLAKE2B a2945d95e1ba37c28d86fdd0bff32f0a880c801eeddb2f3f70f6b21fbac7c0bb869021ccb389888c146f5920b7350af1d0c53d34784f9dd0e0934eb937ff1f55 SHA512 c71925bd2db17d18a625ea6510f589c8bf7df9f10031659f7a6c4a63432826639ba6a93c99be229b5f62933051fc00532d53bb0660f89e0d0c804b8bc7af44dc
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
index 08693bb11aed..c2bdd161e45f 100644
--- a/dev-python/pbr/pbr-0.8.2-r1.ebuild
+++ b/dev-python/pbr/pbr-0.8.2-r1.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index 82dd2727d53d..28f912e699b0 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -2,8 +2,8 @@ DIST pep8-1.5.6.tar.gz 66944 BLAKE2B 5875895eb21c771d21cb1c415dc9f85737ae18ab10c
 DIST pep8-1.5.7.tar.gz 67302 BLAKE2B 714ecb7f21c457aca1a2465319c3f202d13b5cfe067418eb2e3e6f21b25dffbab891a05f5b145264e484c180b67e1fc8c4ad1cf47f1413ebeaff2bb858f9858e SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb
 DIST pep8-1.7.0.tar.gz 79704 BLAKE2B f2e3585bdb3732f9be7f77b1cbf065c0938c1847a5caeb493e3cd62e6a5e19713779a087ffdc9c627481fb10e13d3ed53b3bc368182c2442f24ad57d1d2e96d3 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.5.6.ebuild 911 BLAKE2B b5d3b0deb03dfdea2ebb7719101c0ea94376d21ead1ba4d85ad316bba68bd88ecca1c7268ea7b4b6658616471d6f554806da5132fe43c6031f99c0b6b2e12c4e SHA512 8835ff5174039423a5a9686235ef5675314eb001afd17accd1a87bdd8842d4de5a7136820654fa62d4b57ca0dd98d9d8f163d2f86f7415b84ac0ef06c094ac6b
-EBUILD pep8-1.5.7.ebuild 921 BLAKE2B 56723fa33931fc9936754d6f7675a656ae42e3d763664a829ed45311ee2971536dd3040162d444c1a616a31995b43f691c78e57a0f9c2fe7670e39edbe107e70 SHA512 29e7ac9f1b9468c99f591221710b798bd10405570b83b83b85e17294a29e5961f405f143e05839a134236b99c8c65626e4b1f43eef5f5dead597998e8988e5a2
-EBUILD pep8-1.7.0.ebuild 1096 BLAKE2B 1fa817a381117c4900615a1e805cc018d9fc336bc81e8182dc0886060cb544888406015f7382cf711a3212cd03c89ec27cf3771afc1185fa6f2fdb7276608673 SHA512 cdb41c5f4d774db5b2d7991691d258a6b59e898f623b95a90c63d74c1a5349f9b0ba697736a9eb4ef8ce62a587027f6b19ca11974508b40e9bb7cea6534db85c
+EBUILD pep8-1.5.6.ebuild 910 BLAKE2B f74f7c0cfac05ff5c1635d47f50493ee06797e18e34ec799ce605840465f5d15c68f18022b4aad20fa2a4ee34205d20d3d6f4df1ca6925b9ba8c1291420a3f1c SHA512 0a7024c7867d6d1ef01667e958b834a6a93a33eb81fd6a396f842bb1d9c0b0121f2520e9f3e2f1e967e174f63d64c1ba5bfbe2d3d427c67a70164a788ca244b6
+EBUILD pep8-1.5.7.ebuild 920 BLAKE2B 7c169a681745bea3275d03b7e5a8d3bf04e8a8a53ac8f58ceab35bb0667f5210558b73ad5e7d88113d364bdc9c1736224ee3e9c9a61b154c29a8c1c06bb8f3e2 SHA512 b5c2df4207ca9e8fe7e2a6bf8a5597f341af959f81982719766ec6d2e4e32d0e5035aee9db68d6ad463c2de4e2c67f1e22c5a72ca3997a555ccf5e3fbe083b49
+EBUILD pep8-1.7.0.ebuild 1095 BLAKE2B 3e08535f1656d35d2ba9626a5fcbb84e78b027c5abaa9e68f513bbb42754bdcea2ed6dc07f507ef555018c854df69090a24f4f9baf0591d0460839b63f90cf79 SHA512 f67120c494983c212442b29003998a34e395d2e9c3b4b878bd0f68d750081c506eab510f8c971d94f4f0515e335fb3ed05fffc9a2480820a72b705f67748b412
 EBUILD pep8-1.7.1.ebuild 1099 BLAKE2B f6a98c3e2eda4a2f87b15dd1d6cd0d023c13a4d6e979eba721a78a15a0e2ec921bb4fd4b89d05fc4775e7d46dbd22255fe190d9b6e72afa09695d81214c703b8 SHA512 37b4e55373155428ab093410a987ff53c1dbdb12ee9b4a8a61a32d8319ccf1e49755e4ae58c21664bddb0b245a5debe55d01a66f4f679630167eb57023a9456f
 MISC metadata.xml 373 BLAKE2B c13332bbd6ab86ea6a6c9d6cd0dadde195528493cc7984e31416b833906e692cbadd18f4185b6cdfce0e2847750ce05a12f70d29d4fa98d3932654b73aeaa9ca SHA512 0c3ea303192c4b56bd910168dbac81284231291053b5fbca4a5a0700cb40ae8646f1b201fddc76dfeab52979c4c5944a67a2b0c62cfdf5c020c23e09e034056c
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
index 426c944e44c7..e0aee1618d00 100644
--- a/dev-python/pep8/pep8-1.5.6.ebuild
+++ b/dev-python/pep8/pep8-1.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
index 105d51cbb5c7..69a2379d0ec0 100644
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ b/dev-python/pep8/pep8-1.5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/pep8-1.7.0.ebuild b/dev-python/pep8/pep8-1.7.0.ebuild
index 9bf32c58ef02..67cd99c4de70 100644
--- a/dev-python/pep8/pep8-1.7.0.ebuild
+++ b/dev-python/pep8/pep8-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~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 ~ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index dce947ea7735..8d3cb357843a 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -4,10 +4,10 @@ AUX pillow-5.4.1-pkg-config.patch 790 BLAKE2B 702af0f1901834f13f4731fbc78989ee56
 AUX pillow-5.4.1-toolchain-paths.patch 516 BLAKE2B e794866ebfb5db41cba72def4690721f2f1254d16932a89f8ef5f28095a07df3a928aa7fc90c96e5a57983e8421369fd7495fa30a677831761801a639f22a91b SHA512 48bc736101fae55bf7da666e7b82c05c9a0a549f6892f8dbedb64d6db8a9bcfae34950847189209ab3acbbc5c357633a0102fd298f12590e678c7ad1b2dbffde
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
-DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab
 DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
+DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa SHA512 c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
 EBUILD pillow-5.2.0.ebuild 2732 BLAKE2B b603fc71dfb8cd3421a4460a36a9abd5be1f121a83f85c941399ab6a44474fbdf0bf673d2a3200360788279edcbb3973e153966dc0734db8008d390c12b4029a SHA512 235588590a41de73863bba24c92be25d815cc40aade9aab8bc94ff9b8e507d5953ecd0dc3be0953abf7e91188073bea71f0fb4e1c53fc6bcc9009a67d30d182a
-EBUILD pillow-5.3.0.ebuild 2318 BLAKE2B 4e619ddc6b8ac66beb75809c67f9555080c136bfeba8d9cb1be67432ae72ea4b2e2b488f228d8629dc3b41a555bb28744daff0c94f9e842e1e7a4463c29b5a38 SHA512 aaeb62ce2d17833205a0c32a47778bbe1465e9b6d9fa70828d67bd718920f25e5000d06a1d911040a42b0269480a4845472f2156ab544a6ff2be16af2661bf25
-EBUILD pillow-5.4.1.ebuild 2777 BLAKE2B c39730350035dd69c196e901d8658e11a0faabadff5dd1c3714e9b6ed20ce51b2eff5b278ed822b78393ae40ed45c432151b1268634f2d9de4c70af86b07ad03 SHA512 217dc85851f3f80d7a236b7bf9601306fa6dff83a854ca82913fa6963b9cd87039fd54f91c3e54586732dd38d7c8aa0ea694c8334932d232c0432d75e3acfe35
+EBUILD pillow-5.4.1.ebuild 2775 BLAKE2B 7d1dde851e3f0f3253a655252fd9b48e56a460034b9de5a4b0c70ebe63754ed67a7fab2a542985682b474742499ca3d990df9a649873706dbbf86fd02d3437bd SHA512 e02bbd5ae941320598b0b2a5c767454db87688bd2c8614c3f656b0271485209370ece3e5dafd2a628d8f0f7a2bdda28a0cb60d0a7cae5f60254563a548d4efbd
+EBUILD pillow-6.0.0.ebuild 2776 BLAKE2B 4fdc8914bcc72c58e89aeff5e1adbe11ab38ecb6dfed52297ca9d1acf615021e847e6b7780b583dc8a5e98b4f0139efb38ad99f9c03f19910bc2c3540182ae94 SHA512 b12641e3630355270aa92239ba63cd9b43d072b9c780e6f594df0684a06f1992bb12f4891fbb2678dfde520584cf37a0b90951acce5e4e3e039f13421c6da73e
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
index 98e0b4930127..0f964b03c559 100644
--- a/dev-python/pillow/pillow-5.4.1.ebuild
+++ b/dev-python/pillow/pillow-5.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/pillow/pillow-5.3.0.ebuild b/dev-python/pillow/pillow-6.0.0.ebuild
index 13d76f2458f5..b987fe75792a 100644
--- a/dev-python/pillow/pillow-5.3.0.ebuild
+++ b/dev-python/pillow/pillow-6.0.0.ebuild
@@ -3,21 +3,21 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 PYTHON_REQ_USE='tk?,threads(+)'
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 toolchain-funcs virtualx
 
 MY_PN=Pillow
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Python Imaging Library (fork)"
 HOMEPAGE="https://python-pillow.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch"
+	"${FILESDIR}"/${PN}-5.4.1-{pkg-config,toolchain-paths}.patch
 )
 
 python_configure_all() {
@@ -66,6 +66,17 @@ python_configure_all() {
 		$(use_enable webp webpmux)
 		$(use_enable zlib)
 	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
 }
 
 python_compile_all() {
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 24a944ad9bc7..5541dc2269f1 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -7,5 +7,5 @@ EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065
 EBUILD psutil-5.4.3.ebuild 810 BLAKE2B add86bcbe158a1c9b272198c7639b870060c19e1359072cc64d286ed92182f4990d25dda21be9595c4d487624eaecbea074d89aae27f5f97e7edecfd844b3c05 SHA512 20c85ada79b763349f26c277fb157413a35b56bd5d85fcf4c2f1995ddaa463c29bed24e04bdf2353dc85e9afc7a39e874e2a244b25d217b539e227fdb383db02
 EBUILD psutil-5.4.7.ebuild 918 BLAKE2B 099a4f9a6a2fd33e986f5b57f50847379c5ea2e1e964fef90efb5134d803c4977807784b986fe1a753b3062e2f1c21db2bdf54f574b86d814f79a28c4eb4295d SHA512 7b3d0b83a96eaf4efbf271c47fa7a4b3981ea2e72b252871daa0058a5b6018a2f244ac8d1df3ef95207b3fbb7f649762cf144e77308e4fb274b318397325f208
 EBUILD psutil-5.4.8.ebuild 932 BLAKE2B 2d7fc8e190f50371887422c918ec8e8d24fe4fb7bf73c89440aa0fb77aa4f4d8c0b0e87f5fe50c120a08f841daa41cde393fdad4c37e280f61fc6bc12794564e SHA512 8b6a3f6e55276400aa03a39ba4853582dbae7b099ef4b956ab734b44fd974ac271ac0ccd00c2a88321e102fcd53ec89b77a3999a6e5fd00ac650ff63964aef83
-EBUILD psutil-5.5.0.ebuild 932 BLAKE2B 2d7fc8e190f50371887422c918ec8e8d24fe4fb7bf73c89440aa0fb77aa4f4d8c0b0e87f5fe50c120a08f841daa41cde393fdad4c37e280f61fc6bc12794564e SHA512 8b6a3f6e55276400aa03a39ba4853582dbae7b099ef4b956ab734b44fd974ac271ac0ccd00c2a88321e102fcd53ec89b77a3999a6e5fd00ac650ff63964aef83
+EBUILD psutil-5.5.0.ebuild 931 BLAKE2B 6e586bb3ae238046234f1fee42bcc12974c24ea0a3064e00a42560500a19ee99a2b592084f348666e7e3f7779e032caa87b7af3da769da545270508586c66a3d SHA512 9fcbcea51d00581c24256e6688d6376b80386962b6cb5e92abd5f50a0cb4b3885b50afa3968a5acffdcb9629908d123fbd3c4415edd6a5147287f97d576d7136
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.5.0.ebuild b/dev-python/psutil/psutil-5.5.0.ebuild
index c2018817a3c7..1fa59ceac07f 100644
--- a/dev-python/psutil/psutil-5.5.0.ebuild
+++ b/dev-python/psutil/psutil-5.5.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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-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 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index e0fc05768adf..3311fc35e506 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,6 +1,8 @@
 AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a53ac525bca24cd9c2282edb92168ba38e73c38bad9f5a8b24910a690105bb4f98888e174f8d7c2a285e6e42efb36a45499ed02e SHA512 1c582abe153d73bd71cdfefff4293f2c497a5818fe2ea7e0deffe71d0acb89ccde8e20aaa33acf3d47900743c548eecbf01db24b01abe35b5ed60ca20bf4a658
 DIST psycopg2-2.7.4.tar.gz 425331 BLAKE2B 9d256ea340e4bace53981596d9d42863ddc9c8c079579b0621d8043af34daade05b9cec5465c6b3990f537a4350d9cf60a43062a0aa34db1f39b336296b32d3f SHA512 e78db528a4d3b897e0d8d38755179082dacddfb2d10bda963fc3836548991eaa0d4c1b8f81b329b15f4e685046c39e6f2a352b6c47b1da42af3a262094233034
 DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb00142998a85f5a79678a96b521098a8d0bf75779ab7ecb082c6d374cbf41cc845dcba0e1413b98621f67f9b139135 SHA512 5bf85b6760871f904b6b570ea454f99b72cf97acf9cce10b63dc7b6b0b18913b50ad4f24c469d101c54de6ad6100f1cac3c58225076b5e584a677f5ab4170a93
+DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 EBUILD psycopg-2.7.4.ebuild 1557 BLAKE2B 31e58e68e36e51d3b3e59ef731debe70dc2c8f47bc5d773abe74eadab4b941cc1177626f423cf43546ec02228d1e45c3435ee22313570a02b2eacc347fd08d3b SHA512 dfa0479608709a00f15e5075ee8a5b5ef03ba9c80848d9cd14dedebb034d1c304fcf1037ba7cb629e9cebc1498f86a0779690579351dab8c9fb140e827cfbdea
 EBUILD psycopg-2.7.5.ebuild 1568 BLAKE2B aadbf7b22637151227f36add992b5b8cdebffcff15bb9e185304790237f0dcc18f4640d0019ab15b6405afe4b6f3f821e5025721d5d2e9df687105ec5ff51413 SHA512 36f52384fe13174d6cedac08ec629874c5c9d802245702bf7e20761e38631fcb65a1a6ca4f3bc1280f5d21df3eadba9e92a92d7ee891ac55451385d5f4d23bc0
+EBUILD psycopg-2.7.7.ebuild 1568 BLAKE2B 72a192cea3451f17f9470c67322c81d90ec878034ed4e3ce3f40e9a635fecaaa4190dd78ce3d9e3ed596fefcbeb3185797fc513cca602d9bad58394904ed3596 SHA512 3e30c295a00651e92436bef4b15d0146b3d98c0a6f0e01035ed093195718dd9e6c9a2c919abbc74256a83d4bfb04d5b3e071b6a673df1b2f7d6aac9b90775c5d
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7.ebuild
new file mode 100644
index 000000000000..66a3df040bf5
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.7.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/pygments-2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="test"
+
+# Avoid using mxdatetime: https://bugs.gentoo.org/452028
+PATCHES=( "${FILESDIR}"/psycopg-2.7.3-avoid-mxdatetime.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r doc/src/_build/html
+		dodoc doc/src/_build/text/*
+	fi
+
+	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/pure-sasl/Manifest b/dev-python/pure-sasl/Manifest
new file mode 100644
index 000000000000..6f9e82567866
--- /dev/null
+++ b/dev-python/pure-sasl/Manifest
@@ -0,0 +1,3 @@
+DIST pure-sasl-0.6.1.tar.gz 11553 BLAKE2B 17a3728e23b04cfcebd967ec4e40ab40ae72ebd18325579dfac52dbeac58ebee6e467f32a8030214cd976b2ae96e446afbc853c3e4233a61fa149d2910b1ecfc SHA512 f0e34fba460b03fb2348871859f79a21ac27df4be8b125a1652891efacd428a560673f42dff0993e87a3d80439f182e3a6e07b7c968cbfa3c86311c1592822a2
+EBUILD pure-sasl-0.6.1.ebuild 742 BLAKE2B 75724320cdb833e5f95b0d3f27133f9083fe36e6a997079d95127beb6ad4905c7e73ac7399d10b6133045dde60214514bd361d382a99474ad4be41109aa9e28a SHA512 583304bc522b7384b64cb3f3ea48225ee3490e370d3494b861c890136531753b5b790dfe17ab7b80e1514996bf8b5416a003b0d7abdc62a5682e29bb07a7f85b
+MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/pure-sasl/metadata.xml b/dev-python/pure-sasl/metadata.xml
new file mode 100644
index 000000000000..3743220e59f3
--- /dev/null
+++ b/dev-python/pure-sasl/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild b/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
new file mode 100644
index 000000000000..1aec7ab83c2f
--- /dev/null
+++ b/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="High-level SASL client written in pure Python"
+HOMEPAGE="https://github.com/thobbs/pure-sasl"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep dev-python/unittest2 'python2*')
+	)"
+
+# tests aren't in dist tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/py2neo/Manifest b/dev-python/py2neo/Manifest
index 6d456c4bdc61..53af3171f5f1 100644
--- a/dev-python/py2neo/Manifest
+++ b/dev-python/py2neo/Manifest
@@ -1,3 +1,3 @@
 DIST py2neo-3.1.2.tar.gz 100101 BLAKE2B e3339049ce112ce2d952af130aa612ea8c810dafd77f58178bc5bacc743dd384113a56a34f99c1c6ca6f6af07311a608104bb2ce787285ce4d97ca57834ad7e1 SHA512 1f61e1129effe5e77b72955b34726cde668eeb3f3627a1164b40593ad863ae4f19d534f7174742eccae58d770f5e54d907346bef698d98c33e3f3837e70659d4
-EBUILD py2neo-3.1.2.ebuild 633 BLAKE2B 0525eb27dfdf67b0d14388594e0a01dd15e2ccfc40de8e6ecb61299b280005d760e1e5dd124d81aabdf320e8e7f284072c23acf8bf787b48f990f2347a550ab2 SHA512 cb24afb9a702f3596e1de9f51089c947e7cad12d80fb95855f82676a517afde61f974d079bb1fad65c74019e51fa7132e3a0ae3df4e6e9ea8ae1070b1909df84
+EBUILD py2neo-3.1.2.ebuild 635 BLAKE2B cd9f542769bb5547c6e7d981a5a3afa6841d3603d9f8115a9ae6f08ddecb185c68f7b5391babf597366a7f6b0694ff2655f557ab529071dc5f7fe73009792515 SHA512 3e2f63db0c6ab5df056018b6bc01e6a753c5ce175c60aa5cf159a3430cd004786f71aff0f38fb434ce8f3974771d590212ef742bc738f6cb05a247d4cb5b7e78
 MISC metadata.xml 366 BLAKE2B 31803fbd38d7d95cf2d4b34ffd2531748b20e18e0c3137835a7b93b3461717d905bb3b6fe4254370a4495e825470995ad66e458f9764d6ab47a4bc8c0d2600e5 SHA512 90e6f3f7417e4315f6682e22790c807a226fb244e5e42965443b907fa188eeb602f37c7ef57ba451e3e9dc53da95aaf4ebc911a4446a5269307f343593d52159
diff --git a/dev-python/py2neo/py2neo-3.1.2.ebuild b/dev-python/py2neo/py2neo-3.1.2.ebuild
index 77e8e49bb32e..186dec019a98 100644
--- a/dev-python/py2neo/py2neo-3.1.2.ebuild
+++ b/dev-python/py2neo/py2neo-3.1.2.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=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 inherit distutils-r1
 
 DESCRIPTION="A simple and pragmatic library which accesses the Neo4j graph database"
-HOMEPAGE="http://py2neo.org"
+HOMEPAGE="https://py2neo.org/v3/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index bf569bdfce4c..8aff723e419e 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -1,3 +1,5 @@
+DIST pyTenable-0.3.14.tar.gz 101836 BLAKE2B 276c35cddf1f1b7d96f2e5f7d1e16244d4884abbc5b84e3902db2c98edb906a5805354b5c9482ab24598c6ba83ba9e7ec4cb62bed2a76a38c749c229438ad43b SHA512 66c0217730b51733ce691efcb8f6750de810c2a256397cd445f6d1ddff36e3e32c0afd2860d0d2ef38b2c0b181555eac5d2c0eb8c22226b1c61ce3b31177984f
 DIST pyTenable-0.3.7.tar.gz 76638 BLAKE2B 8ff586e4a77bc4005769e6565622756b798398aac9e8e2335653c1ccc5f9c0525ab9e1261b939c848126b1fa71dcca8ea7887d82972f1d881c7b21e5f61de0b5 SHA512 c1f5d7a916cc79a754160fd056b661bad15ec60d64ab08b91345c2646f0e8047ba629d73b39a4d70d87ad7b1c624d55744cbbe0eb78f6e9df32e50a5c85c38b4
+EBUILD pyTenable-0.3.14.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
 EBUILD pyTenable-0.3.7.ebuild 680 BLAKE2B fb3aae727d73671d32c0aa448e9c543a7c78f8be8467cf3ee8b3bfdce83832ab4c55689d81705eae76e3ab323fa3f4747bd5fe9e258f75863d5f10edb60ec93b SHA512 098c0f083fcd64fb8bbb21698f5ce064fa32a7a02438ae651f870ac5bb37df64befc09fd1abdd9a3d93c476d2550211cb885a0e287c72b73186fe10218f1d991
 MISC metadata.xml 529 BLAKE2B eccd96c558e42e1d453f21c6ce85fdda19c47a9bebd5803cc1f789f311726ff02a41d6da592ad1202a6c970413745a5e272dafa7efb6c2abdbe5361c0d7544b0 SHA512 9c8094a71191ceda8919499eca6c8cebcbb3db0bc668b5d2cc414b1ed0798ad1431fa9e102358deee6eeadd5a11c610d2bd90ade8ace0d4451b4d87ac66a5ae1
diff --git a/dev-python/pyTenable/pyTenable-0.3.14.ebuild b/dev-python/pyTenable/pyTenable-0.3.14.ebuild
new file mode 100644
index 000000000000..6aa15ef4bd9c
--- /dev/null
+++ b/dev-python/pyTenable/pyTenable-0.3.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tenable API Library for Tenable.io and SecurityCenter"
+HOMEPAGE="https://github.com/tenable/pyTenable"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.19[${PYTHON_USEDEP}]
+	>=dev-python/requests_pkcs12-1.3[${PYTHON_USEDEP}]
+	>=dev-python/semver-2.8.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# requires networking and API endpoint
+RESTRICT="test"
diff --git a/dev-python/pyamazon/Manifest b/dev-python/pyamazon/Manifest
index a1aef54f9068..8e3726e4222e 100644
--- a/dev-python/pyamazon/Manifest
+++ b/dev-python/pyamazon/Manifest
@@ -1,3 +1,3 @@
 DIST pyamazon-0.65.zip 4715 BLAKE2B d657fd1b077f1a4962320a3aac502c8f3a223ca426ce6dc7a7e45c6bd0927b6249f5d2bc076a51966a4c021dc76c2b97503fe3ca4b7fcb92f41e3b764298dcd5 SHA512 91da5c766f3c8b24429f92c46d27509e6e7ea4f3fe945920774aad88ab7ccfa9418067d9919f14f7800c767a2c59da52452d9949e7cda46c2626c33db7bd9997
-EBUILD pyamazon-0.65-r1.ebuild 620 BLAKE2B fec0500566d8ca4473ba53dd1c81e9fde08f5a6e5d63ba51af6fb1e7793fddccc5de0023f1be3bd58ee0ba0d386377852324a9fdfb49160c06775b54db928049 SHA512 34a34e673366d760d80bcf3b432325d37caec96be917f157592408f2d0ddfab5c9204e7939bc7ebaa9dd40db3fbd3c2638902e5097201b5ae37888e36ce5f8bb
+EBUILD pyamazon-0.65-r1.ebuild 620 BLAKE2B 35aa0827544c292247c4880f18e96dc72d78fad39861f06cae3e7d209eeee7c2fc6e7a8f1a26139872fa2b768c4b05882285208e4c2582e232a5ec733442c944 SHA512 8739ad39128edbdccd5835fb6b24ea42616040c6d762b5723a7b987f0c2b951a32ce1fa9160b21555190cde088dc902daf78aaf2072d03b888da88e9e28c7b0f
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/pyamazon/pyamazon-0.65-r1.ebuild b/dev-python/pyamazon/pyamazon-0.65-r1.ebuild
index cb966fe2c805..ee51a16a8cd1 100644
--- a/dev-python/pyamazon/pyamazon-0.65-r1.ebuild
+++ b/dev-python/pyamazon/pyamazon-0.65-r1.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=6
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-single-r1
 
 DESCRIPTION="A Python wrapper for the Amazon web API"
-HOMEPAGE="http://www.josephson.org/projects/pyamazon"
-SRC_URI="http://www.josephson.org/projects/${PN}/files/${P}.zip"
+HOMEPAGE="https://www.josephson.org/projects/pyamazon/"
+SRC_URI="https://www.josephson.org/projects/${PN}/files/${P}.zip"
 
 LICENSE="PSF-2"
 SLOT="0"
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index a501654ff052..3a9ef7900998 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,8 +1,6 @@
 AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268bb002e8e4a32c7c3e3e7f4445a5ee7e6a899b1caae25e1ecaff417d2d121063361d3dd983df08bafa666ab03aa6746fa21151c SHA512 7171f77080fed4ef235d1d3380821939d5a41e919b8509db8dcbe211d63b7b390e66389152c7275128cc8372c2a7fd1bdfaf179fc93b8fa62ed76a6edffd11ed
 DIST pyatspi-2.24.0.tar.xz 298228 BLAKE2B a1c989df5431a9fdf0b35c5fa75a12b9c083c6a979052e3a621685feada611f4322195b30bc1f4f56cd35f305087756cded31a445cca07e74262ecd807926239 SHA512 ea0c3e5a5a417c4d494cfe33ccfcca1996f417e51f5ccd3508372a0df636fb186b9940d7832681af9b353aa50a9aabd64c5477fdabbc5016794a502396b3d67a
-DIST pyatspi-2.26.0.tar.xz 309780 BLAKE2B f3657052ef7c5fde35506e04e5f1a3920fed5edd1af182b3e9bff6fc0461595e9b14644c8858d6f12b1042d57231fc09ae5061129d74a1030e0c8de88364ec7b SHA512 a1aa7e608fa95bdf4c891666fe5038dd2fd7cc7e675cef4c9759ffed4f6342e3cebbc6d5fad8899c0c91eda29664a5f8ff06a1cb0ab46958c8f629cd014d3579
 DIST pyatspi-2.30.0.tar.xz 310672 BLAKE2B 76d51e6ce2f39305bcda8f706b5207738d3a2c0fd7480efb77c4dab8baf8ed6eb71263375ff0c16be0087e47f7f6b5eab99c6fc8992b83bdea6e64c92c381043 SHA512 a7af81bb55dff45d1bceced645f6aeb1adc1fa2a2b61fc39d9e97b6659e474636e5ac1af9923588311e651fee57b5e31a62ea5b2977b341eda43a5a736bf27ed
 EBUILD pyatspi-2.24.0.ebuild 1297 BLAKE2B 232974954d137d16728d738e2ed0e4f3c206ba1c608a1e5997e9868f02a4cc6e9d825480bec8b1d3af7a9961a101f2e2514eb51ed5687dfae3369ca11a94ed5e SHA512 07a7cba527f24318267f80964953cdf5201a202db70dc096e117249cdb562a64e854056c90915ba473867443c7e94931834217c7f0fc7d21608da8cfa56ef15d
-EBUILD pyatspi-2.26.0.ebuild 1297 BLAKE2B 04b7e43b50e9a04915215118b28356c3e005a14017f2d187743bb279220ed07e45f06093d766d20f72935bbf98d7696cf0477090a9c08e49912de8be6f3f5856 SHA512 f00a7a30d13238e465ded58a54d5781e030ca45ac2facad4b93b92078a362402f6b6ae8cd69ca862ecd6125df1b0e767b9a09cb665a80c2d4de93f28361b9c58
 EBUILD pyatspi-2.30.0.ebuild 1297 BLAKE2B 04b7e43b50e9a04915215118b28356c3e005a14017f2d187743bb279220ed07e45f06093d766d20f72935bbf98d7696cf0477090a9c08e49912de8be6f3f5856 SHA512 f00a7a30d13238e465ded58a54d5781e030ca45ac2facad4b93b92078a362402f6b6ae8cd69ca862ecd6125df1b0e767b9a09cb665a80c2d4de93f28361b9c58
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.26.0.ebuild b/dev-python/pyatspi/pyatspi-2.26.0.ebuild
deleted file mode 100644
index 25898e111ef4..000000000000
--- a/dev-python/pyatspi/pyatspi-2.26.0.ebuild
+++ /dev/null
@@ -1,57 +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_4,3_5,3_6} )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Python binding to at-spi library"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-# Note: only some of the tests are GPL-licensed, everything else is LGPL
-LICENSE="LGPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="" # test
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/atk-2.11.2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/dbus-1
-	>=app-accessibility/at-spi2-core-2.20.2[introspection]
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
-	"${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
-)
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	docinto examples
-	dodoc examples/*.py
-}
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index c539fba9fc51..d27ae28a243d 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,4 +1,4 @@
 DIST pychroot-0.9.18.tar.gz 32879 BLAKE2B 769b3347bae3f7dfb47c0335015cc898ec851a3d45f774a4e21aeaf9b8d7937331bc69aa5bcbb298e76e7e51ffc2e55f049336fd90f6b08fc3bba87089f2205d SHA512 59c8750c9ba8d601eca485079c04d4153bba92531dbd30fba0104694e4435d76e65b762b76ef89a6a6f8908dd6054d1d95fe4be74825ac1c5a56e473370dfa41
 EBUILD pychroot-0.9.18.ebuild 1149 BLAKE2B 3a77de87563d777b6fb44603de847a5a8637949c10050d74e0217e76b045b59509a814df9c8585bde111a07930c92c79d2b9507ba8acc3002851689bb8f7164a SHA512 c019b5e5d73cec26a74cd363c2784a4ccb3e8bda0aa5ae472e60f6165b533ead1ad54a67740c3021c17980d11729b66460f7a0ca244eec62c576ba649ab3bd97
-EBUILD pychroot-9999.ebuild 1066 BLAKE2B 3efb60e1c7cfc0885e30d30d73a4f8fc59487c310dbe22e2a7f753836d612b0bea47f3777e4f15547e38bd2c649adbb1477de9f895d0c7696edaf3b6072df9c5 SHA512 50e807c9169144bfd70b4894b860f8c814a0e8bfdea82df4754922b671803beb791d98ce30067738d50e04e8a6901cde0b720fe0761086f7e248dd7d4657c9c8
+EBUILD pychroot-9999.ebuild 1077 BLAKE2B 9dc673b8688ea55b8bf5774b0c6e5d54201796e443e976dc42e4f45503d231562b02ff010aa984f157ff13e3c9a883462f828963615250633a4b68996fc06ca2 SHA512 1289c367e4f698670021dc7ee154a2dc0d12d48545793142378541214fd5f271fb8f2a47c5cc1b1e95b876df0bbd24a217d5e57121ad57d0bcb7f0e819f50c66
 MISC metadata.xml 337 BLAKE2B 3c60605dbe9296fe7f6c285123fa649b47c4997af6f715cefcb5047817ddff55f15c4813c2c33dcffa4e771ab3d0afb83bd88506d915e313b237e51ca4729c70 SHA512 4b0da70f35cd4983f6f5cd8aa02e5555b770d3bc2b7e90a8e8287c64593fadf1fe532cef6becce24de96766f94d24d8ec731ac3acff6f42a2c7b06c3e1e1e4d0
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index a59532024a50..6ba82dd84eea 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -41,6 +41,6 @@ python_test() {
 
 python_install_all() {
 	local DOCS=( NEWS.rst README.rst )
-	distutils-r1_python_install install_man
+	esetup.py install_man --mandir="${ED}/usr/share/man"
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index a4274b68b530..4c5a08279aa4 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -6,5 +6,5 @@ DIST pyfakefs-3.4.1.tar.gz 151662 BLAKE2B cbfdd7ab4c2936d484b5ff1e22852438c5c653
 DIST pyfakefs-3.4.3.tar.gz 156896 BLAKE2B 2450cb67dbb25d2029a113dd95c3d51e60ef66c6683a5898ea73800ce1269d628af9f8daa85195d5b473f18b7c3262f2f26fc9c17caf80ce2f5159c247ebea5b SHA512 aafcad5d801f625273239221c56e46229ff8ab622cfb474d92f8555cfff90279ad9a092c20878279454c59033ad23d53cfe877023ac5d20c5a67a610b62ba7f1
 EBUILD pyfakefs-3.3.ebuild 720 BLAKE2B a0c8f2aeb266a89cc6d16b63d6b71df91a718c649b3a1a3c7c9c139f8d54cfe9b980b593ec572754f36e8827a81bf7b243ad58b70d994ecd348e03d8678193a7 SHA512 ec406f3c89e67e3d9bc626e06cf78cd9b88f0d10df1a4e85a500ac026d3eb401f50782d44c6193cd859cfe7851cc61d337ae4b53d51c363574700cf611058b13
 EBUILD pyfakefs-3.4.1.ebuild 723 BLAKE2B afe4b02b8119759b73619ed4d7af26b0aa077d3f9c0d719dfd329638eec119bec522a2d370a34689c07b4fe3ab840659a38c70f9c78b84cb96438bd972035f92 SHA512 f3c652059b4ed40259bf1569c9772a03848786d7b93e2ae3601a68053ceae13efe4dd2c6bae72cc8c27fc4862d33f5f325ce23f24a82567e1321dd9ef1d45209
-EBUILD pyfakefs-3.4.3.ebuild 725 BLAKE2B 8cd8fa143eb42104625f76691d097e6c00f4760945eb1d72513fd67d9a2213d0240653bc43f0d91ed04ba1179538482c44162c021ef71158e282c83cd99eef11 SHA512 53ec91eb11db8498de382c9be70e5c1e6958be65ee43028948c5bc631e9213f04abe4c9fe51ad0069c5188d2b126497534c2f0cf7da3d68834e3b59ed3ce5fe6
+EBUILD pyfakefs-3.4.3.ebuild 724 BLAKE2B deca1fbea6d615e110311ca67eab00e6261f2e188d7944950d235a4a73ac42d75640aec81511777dd1db3fa39c45b2a79921a906e93fb7b63654e1b3d8f1f1c4 SHA512 6bb830b5132e1813df261b663fa7e9f6b50014083b7c70c72cffdc5b84cc65b61abf1b94e212c24cc1bc1951354dcfd8c900317977c0b911830e341908ebecde
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
index 3fb0d1696a6f..1633f95679d1 100644
--- a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 277e69e86d5c..b1780bbfda08 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,5 @@
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
-DIST pygit2-0.27.2.tar.gz 477237 BLAKE2B 68fc1e9d9456e4a9d6eaaf00963d02704282de2a9deb1af946ee0c7c69be22fc904b8e80fe243987a3dddb9a0e5365fdf5e336b9dca829dcd9843c2035db42c9 SHA512 f6578a3694babe7837a5ccc4c99e2fa1827b5f67815f2cac6f3b3d0498d94a0ffeb55d3c6e9c9417d47ecbf0ad9a10302e3b59ea0d2e9eec6d9da8426b10175b
 DIST pygit2-0.27.4.tar.gz 479157 BLAKE2B 5b650c7916127219ba18212f035793bb805adda570dd4a89cc7fcda8af581c7aa3916d2851117a5efe7b434dbe2e9ff103e37e69de5d158d0a58162b15f1e18b SHA512 046e8830d403d869418a8cf7f22549293e336fa1b8fc108489c3c2299316838724d1eebc8747005d594e1c6c3596aafa5192dd64a1f34e0a2d080c83214324da
 EBUILD pygit2-0.26.4.ebuild 626 BLAKE2B a077ae59833c4adb59a9a2c8eb7c37cc091478d31867e09cf3ae4949231b7f30c0dd605d47009fa40098a8b58277bdd74a744d46f5a38a08a5e2ed0e6e991cf6 SHA512 3c04ded6c6012968dfcf4a36e4c3ac5eec95cab7f558c0fc9574bc1a4ced5b93b1287291bdd84b36c8071ec2394593f70091978eed20091787ec2f53dee15a75
-EBUILD pygit2-0.27.2.ebuild 739 BLAKE2B a5c0508833bed48cccba3a63fd37f5c3f5d6e0e59773d2ff03f9b7a5f9c13dff9db506b0d505facc72db50ec589b43dc554b69f814ace442a565da3daa4ae236 SHA512 5c60050093502af5dfd107e94a892c06b3cacfeb9eec3c857fb2eabe4638f34f2dbc52b51b6bc13c9867a0caf57271f20795a518ac18318c1e65b2f523d3b100
-EBUILD pygit2-0.27.4.ebuild 790 BLAKE2B 269a8f8a624f4b9b8faf4e24df4afa95a8f73ae0aff6498d7472c06fa5f64947c22c2ee748c3ab80d5653a8bd5182a8ee9a4cfe8fc53de52af610e4a67d58222 SHA512 15872ee6f4298cea673fad6e4fe64d3d8e70102c62ae5032eb0525959c1952c53873add1285595b157e715277b4f07c7793538359efecf003c38987c47096e63
+EBUILD pygit2-0.27.4.ebuild 840 BLAKE2B dab91ab5392d7e51f6ebd3a14acdccce9498e4276552402ee557d52d38ab4d7367257da4547d1db82ee40de81360f18f63645000950ee050e486a0e0fa7fb89b SHA512 2e2ed563c0ae0d1a3272c836c62125ff20459b0da8bef68b0000b1bd5af99a3d7fdc420a03df8fbc7b71ff74710de89bd52d65c961708908d0f9607ae5a10bd4
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.27.2.ebuild b/dev-python/pygit2/pygit2-0.27.2.ebuild
deleted file mode 100644
index b4668c6c371b..000000000000
--- a/dev-python/pygit2/pygit2-0.27.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,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"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	sed -i -e '/pycparser/s:<2.18::' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pygit2/pygit2-0.27.4.ebuild b/dev-python/pygit2/pygit2-0.27.4.ebuild
index bc0bb7e5f0aa..fee4feb21364 100644
--- a/dev-python/pygit2/pygit2-0.27.4.ebuild
+++ b/dev-python/pygit2/pygit2-0.27.4.ebuild
@@ -13,6 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
 RDEPEND="
 	=dev-libs/libgit2-$(ver_cut 1-2)*
@@ -20,7 +21,9 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}]"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="!test? ( test )"
 
 python_prepare_all() {
 	sed -i -e '/pycparser/s:<2.18::' setup.py || die
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index babe3d9a6751..8086789cda5b 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -10,7 +10,6 @@ DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f
 DIST pygobject-3.28.3.tar.xz 1005368 BLAKE2B 5c24fd25fa20dbdbd3ad18d7e2eafd8f47f5e28903d9f8dab6110f09ccfc13f865149f0d4bd84bc755bc6e4191b903646930e818d85382dfaf4e05f7107b3ecf SHA512 0abda393dd774f9cea04f883eab53f5ebde81d2439ed18cfe08ef39a1996054ab34bf4e770f70116a4485fb4f9970464b9a950ffa4af76cfa21ecc8d4dff968d
 DIST pygobject-3.32.0.tar.xz 551516 BLAKE2B 4c0b568c900523f4ff6dcf88a85c8780b16004985db6388e29f7d71e7bbac3131779d2652ba760f47cddee8607ca1da7f6144213f29f709069655ec898a125ea SHA512 beb0625e3257cdc2be251624dbf852d2f51bcb95d13bff676b93d46a80d9df94f6fb6ef9850e5c38c56325b72854165fba9ce20ab78f13d99552b3b10ff0fa81
 EBUILD pygobject-2.28.6-r55.ebuild 3537 BLAKE2B a5b8ed9f09176314ffd8584203f5688399c9aa4320379765c0867c4605e38d2fdfc51986b58960465506e36b70260afdf48e68d4de385b4ce0d0113a20309d40 SHA512 c605ab80a65d3a8e71669c22675b4cf54cb94fefad28126df05504e84b0d867bb5608952c0b0e161df4c8895c159159035622919b9321d81b1f26b34ea677b0a
-EBUILD pygobject-3.28.3-r1.ebuild 2810 BLAKE2B 6f26b9498fef402192c97b90a5e6116800952029cfa1935d4b7dc62ef7338d925d4b53de17f891dd9e1dc792bf4cc60c0c1d14ddd05c4e755d8ea87437ab5f3f SHA512 b91c5bc78371ebffa96889507012238d33983c65f5d874cdca43a176fd3c70c826d601cee4d6b7ccf293fbad3a95db94c3f5f733db51e96933a4ea56660a9854
 EBUILD pygobject-3.28.3.ebuild 2784 BLAKE2B 8b54aeafc713570ead6f752cefc903b9bd50c5d16652ea7ef7bc66cfc9dab2956f1cc1010530b9a69b9fb2c6afcaeda3e13d3269f07bd3e8451cc8858313fbb1 SHA512 5cbdb3ec07708673452a053f425d626d277a4eec9b9650336ff1161cace4ff613025fbe08fb2e6f8cbfbcf92b29a927095b8a72f58656811d1e4ae602751b3c1
 EBUILD pygobject-3.32.0.ebuild 1801 BLAKE2B 804ff95271906b986beb73d8e6786849c2b8834886214ff0e0bdd66f479bf5e5bb25dfc4e0ac85ea1f4e377484fb5aa5f395e1122ce878e4bde3eb715b06d619 SHA512 fac66aa74ffac600db739f835575e6fd59cc983cc921231382f6ecc8e501180b6e8f82127ddab89abe7d03c959600b653b5f6445d76f80c937951792e001c3bf
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.28.3-r1.ebuild b/dev-python/pygobject/pygobject-3.28.3-r1.ebuild
deleted file mode 100644
index 821b3393db02..000000000000
--- a/dev-python/pygobject/pygobject-3.28.3-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit eutils gnome2 python-r1 virtualx
-
-DESCRIPTION="GLib's GObject library bindings for Python"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-1.46.0:=
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	cairo? ( x11-libs/cairo[glib] )
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
-"
-# autoconf-archive required by eautoreconf
-
-# We now disable introspection support in slot 2 per upstream recommendation
-# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
-# older versions of slot 2 installed their own site-packages/gi, and
-# slot 3 will collide with them.
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/pygtk-2.13
-	!<dev-python/pygobject-2.28.6-r50:2[introspection]
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	# Hard-enable libffi support since both gobject-introspection and
-	# glib-2.29.x rdepend on it anyway
-	# docs disabled by upstream default since they are very out of date
-	configuring() {
-		gnome2_src_configure \
-			$(use_enable cairo)
-
-		# Pyflakes tests work only in python2, bug #516744
-		if use test && [[ ${EPYTHON} != python2.7 ]]; then
-			sed -e 's/if type pyflakes/if false/' \
-				-i Makefile || die "sed failed"
-		fi
-	}
-
-	python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-	local -x SKIP_PEP8="yes"
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		emake -C "${BUILD_DIR}" check || die "emake check failed"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 4906e0ab1c58..88d1750e36e5 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,5 +1,5 @@
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
 EBUILD pygresql-5.0.4.ebuild 714 BLAKE2B 9365cf32ddb6a06926680bb38ecb93de0d1061e2955978b7d3adac5fbe4c0161e712ab73f577afe2aa0cadb16fd2c6432712b485c9bb30831778a431777a2415 SHA512 9a08e9e54ed38286f4ad3004baa36be5ca1f0b54dd0181ced529a301dd4aa7a6b42e9dc75ab1afec18c2849f1936670fd86b9a426dbc2e9bae507d85e5aea7b8
-EBUILD pygresql-5.0.6.ebuild 685 BLAKE2B 2796a98d19d8941e40bf58288bd956c33556abe45fea2840db4208fd99f6ad43b75e3303511c7544909edca69be797d8ff58f95ae8f6d092f058f5643732c3b2 SHA512 32606c0aa6dcf66f8d9f8582eada44f2e5fa1cc990784f236122a33ec826f744b9bb03720dc3d588ca47eab0f6266f9d262966c39acf265b37e47a3a51e3efa3
+EBUILD pygresql-5.0.6.ebuild 681 BLAKE2B ba984059f8a185434e4d97acce36665fe68995edc44273ae7bdaa17e9830b7761e58a7e88c08d48442a05b31451f9a0055d8f12d4801b02fb4b65efb4b59d09a SHA512 e02e914aa3bc7f7184befd7ce4a313474a0d843b27e59d3e25efaa9f096872ef343a998737ce808ace5c259eed21a5321bfe24631967a800e90184be0bf47473
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.6.ebuild b/dev-python/pygresql/pygresql-5.0.6.ebuild
index 1647a3dc50ca..1d804e29d019 100644
--- a/dev-python/pygresql/pygresql-5.0.6.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="${POSTGRES_DEP}"
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 4ee39c1c1227..50e377ac70d5 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,5 +1,5 @@
 DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
 DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
-EBUILD pyhamcrest-1.9.0-r1.ebuild 1311 BLAKE2B 8ed46f9c2d8c89e0cf8f5d6bed261464265eefb220f365e87d16f2b94253a355828fccb65741059a63f8d5e2605496dc12a64e9608da855929633bac071500ce SHA512 8c5ffc5913c279c3f9190e77530b4d4df6022572e404bada3d90ea306e88f9104bd1142d15becd68c5ead8463d6820913e87660f77fa195b0b45e9989a3e0092
+EBUILD pyhamcrest-1.9.0-r1.ebuild 1324 BLAKE2B d0bd2bad60407c2fb4a87f2d1355c9bccfd5bb00f1c795cf1fd4f2fda3818a72c82b4334688e93195744a9fbbce129ed2ade3c7a63d9a2e2dd129f85281d04c3 SHA512 5437cd45c5100711bd045c28a1e421893e7a5364cfcfb308c20d2dd68ecf287f9ba9096dcf80d81f23fd3e563570e2d32fcb32b6d50185c99e7490873a370c59
 EBUILD pyhamcrest-1.9.0.ebuild 1227 BLAKE2B 173ad0e42c44e083043203c40435865697bf5222e7bd4fe907db296fbea627aa06de8a99dd8842f259073ecedbd902a4bc7c9eaf7b74540e1afe53d85832612d SHA512 4bca028ef12f224a122978f6ca9ed259306b7817f5f6182cd462d366b944458bf2657ff7a25f2993582d69cd9e5780004b65702062c2f6cbe429f6c39eefb81d
 MISC metadata.xml 271 BLAKE2B c9035b9fb7a0fca1355aeda317feceecac5790bb6723360063b236d6633a040a594eea8f304c3b5bc8e918b1781f0e5e887ec15225d51a021592391195b7e8ff SHA512 89f447b79dadbb441c4c51527f486fcf7110b67c0a86c9fe6413c563463be57089faa1ddb36701080c368ff0a8442532bc774602e0120cd5466a4d7fb6bb6e0d
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 8364afe1d5e2..c87d6490028b 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sh ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~sh ~amd64-fbsd ~amd64-linux"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 2eed0a2ee6f6..d6e5848d43b5 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,5 @@
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
-DIST PyICU-2.2.tar.gz 211135 BLAKE2B f56e590ec4aefb61b6d3b37c807a018698ee97a632ccdd08f5f879cdccc576a6da1d31bb0ede54813be640ebdf600fe522a5c35ff417ac8e157c516a1b3bd7cc SHA512 30cce676fa502040e20fd4303baeebf0d83730abfedf79fdf3b69c1a3b52032a3337168b6e8902286dd4b46dda5bf894795995c6f1ef2a237fdabc374bb5ffcf
+DIST PyICU-2.3.tar.gz 214710 BLAKE2B ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c SHA512 2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94
 EBUILD pyicu-2.0.2.ebuild 805 BLAKE2B 50c8cc5a9eb124140f9a8bce4c545f512901aa52259bd110197f9575a3c440f0c10efbbef20f395851bc1268b08ca014e3a7a50148b7ab20a08da403f5928ae7 SHA512 a2a39ed9d33840ebf2db72847623ce2fc0b74909e1741c3f0cbe8a145e0989202db2b0a7f0727c82841a1f76ed0d353fb496b402226b57973d15e6981d2b6df5
-EBUILD pyicu-2.2.ebuild 819 BLAKE2B b5f2141b408b90cfda0b0620f1b9c81e29c6878f865aa9b04627b9d8fdb1128170b8041f4ebd228fc2927bc134a4f95934e6b13e94a0a2da3f50b3556c7880c1 SHA512 d54a5ca5403b3051ca3ff1da0f1f40c58344b2be592b910e3efe47698fdc63db1ca43a94e7b6b3916f3fdfc23ade743fb66053169939cd0d9d2db13b4daaa3d4
+EBUILD pyicu-2.3.ebuild 821 BLAKE2B 67d8621c6f96db9580ecd62123fd2c41ef127b6042856d473a2d2ae911a6d9126f4adace4ddb2d32abd71332c0f0fa4f1fbfaf94eb6299c823f598ad9b89dc62 SHA512 c67f7bd407977b46b83bc2f0c76db926a1dc87da9035f4c666185464574c6e6b8bf61b08e362fc13f4b0349089c81e302253b722215c579a9e49e9af31f38ab6
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.2.ebuild b/dev-python/pyicu/pyicu-2.3.ebuild
index 8a6c78ecb663..20c7f98b97f7 100644
--- a/dev-python/pyicu/pyicu-2.2.ebuild
+++ b/dev-python/pyicu/pyicu-2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 86756af52784..5ae7c3f407d7 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,7 +1,5 @@
-DIST pymediainfo-2.3.0.tar.gz 423912 BLAKE2B 2108627d7eb661a4329b46abdf6821c7f9af6d3817455edf884d3d96af534424ae434e28c061deca699e967913c40b609f72ffe38316811d4c7b09008de0bde2 SHA512 6ca616ac92f4e8ab71d8edcdd1208dc3dcf9a13f7c3dd2d401a4997c95222b4e559786678826f75b631c4c46913c9cb390126a5468714a7c417638d3a4468d32
-DIST pymediainfo-3.0.tar.gz 425428 BLAKE2B b56fa94f41096aff143d57c8f4175ce251d270e1d94f8464800eea2c4a5a952a466b962c646b0449d81ce2dd394c7bab1293eb358a33742631e51aead49e893b SHA512 b6828065f8d4907e94a299e4b3d550b1aad6dfa335b5eaae73e51a9b9052a8c494960b95473b49c10bb4407d3f48db07c2457b2937464317d64997c380571bcd
 DIST pymediainfo-3.1.tar.gz 430689 BLAKE2B 2abb8197ab8890617cb0cebf15001fefc5837c886c110f66852be56db6a2df851ec13b7dc76db40723cc920bf44ca87286446f451dc5c51b8998ee332a23cad8 SHA512 a2fd04977236190c18e62da9ec0110d9de9f31acaae448b40ce56f66d925d9e0e0d2015f7824d359ebbd8ec749c0ff812ee4ef776333319827759c4c4fe708ab
-EBUILD pymediainfo-2.3.0-r1.ebuild 1079 BLAKE2B d727c3741fdcd0f581abe20f3bfc4dff3fa47b6880ddc33dd3e64211f98dae8789b6d62d2d32772593331d8877f84c009382fb8655b7ca372de1f4d7bf9d3ca1 SHA512 534a061468a4cf27a504b54f566d37e2a8e357d54c07644c2582d94033953d88e0c5182bd2a501096b36c9f4e14fd557eb3ad81ef8b3ee265cd8a2a068787577
-EBUILD pymediainfo-3.0.ebuild 1054 BLAKE2B ea26d5ce2f06d14949193dca7342a5498bee8448a5a65aa4439be2667c3e55f1369c91256ee520a3687bee29964436cc564c6eb4c00516aef3a28c253bf56527 SHA512 17d5f481f8119946d04010e298c2de2ca102e98561a6c48615531a0030385917f5cad923561ca783f8416dbbdf95d4263950c43a67a445ff9c8faf0e9e98f00d
+DIST pymediainfo-4.0.tar.gz 432284 BLAKE2B 1159f48f28f0a3473327830e56a27fcd14dc9d9dceeac6f90d52a048229d87e97d3b88ef865eefe454c8cebf55148981b2e88127e863682e00992d56c2906048 SHA512 988f0d8a212bc5893925bd96a5b41a1a2c8e9508c747e7aa1106f3a065ad5707a7ed9de71264d74ba6637a2b8efbdeeed3677d779167bb90f643d40f81c5a74e
 EBUILD pymediainfo-3.1.ebuild 1054 BLAKE2B a313fbd824eb4d67c058e8b8f9a5110d80648aaa257f55f208fc9c08641ed1c89ea697a8df915e7caa77eb21b1f679b963c9b45724844af2dd45d22e8d4bb450 SHA512 88b052ddb5626b46da8c1a6f52ec5f11e686f317e5eab417bfe4812355992f16053fecf1394ffe023325f6e0048ed2fea291f7e3e808b294f8e7b522a95dff11
+EBUILD pymediainfo-4.0.ebuild 1054 BLAKE2B a313fbd824eb4d67c058e8b8f9a5110d80648aaa257f55f208fc9c08641ed1c89ea697a8df915e7caa77eb21b1f679b963c9b45724844af2dd45d22e8d4bb450 SHA512 88b052ddb5626b46da8c1a6f52ec5f11e686f317e5eab417bfe4812355992f16053fecf1394ffe023325f6e0048ed2fea291f7e3e808b294f8e7b522a95dff11
 MISC metadata.xml 441 BLAKE2B 6dcb65038010218beb340daaab820392fa857e77a417aa8957f678983f0b56fbb878c508790f9c7f33b6acd8eeaab2320c7b0ca2d2533e112ccb984f9ec7d3c0 SHA512 a5052eb10a6672d924cd1a09505d2eccb26187cc11a16b2ab30dcf7e1ebf1e59e12e10f5b35426eebbe9c74a74611b25ea70464e661e9abaf22fee3ed361fea3
diff --git a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild b/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
deleted file mode 100644
index ffd76f0cf136..000000000000
--- a/dev-python/pymediainfo/pymediainfo-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libmediainfo
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# requires network access
-	py.test tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymediainfo/pymediainfo-3.0.ebuild b/dev-python/pymediainfo/pymediainfo-4.0.ebuild
index ea072cab56c1..6ea542796361 100644
--- a/dev-python/pymediainfo/pymediainfo-3.0.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/pympler/Manifest b/dev-python/pympler/Manifest
index 4e6891ba7681..7a34d3d03a59 100644
--- a/dev-python/pympler/Manifest
+++ b/dev-python/pympler/Manifest
@@ -1,3 +1,5 @@
 DIST pympler-0.5.tar.gz 263627 BLAKE2B 5ce881664e2d57d1a7a9b87238cfc6657fd35a140e6ab906b55ca6e0ac91fc8a74377d4db21706708c55773f8ca65d3578c101669ba409339418e09ca53d0fb2 SHA512 254b758df70bafe57f315a973de0caeef6cd616bd0cc7b4475c74c3a9a94f52b3ac3da3f073483db3560cd0060536c95ed1297007c24dfe8db89fd893ff1409c
+DIST pympler-0.6.tar.gz 267267 BLAKE2B 84a8df3177d0defed949869bec9342beb4336c912be5539c597388207abcbc53fa5218da34b16a872dca804ff559a448dc092b4d33396d570164311c1808765a SHA512 891822ce0a76377d74aa99dd2ce8b21a364084f0bc03ab6d6fe505597a0e182dde459b218dff8e0e6a753e1d88ba9f01b3a4b97be31a20e73a93d6c6fee66e1b
 EBUILD pympler-0.5.ebuild 1030 BLAKE2B 14da7bb233d40ef678276520347c567a226a9e71498834020ace97a08fdb292c03a725c7e307a407ce92ba493a29f1a1239120f12a90c41dfaaeb27d6289ea36 SHA512 25e9285a5702ba56217263ea586a118285f9eb2fb68c3976308a454a95a84999ddf2f9c3ab3417cf06d8f571ab9f81ec822a8846ab1ff4b84d239b7e1efc55d6
+EBUILD pympler-0.6.ebuild 1035 BLAKE2B b88864500989b1ad33e2ec354c7db11aa1569da81523d89cca4647e3df7be99467696b408d663455f5da7ec68935111b0a57a8d72005aea2c116b192397e4548 SHA512 7eb007f4c2942cd2a05331d594b0d8b42bdf7db3cd7ec508861d9a02bf7453a1745f3817ce03ba9e29acddd777359d991ce0b568798a9c3dcd0479a8dd9f01fa
 MISC metadata.xml 775 BLAKE2B bb415e7f09dec344f5f97fac36d3659c0670de5230a628515f26b1b9177883b6d99bed0ad2992af116f6b800a9f73aac3f436a6480a57c6ea5565e01f56c95b5 SHA512 e97ef9decf71b8f941e1fb54fee0aef66dee9c3e722f590d1d08f87dc20ba709713089c91891f0c686d69053321894fd6c8e6de690154f193e2bb72a5d879d41
diff --git a/dev-python/pympler/pympler-0.6.ebuild b/dev-python/pympler/pympler-0.6.ebuild
new file mode 100644
index 000000000000..03f9d85458ee
--- /dev/null
+++ b/dev-python/pympler/pympler-0.6.ebuild
@@ -0,0 +1,42 @@
+# 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="Pympler"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Memory profiling for Python applications"
+HOMEPAGE="https://pypi.org/project/Pympler/ https://github.com/pympler/pympler"
+SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# The PyPi tarball is missing the documentation
+#SRC_URI="mirror://pypi/P/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/bottle[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		sphinx-build -b html doc/{source,html} || die
+	fi
+}
+
+python_test() {
+	esetup.py try
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index fd86a9bc66f4..63ba88bb3e94 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,7 +1,9 @@
 DIST pynacl-1.1.2.tar.gz 3149804 BLAKE2B 2ddf6728bfc5a8d5984ecf3fe054a7f36acf15b64d9ba42df93bb21940b9646997d59500825cdf04deeba9afbf4d227a016ad631211d18cba2ab1a38bdd89541 SHA512 ce9c720699fc3b808bb569ad9916f5f5ea97fbc49643117b014374ffaf77ce7972a530e9c4cfaca14dcffc8d676b5bce2facf6da99bf2fda4e319b772075e52e
 DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd41119e68115452a8c51317005d10eebfa7017f0a182f07bd20ef36f7b395c9461e3e7929cb1102b24afcb937b SHA512 ffc3b91766aad9d0d21c88c198ebb7520d204e58ffbcac815a382af7eaf9b489f85ae6c2fc4cfe4dd5e04576062bfe248bdcc08fb42bf184a73e41f4352c7bd1
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
+DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb8396fbae30dc1e16f7702a559b7ea56889d9889adfea09ac6644732fafb98e07da99e3a41392303b6a45f0b494b1 SHA512 815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d
 EBUILD pynacl-1.1.2.ebuild 865 BLAKE2B 7f1f6c7a037719c5e94cd46eaf9c32c2949b64f3371af5a2254da8dacdd0633bfb5d0a8fe0f8f131214499d186510f48c89ffd6c9c395ea839d47825477409cc SHA512 57a53e92e4d562a826f8dafbc9691f92beca1aa6c112eec0519dafd46efb51962c0214b7733240aef2657f612d2fd3cd1129fc0c3efc7fb82838e06f4822d523
 EBUILD pynacl-1.2.0.ebuild 861 BLAKE2B 50369302f5b01db8e932ae94c6e41fce814b3c446910fde9aed2ba92e067d10e642cbddfe2e55b79311308b5dc71f98123a5e5926de18a2336b1632226b786cb SHA512 65695f94648eaafb6c163f3f10e221a0c7e1523dba6a15ca831f2387952d13a7b17327840ea2af7283b9ce1d13b2bd9512e72b1bc942d4885b93061c4f204d32
 EBUILD pynacl-1.2.1.ebuild 1004 BLAKE2B d29f7d4b70f422a4c18f88fec0fc50346b079275f53a81f5c59dbde726d97bd3f3a8590c42bdb864cd46586976914afa7c0fa1c950dbaeb91a11bfcac6a49fbb SHA512 4bf79617088db20c46777396b6da792d312511ef581d1e3ed897fa8c68b215e24a1a1b2bbf05b138276bd3b15f0ebbe375571367e021739eb223571abef9ebcc
+EBUILD pynacl-1.3.0.ebuild 1011 BLAKE2B bf8c8f5c08dce8a17c234a64adf265fbcf58a4e10e78b735389a82b844bc8ef3bba0c532f614054b4ce32edca7ed460e08b79ebe76c309dafcf2fa45940dfab1 SHA512 b828b2a156a3ed430f6e527e8ed164fc8a6a29cbdc70181d6e595adccc67ecb48ed3bb37bd9ec728d2c17e385d62c514d0ec8ef35877413e37ec11343f5ee2d1
 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
new file mode 100644
index 000000000000..c0afe300d433
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.3.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})
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
+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"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
+	dev-libs/libsodium:0/23
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	# For not using the bundled libsodium
+	export SODIUM_INSTALL=system
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 84f19fcf2ae8..3045b6483bb9 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -37,12 +37,24 @@ DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6050854 BLAKE2B a8fb8
 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 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 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
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
new file mode 100644
index 000000000000..53daf3ce27be
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-7.1.0.ebuild
@@ -0,0 +1,208 @@
+# 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 a619af83a7b9..fd98a6819d8f 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -5,9 +5,11 @@ AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f
 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 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-9999.ebuild 8181 BLAKE2B 65fa3643a8875871015f6878898cbe57c9f2f1f7568140ea74fa6b28dfac8bb07939ce50d22e623b43f43a9d1aadcc28a586f8a6b1ad21488d3b72405566724c SHA512 bb089f9837f9b2e4a0cc501c337f7b837a5900d4aee414a83c9b0cff027c8190ec7ba22d344c98cdc17f22e20831bec40299b811ed1240e0833a8fefcb91c1a1
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/pypy-7.1.0.ebuild b/dev-python/pypy/pypy-7.1.0.ebuild
new file mode 100644
index 000000000000..7a956b9f4a0d
--- /dev/null
+++ b/dev-python/pypy/pypy-7.1.0.ebuild
@@ -0,0 +1,286 @@
+# 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 164fc2e72ba3..7a5e78e6b80a 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -19,9 +19,16 @@ DIST pypy3-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 6873174 BLAKE2B 6ed19040d3af0dfd
 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-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
 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
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild
new file mode 100644
index 000000000000..0f8954a4f842
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-7.1.0.ebuild
@@ -0,0 +1,188 @@
+# 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 4b90ccc3abfe..db70aa43a728 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -7,7 +7,9 @@ AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d1079
 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
 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-9999.ebuild 6899 BLAKE2B deb7ad2878e9774c6f5d7c78ef8c6041849b87bd18cc85be058d1d713331f5988e129072510c84ba90172cdc557366ef57a113890b17a3ef1e502d172a8ee047 SHA512 07ba00e030bdeb26f764d0fc0ba6435c0522054b4e401757c3dc742cb833061a49ca89d19d83c5875749285b1749e54a8c616adad4edd693630bb23be1247cab
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/pypy3-7.1.0.ebuild b/dev-python/pypy3/pypy3-7.1.0.ebuild
new file mode 100644
index 000000000000..f0f7cdf74a2a
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.1.0.ebuild
@@ -0,0 +1,250 @@
+# 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/pyscard/Manifest b/dev-python/pyscard/Manifest
index 4f8d6d6d4751..245b47c971a0 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,5 +1,3 @@
-DIST pyscard-1.9.5.tar.gz 146010 BLAKE2B 04569422bef66839ab1e8420b37741ebb5591732f1b88d75d8348465d3c7758febdc5722ac0329d5722d1609abe2aaa39ce507087fd551d760f9fd0f69b06d50 SHA512 a0c5cd4ccbe8437ffd37afcf95c71f7d1d6c3ae364063cf81907095625d2062da8e7335ebfd15d1f952e8a8d9395e990b351b1308ab07fa456a7ee10658db4f9
 DIST pyscard-1.9.7.tar.gz 144692 BLAKE2B 5a842b790e01ff5461c462d6fe2d7763a79725cd1bcb841c1aaa49f2b17decb251446adb908fa8b525b91f418a6df6a76ddf779a67b7e8547211993837aed2bd SHA512 339d6efd5fcaa361e30029e736d4e2e98e05acd701c39574b40960b4bcec4782ca9c1d6927cea0b3641c5e6a137d0b9fbd961b58422a4151cfbdfa067dcd4b4a
-EBUILD pyscard-1.9.5.ebuild 793 BLAKE2B 64de7dd70232d6b27de35a555bff5239adad16d9c5a5b1d4bf17c226a1855157c1e45cb7cb5ea5b28cec8bc606553ab5cefa9a8adcc59ef695d5dbad15244c67 SHA512 5417ac7b8d6a39937edbf0672ee967082c0244e2789e8ea7b9d77ceadb7d763020c206372a0150cda6da0b8dbfbe916324dfb442d1c14ee291cd96b7892c762f
-EBUILD pyscard-1.9.7.ebuild 766 BLAKE2B 309cfdc4b71def3aadeedf14b9d8aae4b0ae85b3106632a7dd0c541bbfd8836ea2ec3fef22342687dd65d32aebeeff882ee4caa6dfe8d3d904022ca39b013701 SHA512 50b1b62db9d2fd40c608a24aa431258a4c4182888cdae6c3d6a48395a0cc38492f9e6212bf981eab387c93ecc3825edfd6838722020f0e9070dd357ede10bded
+EBUILD pyscard-1.9.7.ebuild 765 BLAKE2B 2244dbfae488353a2dd78cf8c27589cee2a8816d5f9e66b064cca4a1ee02e9324a5faf692efeb69c8405176e98d1b335f3a964eb8b537eec00e8612c4f6aa59e SHA512 792407a34eba112cd3c24638c48704f48dd327f21e8b84ec68d0f7a396fe33d6751427f006bad8e004cc07bd5ad7d05f264d5aff3514210e64c35e714caddd53
 MISC metadata.xml 418 BLAKE2B 7c2e1919ef8f47007374f1f7854380d5258fe75f257be89c7e1ee6303424ef5cb2c8bcd4d6f36cd0218e46b53d9af309276bff6e5fb49eb31e645e3a14c3b719 SHA512 88cd5d13d515f02d3c53e62900afbb7ee5307d2073696f4a53358e7f3cf658dc3fa79465b25477c4dcfc165f8a06021e1ce5dbeaacfd932d8efab922cc2b32c4
diff --git a/dev-python/pyscard/pyscard-1.9.5.ebuild b/dev-python/pyscard/pyscard-1.9.5.ebuild
deleted file mode 100644
index 4cf0792d4dee..000000000000
--- a/dev-python/pyscard/pyscard-1.9.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Smart cards support in python"
-HOMEPAGE="https://pyscard.sourceforge.io/
-	https://github.com/LudovicRousseau/pyscard
-	https://pypi.org/project/pyscard/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="${PYTHON_DEP}
-	sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${PYTHON_DEP}
-	dev-lang/swig"
-
-# Fails
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "Gui support" dev-python/wxpython
-	optfeature "Support of remote readers with Pyro" dev-python/pyro
-}
diff --git a/dev-python/pyscard/pyscard-1.9.7.ebuild b/dev-python/pyscard/pyscard-1.9.7.ebuild
index 637aea76a4c9..11898e328e34 100644
--- a/dev-python/pyscard/pyscard-1.9.7.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="${PYTHON_DEP}
 	sys-apps/pcsc-lite"
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 2fe51498ebf2..cc87c708093c 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,9 +2,9 @@ AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
-DIST pytest-4.3.1.tar.gz 917608 BLAKE2B 62fea17e481984489d640872aac4f18b7278688b499302f407fd618b6357e3cb18e995f6f0974ba16da51bae5e3337732d2e1a0a6cc65936f8936d3bc7981809 SHA512 5c76100b9efc9176803807a54ff25bfaba065fe3e8fea28b9b2f3ade289056d174e0cc4e1f399eba4ee8642e8990f43f5dc68b59cf55b7d81a43cd7cb363f542
-EBUILD pytest-3.10.1.ebuild 2215 BLAKE2B 310c20f41363ce7c46c6ebcd5a32cdadd1bc3d540a68f17e311018a12aa6e45cfd4d08b128aed7d32f0b2262639120fc45b304571ba3ce2f3c6ce0e6d8bfa057 SHA512 77c5bdcc8930b118017059421bf10adc5091fba9597fec5f225385380f24152c83e76ea29551a0a86be7a31a6c09287f0caa0413e0e6be63ec95ea92debbb8dd
+DIST pytest-4.4.0.tar.gz 931197 BLAKE2B f63186f2bd372bb1acfbc0273dcdf43f78a7c7e4ae7d6e91d4f8e59804c40437da06a69e93fe128b6d31b1144a51aea953145bce780bde0037ef395d64ed30b4 SHA512 c3e2f75434bdf712d1773eb9220c4258a7c57f92c8172033989e6bb78cfa8e2198e9fecce8daf27935e8eb71f416fcdc1a6a9a135cf8c925fbfaeaf80f616411
+EBUILD pytest-3.10.1.ebuild 2452 BLAKE2B 73f33238f6252c0f7df0534b699193ef4cb10c43932ced0488009888defb141375bb38d80e52de04a6b3835c8f97de439adc383b9769278445ffbc850a983dfd SHA512 7ccc22902002576efa336d058ea3c85cbfab0da37951cb41b6f838ac999d7db7a972fa588a3b1f78d2f6497b228ed1b61aaba7ed4966885199708e37e4fc291e
 EBUILD pytest-3.2.2.ebuild 2112 BLAKE2B 5d60971f4ac0e85e21bba987a80e4124b99ddcb2fa92249127f379f1f6c6c9e1b5e59ac5bc6252eaf2fb286a2674e9deb25cb032e4ab3138be7ef9f990d29899 SHA512 b8c78dcb725d879ab6f6b7e3a24dc1305acc2569a2b02169f77b018d68806fe410c6094ae025bab43312ba79447fa1fe9ff6f6c1fdf7354b63fd6cfd9ecd84a7
 EBUILD pytest-3.4.2.ebuild 2521 BLAKE2B be3429b82dbdaa3d09d11cadc647e9c79b6829277ae6fd2097afbbc8bf7f8009090c7a73ef016a35560d34db4f79c4d2c10ec20db64957c8eb7a505761ffe054 SHA512 a135fdfce02a379826614edaad8e8c0c1e5fc29a5e30615f4aae7e646d78abe309e53edfd251d26c77a56420e6f8a759463e72557ef7c85f53d5e5823057a8e7
-EBUILD pytest-4.3.1.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
+EBUILD pytest-4.4.0.ebuild 2111 BLAKE2B aa77e846b170a1202a912856025827fd01234be9f3faed1bac155335c9aabb5a912ba29356b3f7fdfccddb6d6b552b3e9297fafd197fb9d811d3fc368cd41f07 SHA512 37e71b9e38096cfa16003806a469cdb8cbe9e5d5031faca375089ae7851e4e7dd8737b50f43fb51313392359c3652b667751a29d4c59524c78b18101f41a2df6
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 97eacfe36376..5e0846138d99 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~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"
 
 # When bumping, please check setup.py for the proper py version
@@ -24,7 +24,9 @@ PY_VER="1.5.0"
 RDEPEND="
 	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 )
+	$(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 )
+	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{4,5,6,7} pypy{,3} )
 	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
 	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-4.3.1.ebuild b/dev-python/pytest/pytest-4.4.0.ebuild
index ab4d81909734..1f98542589da 100644
--- a/dev-python/pytest/pytest-4.3.1.ebuild
+++ b/dev-python/pytest/pytest-4.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
 
 # When bumping, please check setup.py for the proper py version
@@ -25,8 +25,8 @@ RDEPEND="
 	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
-	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
+	>=dev-python/pluggy-0.9[${PYTHON_USEDEP}]
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
@@ -41,7 +41,6 @@ DEPEND="${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
 		dev-python/requests[${PYTHON_USEDEP}]
 		!!dev-python/flaky
-		!!dev-python/pytest-capturelog
 		!!<dev-python/pytest-xdist-1.22
 	)"
 
diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
index c88f4da38612..7eabd0640f9f 100644
--- a/dev-python/python-axolotl-curve25519/Manifest
+++ b/dev-python/python-axolotl-curve25519/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-curve25519-0.4.1-2.tar.gz 100957 BLAKE2B cda4fb7ad7c78df7465a952e2b5f3c6616849876bc1c8b72dde08042a655c2b86233329d311f6bee1bfc6d2b32926968aafc7e6204320209c2c1bd008f1aa361 SHA512 cbc7c6caa47a9a811640c247a1be727d7b1b68bcdb4c5336e02b4d1eaf9fd2c57b7438b0da466a379a1c0f3f146756b9b7eea3c9b7945ce88478d4bf0b8a1e0d
-EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 575 BLAKE2B 15d78409d412488ecf75404e278fb3f47aefa42fea67ccdced077c8a652d8843f90a64d197a2973c7e5d1cb95914d9af28fb35cb79f2735770a3391d67115174 SHA512 e4fae57be96db221851b2d0bd26d4b9e3053bc31fd79900107f7cba37e2cf0d47409e68d14017b4cb36a65552e4424cb9d057929e863f0ad693f481b24694465
+EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 571 BLAKE2B 688dd0a14c3cc90a8423a009b2c0c93d337ac801c4e3375ba98aef22a0b2bce0ca0d2d97c4dbd281fc66459d1d6b661ff7943fab605d0d6a7959e76088029048 SHA512 c6d36801107963073da39ce3cd124fc0c7c158b805b59a53f54c2149ba2df7ff262e324867cc6872fe12287cd1afc83b12d5d636e5cebe639d7a88c0232eee28
 MISC metadata.xml 877 BLAKE2B 5b32a6d7f8e3a2592800c3805a4d24a18f67b922b4cac977d6cfdd065265c23054468c9bcc96ad433027849381fe4bded34a43ce2d13a0316f833d19d79f03d9 SHA512 a8b07c45bb17e8782b6b9e6fa6f909a1d84296969d8df6c6b66fc4f62a370446b1c59e9fef5ab877ce727b637c0af6620ce34982fab15c36cc112df1d38a9fc9
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
index 98206da43693..b4fdda0d1f4f 100644
--- a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
+++ b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 80853b7a55f1..63cdb974b92d 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-0.1.42.tar.gz 53869 BLAKE2B 045d19b38478404b19717daee431a4fc36d187dc511d42ee950b37ef257d98aaee8ba42633888d596265c0d64bfc33f2da9307d45feb4189ec04c03d69687108 SHA512 db9e1cfab87d690619a672b1782942a18b12b17af555959c17bcc3e2581e9c689c57becc0ea884a1129df9dace17684ba03de38b81f8c8c65cab27962ebdb6c5
-EBUILD python-axolotl-0.1.42-r1.ebuild 682 BLAKE2B 94273649fa952ec9466684dcbb5fecdc28498c13d1a2c10fc9c336cb882a274b6fc129104978b1560979db4985bf319e6d827f67badfe41797bf4023aa639990 SHA512 24a36a7fae97454921bcbf8e98cbb8498a2413b26645b9aa6ba350fec85a152117962f580029cc160f6e3c3d600aed8eda0e0e45f89dbca26266f6eb337fd9c9
+EBUILD python-axolotl-0.1.42-r1.ebuild 678 BLAKE2B 2805568d113a0c17f6fb0359e7c7e4e2d47ecd0479c040c813b3384f886f1a5f2e2fbbb4a3d53a5414ac6839756aee666887650bcb346e1996b5bc474ad8dab9 SHA512 085a6ccb8893f2158e2291141641e377660bc88ac829c5af3b52550326c5b6efc379f602aefac6454fbfb3e058605a47e1cce23702b4b1f34992d7fb851a0db7
 MISC metadata.xml 734 BLAKE2B 86bb0a6b6c1c45e41917d6ed44a49d6b72acb3de3a466417967b3b7295543af235d958ecc1057b9ae666a96152f9d56e2520d48fef45216024662e9eef07eedb SHA512 b779e5edf07f64d7ec266051a76ea3f3011808811f542c43582d85221e988bd7dbc97581ff59d7b115830a7e4d101306dda24d39f24acaccb3f4f54884e6b3ef
diff --git a/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild b/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild
index a51e848c9599..66e74fa421f5 100644
--- a/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild
+++ b/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 6b3c135f8a9a..81f8baa1b62f 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,5 +1,7 @@
 DIST python-heatclient-1.11.1.tar.gz 166963 BLAKE2B 340c9f1ed054815176af8da9b3035d8e260730fdd389317190281314af7b3df60214dc780036b098a15485bf2cd5b02010eacaf474746a73d7d7ee94972c14da SHA512 f4ffc4706a2630753c11423270ef18a344603ec6b1d5afc550fb8f3cfeca1bf4fbd0c32670318eded6b81a810fcdff68faf9039c6290c6a106bf8618502efe78
+DIST python-heatclient-1.16.2.tar.gz 173543 BLAKE2B f5b4016166bba804a2704b2cc3203438e7ebdae429f85b74e89ccc6d1b2db2de32d4acc6622138b211f5d8657876001b83977d55d56f0cd5906df99eb92a429e SHA512 eb566e5c0270a0cdb8994194a757102febf88869a61bec65e345fd62f8ae9c0b3609bf27f758d37088d69d2227cbbe086960123feebfae7f543ba2bac2133b0e
 DIST python-heatclient-1.8.2.tar.gz 165073 BLAKE2B 32f09850f2da3ae3235dd8a7f683529189db6a97712374bb2a387c87fe61a74b132d7b51c3fc77e0fffbfd6d8f2596ee097102f034d5fe029b8a08ceb0e31500 SHA512 38c27dff97c8bf9826e57c02fdd5edb4c0410ccc041b7b1f2e95aa16b22d46cfd9a8b728bbd371e1dee0664aa1f8e14b4eafc6bbaab92a038abbb821e3c8dd34
 EBUILD python-heatclient-1.11.1.ebuild 2662 BLAKE2B 7bcaed68fb7c87afa29b19be5b064f9dd52d184fe5c288c798fb371d2d82672b6513e4bedb9609e3a0dd0f31c0bac413d26f649e651335a0978e6f54eb53f8aa SHA512 5614b413daa403736eb3f85d9b06e949af48a28df1a3bfb75e74d4b0ef4d05ffd0774a0672bc40bf5132212c9e21e1aebe9ecac75f7aec2cd70fb4c894031bac
+EBUILD python-heatclient-1.16.2.ebuild 2805 BLAKE2B 05daf0e3922eee5378aa6b1085f4c7c32a7968a65ea58beacceba46e0a1d3be759237690c4a37ed305898b490b87f8169ec372e04f2dd6d78540aa52430fb409 SHA512 a6e768e7734a7903d4581a94b7206dd2719732962b8cea3ed9921081bd115fea88b589e4ac8e7bd5b3f94f32760b75b81d8ec39d9ed203f2c5035fbe48e005fa
 EBUILD python-heatclient-1.8.2.ebuild 2410 BLAKE2B 9c0c211d7e2fb0187a8f1f77c5aa1960c76a3254e470147714a9707960090608b6c740189b831d085621278e154a5e9cc30009a39381b2e7dd87306b85a6e0e2 SHA512 95f5ecea31d0160089447e68d624dca7b8ba4c7f0c669847c4dc046feefebc7fd5db9e235bcc3ffccdf36afbe90b11b2f30785663d95b7341d88181e4a998bed
 MISC metadata.xml 582 BLAKE2B 51e093bfad4008e3d662b8eb5d3714815f7ced2ce68867b2b4dddceff4cad927a60b84706dbb14a36609720e96259a744460a3cd82a068810e1de6173bcf7dc1 SHA512 b0af42a00c8e7e226f912a056edf53b3fdaf356457fd76edd34cb243d45e7f6427fac8bebd39e1aad57c0d16da8e222b3c6414fa9c5b85728294032afdf5804c
diff --git a/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild b/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild
new file mode 100644
index 000000000000..089206d199f5
--- /dev/null
+++ b/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Orchestration API Client Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.20.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-httpdomain-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^tempest/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init
+	testr run || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-sense-hat/Manifest b/dev-python/python-sense-hat/Manifest
index eb63434ad11f..402ed461b13a 100644
--- a/dev-python/python-sense-hat/Manifest
+++ b/dev-python/python-sense-hat/Manifest
@@ -1,3 +1,3 @@
 DIST python-sense-hat-2.2.0.tar.gz 20841 BLAKE2B 59e6b9111fb90493e6bda00ce4a4c143dcb84d8b6529efadaf2f337adb38a8fb4287cbd9a303070ea4f335f1e03c6f4789e6f8fbe64a7c70db20675bdae7c6a1 SHA512 71914f6f22206cff23992a6908698978741a46bf9b98648388bac4550f39e8de73db6bd389b79585eba6e82160649a8c8da4217d515bbdbcb50d47218415f3ac
-EBUILD python-sense-hat-2.2.0-r1.ebuild 630 BLAKE2B b3eb4640b05999afe28c7dbd3734cb6e78e1ae4248e91f72ed9b88bc463b37604c493c1f2b7855009bd71ee38bba3e8ebee8d52f3d5cdfd30b8f75cf8bc8beed SHA512 c1eb21667f27205b60ef569f36e3c930f2e5c6bbd9b4980669881995536acd3a75fb550bbf53725bac1a2f7a0cc531e90836d1063d9aab474e2655a19e407c8c
+EBUILD python-sense-hat-2.2.0-r1.ebuild 626 BLAKE2B 44cf3bb5ed40adc81b264c0feb9c2f5ba959e392ddc8e5c0d697eb5c70538fd852523dbe453a62b5f1efd8786f4afd983f8f123d5a1c0faeb23681ff2898842e SHA512 7c9082eb7ef5a3e0d0290a20124e88f67d2996e838207a53a833e2048e4dbb5f35dd70ff5aa0a38ca8003051625cb496b30c46d3835f6bd6e24bbcf84fde06c6
 MISC metadata.xml 771 BLAKE2B 05de535f0e56d7233bc94020ee828866757b95725e8f9f3cbd7681ca7ff6b92000dd8176af44115ebfae157886ec305513ec6f1f12cc56a233ff3fdc73e63fb6 SHA512 e4c3cb494bb4c8b874be22478577f0ee6a4f3f6c12a8eb00e27d6a854d5c88265714ee438486663e315c36c84369c67785ebc38764617644cda0bd6bfd314cfa
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
index fed87a383669..1a3996585835 100644
--- a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
+++ b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index bdbf1ed6694b..f8d4f8c38239 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -1,5 +1,7 @@
 DIST sqlparse-0.2.3.tar.gz 60742 BLAKE2B 38d3f17d196d3a1d50ea75810b5bd3a890c6f4b12195621d571d62b8c40e2e2d13034deddd95288df37a15daba28153a5ca9221b78bfff1c0e3bc37eddca2dba SHA512 ec654e680f8ce423a89da92c4c74f85e652bebb19e9a40ab0b8067f61803897e49e1e6f8dd1ab454b1ed130974d76b4f973c799264fd4bf8a87f034ba9c44835
 DIST sqlparse-0.2.4.tar.gz 61614 BLAKE2B 2462fa5d77ca2c3028aa3539bedc3cb2d7abd35db3c736ffd8abad8626a33174787f0079453ec646739749c8860fce0f1c7d815e6a8485c24b851a40b5bf3b87 SHA512 abea0f084778976f2d1086006eaa88e1fc1d2580654d063b35557a44d9d9727b410a022e8ea06ae3b265f2829d49c48d347dddc61f2e56be9c3d6207104712b2
+DIST sqlparse-0.3.0.tar.gz 64072 BLAKE2B fbee74c7222fa50c5d627959d5c8652dcd85ab5b5b771e3c8375cadc6e009c2fb1adc3c2428e27d769c210e7976c350bfab367cb7aa44dd7b4183ad9722a4ca6 SHA512 596d25f5fa2c797fe5652e36e9633397e7867586ff0959f52d1ff861c16d0e7c73644daf03d74169dd20255e802b7369d4dace0a44a3d94c15bd67faa41df551
 EBUILD python-sqlparse-0.2.3.ebuild 1333 BLAKE2B d44fccde2d40af01692fc1d83156c879f7a51934754d79a53c81cd713dac9551f8e7ac367ad638265d2c2f7cb37bf8949e6794ad3a4c2a3943029935f65a0223 SHA512 144b388deaae1ba6dbd1481ca964c2c58531adc8c1f6b55d730fe071b1a7b4c229ab0edb244394554786928c0d2efe4c40c3bcf087212d88f26f443ad6b1c56a
 EBUILD python-sqlparse-0.2.4.ebuild 1333 BLAKE2B d44fccde2d40af01692fc1d83156c879f7a51934754d79a53c81cd713dac9551f8e7ac367ad638265d2c2f7cb37bf8949e6794ad3a4c2a3943029935f65a0223 SHA512 144b388deaae1ba6dbd1481ca964c2c58531adc8c1f6b55d730fe071b1a7b4c229ab0edb244394554786928c0d2efe4c40c3bcf087212d88f26f443ad6b1c56a
+EBUILD python-sqlparse-0.3.0.ebuild 965 BLAKE2B 2f33741212b41d2358d319e1dada6aa7e4bfc37acfb0b20ce031bd0fb8c5076008853c5d5b7241e31ef7897a9be71805ed25a236d29736539de56d59259730a9 SHA512 9176f9e86f772bf45265b33f9a230715af85d53e82ff38941e2ee0a58f9c36f74512c20a6c68cf7666a31733ee506504bf06371a9b723d3c3844ab29ad599d9b
 MISC metadata.xml 453 BLAKE2B 2b04f47b565bbce71b1ddf27bedcd903f123751e7524ca62ea280b96788dbd14ae18513fda8eaf563d927c09dff7094b6a5c0d651c0530f2d3e07ee1d092c946 SHA512 5bb3c69c2dd5bc8ad2bc8c4a174be8627ed54ba0055bc153d36733f964ee289d71d0b392ec63127482a87f5f56fee9cf2900a2830a0ffbb733b1119be4abc0d3
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
new file mode 100644
index 000000000000..eca64775215c
--- /dev/null
+++ b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+MY_PN="${PN##python-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="https://github.com/andialbrecht/sqlparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/${P#python-}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pytest tests || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index 38dcfd4e9a41..473baf3f4fed 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,9 +1,7 @@
 DIST python2-pythondialog-3.3.0.tar.gz 1906527 BLAKE2B 67fbb2dbd2b9c5f5da4c74f5360b5c0753ac39d9472e6ac4d09ef01831a1d95a8fe9ccdfad80487452b2704e0fd237286d755e7f49188e388272c34ddbf47081 SHA512 65ce7f9305e20b0c5e0d4588a241e0f14907ecad64f8a6bb3899a2d6e0245fdd848a8c4fb1da3465f03810a1e408fa97c46d9ec082c4ebba0c04a41293a23ea8
 DIST python2-pythondialog-3.4.0.tar.gz 1487867 BLAKE2B 795af99391e7a3d5e9b0657116dba8fd85819261a9ac590e797d0144577d66261529515cf8421a4724b6eacd0b6c7ae20d030bc7eb22c56ef870294c6f2386d3 SHA512 f4ec3e3eeab9ee00146b4604a8f72c765fcc164a24def0f1a9cbf083123e55dbe371ce6d4790ad4c0b5ee6905a1877f9b8e90ca3443a780fa0965c9bcf4bf629
-DIST python3-pythondialog-3.2.2.tar.bz2 1412368 BLAKE2B 2c20347a09720c15c696795826e9d24034a0f85b16936ff145511d50830e116436b30868bcd53fbe425929709f7bede0a422257ba8231a9f2846d3f15b3a7709 SHA512 58b84c0dd7b71ec9d1e60c4802cfc8e6cc72f79b8b6accd387553c685a92367d242746065bac6cb1c9d501ac291d9307cb2bb6b26694e9f24a3c5d6637a5bb8e
 DIST python3-pythondialog-3.3.0.tar.bz2 1827891 BLAKE2B ef78832972cc2417ecedc797cb95ea10b1fcca4ff1ab2f7db74a9afaefddeedfee8303f2f4b9ff7230f3d2eea305e359f3854112abaefa2a4adf4c801de7ffe0 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f
 DIST python3-pythondialog-3.4.0.tar.bz2 1415324 BLAKE2B 1135df25b988dfaacd45a68dd918409e001719f92436e9e88fcf1a66e9ba70f03fdef1b86ebb80ca6a1c02006353ed3f9df998a5bfaacb9505d6e8a96a37d5d9 SHA512 a810128459133c4e416f4b04b8dd98b2230f046b8762e6b29c4e02e1458fa96029d37137a71cc01aee292106867a6f30026941ed1f727b7e48cbe976d96d7ed4
-EBUILD pythondialog-3.2.2.ebuild 887 BLAKE2B c4f781b01a4ab36b9dcca8f908c7227d481f25eb9cbe344874e9c605f30c879450a3c2e9153c04607f6730ffa9003bb8f9e76a61ca898721b1ac303ca721c342 SHA512 e08875187db07029da90bf2fdeadd4cfe2e351a290c2bb5ebcbc790340c9181951bc6e1a27329b039e714508370b67448c100639723ba55d1359e15c6f89a2d0
 EBUILD pythondialog-3.3.0-r200.ebuild 969 BLAKE2B 7f7c43fadf1ebb8626bff6d0123bbf9ec0b61a94de7d20c9a88da273ae328ed96ea9a80b91bc46b1894e8139c4533af4990b1555785157898b2477d4a0ea4c5e SHA512 7d974f0c872bd37f0e8f4720ecaed58526dd1a7d1e75ebba4118fe5b0a3606fcded45fa231940aa01a22f45d54b59f045335027cd64dda0a2bc7f0cf82e85765
 EBUILD pythondialog-3.3.0.ebuild 893 BLAKE2B ee783b2698e86dc24e504069dc15aa91bf64e53ef90c20298faef43c3c42d607a66f241c80e00cf1aa2f21ec515dcddecad536688e231cca7c7805ec04266882 SHA512 1087dbcc93a4a2b40ccc70a7774574ce143fea57c897fe81ed3a9083be62b8f5147a10c68c68dd0ad0689d9611b6bb665fe8e970f02b2cc7c15a34d883516d80
 EBUILD pythondialog-3.4.0-r200.ebuild 960 BLAKE2B 06a8394d7a6e15da2dc14366809b69d6e63265bc05b76a3fbc61a03fe164e2989097af29bfc7d67d6257c46c0801e9d6e235986aa21d4d92a0b800af35e5965c SHA512 e8516de81909af2f15d10896f5916b31cb634c745233bb51bff469be39774b9920c1412cc67c2974b0351cc0b491cc0fac5216f9ca2df524f24f5c676a56b6a7
diff --git a/dev-python/pythondialog/pythondialog-3.2.2.ebuild b/dev-python/pythondialog/pythondialog-3.2.2.ebuild
deleted file mode 100644
index 69af5d8f70ed..000000000000
--- a/dev-python/pythondialog/pythondialog-3.2.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-util/dialog"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 0cd02432f3a6..31998e408d90 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,3 @@
 DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
-EBUILD pyusb-1.0.2.ebuild 814 BLAKE2B fb86c5046b10efc9c1eee978c4ac5d034f6f033f49d159c44d421df16db7d55219ab5d8a07d8facd71efe0bd5fae2f0d92726edd6e992f6a9769a536434a03d3 SHA512 396eb25ef3ec71e40e0b7cd7622288107e2cce02800c820e97bab3b8ef64955eabc3fe3f3222a4b1f7006c4d7063e294639768ed2f131801f37cbdd67f3a7c7e
+EBUILD pyusb-1.0.2.ebuild 813 BLAKE2B 9c4b39429616e21190a32e3b2b0d76217cc6af0033a29d163b568083939e18a3daf78cb841846a891a8c0e76fe71684689554b1e16eea2fd9215566a47e5d71d SHA512 c34592642172615583a22be2ecc5baf978883abdb79d8317a5085e49b1c4b901618a97c7e5ca6928a80a0a4f81ed8c2fa302c917c517cd466a760a288360c9e9
 MISC metadata.xml 472 BLAKE2B bae31bb84443c5d215f931618d90cabbc11633d90a1dea5e29ade93e42671b4bf1cd037f235e9a58059d2571b0e9b32f0261508108bc6678544dc09f3293b8da SHA512 7db6620b2545b31d9dd3c3844f9d02d0403c266a931935ec8e5728bb936ed3ec1f5ec5fd5d7146668e4e17c9f8f1eb31affaaec90dc93e690864b574a7ddbc4c
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
index 2592f61f9dcb..ef49d8dde196 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/walac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE=""
 
 ### This version is compatible with both 0.X and 1.X versions of libusb
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 01a41a0ae4d2..45d6291f70a3 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,3 +1,5 @@
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-EBUILD qscintilla-python-2.10.8.ebuild 1553 BLAKE2B 210cad565973dfaecd9e2affebb750b112edef43551847206639228ff2f4d7be21b28e964cc3d4e5491c4cb7979774f7f86893f8cb8c7312755dcf647ba235af SHA512 a5f467336e07bff0b6bc6375e263169ff27febc274fdbc4d202667ed1e4a5bdf7aa6f8bf5adcb2574426a45650041bf606c041ae976d195c069c9084a97242b7
-MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
+DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
+EBUILD qscintilla-python-2.10.8.ebuild 1551 BLAKE2B bff3a35fec9120904fa4b3e9c5c731334a0d9bd61de51cfa582a0cf41a26d64602a682fe5fdc0f27d4c916b50418c71c1344cf3fe88d47ea05613886d3180c51 SHA512 b559358ecbb09e10250d64145b1629795bd0b57e228cbada6239199a8436a951e5dd298916be6d1904f1c99bc70ee04592b1b9cd300ca7f4adb1f42ffe340965
+EBUILD qscintilla-python-2.11.1-r1.ebuild 1744 BLAKE2B 82be7cd42fbd8c1348fc14e08fb1981e8baad99361c79b076340a634d629dcc218df7ae952c5a865dacf34fe4312ab3da3280fa4d34e6115cc91eb45b5d7da7f SHA512 618eaa127ea65050ab2b0028622433a58d8a358e11995253e5602df1dd52e7d67a947dbef4bb4affe45543ba9143a004fcc53a969c75d15fa26b71ef6f573734
+MISC metadata.xml 776 BLAKE2B 63270d838d1a2bc0deddcf6ec6ff08a9cf0233720ba826a1b457b7369492ec4e292c16ef76b55ce37bf35e7d2497f2beb0c5d03bd23a84558829bd3e84c558e4 SHA512 08ee336155dd291545fc1579ffe8d9894ade3eb0f1d671d5df59933651ec3262239c3a15f32378fc5cedd3a40459e79c3c64a38b53fa95a6619572290bdd0367
diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla-python/metadata.xml
index 7054692c3439..3e46f747a5e4 100644
--- a/dev-python/qscintilla-python/metadata.xml
+++ b/dev-python/qscintilla-python/metadata.xml
@@ -14,8 +14,9 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/QScintilla/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/QScintilla/</doc>
 		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
-		<doc>http://pyqt.sourceforge.net/Docs/QScintilla2/</doc>
-		<remote-id type="sourceforge">pyqt</remote-id>
+		<remote-id type="pypi">QScintilla</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
index a03ddc26eb02..1b2bcb06dd65 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit python-r1 qmake-utils
 
 MY_P=QScintilla_gpl-${PV/_pre/.dev}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
new file mode 100644
index 000000000000..b5af9609872c
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.1-r1.ebuild
@@ -0,0 +1,75 @@
+# 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 python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	~x11-libs/qscintilla-${PV}:=
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--pyqt=PyQt5
+			--qmake="$(qt5_get_bindir)"/qmake
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${MY_PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 53412dd97a5b..f76797b43edf 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -2,7 +2,9 @@ AUX redis-py-2.10.5-test-finalize.patch 543 BLAKE2B 5bb883a674bee5fd4c7466a7a7b0
 DIST redis-py-2.10.5.tar.gz 88610 BLAKE2B 092efe4fcbc500a59981fc2d8574b70ee322ce7ccba012e5babd022f30abb017e53f093b3f4d876a297ab2e4403a57e749582d4027f1efa53efcbab0214347b7 SHA512 b2e6cb85c274c8f1c63e27256bbab816d016a68c324bf7092cf53feae819a34fa94f45565b0f209ee981919d793b2963462eb1a6f841e9dde9885802e0ebbe8f
 DIST redis-py-2.10.6.tar.gz 97299 BLAKE2B 9fea87b5c8ae0f3574651717e664cda62ca7752e44c4e60f4a50b82b53a52a5d005dc79c72afa58abfb807bf303f46335761129c54a2ef8e4f524451543c6c96 SHA512 e7df464bc3b26e23f6a0d2d2896306c1e4792b9a2a4ecaea6dd8690ffa17853cc85345f063307295dd3c2da399f7f203f4b21d785f7e073c0501732257419dad
 DIST redis-py-2.9.1.tar.gz 62204 BLAKE2B 633dd00d5aa984ac4dfb223aa685f8fa6913f4f00bb5c5c231dc77b6e8d33f1cd57c2e2bc07c4ec4658ca3b7675fd172919187fa2e95afb8eb5345f65dcbca00 SHA512 6b4912acafb31c87a5bc47b0420834aa9d1eba57feb0bbacdea943b746fe2f24aee4c9f13e7b03ae4edc562043b22c370cc7f53e45be07c5408cfa9852f8ea38
+DIST redis-py-3.2.1.tar.gz 124692 BLAKE2B fc7a773ab0a7e13f034b9efa174806b024733f9263b962599ce72e9a0c88b11964c26081375b6ae2de49939b59a561c145ae1b69c262b801f9b887befe9dcc0a SHA512 be51642a8895325c3c61993dd83c3299a9e2cefc1010e04f182833f720ff161bea43d3a57d28afba991949fcf6e967c4f778002967641bffe651d5db384f2e08
 EBUILD redis-py-2.10.5.ebuild 1454 BLAKE2B c645ec40e72632eabf747598f221d9e88394189f9dd392dd84162f02795af67b3b4c6badc92707bd8b7120f0288c95046b3aaf03c3e13788e3764e274764398f SHA512 7f38ee8032cec9ffc40554672fc29e53f8654747852c56b7a2f30bdb90cae865dc0c234fae8b95d6ad943f73714c9866fd06e0f35ed2cb38b990988293fa9079
 EBUILD redis-py-2.10.6.ebuild 1467 BLAKE2B b3e30cdf347a7f89ae92f15c95948a15f54b8fd84c6b13f9254f3ec3b80da25c4b38effb13189ae2a7bd11069a451cba01183755589beb54247507c83c0a18cb SHA512 48800bc3ccee6808fc18288eac74763346e0607ddceb151d8ef47229426d2b8afce1a22b3d28722bbbf96e673d23cffdaebccbda965dc33764c80b4877e6ca48
 EBUILD redis-py-2.9.1.ebuild 1527 BLAKE2B 51ff272cf07853883818688b8826950096f26f3e7c8c77e099c200498879c98ef2461e0d71339a2582a43f0366cdf4674eb3dff118dcb81bc5122e3c156fa387 SHA512 7eb014071ec90b685ad9f86a942e716b695e4f8dafb74faa259811021d2d272721722df883bf47ef9e130579c9ce3768fa26f3ce19175d10b64f2e93339131dd
+EBUILD redis-py-3.2.1.ebuild 1454 BLAKE2B a0e165a64c8b2aab1fa7d06de9fad94da9178f477ceaec3013ab090a85074b7267d78c15fcc60d24adfe662f88c7500d017ab55135c31ace8d41d99f9c7ac74a SHA512 759f180ac700530f501224ef6570f6d1d1b3939a243761790814a8d3a1311c612eda086a4454b3b6ee7dfc1edd1d0b1986c669bf2bf7d9b2424524a4f7348f0d
 MISC metadata.xml 380 BLAKE2B 993e671ed9c6a9649a8dc0d95207b4dc1f90cb38eb8af6e470fc9e18b496768b541c033ee961957d56ee93b335c54447b741fad38f71498188480822350b508b SHA512 5e03d25770ee53beb71d1efa039401a5598572bbf6cd441c904fb5c074d212c0c05934c6f86abb566e913ac65bd84db3cdaca8b83c182dad57d0fcffdeb9aa4b
diff --git a/dev-python/redis-py/redis-py-3.2.1.ebuild b/dev-python/redis-py/redis-py-3.2.1.ebuild
new file mode 100644
index 000000000000..fd8436a7c944
--- /dev/null
+++ b/dev-python/redis-py/redis-py-3.2.1.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_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/andymccurdy/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Make sure that tests will be used from BUILD_DIR rather than cwd.
+	mv tests tests-hidden || die
+
+	# Correct local import patch syntax
+	sed -e 's:from .conftest:from conftest:' \
+		-i tests-hidden/{test_commands.py,test_connection_pool.py,test_encoding.py,test_lock.py,test_pubsub.py} \
+		|| die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		cp -r tests-hidden "${BUILD_DIR}"/tests || die
+	fi
+}
+
+python_test() {
+	local sock="${T}/redis.sock"
+
+	"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
+		daemonize yes
+		pidfile "${T}/redis.pid"
+		unixsocket ${sock}
+		EOF
+
+	PYTHONPATH="${S}:${S}/tests-hidden"
+	esetup.py test --verbose
+	kill $(<"${T}/redis.pid")
+}
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
new file mode 100644
index 000000000000..a645d494c0cc
--- /dev/null
+++ b/dev-python/requests_pkcs12/Manifest
@@ -0,0 +1,3 @@
+DIST requests_pkcs12-1.4.tar.gz 3884 BLAKE2B ebeb89349163d4f9995c00dfe3d725036a76660870d36203f47029f225698fe7a15993a9dd756e0b6b33011726ad26323962609bb94f223f4478096658f20a3c SHA512 f77703b7b0ba1f13aa095fcf4955f119c34a20e0601e0d6888a29932d8d4289548cf2b7b0e065abfea2ebcda542d48a4d9a3ded32974c1d24bdae223893f0241
+EBUILD requests_pkcs12-1.4.ebuild 575 BLAKE2B f42d65935645720be3523ac37590224acbaebe5411857a5f1517d32be3a2492e6a75a79f1e54ef058ab82d9e00c9c503c607e1d668c2622ce9ec179b01b9a567 SHA512 52cc2fc2d9809dc712f2f56f32de93fb794c7fcbf40ed3ae233eb8382af1bddef3eb51787fc784e0cb6991cf7e52b3f37e60b72c712627ec5789f79081f017ea
+MISC metadata.xml 555 BLAKE2B d70dda6dc42c1a4da489771576e149a106fd0dae72477045e98a57c2fcd04552057d526b52da2c1b1ced97a118a6c0d914100ebe0e2996a12cfc55c9f66da128 SHA512 3ae1a29b15280f429202f4b031ffde905a26056964ba53610ae29f961d3f7c2562b8a5d27d701b3c1a72204464cf5c4ede628339ce3e6874aed62f127523f32b
diff --git a/dev-python/requests_pkcs12/metadata.xml b/dev-python/requests_pkcs12/metadata.xml
new file mode 100644
index 000000000000..0a878536db01
--- /dev/null
+++ b/dev-python/requests_pkcs12/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Adds PKCS#12 support to the Python requests library in a clean way, without monkey patching or temporary files.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">m-click/requests_pkcs12</remote-id>
+		<remote-id type="pypi">requests-pkcs12</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild
new file mode 100644
index 000000000000..717b7c6e3fa5
--- /dev/null
+++ b/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild
@@ -0,0 +1,24 @@
+# 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="Adds PKCS#12 support to the Python requests library in a clean way"
+HOMEPAGE="https://github.com/m-click/requests_pkcs12"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND=""
+
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index bca136fede99..2cae039828bf 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
-EBUILD rtimulib-7.2.1-r1.ebuild 576 BLAKE2B 19b05ae328191a093d0fac7116fa17d5f9ab05abbe1305819cb84c65c2c5e2fe2a5d7c7d020bdf5f7c3d252675fa92e57110fae092907f228582d35fd5f50998 SHA512 7a31291f796050843a3ef12a2a7bfbcc3f8d7e09902874365ec7cee64537732552f01a9d849ec5ee13d2113a6f660239230e609576c95ca19e9caecbf798ea97
+EBUILD rtimulib-7.2.1-r1.ebuild 573 BLAKE2B e0d9440d55487e39fcb5a97314586b87180f601d468fbf29a6f9782d212397436df52b436690de404957711954c5f4234e04ea3fb931eed6d673db66cc9b85ef SHA512 dacaa8dfc49250a3d82783a31a218457a0fa9b8cfe4e69a3e94b1cc4a88852a58ddb22165d3b0f7130a19ddce08fcec811ba4a0392bbc104ce67bb2f68536ea4
 MISC metadata.xml 848 BLAKE2B 8a0045ba1eb894fd8b3796e1e301e6bc11510a78f9ce3943309448f5235b0bb8865bed7d81b5da7f5dffdbc251c1a5ce908a5448d109e7e61ab433d234dca868 SHA512 1f5e646966e092c296948894357743d5be29e23e1abead62a748ec3d8237025d212bd48b9b5a15eecfbd486b02bda4e81c5ff2fee4eb08c0ef0d5f91b47e0a3c
diff --git a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
index b593b7430083..bef8c7d8c860 100644
--- a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
+++ b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-MY_PN="RTIMULib"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
+MY_PN="RTIMULib"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="Python Binding for RTIMULib, a versatile IMU library"
 HOMEPAGE="https://github.com/RPi-Distro/RTIMULib"
 SRC_URI="https://github.com/RPi-Distro/${MY_PN}/archive/V${PV}.tar.gz -> ${MY_P}.tar.gz"
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index b68ece96f457..62cf3f83756b 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,7 +1,6 @@
 AUX s3transfer-0.1.13-tests.patch 753 BLAKE2B 7b168d35c9287eade9b9e1ca0393c625f742d1a698df9996f9ddbe6cb892128badb3a77dc9804e3bc9905d0982f240c3dd5021459e3d050a7647e279efd93491 SHA512 3fd66ae7574ee5263582006292a19a782aa3c2d4ebef00e005b02d1cb5192a99c36325114e49aa13ddc2fa1cb8604f65f87dcac8994b2845eaa45b409a5b8ff6
-DIST s3transfer-0.1.11.tar.gz 95555 BLAKE2B 404a058ad371161d2f7d44b3fdf835b6641e6f299ec3660b322afcbd0036860a658e641479f0214b67b6e96d1b652d2b2fd888bc84473e8827f907bdcc5c6477 SHA512 83b85dadb696df9dfcd28719ccadba8aa0e8f36b0fe4ce4f61dfe00460617bae74307cbe6ba924a8de86fe527e18a34d66acb72f7a3d9001e670d76dfc8b60a2
 DIST s3transfer-0.1.13.tar.gz 103335 BLAKE2B bbc6e76647a9b531f0ef70912ddd17a186a5bbe4ecc9ed21de4674cdc20d39150be3212065bcdf6145c0721644c59d157fd528b79039bb091d750f28085bb476 SHA512 90aca5cacefa19cb8cb21b7b82c5f3383bc0478503557de9c2277db2f39d98f6e11ad74bf56ec84a1fc8c4a920337b0bcb34bfcf509a49f347144b7f13afb37c
-EBUILD s3transfer-0.1.11.ebuild 1028 BLAKE2B b17a39966352d5f81aa26bade63947f94c79c6b01dbc26a56c8a9cf8ffe508f9ad399ad3c9b6186879a354bf6484af3b73b67a31a81d552760f6ede192da636c SHA512 2a9ad77eb825d0851ad68e02c70f4873925379c1cb91b7fa7faffc8315fe67fc3c47c32d5c696724dc012500a12edf774a4a13ada56579d39bea4c72ac517418
+DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
 EBUILD s3transfer-0.1.13-r1.ebuild 954 BLAKE2B eb675e75b181a4fc8508fef4344395b413c8e628af57cc312f0506255d496e5d33556e79c905e0278448409ba75157397b9dc4c19749113da658dca2cd7ebf54 SHA512 5271d309ab5c39581e7562c389a5ef3d94a6452b0e6a643011c9d5b64bceb565b6ab692a456da9ae2347438b5181ac395ee96385aa587424dafe47d8e0ae7f14
-EBUILD s3transfer-0.1.13.ebuild 893 BLAKE2B d6fd015623b4463fb75ef84d7ee476d4efdadb85cae04bce9aba3343c4649d6b94dec8c9098b6e50743c8461b673e93f945d3a28c36f115ea0196433a1de46b6 SHA512 a22263f3eb37dc8d067585c48202bf36335b4cd0f42d288e1c456a22c5f51846813f38fc8944ba3679eab784acc30d880b2e678ea50f1da30a2552f07af2dbaa
+EBUILD s3transfer-0.2.0.ebuild 900 BLAKE2B 5efcb0e1da3ef8e178902e6e4aa4fbffb7e3133f3062ced198274bdb84f17008b4f396caecbf9e826edf0fbc4fe60d58cb777f50bab98a4857243b0b6c7ea003 SHA512 a7d01586b587fa7ca998673b1410f8147e97008116146f865e2dfc43b0bfa91080fd34e2b60d37cbceef175a9dd796bd404bf140a19d9ce696dcb3957289ece9
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/s3transfer-0.1.11.ebuild b/dev-python/s3transfer/s3transfer-0.1.11.ebuild
deleted file mode 100644
index eda0e7e539b9..000000000000
--- a/dev-python/s3transfer/s3transfer-0.1.11.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 python3_4 python3_5 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/botocore-2.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/s3transfer/s3transfer-0.1.13.ebuild b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
index 73b0b99fd598..d4f198cef9ea 100644
--- a/dev-python/s3transfer/s3transfer-0.1.13.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index fca1d807746a..291b97447223 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -3,5 +3,5 @@ DIST scandir-1.8.tar.gz 33065 BLAKE2B 020789b939f347de49dba6eb35cf53733a34b283a4
 DIST scandir-1.9.0.tar.gz 33315 BLAKE2B 70c0cb0819f205b3cee37f471f84be2bddb565cd7341e5a28b9f1263f3176450cd5f2edacd63130e4f3f38940d0d3e1a01239f4729ac05e5cf5fd0005e712f8d SHA512 41dacf42734ac9a53bb5bd5d783023236d68bb4883c853fb2ee34224206c577a4a277d4a8cf8f9be6fd5a8b59d9b4fe4568a0c815a62ec84ce99ded933961ec3
 EBUILD scandir-1.7.ebuild 565 BLAKE2B 9d08fb18c8277903a9d1f2e38a2d5da42c095ff3c9c4e9919fd23c408d64156651188feed20df5cc03569419e8c1372f0e3653fac168e5b3de85ab0cb572ce28 SHA512 f46a08f4858fdabcdf8b0221b956aa589bffe1c0c82d16540ca1efccb4dd2925abbb3ef57a5a5a53f551023cca7abb8d17d3b630a1c61d1467de0b1cb7cdd528
 EBUILD scandir-1.8.ebuild 571 BLAKE2B 528c6b3487876b93305bcb3fd631ac0bf7cc469b35b72c5b74865a1b6faf5c4aa65f0cda1e422bb94ef6a8cc90081ea969d63720bece9fbb1b1b9d882df7b8d3 SHA512 86ce0e8898cd439682ac0e2eba784c50eea56cb9ea5266b6243dca2ec3b7ccea00abed36813d8f50e508872d7bbf721fa97771dbcae33a16d68877b6c570cae4
-EBUILD scandir-1.9.0.ebuild 667 BLAKE2B 2517c7df56ef5efce0a4f29963ec2fd2d96a2f039f80b328befb734820996fe1cff45cf63756d574457fa17b89df601a52c0b24d342d13cf37d0ac6a85ece009 SHA512 0ef578049fa6f8cd3dbf20399eeeec00e7710434fe6ebabb654a8bef7f247e28863ac3b4e6380e89fe547e2bde3fa3882bb081928c9c8270a5a3a9a95fbd0cde
+EBUILD scandir-1.9.0.ebuild 666 BLAKE2B 004f061fa7ae094778bd56f26b1cca40c3c8055df9b986fdc09049f7dc80394b17ac900043b9ed1bfdf0ace58b23c81238bd51515b48ffb095ff71edd8a40489 SHA512 7bd78a70410dd57b915add64db4dbd8aa860b298df2443ae111e0766fd9df5b39bd0b4fa541f48d89c8682b0ef2c82e67c1789941f02ae71e544cb28481046cf
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.9.0.ebuild b/dev-python/scandir/scandir-1.9.0.ebuild
index 156a823ee595..3bcd829fd4d3 100644
--- a/dev-python/scandir/scandir-1.9.0.ebuild
+++ b/dev-python/scandir/scandir-1.9.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/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 830e9aabe1e3..ba89d001f2a3 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,5 +1,5 @@
 DIST SecretStorage-2.3.1.tar.gz 16073 BLAKE2B e4769e748ee39596c51012a6ac626dba2b019238a8237678c47d713c2af4b0e88b50d0068b5dbf3a405b9f7b14a7df64aabf751009dd21ab25de65ead2a79c38 SHA512 69a2c86a1abd904b7d71bbb59cead3b2588cf88d7f35cbaf64d18ff9aa9ed62ba9f79d0bebd10136aa8a0edb1ff8a1d1aff70cf8e519dc74303993ef0d564047
 DIST SecretStorage-3.1.0.tar.gz 17767 BLAKE2B e234a7f34b5ca2debfd04d4f3b4b4e2a1625aa346133e464bbc1f094381445e3d0c5460457c687f55f6682c6b6085a757edb23a6029fe5c2abf139278203f326 SHA512 a044009480b359aecb0c8782f04e4d02c3c1c0e682f72733896c98f386562c43766318963452d60028d0a92d02903130278cf26a5c206f5f0909e106bdb2d133
 EBUILD secretstorage-2.3.1.ebuild 688 BLAKE2B c3b9fb385b428b3c8552a888a0023f9ebcd694b34f560c8bc3f2936de5ea9a940b0e917896589a6059b55e2620929f08f726f9aa5801b93c2750c4fd5052732f SHA512 8e71eef0cc07a17f81b38c2d6e2f7b15541dfb5f5c5b4acbac7da6aaa7c1c36c5922600382ee248deba3020e9a65cf97071c937aafbf11e651bb339a1104bb11
-EBUILD secretstorage-3.1.0.ebuild 1031 BLAKE2B 70ce0127b2f93915802881592c01aff9fb1d323cc7cddff3cbe9e81b1b22c7d2d784a3f0ee6327378e202af350fef8516e64084bfd6de2a3a00d1fc06918917f SHA512 e2a4881b12380a4a128753fa36ffa2fdcacc1cd9b88fdd46aa4c2820e1f9f5542882418e83588a8d254df8147082a4b6af2b751d5fc3485de0d0196e415a58db
+EBUILD secretstorage-3.1.0.ebuild 1069 BLAKE2B 702c60c40f07c6196e45fe96bddce9049cec6f24ab4ef488dd36245a85592c8d743d7d7a8c1df6565687d00fb3df1be06d4f8b3c39daabfc710aa174420158b7 SHA512 1b7e96d396029f2e804279477b501b95c5c6e61882aee5a68fe871844d874f51ae86e62deba076aa7178d25dd4e1c5b008daef65db51d2568c2d911cb2e4fb48
 MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-3.1.0.ebuild b/dev-python/secretstorage/secretstorage-3.1.0.ebuild
index 55915a6194af..d05e995ee3db 100644
--- a/dev-python/secretstorage/secretstorage-3.1.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.0.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=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
new file mode 100644
index 000000000000..5527a704263b
--- /dev/null
+++ b/dev-python/semver/Manifest
@@ -0,0 +1,3 @@
+DIST semver-2.8.1.tar.gz 15000 BLAKE2B 71fee2372713cefd11778fb223d58cc1e41909cc8adb8b5b3330770eb1ebcaf45c3250c553c40b85c54a59b1427308e7c143e1cfadf6276d7652df339263c65d SHA512 a457b1a170b309ee563955e4c506de56a061acd4e7e92a58fd8bd78801e33207fbc5e0e026fc0ea243301bf9ecfe0b219c0d95681aa10066480cbd3974e17d3a
+EBUILD semver-2.8.1.ebuild 646 BLAKE2B f46a234b7f4e76fc2315e50033f2cbd9521bd69ea1e14c657b555e5b290c02a939f29d1447eefd50aea5ed339b3a13cd951cc52e9b2438a9650d743ccea94fc3 SHA512 92c4751f751fce51b74de76ea742b706c0936ee75332d0f5da47c371850641ae5f7f9018acda4c7a9ab21549cb4527d17c2e46880ddccbc071ed67966b6446d6
+MISC metadata.xml 501 BLAKE2B 09ad734b4d8f01e46f57b531eb47f27ce9ff18843e1796b96dcb664a23ca1a675fbfdcaf687452fb702811daaef61e1f3314d88d239cda37db75dda9764bbc21 SHA512 24204b5aece1f9f750ab0d6b0ffccd0d46aa33bfe87020866c4e82f5e3939028fef305b39a1b5536efb521e838a300972b755295b772348569f0b6cd8f30a763
diff --git a/dev-python/semver/metadata.xml b/dev-python/semver/metadata.xml
new file mode 100644
index 000000000000..6ddccbbf5f06
--- /dev/null
+++ b/dev-python/semver/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		A Python module for semantic versioning. Simplifies comparing versions.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">k-bx/python-semver</remote-id>
+		<remote-id type="pypi">semver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/semver/semver-2.8.1.ebuild b/dev-python/semver/semver-2.8.1.ebuild
new file mode 100644
index 000000000000..b7312e165270
--- /dev/null
+++ b/dev-python/semver/semver-2.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for semantic versioning"
+HOMEPAGE="https://github.com/k-bx/python-semver"
+SRC_URI="https://github.com/k-bx/python-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
+"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/python-${P}"
+
+python_test() {
+	pytest -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index ef43edc5d5fe..6b06a4ee0387 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -2,9 +2,11 @@ DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14
 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
 DIST setuptools-40.7.3.zip 842920 BLAKE2B 53b5845f157d088fa0848384770f185b2daf8f1bc0304e8d5ab3eb5cae44a42133e7cf2f655e95be351733760ed401d55e3717c4a1257c77644796c08cbe67f6 SHA512 fb61e4d7ae620684b128bd60112938a4a9721a82ed3aa4daa774837a2db60e989d608ce2ba7f51393f412b78244d6f4c8f1025416b137d8ce01a2c0375ffec65
 DIST setuptools-40.8.0.zip 845071 BLAKE2B a76b92a7e3a5cd87d74f3ff5f49fe4c6b2a1f0c5cc3b04219f6f773585be479ec5d092185129ada1fe5c5ef62714687beb3a316a6d50b559e9224aed468aef24 SHA512 f14976a76bff74b7494d44fcfffa511de0d142b4d308fcbf87b34c31c51491102e152acc11a383c5f6b693d1b18eb119c5186ca23deb12b2bbf186794b062868
+DIST setuptools-40.9.0.zip 847572 BLAKE2B 1ef3f05d747a67395f705ad46bf066f400c9a5ad97efe73175e72eb9091c929cb61a526da1206f431a4e054939e0fd2b2a841a892c6cc76a6116cf781112b472 SHA512 2d278ef162139dfb1dd3640154ae3db755ff5c2285810c85b0452d12e3f3cb199e3f1a1ec7cc43a377d42cd4f86e97e2c773d9f0a3bef8dc1acbf31e6f61033f
 EBUILD setuptools-36.7.2.ebuild 1923 BLAKE2B b7f55129aaef27eee778fdfb97ef06f6f70e558402fe503dd73c7a23502e6454f8c1f0e8182770d9c3334ebe3c1a21eb19e3ee8a0bc26ed99a819e7484b040ef SHA512 98b9465fb954575ed3a4a0b3b5be1c8a4c30d60112d4d222e95786a5a221a5a13799c4055bf7cd074476bd7d65ee7cd5c9a4fcad2a571ba83583e67751bb8376
 EBUILD setuptools-40.6.3.ebuild 2050 BLAKE2B 2b5aa7cfc64d6d9bca4e6a05e61c443ea4323cafa558756a240b3b04ab56d1304609be3e84f782fe5bad91063f899aed7d629ba6b8bdf9d05bb13297616153e6 SHA512 cb1caf4278307d71ef23c324acf9f0234da6a2b69932ccd418cdcb26ac82f782fefb104aa0755a7fe62a8f4373b2c76f16ccf0141dd96087cfecb972277e9c3f
 EBUILD setuptools-40.7.3.ebuild 1993 BLAKE2B ae75fde0a8d0c778463f4ac50634b4b9f93b5ac15e5e8bf1c7ea9951fb8fc65c7d3ac8b11d57de1516b3d47e99a2756b492b10ce3b91eb401402d14da0d511d5 SHA512 06945865143b937fb74b601f1f0c598c93a6b3418432ab7963ebe44c6debf5d8823d5b0875d80ff15cce97e52dfb0ffab28914414ae8ea8ab530cb4efb0e6d19
 EBUILD setuptools-40.8.0.ebuild 2020 BLAKE2B f0ddf37f540afaf0bce258603b0d453abfa25b2616a8efc9c8144b16eeceda29b992bdeac4ef628e72fc073066293bfc30c8089944f5e24f191ee3f481d4e8e4 SHA512 269167eb6045429c55096d9daa3b752552dff68317506ba3dede93d4a84d056c72bcbad562bd94ec1d8d1e33e7fc1e8454d172d6a3357ddcb2dc634f739678cc
+EBUILD setuptools-40.9.0.ebuild 2073 BLAKE2B f9273c0f5dc0fa60039b45f886b9e99ed636e820d567d138a3d6cbab611060c6b71c5440f9e30856cd7cbb49cb0aa41e544a2e1ad0443fb7f5620b78dc343611 SHA512 d800d005ae6d8a8914aa5a20bc5b19653ab931a32c2250ab7fefdab6731698dfdd0dacb83678b9b66ac1328afea6e1d37e33480cfc564d8ebc6fca0d94b9a87a
 EBUILD setuptools-9999.ebuild 2020 BLAKE2B f0ddf37f540afaf0bce258603b0d453abfa25b2616a8efc9c8144b16eeceda29b992bdeac4ef628e72fc073066293bfc30c8089944f5e24f191ee3f481d4e8e4 SHA512 269167eb6045429c55096d9daa3b752552dff68317506ba3dede93d4a84d056c72bcbad562bd94ec1d8d1e33e7fc1e8454d172d6a3357ddcb2dc634f739678cc
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-40.9.0.ebuild b/dev-python/setuptools/setuptools-40.9.0.ebuild
new file mode 100644
index 000000000000..12cde2b702cb
--- /dev/null
+++ b/dev-python/setuptools/setuptools-40.9.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-4
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 857696825a73..b21a189ddde9 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.14.tar.gz 1049688 BLAKE2B 8e68910f533d0f58bef1f20ec58579ce0166efaee2caef1c64d4e9878b0887040d9284a9fa5ee48d7a4f0949866d0b988b0d962303f0ace03a4ad48bd08eec5d SHA512 afde261331f38eac863d8cea0e343649f460f0b9a603d7fe91f14583904ea4b488bbd88d20fad5c985c43c6c1683fffee38676d94831ac8f2de40d9ed4d0423e
-EBUILD sip-4.19.13.ebuild 2856 BLAKE2B 992b5ea525fd276db4ddeda3b067bafcedd4a603b869c5a847951d6c70050015f78371c66bd60589f5d13411ae35b62cc9cc90d5d82f69a25fb9f5479a76ac71 SHA512 4e75fd5bdad8200a6ffe53de8163cd03cb66a72a22c517dffcaff160b371af8cebdfdd81acb6451c7b0e1697c060adaa6488689f82a6364a97110eddbdd18951
-EBUILD sip-4.19.14.ebuild 2428 BLAKE2B 9caeca45fcbd171794a03ad6dcbaba07fd187a3ccfb5f2120c97ba7ea8e6b1cf0d8e676902dd933c1582bd32d7105da27b598dbb86d67e04859e711b743e8a9d SHA512 43befcfad315a2f2d642ae587fe44e8a646bf528baa58b34873509a249d4459d38df905cf0126adb0cc67a64ab262b0ca4f933822ef3f8692451980a063a73a8
+DIST sip-4.19.15.tar.gz 1053921 BLAKE2B afe0f1c2faf839305d21da05a667e649c37ab42c95df86d237bbd8f39a6b8bb7224da547467311bf82a85ce8f0fafd8bb6dd7cbf6050f2b157773339438d6277 SHA512 9518a5e90d54758b13dd8752669d4deb175cea8d8cdf810deaf554cd157d32ab7e394d23c774993fac3b7c02d56445b80962457d59f5cda543917a0251816422
+EBUILD sip-4.19.13.ebuild 2892 BLAKE2B abc2837c6971c94c2bc0b93ded8bec73fee27c7fcf1555b6ec01c8f2c3fb9058eac1e36d2baba0855a827e1033871c8d7051b14175875ba5f83f48743454c104 SHA512 eb7a507520708d1e76982b2875153ad16ad4567e8d1a86d9facee8845de0c2fffa27ab2eba130b631d62a28e2689a35a969e06291a89a5b58ebeff2194be21ff
+EBUILD sip-4.19.15.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 62c11778a164..b51ae723fcf6 100644
--- a/dev-python/sip/sip-4.19.13.ebuild
+++ b/dev-python/sip/sip-4.19.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit python-r1 toolchain-funcs
 
@@ -18,7 +18,7 @@ elif [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 	S=${WORKDIR}/${MY_P}
 else
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${P}.tar.gz"
 fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
diff --git a/dev-python/sip/sip-4.19.14.ebuild b/dev-python/sip/sip-4.19.15.ebuild
index e694b38a121f..cbfa17402c9d 100644
--- a/dev-python/sip/sip-4.19.14.ebuild
+++ b/dev-python/sip/sip-4.19.15.ebuild
@@ -3,17 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
 
-MY_P=sip-${PV/_pre/.dev}
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/sip/${MY_P}.tar.gz"
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
 fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
diff --git a/dev-python/soappy/Manifest b/dev-python/soappy/Manifest
index 3258ccbdb0af..1776dc85b7f9 100644
--- a/dev-python/soappy/Manifest
+++ b/dev-python/soappy/Manifest
@@ -1,3 +1,3 @@
 DIST SOAPpy-0.12.22.zip 172855 BLAKE2B 119232713da3474c58c925a2652f5739f70903ce8204a3f999bc511df9387cfc33d9d812ea3735d04b37e7ce45d6c0f5a5a11c79849406c2d60fa6ca91afe61d SHA512 d75d0bf8e88c8ecae57f51a201f9ab6f24fc41856ee2093e7e2e73e5d8618c9a766a69140df28a24b6d8493b53555c09502684c6d2fd78e90a3c53bba52f388b
-EBUILD soappy-0.12.22.ebuild 1000 BLAKE2B 54863e9ba17c0991e30397ac5a7ae83c14a02799ee588eb52582d1867d85e3bc0a5cc799a7d04f93980d986b1854cdfa6747f87bdc92d1ae55899775d5cd50bf SHA512 7f5e6d78fd6c64267436e9a735cec4c2db9bdbb08af7dfe81e3bb448d5ccffb2ae8f5fea30f960362f7d322da9a63b9b127c551d92b6270e8be21f5a8fce2945
+EBUILD soappy-0.12.22.ebuild 1013 BLAKE2B 935960ec95aa535bed46bbcd79a9a5649408b060f92cb57864f2ece21bb5a1f308714a1b7d9e0b4a8b93c89c6e3afc94d29745865881150dcd1e9aeed290fa6b SHA512 9eed073631d94158836e03b845e62b5e5ad48b40cb12556fc26bf63f521945d6c5db1c02c205b65a222e182c4c4e446a73a2722d703e4709265b6968e375ebec
 MISC metadata.xml 363 BLAKE2B ef3fe590c0ee03d9316b5f70d2c4eef13be725830b11d2c5071c3678efe724b4572a52cf967844c5b194064ea464e40d6f4faec5fef804e07bf98ef9bc695711 SHA512 09455c1710a40712fec6cbe5680091f3186d755fbcc2c64ae4fe4c9dd50bcbcab681a2e9aefd6390c12c775b76bc76aa7a04a78a8ac23b281efc908d14285742
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index 40ab700736b4..3cdbe5adc915 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux"
 
 IUSE="examples ssl"
 
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index 8d146231cf13..b755632f74e6 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -3,5 +3,5 @@ DIST sphinx-bootstrap-theme-0.6.0.tar.gz 1232454 BLAKE2B 90fed63a388f71f1d74cc31
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
 EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 538 BLAKE2B 5dd5b20e7f382157d748baf695592c48643e97af2ed8557f565b799578b11356a1785e32cdd98b2dd1a6c29c4468c2111770d8262b84ecd5dd7f7501fde7b415 SHA512 deb99fd8023fe6c8a13f694735828654fd22977b8cd31a427f6b791a45ad6e53d0685761051111e8809547f24eb8ec403bfc5d6b403e2ec0a09795ef021798c1
 EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 542 BLAKE2B 865fd5d6a280bb83e979d8f761541e0d4062a7a53aa97ffb62a8cd2c8484bb161874a44ef21b3b3646bf643cbe2b2714eee1b308c0323bb36609d0a02cbfe7fa SHA512 e20fd1c014a31d6fcb66ae67570f173fcb037a8ab28ff486b37f65f33e859fd5b96d887489d0473c48872ab8a8517dc6f28f2699c774ff59f01f28e311a032a8
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 565 BLAKE2B 1a46e7c679ec39172e33e0b6a9c5a491c450f1238d9e68cedc938bc6dd872d682e0109dbaad7f2ba45a5ae6d4ca27ac1265b699f30108fe60bd3e77280d2937d SHA512 7e046ca24a59c937da04bac83be7be4de99aa5fecad37a198f5c8cfd45459fd4a7816bfd4224f99c870058b16c16851eec1d7d73a2cb66fe01cb00cfb2a72a60
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 577 BLAKE2B 2ef867218528c658fa70ee83398b39884a4331f3800279724c0027d70036cdf4c42b0ea1de71e362638a0605d54a6df9167bd232f4523c7644027664bb88ddcf SHA512 99f01ec534a047ea9d83e635d0d6f2df04b930a149499fd5ebbc595160e3bf5d406fddfb49139415c2e91745170b022dcc75d39471d6879af2b4001d8742a562
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
index a43d7ca0142f..932ca90a05ca 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 0890ab19d203..96220079a5fe 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,7 +1,9 @@
 DIST Sphinx-1.2.2.tar.gz 3143671 BLAKE2B a21b2a060363ac86832a6a28a623ed410ff0bb39ca3c9c58618ade88f4305996e54c559bb588c518597e31a73fc16e0c37fc57950eb077179f03715dfee72729 SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c
 DIST Sphinx-1.2.3.tar.gz 3200548 BLAKE2B 42033c59e6e38247af12c78cb4f69c73b1dfa883aa8a9e6c180bb74de666b45faef24a55c0bfd3aa1f22bf3e632e0e95016eb1bea54e8b5ebc7df78756763b5c SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05
 DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
+DIST Sphinx-2.0.0.tar.gz 6011308 BLAKE2B 72ec668522b803c07a76be086a27d2f8fb844558fc3d3a9fbaa7a191e570c23e3baa951873f68d3b54c48d8cfa770f8fd1549b718a7e760b7691bb686fe9e83d SHA512 283e18514262366e0aebc23f1e48ce7fa3591e48572525c832f96ec4f943463e19904c67ab06a4b3244119750c63dc496d4a4142e1e4a55e0b4ebdc748cf6aa6
 EBUILD sphinx-1.2.2-r1.ebuild 3045 BLAKE2B 315adfce3238e7b3c21465cd16e9a682255df98cf1c2289e3611a946f3642a9df204952d15a5947d1db2e4edaf909457bf78fc995e9d2d7b319ed8d82bd4ab17 SHA512 74d6530a5e4db4dc519eda8e4c9958fc54eb0767b00d6a69334a7c9e515bc878781c09b20e4ea5d7a23e55f3aa3093940be58013a42ef4507cf6fa2b3109007c
 EBUILD sphinx-1.2.3-r1.ebuild 3104 BLAKE2B 5def64661cf250461a510307eface9a79577a19f8a0c347e6c3a2b5c0861bdcb075204d26e56030535fad6a96978344c650907e15aed03a859d4de9f6709252f SHA512 2106fa9b8fd5fb65da085464a9d6133cf07bab371fcce363ed0154fb0a86543047910b571d71f8f28e523a311f6e193cd3e29d777b28d6109681cf2ada1fdd9f
 EBUILD sphinx-1.7.5-r1.ebuild 3300 BLAKE2B 2bc93273d9fc49adfa033126c59f3383754537ef81632e6b47f3707fbcd62895325869078ff6cb5a6f4ade8439ce676585be2954832a4b6d2fda5aee67fa7999 SHA512 e90d2932c53cdb9d0628083441d48cbfd1c1aa3bb215058a55dee6977a1f2d7bfd36ea7e3c220c3b629c03805f0f7327597f8bcf0a87db71228ad639ada188b6
+EBUILD sphinx-2.0.0.ebuild 3492 BLAKE2B 8ceb448bd085ff9dfaf5dcd6d42d142561b843846761bdbbc753bb05e43d57293047641c1be3b61bb2e48718ddf430ea0aaff9ab1f4cfd517245f80501b4d45e SHA512 2b1bcbfefbbb1b69f4bcf9d9de81ad81e504d02143183a96b3876db1cc5f686623b46df64765f33ee2924840b4f2c72230c855dc462fcbc9c65808a9df9a6ccc
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-2.0.0.ebuild b/dev-python/sphinx/sphinx-2.0.0.ebuild
new file mode 100644
index 000000000000..779ccc6065cf
--- /dev/null
+++ b/dev-python/sphinx/sphinx-2.0.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://www.sphinx-doc.org/"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc latex test"
+
+# Tests automagically use latex, bug 667414
+#REQUIRED_USE="test? ( latex )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+	sed -i -e 's:test_latex_images:_&:' tests/test_build_latex.py || die
+	sed -i -e 's:test_latex_doc:_&:' tests/test_build_latex.py || die
+
+	# requires specific locales
+	sed -i -e 's:test_babel_with_language_:_&:' tests/test_build_latex.py || die
+	sed -i -e 's:test_polyglossia_with_language_:_&:' tests/test_build_latex.py || die
+
+	# fail for unknown reasons. TODO: find out why
+	sed -i -e 's:test_build_latex_doc:_&:' tests/test_build_latex.py || die
+	rm tests/test_ext_imgconverter.py || die "Failed to remove broken test"
+
+	# fails when additional sphinx themes are installed
+	sed -i -e 's:test_theme_api:_&:' tests/test_theming.py || die
+
+	# fail under pypy3
+	sed -i -e 's:test_partialmethod:_&:' tests/test_autodoc.py || die
+	sed -i -e 's:test_partialfunction:_&:' tests/test_autodoc.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
new file mode 100644
index 000000000000..c1b11c7e6525
--- /dev/null
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-applehelp-1.0.1.tar.gz 22086 BLAKE2B 6e10329a1712cfcb1f29a3b4c23be5169507398a43f800623f2b24fd350f7e2ad16a887e87a3b68253dc348337342d3d4397d3a9d81a460c389a77ed4bdc973f SHA512 a6500bc2899f25c0b04c8649e86a6f688823e573a3f58f2b786117768e8b415acffbe79b99cff8aeb6ae3c74dd244254de120b82b7432cf61c5fabdd38f21603
+EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 758 BLAKE2B 1406ba5f3073674d7470c4d21d3ee9f0fcd766984567f36f8e484f857d2e30775ad0c7a834de493f300216205f47f98c8780bce5d9b9f67c2a601ae9f8fcefa1 SHA512 4f7cc29d109190fb952ae33150905c36b0b511e758fe08e6f10cbf5c1e4a16e364c3a851317ce8592a8191e76d1a7213f0a78c669b4bcbf117efeab7439afd88
+MISC metadata.xml 326 BLAKE2B ad14acf80a55c014b396340b6f42885185c7059c9b2159662d0291c9fbc4b03b9000b612d53fd2d95eb861b410d35ca301cf00bde26ea3344219923ba1fbf3b1 SHA512 55187b429105dff1f05c80cf935da48c02fcf8b00dccd572a562d75fdba50b73183d2781d67c498c2fee181707eb32e09e7e5dc12a88e7bdfa7212f916c45543
diff --git a/dev-python/sphinxcontrib-applehelp/metadata.xml b/dev-python/sphinxcontrib-applehelp/metadata.xml
new file mode 100644
index 000000000000..5f2f3cd24f8e
--- /dev/null
+++ b/dev-python/sphinxcontrib-applehelp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-applehelp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
new file mode 100644
index 000000000000..3cb06e3f8cc2
--- /dev/null
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs Apple help book"
+HOMEPAGE="http://www.sphinx-doc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND=""
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
new file mode 100644
index 000000000000..b62bba7105c7
--- /dev/null
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-devhelp-1.0.1.tar.gz 14016 BLAKE2B 4b8c079773d65f5fb752870dc728d8e90e03fdd2f8a4b01324838928ef2deaf2c724c0b149697a61624ea7382445e81fe261ec2b726fa3cfb5547bd053286e4e SHA512 135d6405e330cc245391646d4055988cf762d82f6473e58c64a76f3a88e7f33a66baba366e7f29e1378320bd0c374af92b0f972bceeec8c05ad0fe652a81e984
+EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 760 BLAKE2B 8aebb01d04952eefa7daad168b82ae27b4e87d337b897a07e9e58c1c2751fd65a0fb450cf1b92286d035b8850450c84dcc80f1a5b23328913bc6b1abfee197a0 SHA512 fa90599bd81f7ade52a7c9e870aa227b30e4d822352a0b80581dd398142da11080fb116524b1ceda7c2d3b258197db11975b42a8a0225784b0b80ce4299d45fb
+MISC metadata.xml 324 BLAKE2B 986204c86559fccc9a83332d2a443367be0d3f6d58ee2f50d5119688db2c3bf979aa14ad41979bfe0cabab649594e6d69e83c592a4d883e6d14b4840d3dcdf4d SHA512 d4f768df06e1c208502e7f87ec3ff4481f07ff84fd77721a5afc8a7c3bb7804a17a6a5798bc056e384d2ce433954790403c0d5d5cbba459ce835659bf8072a53
diff --git a/dev-python/sphinxcontrib-devhelp/metadata.xml b/dev-python/sphinxcontrib-devhelp/metadata.xml
new file mode 100644
index 000000000000..56e1912641fe
--- /dev/null
+++ b/dev-python/sphinxcontrib-devhelp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-devhelp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
new file mode 100644
index 000000000000..be40fb0be2d7
--- /dev/null
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs Devhelp documents"
+HOMEPAGE="http://www.sphinx-doc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND=""
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
new file mode 100644
index 000000000000..0bf59ce5ad03
--- /dev/null
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-htmlhelp-1.0.1.tar.gz 20448 BLAKE2B c7e8cc306f196719b60f4ae8aa678a09d18f7986529b71e4631b99a14d4631b00d9f59766f4d96eea1f16e26adc3e0998295b766886def705be57adf0016ee2d SHA512 a364a490e5043e767a8b498b5b621f3f3c64bf15f65847097489d3d2ba8620adea2045024d5189a68d97af6f68161f714f09a712cdd9fc6d06524ea818cf2e1a
+EBUILD sphinxcontrib-htmlhelp-1.0.1.ebuild 757 BLAKE2B 46a80ba87c9d62131bc8736d1abaa53799918f8504b6b80b1cdd8fb5cdf62027274b17b46583c201fdb6e4ada727696f9ee9b465f7acce8cbdcecea19db0d3c9 SHA512 5f710273958986fe98d840cb794fedee12b772083ff4c3d21d0b0a66d521946fe02980842f7e5290f098c79b2078a604ca201fc18c335364b231da687af400eb
+MISC metadata.xml 325 BLAKE2B 86b320327210716251580bcde7ca53cece58e22f07973de023d09bb7a6b68cc4e4c4cace4c9b8ba73f15482332e3b94e38650468fe790e8f6c123c77b9f2ad48 SHA512 700c19351b017fed0536e0e57728b410052b2c34bf06912aedc754e4f931614f3f4b31a10bb67381134c9bd5f61f9af23f204641e8e531ec0ff9a6c1cf9eb41f
diff --git a/dev-python/sphinxcontrib-htmlhelp/metadata.xml b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
new file mode 100644
index 000000000000..0cca313393e1
--- /dev/null
+++ b/dev-python/sphinxcontrib-htmlhelp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-htmlhelp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.1.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.1.ebuild
new file mode 100644
index 000000000000..ebec7800e64c
--- /dev/null
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs HTML help book"
+HOMEPAGE="http://www.sphinx-doc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND=""
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index 75d3f452ca33..3ca5775acafc 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-httpdomain-1.4.0.tar.gz 12192 BLAKE2B e4250a3814448d87255a6cef4fafb9be86bec1d7670fd30d2988cdc0c8d6db67fd18a1e9e02588754bd03ae7261806ce1d79d7bb8d94f47f2e2086a6897a67cb SHA512 85d4d0898a1703a1742755814200253b875795b5f267b08adb00c7d8d7c15c434718ce0f93656e7b698df89c958a9f6f3f3403bdc6d08f6df322fd80371f1d70
 DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 BLAKE2B ca08a5cdc22d9898c6972ce8b7585fc4f185e3a0c8e49302bfafbfc88b4bb69d9d3deaf15cca2dfcd2f218199f509023aeb542129fea2003cecb2e8ef8215fd4 SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a
 EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 635 BLAKE2B 7ff1482e4a3cdd2b3ce688f204df3b2004fbdaa5fe2df38e44b5736df7c6099488db31c0687663ae4db4de48c94dd9006a5ae57664fa95d551026e091cdf9c06 SHA512 6f6d76770211508f9f2ea5a8a31bde0b238cd1c1644415b6e982bd85bb884703ca45a463eac2fa2108e5f359f7123f8984f163a2a7e203baa0b6471d6d5b60db
-EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 811 BLAKE2B f1738bab2b5bd8d86d541f5780315fa94d8d2938355c3fee91dea7ebefc0f7f11d9bdc856746fc514974bc6f7dd28213cc2e0a4261c2d28956165471abb8a8cc SHA512 7a33707db9ef577791add8150af8f5ce767cee6908e4d05ff71f8ef85443148a6107ac71a2d8325c3a267c17a5caf11c1770e249a6df79e89409c354b98b678b
+EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 815 BLAKE2B e527b99a458c7f284b8aa2d7beae839267ffc4917203630c66e613718410ef70fcdbccffb3921c5df7235a0279de95c8224a09a7557bb258c491f19c9281c2ad SHA512 4bed3aecea7010e3be54fc685f6cbf8f7a10c21eb305bfc2658159a5064f46e0d25320b14af98e6716a53899fe7c4dc4c34264dd0e5b319c56bf5dbdf7b5a29c
 MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
index 632c15f40f81..ae5b16a6f800 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
new file mode 100644
index 000000000000..5740b8f42719
--- /dev/null
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
+EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 778 BLAKE2B 29eb657eafb07e3a9e481430ab437391ffc15c5c878b0e29082f6091ac54211b082f46b15e9cb495a528cd3618823f8ca7cce7f6932861c5634d34bd647b5c4c SHA512 eb92213b8e1517bc5077260cb7ac4ba170c46103c137f24b4af7ca860bf523039abdea2eca6958c5e9ac754b60267a7c0c95525db14e2a80a2d54c773bc13361
+MISC metadata.xml 323 BLAKE2B bae56c440e079dcb99602f6e513fb9bf5c2415292f4c058e9da93fca5c14e0048789b1f9c1000b4d83cc37bc08d2fb3008898c2417a819c1128d1efe19e46414 SHA512 03745eb2d0defdb73cfd778eb7ab217cd839f9f94ce7cc1ef70c75c326cc0ba94bbc745624f8adca19e9049a332ca57c0951b0249f8a21b95ef6015ed6f545d0
diff --git a/dev-python/sphinxcontrib-jsmath/metadata.xml b/dev-python/sphinxcontrib-jsmath/metadata.xml
new file mode 100644
index 000000000000..a04c6af16897
--- /dev/null
+++ b/dev-python/sphinxcontrib-jsmath/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-jsmath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
new file mode 100644
index 000000000000..965bd8e7c11c
--- /dev/null
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which renders display math in HTML via JavaScript"
+HOMEPAGE="http://www.sphinx-doc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND=""
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
new file mode 100644
index 000000000000..cd6b092bce55
--- /dev/null
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-qthelp-1.0.2.tar.gz 17804 BLAKE2B f3d6a67469c82e2a6e90b75d506ee3faa896d8ec408d60f93f74c8cc4bafb22772f85e36c286a96cecf2d7808338da233910055404969ef311f935173f06f376 SHA512 8fe840e011fabd596194f539d27a502b77ae8a6030ae1a7646b1af9f203d3578b7420ead655297b2a752f0cb0e6803247c7a79b2ccd2d4662ed9f58398947864
+EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 759 BLAKE2B f82067d5c20003acd821876189c986eacdc4077676c622da084b747fc60e78c8c599e1bc47b6c93e240efdbb67b71531e0d2fda17276703b994a27ea3f0ea9b7 SHA512 6cbf4147439ce2df18536ef6d6bee076f93c891436648c9c37539a599608a42278576601a889d5561242cef537043e29eb45a51b6ec82083db95546f8455aa54
+MISC metadata.xml 323 BLAKE2B 958abf4a10551f32a30bf4a103bf38f001d827dad8f8b7c0d737cd8d6cd5a1a7bd4bb0de765ef457875bfedc913a9303fbb94d4f8f796dd6114b1c15a3849b3a SHA512 5b1be7c4599df98adaf5c3b08b078cd15c207957c5e8e7025181be66f09cfe3331b0e1c53404c10041612c34e3cb0af388f1b1c34e3e508b609721c617dc89d6
diff --git a/dev-python/sphinxcontrib-qthelp/metadata.xml b/dev-python/sphinxcontrib-qthelp/metadata.xml
new file mode 100644
index 000000000000..a830ee0b076f
--- /dev/null
+++ b/dev-python/sphinxcontrib-qthelp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-qthelp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
new file mode 100644
index 000000000000..e9c1a10e87b8
--- /dev/null
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs QtHelp documents"
+HOMEPAGE="http://www.sphinx-doc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND=""
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
new file mode 100644
index 000000000000..143aff3855bf
--- /dev/null
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-serializinghtml-1.1.1.tar.gz 15959 BLAKE2B a91ceee8fca73853220c43951c69b983662c35e420b502ab76ebd49dbf6587c749998b8c3440461d64de02de2a22a34f92279bf8ba739534e72f258da5d3bb43 SHA512 5cf5e4364d415d001c894de8d0983d9e20e5a65d9df39fc59a4e9db3bfc4fb2f688e7864c7228f8f1593f2d486345dd7497072e29726dc10164227384ece598f
+EBUILD sphinxcontrib-serializinghtml-1.1.1.ebuild 772 BLAKE2B c3b44b55953737ed04de258c1cda70e144e7f9f689fdff61f5e4ac3bd029ef6c2a0c9e5fa59b8449696c6f2bedb0efd610a5cd9f207c60d897717d13d00b5442 SHA512 56a223122165ee95e2817081ce2d16421dfd4a4be2ce26d936a50edbdfce010a66c94d353bc5f4299bff5ff3a802053f1d9d94fb067799b443d71c3539dea1ec
+MISC metadata.xml 332 BLAKE2B 899af9aa52c89389d9e459271ba959cef6ef3fc63701e3f0926fcc9bf93c548364cdd2f0b821e167e64ddbd0149d36b75faeaa40abb53bb83d0cab1a8d08247a SHA512 f50027d55de1b3fdc6afc87b99b2f043378cfd2e6993accd208019a84416f7d32824bd0849a18a185db739f0bf77beee794a7b3a7e6430cfd2af71f3c011e235
diff --git a/dev-python/sphinxcontrib-serializinghtml/metadata.xml b/dev-python/sphinxcontrib-serializinghtml/metadata.xml
new file mode 100644
index 000000000000..7d1ab6496a5c
--- /dev/null
+++ b/dev-python/sphinxcontrib-serializinghtml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-serializinghtml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.1.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.1.ebuild
new file mode 100644
index 000000000000..c76dbcd0d04a
--- /dev/null
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
+HOMEPAGE="http://www.sphinx-doc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
+RDEPEND=""
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index f83dc22a44b0..3b3a84a92e1d 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-websupport-1.0.1.tar.gz 590480 BLAKE2B 1be40595094233ca2ddb1a367039320fe6655b1a6bbf251d7722b60efe0d0cfbe1cdb38455f47f4fb6810500e0e4923f5a9a74df4f79d1544261c4706a59e8fb SHA512 67807b2505e063639163b020f0e62469b0c2838c303516cce9a8d90181cc7b8a10d76532adb1267556d40f95966efc20ec9f8ee1a6731056bda827a6f97f40ec
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
-EBUILD sphinxcontrib-websupport-1.0.1-r1.ebuild 1161 BLAKE2B 6841ef437c0e54f5c01ef473178aa3e6af58c331d97343461e9ce5a8f52c2accaf9fca06154232a8d36db404b474b4de2cc2cafe0e0f9417c46a1799d1438d22 SHA512 92ed109f52211a8f0127ca1b82448b49221102a364d601ff31194c8b277ff0b85d7eb59034d74239f351ab16e5fe10e5022564e4608ccafb5b34165ebc49ed02
 EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1162 BLAKE2B ab6a8c0dea3d3674a6e51b3b160e2d576a4a8dca4f44c93828b233767b980c20b131ecba1a5e76528e3d9e6238b5dbc3fb315a85fad11da9b6e68f7fa67a813d SHA512 de451aaf3e957922e4a315f8c8eb866a8b7e32764f8dac57c8bf874dd07ae6c5712fae775a4f7c72c4459669f8aef1da38ce0a986df62385ad333f60e93cd0e8
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1-r1.ebuild
deleted file mode 100644
index 0cfb52983d55..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="http://www.sphinx-doc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-	>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		${PDEPEND}
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	"${EPYTHON}" -m pytest tests/ || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 7db250852700..b87e8caa5771 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -2,6 +2,6 @@ DIST stripe-1.84.2.tar.gz 213050 BLAKE2B df6c195a183d15bdeb7ffbfd2f5683b0b667e8a
 DIST stripe-2.10.1.tar.gz 218299 BLAKE2B b1d836ef92dabfd5a5f292ede69264886dadb0b87b72927e444d615e9f0518efff513f34f2aaee778921f7cb68169f7981a5e84993b19221ec394a1d5c07c622 SHA512 877a87e848d425f333ad3e40c172010a3b1882de0894ff8c5c0623f5d09fbd7ab51d9d53ead8773d3680cdab8d07df32f4210abc08c796adf6feeb4014b671f7
 DIST stripe-2.3.0.tar.gz 213813 BLAKE2B b383c724331d5ec21452aee2eee49c789e2503057c4648d9e879fc561b87cc70ba918bb1e620db3bca380150e62d41433f1bfa7f9b6f164731d3d68542d5f056 SHA512 ba88b18b7328d917379d8474373a1f87717d67cf305022b80eb05c74b8055b825cf30cc879c4e99dbe06dc99f03464649e637d83d70c902b84f5873dd0776453
 EBUILD stripe-1.84.2.ebuild 457 BLAKE2B c75936fad3114182081bc7c01c1368e77f85fadc9d8ff52ec491e6a3b241831fe3f2debe1ab66083a4e64937c0038a27bef835653adf51562ee7f2463c0561a5 SHA512 e6e5efc654d511290c041dc3ef8d3e4c09966456fa2f398f23d36aa5ed05a9e30572a88502f67f52ac373c7e9a90cd7c2cf00f9cfa74112d1630ff18f859a310
-EBUILD stripe-2.10.1.ebuild 2069 BLAKE2B 79f0451d217ac0d3116b0cee6ec80b0a5683c32e37756aa176631133cfd1a3ec0f764fdef2fc09519282cf72ce9ba18960f3d186ce576f007cb63a569d358957 SHA512 1fa4ec467c10ea447b41acc47f227627336f37b0b9eef38846aff2ad1ff8644fbcd8c757eaf7dd7fa3c4e9d4a712cde2de2327eb0b9c1c209e02131fe5f170a5
+EBUILD stripe-2.10.1.ebuild 2180 BLAKE2B 35a9a57cce79db6221f5c05d41ff0d97d37f93d3457420716567226ff62992431b7a3ac200f17fba18652b3786e92db6ec57a9739680d3c5ed457bc3a7d1a1b8 SHA512 d2d6eb08873c48f9fb5bcbaee733c70790daf70db165dbbf11b944140d10b1547c910a83b4ebcaa0bdbecdecd239b4a5403319df3e5e680089a7e0569a8362db
 EBUILD stripe-2.3.0.ebuild 484 BLAKE2B edd8bacf2c513a941a60632ded6876bc11e141fb6ebcabf64c32ac5964c3c53ad26c8ea53c0d064e978d6e5dbce6cddc1b1048698a8016469b441dc35bcad435 SHA512 4ba5b6c40fdb73f708a20c1b7fa843741311ecde00bccd9cd720c06fdfd4bfa5d700ed5b686df37b6b8c558f4c0b066144220529bf2523c709d5bb24b53c1d53
 MISC metadata.xml 539 BLAKE2B 9232265d094774d1f04cba8e358a9655034184c10561bb8db4f8188381fdf7583971f67d5418f2969ad4a12db46a94b4c87c3eb9486eb0ac251fad9bb68f7707 SHA512 f0052ba8457139d76ddce67313bc973564237b409801d3d6da181c495c2d80184076cbe36468850a1ddcd60de50327e728fc3433a8a4bfe9608713a33fdbe9c1
diff --git a/dev-python/stripe/stripe-2.10.1.ebuild b/dev-python/stripe/stripe-2.10.1.ebuild
index ebeb82c56f04..0365114927d8 100644
--- a/dev-python/stripe/stripe-2.10.1.ebuild
+++ b/dev-python/stripe/stripe-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,9 +21,11 @@ RDEPEND="
 "
 # See https://github.com/stripe/stripe-python/blob/v2.10.1/tests/conftest.py#L17
 # for minimum required version of stripe-mock
+# Running the tests against dev-util/stripe-mock-0.47.0 resulted in test errors
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-util/stripe-mock-0.33.0
+		<dev-util/stripe-mock-0.47.0
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		net-misc/curl
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
new file mode 100644
index 000000000000..ac87318bce68
--- /dev/null
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -0,0 +1,3 @@
+DIST swagger-spec-validator-2.4.3.tar.gz 19636 BLAKE2B 3805aa8663d141898e5106ad98d9aa0c697e87a474c0446151b0a6210684c8a0afbfa7a54b44e9aa7c4257c5e9f8713139943774bcacb38105b21c4cfe46492f SHA512 d785f1d9f2664fcf4f62e2e2c2adf9e17d7844e6febda69bcb718efa5f951ddc0496c7e2804e4269750a15f5b5c7f6cc11fac0f99363f7eadab8cf1209d152db
+EBUILD swagger-spec-validator-2.4.3.ebuild 594 BLAKE2B 77682ec5f93d052369b181531e462196f446ad935095f188293e5f19d7a7151b43818b1ba6c1bb47c1e8ef3aa6c22e5d73703ea321dcd47ea6d685b6b35a6182 SHA512 4cec0d281a484a85a80d3a6d783dd2fb366562178fee3d45f5e48e949aedf5cb1848bb155560290a2e7e27dac40669f3a2ac59b9075ed1bb9cfdf5b8b6b97a4d
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/swagger-spec-validator/metadata.xml b/dev-python/swagger-spec-validator/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-python/swagger-spec-validator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
new file mode 100644
index 000000000000..1901a52e0a88
--- /dev/null
+++ b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.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_6 )
+inherit distutils-r1
+
+DESCRIPTION="validate Swagger specs  against Swagger 1.1 or 2.0 specification"
+HOMEPAGE="https://github.com/Yelp/swagger_spec_validator"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index e27787b8193e..cc916d668505 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,3 +1,4 @@
 DIST tblib-1.3.2.tar.gz 26958 BLAKE2B 5c50f6b63b45f34f35843d9e39f03493715e19304804d38e134cd63621d1b72116a84d1403e25a4681d84568dfb87cba2874eaa10fccff6054e121aea86f88cd SHA512 c04d204e8dc53c87fecdb484162488ca10b509341ad030e67300d9c3ac61d298888dd56c1cef8318bcf13d90ccd5633520d75ab45dd0aea8de29ba7317adacce
+EBUILD tblib-1.3.2-r1.ebuild 443 BLAKE2B d80f5ce1ef3ba34c9f965ba87de28dc3ddf0a58900613004585b857bb1718ab4c80b64bc550f2ffe5e39d2d6f02618cfc1837dd1bab4cfe6740d25642c228c69 SHA512 9bcfdf7e757a762c4ee1fec3153de1b1961506c8d53d8289b914cdf3690966365d12eda053f7572d4905b7f095cdbdcf8f2eb775c40605f76000474e1a04efaa
 EBUILD tblib-1.3.2.ebuild 444 BLAKE2B 27af4d3e5d8a9be0004077cd5328dd423480bfcf2359da01c6b1eb5552c089d5b40b66915de8c11f89632d84ac24f587e024f0aca8018d0922a3de6cffbb084b SHA512 6ddf7268fd335bd17890bd13d6c64aba63c03fd09bf8146cf7f21ac2d8de5201754d47a17c8ff61e680a93412667ce3c1c4067109a97bf645c142110bc37edea
 MISC metadata.xml 380 BLAKE2B 2d2d82601724f6960ddd56f2c45b5e85c30bf1366c6bcfb6b6810e885c87bf974c7dae1cf0a4d01a5bbfcfa9c5b2bb8aca6460047f549786527b5d1742b315c2 SHA512 649b0a9457aeb0b3e211e293305a8bd93f0ae1c91c5c31f2d7d1d94c55eabff5df4f7bda64c19d07b216778cbe7bb68dbdaac3a06d9a627a06b8f205fe818d40
diff --git a/dev-python/tblib/tblib-1.3.2-r1.ebuild b/dev-python/tblib/tblib-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..8f3c3c637556
--- /dev/null
+++ b/dev-python/tblib/tblib-1.3.2-r1.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=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Traceback fiddling library for Python"
+HOMEPAGE="https://github.com/ionelmc/python-tblib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index 2a499ef52d4b..7c7d9254bd7f 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,3 +1,3 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
-EBUILD termcolor-1.1.0-r1.ebuild 485 BLAKE2B 7321d7bbb89b377775da406a51fef37c23ce382fb4a5a14b83621320c6a5644bd1b165b1ecb58e1d9f03a438cc67c2acc30dec1ce1627edb422e2ea762cd4dac SHA512 d694d99f8158e3387f1beeabf7b50a71f324e8d54e42a1475c0365907a3a52249c63fc1b77acdcd174c010bac799900755af04319217d14b558b42c36f9ee912
+EBUILD termcolor-1.1.0-r1.ebuild 484 BLAKE2B fe4dd2c4d6e89300e4ca2d9d62956667e029b24e407f7067939799ee0e3393066ecf009bf30ed71def41b4edb3ed98eb4afa1613c123ef321b159a94a8f4cfd3 SHA512 2a5560d2314c9b16cd55cbcf9aa0892f7ef0365fbb47b7e03f29dd96b7abea054d5b9830bcfa2f55690e0ece66e66c4ab8d0ebb4ae621fbe52d93c87d882d2dc
 MISC metadata.xml 545 BLAKE2B e11f72c21c60624a387abecb92db37c886f2e5f7f5744003bc9ec1b3a33e50a3016178126fa60cc626926c132cb3690f7155b3c2e4a65227930e4e0342e52ce6 SHA512 475cd979340760bacfeb70aad2a0a046bafa5f1b8595a897d975615d4755c1b89f511f952d29af8390610fe445a03f3edfd8771d1b217d0258eed5f9f042adf0
diff --git a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
index df325afa8e37..bec6a6b64ac4 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index ef5c7c72db8a..e633f573d65a 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,4 +1,4 @@
 AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a26b1b8fa795472622efea1afa6d5df717c10fbfbf106180d1f6d5f8822350d9605de41fc7db9e37a7b4c7b887df9 SHA512 c27c2dda320d2c16239eb498b2f59f85746745ce1875879a17f41235081983fd1015f0dfd182c6823b998f85aaf460486a3ac6d955be969487692ed50c5648aa
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
-EBUILD testpath-0.3.1.ebuild 1082 BLAKE2B 80a5c48258179db4fd6a45ea5a929840b3f3ae6bf8294820135131688bd28a4cace3102264822279ee86f5417ae8770767da26ceb5f7ada7b1789b6cb6a0e198 SHA512 db220db5afc6dafc49562707945e456f1dc04236e4f631e3af5f53df83721a2c590db737d2e4dd16b599001094c62793c4313cdb35b15560a1a0ffc79bce1d6f
+EBUILD testpath-0.3.1.ebuild 1084 BLAKE2B fb6f5a3d1a393423b8965e26b159e85be1b41634af09a33a64379ffb48cce0867f0bae1b563eb3478417101d9d96e37d960b3c60b1a3d9432982ff75643b8da2 SHA512 74365432aad9a4b7549626a71bddbcefc02a64b09896cab79fcafff6ecda764fd5ef1bce6dd7ea279e37b3e6f2f5e4e5c835bee8fb2a7efea5d562d0094be24f
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
index 14874dcf51ff..c879fc3fc78b 100644
--- a/dev-python/testpath/testpath-0.3.1.ebuild
+++ b/dev-python/testpath/testpath-0.3.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 1b12fb77ef36..243aaca71aad 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,9 +1,9 @@
-DIST Theano-0.6.0.tar.gz 1763756 BLAKE2B d5eddeef1868f4fd6946b2067d0c7264f699650a79f50579eed4e768b59bdd02d81cfbbcd29b6aedac28d7bdd89ec1a6dfabb97b1d203bf8d61d6cac3ce7ae1c SHA512 6333c673df809bed3af952e0759cce4878ed21684367c6eb20e422363c7c5696ea59239ff6a448c6a32771b1069d441b0e3d049f9708ae69d790412303b8ebbd
 DIST Theano-0.7.0.tar.gz 1985387 BLAKE2B 00d547d5d1f6bb4049a1db71442381ae3803be683975ccca7536b8971e066ac1d09a4fc93a7f70693ae052bbf681e0c59a8b30a326f862f870e10422b438f979 SHA512 6e6bf9afdebf3c281d71f5ceda73792e0a52b403b18776a639665767ac73ac4920b5042e29d656d517b8f023e5f9cd5a27086e0456dc40c42abf6f3569da3f06
 DIST Theano-0.8.2.tar.gz 2914631 BLAKE2B d136630d689101e9ae47984cd13289b03943276ed0aa606478169d4334a302448f5a2c31d65b1e6d571648772d6f0760cc004f2eefd86d41d72f2b0270017763 SHA512 d7bad7ed4c9453470b66df2ada4587fbe9effc134c0604d11576630a613568386d41aa7dd4a77f8b7a1eb6d8a2f76a8e809b1ac3ae18c85a0c55ba4a059b865e
 DIST Theano-0.9.0.tar.gz 3116713 BLAKE2B bf38d3c504909caa7aaf8e704a6afc86ab56810199190a0a6beb86ff5e0f9a75c8681dee1f1411ddcfa40739576e4d725c2423e74a32e796987fbd4b09ffde76 SHA512 e0e59256d2442f929fb120b4b21cab735e0a8ba087c4ea7d7caeabe8fa30cc19a46181fe1b4e268e778344fb3506eb20d8090dfc8d2a499c1bf84b07352686ab
-EBUILD theano-0.6.0.ebuild 731 BLAKE2B 9a9f133b2f645a2b7f30fc70745aab5b2cf55deb3168cb46027d0ff5d8f750a06f2182fd9787e976a12cf5e378c876fb839e895128adcfb0217d32027335b7db SHA512 54e3bc7f4dae23ebdd850fb26bf43c8f69a452c3b06bc1a4da1b6f133a95856bb2208f410ed2d3497c943c19165595620c9493b7c11ca928502bed737de0ddb2
+DIST Theano-1.0.4.tar.gz 2840691 BLAKE2B 7f89caee3dd50d75ff09693fde7926f2b7da0f94758ef932f207feea29d74d38ed56591e6ebe0b46cfa043d5fb46d5b97028171acdfd324a01eb7b904169b4ac SHA512 3cc7f9dbb606c3c997c8651c34dd861721d5a8b99d06ed0887306d5a5ad0d7e402fbe29dcb5ad2f513b3bf75966e41a2854ebdf9a4fb212607345f84f367de8c
 EBUILD theano-0.7.0.ebuild 1005 BLAKE2B 934cfe616a4ecf858ea278fa26c71c39655310d1377e8ec4fd57ce7bb642004b861d75840e238e04e238562cd4c86d4cd5a2f960b6f0fc566bc8e7562f473137 SHA512 5d15c8eb54bc2a6db09e5f2279b54526bcce8c07041808d6a021d41200fce309b3aa430c95702d1e5d6e549102070489c36498bde0ae717d93c301ef868107d0
 EBUILD theano-0.8.2.ebuild 1325 BLAKE2B e7b89ee6c43ad06ed7d99e34c5f4594cffd2b03f41983f0c63f210f272b68aa5dc44052428f7d90eb5953a53c8bf562d3adafe60c75652723aec88a9a6cd7f07 SHA512 763f07ed681dea61836b5d3c0a35642fe6bbd8334091d6bac5d9016ed0c2287e60e8235ec2f390dd1856879756b0d7c73b0cdb0c82a01f983415779b539b9836
 EBUILD theano-0.9.0.ebuild 1326 BLAKE2B 0c895d7988fd60fbaa48e1e38a93a32eead802bd582d3041f98df50d0e45d565ff9c2bc7c68228727fd0e53301e7d4f408c8f3e0dcbe6e03bb85c0607f693622 SHA512 de28a14628e8127185f26b1b51a050c6c5dfda457cb13752ec9036bc61109f6c831a7a88c606147cf0a118b705c448f50bd2d0c7fc26bf030fa0fc73df3e5f4c
+EBUILD theano-1.0.4.ebuild 1287 BLAKE2B d47fde8e8bfff99c4ad24c8da2edbc453b6ecaf6835efc2f0b8b1ecbcff19f44c002fffbb11043b9b2202268768c1997a558ca9f394d668163e5f6cc26446022 SHA512 bc37a94769750591801145ba877b42b6a9b878ca794568aebee386bb9f9a722523f867d6a642b328897599122c598e75344199b566c33cf3581e230f7ff97d59
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-0.6.0.ebuild b/dev-python/theano/theano-0.6.0.ebuild
deleted file mode 100644
index 04aebf32abcd..000000000000
--- a/dev-python/theano/theano-0.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MYPN=Theano
-MYP=${MYPN}-$(replace_version_separator 3 '')
-
-DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
-HOMEPAGE="https://github.com/Theano/Theano"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="test"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	nosetests --verbosity=3 || die
-}
diff --git a/dev-python/theano/theano-1.0.4.ebuild b/dev-python/theano/theano-1.0.4.ebuild
new file mode 100644
index 000000000000..645f4a198a38
--- /dev/null
+++ b/dev-python/theano/theano-1.0.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
+HOMEPAGE="https://github.com/Theano/Theano"
+SRC_URI="mirror://pypi/theano/${PN^}/${PN^}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	   dev-python/flake8[${PYTHON_USEDEP}]
+	   dev-python/nose[${PYTHON_USEDEP}]
+	   dev-python/parameterized[${PYTHON_USEDEP}]
+	   dev-python/pyflakes[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${PN^}-${PV}"
+
+python_prepare_all() {
+	# remove bundled six
+	find -type f -name "*.py" -exec \
+		 sed -e 's:theano.compat.six:six:g' -i '{}' + || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	nosetests --verbosity=3 || die
+}
+
+pkg_postinst() {
+	optfeature "Make picture of Theano computation graph" dev-python/pydot-ng
+	optfeature "Required for GPU/CPU code generation" dev-python/pygpu
+}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 760b4de31e7d..2a67b1814318 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -18,5 +18,5 @@ EBUILD twisted-16.6.0-r3.ebuild 5725 BLAKE2B 9a2e141acad54552c9829e85cadae44e620
 EBUILD twisted-17.1.0-r2.ebuild 5751 BLAKE2B 5239f81e689cf2be429c3b63e416de7ceb720c3f24e9ea95e3e830797c05fcfcd25925198ca8e4bd4c4c634e56c74af279008fc00358b09348eb8febd2b4dceb SHA512 4d9959e6183b5c5e6357958ef6d39c18194790b39f55fa85dd683dab620a4ae788ea9a95357ab2ed3665eff1eba13495556d92aa2628737e86bee30b5c551191
 EBUILD twisted-17.9.0.ebuild 6040 BLAKE2B 4b0f32e3625fe3e11fe8c0aa9d1042fbd82d445247b6e141df9ac169694daa94a3d2c74e2e56e09fa42b392c1aa7ef082cb27dcc5e4aabd3c898f1a644778348 SHA512 cc9a56891dd0abf1b8b468fc1c93a23c8cb5d04fd6ccefd714976fca211efb08d7eb4c25bdf64dd107605822ea5454602f45864c49dbc1846838e5ee7e5d7145
 EBUILD twisted-18.4.0.ebuild 5908 BLAKE2B 6591ec655032f44da6466ae85ae90de1247b93851f4d0087ccadca34cd16f6e1938940cc790b59b81782d8d77983b09db69b667ac5d1db52a700cc8591ae1f05 SHA512 07bb9eb0bfa661c90190bfeaf8887a4570bcba31e0e1b452c8d05f962e44b4d9e08a681c6cbcdadf2a2def6d0651d8560eb33bfa0f8b459a61a488c5c770df65
-EBUILD twisted-18.7.0.ebuild 5972 BLAKE2B 24d2791db98100eb024e3bedd18de111620a3a281a94f735b0cd2595c87e04584a202e227ebe22f9b6ebfc1067df3b26bf9ffa385c2433890cca509920bdc780 SHA512 b840467de823bf335fe356ec041a8cd3a2811b9abee36646daac1318f02c3d4183b6c89ed39c70a980e6aafa12ca02165d4f10710b03a11f99f6d456d6fb3c15
+EBUILD twisted-18.7.0.ebuild 5985 BLAKE2B fdb4d726bea7792127bd849e3cdae027b70e081d13e74387acfb33370a8d7243ce502baba36e6a733e4b34c5af844729605f7c7feb2d739e286180b661cfdf1b SHA512 00d53c99771abe3e03c07ff7e5b4c5daeec1447967d460bbe01b0d7435c984481e8ea9613578af784cd35f20aad7ce2c280b3d9a94c80ddaad2fb1af5fab8a4d
 MISC metadata.xml 1429 BLAKE2B f6bf7279da38a837c80fff9f9319d5c2d3893fb4a5a17d731b170153d1c4e10479b58a6576d84fa59ae653794aa017862a4fcb11bf1bc6ca85c374e3b9dc7cd5 SHA512 1ddcc6bb727f97eacb712badf834ceca15a4544e340090622774bc0e781f2ce1a20a96f8b5018535998e9865204697a25ab84eff87c480246fe14e39ef9411ed
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
index 6e23ebe62d4b..89733dde61ee 100644
--- a/dev-python/twisted/twisted-18.7.0.ebuild
+++ b/dev-python/twisted/twisted-18.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 
 # Dropped keywords due to new deps not keyworded
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~amd64-fbsd ~amd64-linux"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
index 13dab0ad1a06..cd8705c31d43 100644
--- a/dev-python/typing/Manifest
+++ b/dev-python/typing/Manifest
@@ -1,5 +1,5 @@
 DIST typing-3.6.2.tar.gz 78726 BLAKE2B 80adf3cab2c37ce36bd33d14e475ed07918ec80ebb5bc68a820abe06dc862fe6b38e1a90f9bb3d37420b311cb4a32af871ae2ff72807daa8c1a334b6cbbe4d2a SHA512 a975980e7ba6ec3e15c938336877071785bec7212443da079770348ab9441c8d918cd806e85ebea8af66a5d94f684566ea07b55e7623ab11e7d922c8c3dfe981
 DIST typing-3.6.4.tar.gz 71347 BLAKE2B dd49919595698347ce4b1004abd075409296acf11e10dd6ae0697d2bf94dc9d1cebedb2afe454be95eddb80fd0a60aebe14ddadc8df8de86545dd2ea05986c57 SHA512 f595e0fc395ba13a129ae45681faca7b199fd5c23e8f1573f49e2a6f162b7f2aef680306e76cbf50b978de9f047c674323219981e89c476474295bb8c02211ce
 EBUILD typing-3.6.2-r1.ebuild 758 BLAKE2B 7cae1173f907bcfa25710845633d62b7c3cc0a96e10f4a39c9fbf33bb0f544c7977f2d92a38b6ce87f37d81f9a5f57578ddc82b948435e56b957319b7b30325a SHA512 850a75ea991065142e13a09dd625bc03b112afdc1a1fde0a73f83d7685d049e2dc103e8eb5900f1f186759e8246fb64c267be62306601837fa07824096833895
-EBUILD typing-3.6.4-r1.ebuild 769 BLAKE2B 054711c2ae364ef0cb47630709869e94420289eb3befd571d88bfc6492a9a989102bb6abfd6c9b2e7c36187083d84d429a33254caac218fcecd8505bd769ff36 SHA512 701883a60400683793d4f88842df158b6b811719e64588f6c6e62a7e50da7cd9cd8d8e1c0a3e156a96e30e1563ae275e604f492b1f85bee722b3c4911ed7d4e3
+EBUILD typing-3.6.4-r1.ebuild 779 BLAKE2B 5061180c2c1c2a0e729898eafdc5118fa662f12cec9b231e4d68405730753bfc21542102e591cfbb9cf3991b21fc4eff1d3bee9bff43ae71e36de41b993ef16b SHA512 71fbca181f0f5c7cf3e18425068e8d193e4053bd7b5686587a7deddfb829c0c07f4d1ca194c9153a24bf16681ec16b2ed02ea0f04596fde8ae843e5bc02b8c60
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing/typing-3.6.4-r1.ebuild b/dev-python/typing/typing-3.6.4-r1.ebuild
index a2f4c6da829e..a26a46309d6d 100644
--- a/dev-python/typing/typing-3.6.4-r1.ebuild
+++ b/dev-python/typing/typing-3.6.4-r1.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 3de5274e809e..c677b31176d0 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -2,5 +2,5 @@ AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c2
 DIST wstools-0.4.3.tar.gz 148878 BLAKE2B 96b1e9dc0310fb0fc5515a7c061f82897e2ecd1b6187167b57444394d1e64e8f63e5db011d77c80b5fe6df2f67fecffe82f861fb761190c6b3248346cd9f5b5c SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed
 DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
 EBUILD wstools-0.4.3.ebuild 593 BLAKE2B 98e5d6f79a1a2425d4ce2764f9e1739510d15f9bf8849516bb4b5278a783fc442b868911efbd56f353f9b80de727cbcd669f8280963a3f0e2454d602fb57c0e0 SHA512 046cff4817e5440376ec2f47c1be6191e63b5fb4e7dde9ce26d232b55f2070932f77cc493678cd9da6d5e8351970775cbfd175451d5d36686b9cd6709c11affe
-EBUILD wstools-0.4.5-r1.ebuild 809 BLAKE2B e4fa19cceb0e119d31622df62efb824d69a8e314fb9241334564e1146296c2b06e04ed5d07974ed7b54939f9738f033200a7dffe0bcef69788e9851245d02c31 SHA512 b0f78e88a0069c9d1f2afd3cbdf59b5bb33660efb3b9f405e867b3330c11c301bbf65b2c6479e73756241f1525e5fef53cda47426cf587517dcf0606cd3ea644
+EBUILD wstools-0.4.5-r1.ebuild 819 BLAKE2B 67ddfd6c54001e036ac327d02b112215e9d8ca3990a78365fd60a5c437aeff815ea3c9310ae60c3a3eac7ba2a26e552ac3f91d0625458c0b86b71f995fc9adec SHA512 139f8fb649377e144e370bb15a31b9445432afec0510112a63f42a8206dcb14530608872c7d9f26ec63129d17b645f237a0e2493606ef1bc511de881320d2e80
 MISC metadata.xml 376 BLAKE2B 4bee67bc37a09d4b34b1f67902a820f63563f87d9771eb462eb7f098955806e025196082a7e6c118e5ab0638c7ee70d1a63c8183f607d1ff9a26f1b0c16d5206 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
index ee485d999110..4d7a6f84833f 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-r1.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
@@ -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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index e5f140393589..5cc27823c47b 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,5 +1,5 @@
 DIST zstandard-0.11.0.tar.gz 641440 BLAKE2B 291db5ecb798a186aaaa0779e2972eb3889cc318ba7a99f0c40988676556bad8c6978181fbe5f797e9936615f965a8b57e711ed99ab2fa761272797a340bffbd SHA512 96e6faa3c31fce59379e037e4e7789b91d1608703ad8540fc8fe3d249ec65670377f2c3233ff21d7ff90a1478ac1fbbd2e169fe2d798a6889a200d71540f75a7
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
 EBUILD zstandard-0.11.0.ebuild 672 BLAKE2B 0d800dc702752f2e0b23cd111792128b6ab88cd93452a684c21f33f560cef745ab19777f94b3bde8d5f5e25ae1ad90c1659a827061859ac1f1f1b958bb2a7b5b SHA512 1e93dfbad29a44096e8fef13936db07a18018520c20125407ca3dce500accf29c5118167c4ee3870c8485d9d868335b5172e71c44866eea7363ae5f45f29940b
-EBUILD zstandard-0.8.1.ebuild 677 BLAKE2B 0803bc537427e61f68de40e85fa8e090cfead07a95cd952a8988eef2f75698fb40d24dd39c1290a6a5dd437c48fa9783cf71fbc3b2bce5c2274a9c1b0f64848b SHA512 d65bcb826491888c2ac8e1b19c575ac0c9a045ada5a32d3be1a31d2f03bffb747780609e26e0fe6928c3aa4e59c5549e5e25b68b5a0e5c9b92debd02d61d88f3
+EBUILD zstandard-0.8.1.ebuild 675 BLAKE2B 8483de2b94ca28fd4f01983a6ace52a019592ef815770c7b1b1354506051082129d32f1b57a1e27f7d9f37269f31506f0bf3f675f0ce4e910e02ce52318e0411 SHA512 da03ede700b9a87b762442383f764ed2e91a0350b3ef6763e00d0b3ecb4fd5b29d87ced8fbfb1392b7cd3272d9edca54de52a9c4558ce0ecc2b91711a690e989
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index ff88d766b3cb..2221ec5851b7 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
commit	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree	c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /dev-python
parent	0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)