gentoo resync : 30.06.2019

198 files changed, 1435 insertions, 1433 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 649fe9c667b5..b6af99136728 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 4eb6499378bc..02887c54fda2 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,7 @@
 DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
 DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379
+DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d
 EBUILD QtPy-1.3.1-r1.ebuild 952 BLAKE2B 345d0a1329e3b3a265203d9d8503511c8cbccaecb7af6904c9655ff19d57956bd281c6b55c53ef3b305b1e581b1380c5769bda97f12659c88e20589df2f70468 SHA512 324d41c1c14fd3720a4f900b86c5c77a0266333a261375799dc8e95903d0403e137d0af14b92ef74b2598fb0d031bcf8dde3fbcdfaf4fe9c921ede7243d8e9b5
 EBUILD QtPy-1.4.0-r1.ebuild 975 BLAKE2B 933495d5cc66dc1282eb2b0b2640b479bdde3ba3d465d400877236defbe57466ee199d27f7beb715a5b5a9612cbf5930b97fae3a2507d9f2463839cb62b9fc02 SHA512 79a4c1fb59c6c2e937a82967196c58a6b0da65034406c94d0353fff848b034b7878d8ecc6e9a2a43bd6358bc158c6e2b958bff323ddf3d38148c181e28aab487
+EBUILD QtPy-1.4.2.ebuild 1065 BLAKE2B 57f8210658e5eb067aa5debb9fc54a36434a748be9dfbfcc048efc57a09a76a2eea075afce16a5e999b843c00e97089f26875368675aeeaea0456ecb123bd591 SHA512 2dd04914793896145b647b16536c12c9c60f9613a000541ef3d66e737fe9a242ad6d255457b37f08091ab34a4f37bc888dc9b403788fca0bf4fa4b609bf32180
 MISC metadata.xml 1338 BLAKE2B 7eee8e39324b18bd84a076882dc539fe2e18f38ec68a539ab40968a3a6023ac0cdfc6899305df0ef0c7561409ca81526d474a1154fb645dccdffdb0779282b12 SHA512 08a2e0b2d0aaecaf91bffb82dbba9d24d4b4753801610102db08c3e29b3ff51f1bd6d46f9c2a706f4b9a887be781a97ead1c753631717f82cd44080d44b67c4c
diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
new file mode 100644
index 000000000000..2675e70c03d5
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.4.2.ebuild
@@ -0,0 +1,35 @@
+# 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="Abstraction layer for PyQt5/PySide"
+HOMEPAGE="https://github.com/spyder-ide/qtpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer gui opengl svg testlib webkit webengine"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
+	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
+	webengine? ( || (
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		dev-python/PyQt5[webengine?]
+	) )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+}
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index e94895baf988..db5b9ea1350c 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -8,5 +8,5 @@ EBUILD autobahn-17.10.1.ebuild 1905 BLAKE2B 9f39260926ebd7685625abc8d7e3658b5028
 EBUILD autobahn-17.5.1-r2.ebuild 1898 BLAKE2B a738f87af9bc2d11d307fbe3633b38a1f8bdc3c1615806f71116ed2c4eb9d0e6e3f6d861c5167417f63bc541f0ac6bfab41392007e2ffa598e054e7f50ae6ba5 SHA512 aec7c1838be2a21f3ae0d331ddb78a3933fa2421257b4b52b3c015b3af56ff706f70414fe7cfca79f4c110d9366e13970154a2ce6f1a259825dd03d79310a1c3
 EBUILD autobahn-17.9.1.ebuild 1905 BLAKE2B 9f39260926ebd7685625abc8d7e3658b5028b5d95b146cce27a318daf11757f9c45d53c95dfb5595953c8486870bdff1cc6b58efaba194dfbe53bb1e8f028ca6 SHA512 7fcb18f912454a08e4e54abaca48a55fff8489a247e6fd4e2042ab8ced54df1cfcde0b393d06ab1bffa4fdd086d0a21a571400c257b9a06cac989514ec28d31e
 EBUILD autobahn-17.9.2.ebuild 1905 BLAKE2B 9f39260926ebd7685625abc8d7e3658b5028b5d95b146cce27a318daf11757f9c45d53c95dfb5595953c8486870bdff1cc6b58efaba194dfbe53bb1e8f028ca6 SHA512 7fcb18f912454a08e4e54abaca48a55fff8489a247e6fd4e2042ab8ced54df1cfcde0b393d06ab1bffa4fdd086d0a21a571400c257b9a06cac989514ec28d31e
-EBUILD autobahn-18.3.1.ebuild 2173 BLAKE2B c770d1e9d78ac69d0b71b4e7f3bf80371fdfad479ab7fc7901ae08ac05c890cdd49fd7dcdc2340c4bfabf0087917eb53a4fcfee01eb635e5444a4942a0d07596 SHA512 2dc92ac4a522652cd16482332ab08d8201c6d61489e6a8740fcc4326abfd51c638307e78bee45301ed96c03a68fc22558df5ed02722f92f13f8a4f4691bf3c70
+EBUILD autobahn-18.3.1.ebuild 2197 BLAKE2B 116f48915057f97a43a7f3839a0b6a15c7e7d1c82cea436da1cd66b7cf523625426db772972cd85aa3133f2bdfe5507fb9127574987a7a837246130a53032d5c SHA512 3b43cb3b985092ae2cb0a990648905f855c5c951af30420937baf63d3b33824d5a22f93bae90dd9001b554f802813af25e83fc66a1168ee45d05c8138c7baf4b
 MISC metadata.xml 321 BLAKE2B 2a222ee5e7e6a2a90a44b834a4b7d430938813786c7179fe3fe273456b501feba4c20da2fe3b9671092085a991fd35c736a5b64c179a08f54fddd029ac5bd731 SHA512 fd00829f66750d3d54b7bfb472179639fbe453840e7c3056b406af546acb952d3fb8d4552973a68ff0966f25bead8dfd4501888cbd68721e54207b5a7628ac36
diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild
index 2ba2f23aedf8..97f79aca94e5 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-18.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="crypt test"
 
 RDEPEND="
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index b62db184a065..8b148917fc32 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 1218 BLAKE2B 403ff7532bd738941a3d2db4daca9a7f256ebe9d095a0d914a4d9e4f802caa5bb36a41085bd651ef19176430a130132d5a7d0c4f72cbba9239e364765064001d SHA512 50194fa033d7641619a51efa9c8d12710586f3758f329eff03d4ab7679cc7923f227355f7bc89dfe098ad5518bb10cb6d5a5ad9f35f53d406874c7bbbc254bf3
 EBUILD automat-0.6.0.ebuild 1236 BLAKE2B a11595ef80ce5d9fa55e50c13e89a445b2008beb1f668e9373ebeeb4e41e203df567969ac9742dff311ead31241a4818fc1479bc4044289758d6a8b3cfb746cf SHA512 54b9abbd4446f2658b0b04ebad07fa1dd858f9aa5bd91898d9e7f3937174f9992b229b1e9e8b71e4c564e768cbab244040cc16a2002719291f1edddea51cf644
-EBUILD automat-0.7.0.ebuild 1458 BLAKE2B 6fef4a9bf3ff3e163599ee26793f52b59230c45751201f01a1e0be8f1d9bbbfd7ffd92e2e1ff49f8114c67daddf5aba1809af7180c731a1fbb171eafde0ef410 SHA512 92fb29d5a014074bfed4ff6a39acc5c4333777ceb866b04cb37820442d4c11bc6b179728f4e09ab4cad36d9c95513b7593430a3945916150ec7cf8bedbd8f333
+EBUILD automat-0.7.0.ebuild 1469 BLAKE2B 82affd4de3b40180307ab0d9cef0546e2957916a51a5b8721c0fb900fbcd933e577752bab7313da14562f34cb2dcf142981e3bcdbd1ba5d19a6e7ed64fcebf45 SHA512 212ca6819b4a876856c8c22ca7cf0ddf08b959b12ce416aa1934ef0f22555d6a85793b81ced3819b0471d4b31760dfc1aa718719e3263505482e8af7c1dda2b4
 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 948692f5b3b7..3363ce4d7d58 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
new file mode 100644
index 000000000000..5587133d10fe
--- /dev/null
+++ b/dev-python/aws-sam-translator/Manifest
@@ -0,0 +1,3 @@
+DIST aws-sam-translator-1.11.0.tar.gz 96492 BLAKE2B 4025492501d17699b64041a94704d0ec491ffb02a4b7e48c2647101be4d504b6a8c08a9a043c2d964a51d1ef7b40e4fd1d993f9d3b38b5b75460a7d0117b9f49 SHA512 e008248ef3401ffe58590c6d68667f67e5963e416656daea545c8d938ab8cb5d8b1c9c7f5aea2d53cedfd74b1fb8677e99a93a8a78235198b18c14df957d0c74
+EBUILD aws-sam-translator-1.11.0.ebuild 877 BLAKE2B 01ab7a3c27190f282d7805a1a35aee2f4d4d64429923115054ebe3e8fbf7c4e28ef8408ad3dc15221158e71af7d890acf0b4c768781139071f8ce475760c6fbe SHA512 e46f1cbea560a0cc5774e692b6238ebd477992ad715344ac7cd527031cc7106375294367e802e30449edd3ffc43cdbfe796201a38fe8d4a81c898591b68e1e8e
+MISC metadata.xml 485 BLAKE2B 10b9c47652be590d59b1947cacf9553a9b4ce84a48984f8b8d7f3084faea37d32d55521cbf3ae5850753745284e36b18013416c929cba11b2b5e92f51292db5f SHA512 c75c6b500543fbd58dc0ffa7a129619d27580935a407653ad65aeb8c38c7e56b1e5fe87191d53d9c5b336953270b120843587a1c5a3030b19e9f48fb690d78ca
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
new file mode 100644
index 000000000000..43c8b5ac9611
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.11.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RDEPEND="virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RESTRICT="test"
+
+python_test() {
+	PYTHONPATH=${BUILD_DIR}/lib \
+		esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/aws-sam-translator/metadata.xml b/dev-python/aws-sam-translator/metadata.xml
new file mode 100644
index 000000000000..de0ced977a97
--- /dev/null
+++ b/dev-python/aws-sam-translator/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">awslabs/serverless-application-model</remote-id>
+		<remote-id type="pypi">aws-sam-translator</remote-id>
+		<bugs-to>https://github.com/awslabs/serverless-application-model/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
new file mode 100644
index 000000000000..a634a0b5acb2
--- /dev/null
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -0,0 +1,3 @@
+DIST aws-xray-sdk-2.4.2.tar.gz 66737 BLAKE2B 5f062299ad28ee12d4f90bbdcb03d691fb9a5888054eae4759b9a0e916f720e71a9b9e01fd4d11106499395c5c1aa1ec90ec4874301a34657cd04b00cb5450e3 SHA512 3d12e96a54a2fc65bd6b6772b1e9cc72c09620d9a8b900780afb6c4051b88f0ada1e2da2e31bf93c37a881514e2ae79692a287a63b44845e0e2b8cb33109f81f
+EBUILD aws-xray-sdk-python-2.4.2.ebuild 879 BLAKE2B 62ef44df3665bcc902e6960eed6e37ff75fbc2aa2788e0e7671656e7f4269eb601a839422bc2a1d3ef96a69fc3908dc8872a49576f6bd058832fe12692bfd845 SHA512 daa7e8e9c9ab0ef9d16f8b2ff5f9b3c26e93595cf04c9c88ce3b11ec5178a97120cbbe3fb569758cf81f85f309e34110df06ce926c0f8b378a15183cd2187f24
+MISC metadata.xml 453 BLAKE2B 78db6d0eab2360b69ec4b17c073e47d10693c8b63b5f0c9f28aa8905453085c9595bed462a7d010480ff37b8b11083e2ce93e24da7cd59413592a5b4fe63cd8c SHA512 5206f2494c0eb5ab56f9673e837b2878aec4f512f6ef6dd8b70ca66a0e5c9c18b5626d9a90541adb158f0d08e0644ed2fb02fa3b80283a0883713eb45fa21e2d
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
new file mode 100644
index 000000000000..8247d997b00b
--- /dev/null
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
@@ -0,0 +1,31 @@
+# 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=${PN%-python}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="AWS X-Ray SDK for Python"
+HOMEPAGE="https://github.com/aws/aws-xray-sdk-python https://pypi.org/project/aws-xray-sdk/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RDEPEND=">=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/jsonpickle[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RESTRICT="test"
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/aws-xray-sdk-python/metadata.xml b/dev-python/aws-xray-sdk-python/metadata.xml
new file mode 100644
index 000000000000..80f5a6bc406b
--- /dev/null
+++ b/dev-python/aws-xray-sdk-python/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aws/aws-xray-sdk-python</remote-id>
+		<remote-id type="pypi">aws-xray-sdk</remote-id>
+		<bugs-to>https://github.com/aws/aws-xray-sdk-python/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index a038fa54e6d9..49478eb268e1 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST awscli-1.16.104.tar.gz 1186611 BLAKE2B 8f0918b86c37e184ffc8055cb16a02379fd35e685c5ddfcbf2b7e1fb71a80f829569eb1c2264e75563a316d933143a662cd7dcf4d6d25d236d72c268fb4985f0 SHA512 738ceac890b28c335f0c9bc703975af3467f17723b8accf713ef131224602895f6b4fae06cad93495933563c08ede18e38cf67abff744e6f5b0042b182bddec3
 DIST awscli-1.16.125.tar.gz 1201382 BLAKE2B 4412aad3e892527c053cc5baedaf9fcdf82f9c28fc1c19249713d5bbf174ad01ca61e2519702f67580c67ac389359e4493c3ad16646216619516a8ec76f37a2f SHA512 01d66d2baf26377f5315f5b3b0bf52fe6643c0e695e83c75178d819b29ebf3d55b1ad4a4ab4065540fc091d2e12090687a1046dc586715c4021dc30519bf2feb
 DIST awscli-1.16.148.tar.gz 1227053 BLAKE2B 3dd32671fff511933703a418c34df8a0c71bad02ae76391eb279cb1148f7ae989dd1d98a9752a894e81f6feef55781129b82d938bc0b16f7bb0ccb8be0d1571c SHA512 c609e109da24e6d58f8c4bfaedfc6ded593dade51e60f66af4b1885d38920eada4fde8a4f67266931484981a6c6a9bb19ef8c36b3b3915a83f3d933912b6bb02
+DIST awscli-1.16.190.tar.gz 1283492 BLAKE2B 9030c7d1c992b15d816cb611a132ab6cc50e58576bc60120aa1de7b87cd863e530f0b46eecb7fb50f2aeab6e11cd840a330d59ad509f0936c4aab04d26432bdd SHA512 ffea030a45128e6e4fd8530488b9a3d8868915a7eb557144d82fd84e50b3ad73acc4b3217298539cdd3d8ac1ee57f9262930bf009357b21d5f5b4fa70ec021f7
 EBUILD awscli-1.16.104.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.125.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.148.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
+EBUILD awscli-1.16.190.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.190.ebuild b/dev-python/awscli/awscli-1.16.190.ebuild
new file mode 100644
index 000000000000..12aa770f418b
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.190.ebuild
@@ -0,0 +1,56 @@
+# 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} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.12.81[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED%/}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/backports-tempfile/Manifest b/dev-python/backports-tempfile/Manifest
new file mode 100644
index 000000000000..68f2b98caf46
--- /dev/null
+++ b/dev-python/backports-tempfile/Manifest
@@ -0,0 +1,3 @@
+DIST backports.tempfile-1.0.tar.gz 10262 BLAKE2B 9436c8a3eb7fa6da17dad4466ab030f62b93a19103e519efcbe79e35cf0687ca2960666a9337cdc2929aeeed3790a7ee0441377755b1f1e2a8192b07ed7f049a SHA512 1f3cf634e289704e96bd8483289415aae896d95a16f5ac9b226ba879497675d76148399770966bd2ef14a02d3c8848516a9b39cc400819023b06254b5b0500dc
+EBUILD backports-tempfile-1.0.ebuild 1174 BLAKE2B 445c24e8e298e496a6cf41d4fcfb62176ea3d583d1cc63201a7ec20101dc826814f1681a20b5cf76cfceabee72ea845d4036f851b47abd2d449e30d18c8a29ea SHA512 a83cc86a3ff5e5c7f3ba9d36fe6c40e3cd972572f94a1ae02a2834412d55de1a19049fa18914ff14e557393dc72f3c7de90e23d706a8229b59fced3c92348bc6
+MISC metadata.xml 469 BLAKE2B a2d579bc290c1cd1f0cc4b8372b3f4b14bdbc351f4ab368df14cf784fd46af41074c61a0816c619d0805485b1b41ce69110578af25f9d00956ba8ec3a68f9e2c SHA512 4b6866dc60034a21acaa1dc1c2a389d878d495747e51dc99ee60b8379e03bd99559f3c805920a77cdc35fb551f97195c6fdf9d596af881ff6f6829c5b7e4b235
diff --git a/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild b/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
new file mode 100644
index 000000000000..632139290b10
--- /dev/null
+++ b/dev-python/backports-tempfile/backports-tempfile-1.0.ebuild
@@ -0,0 +1,43 @@
+# 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=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Backport of new features in Python's tempfile module"
+HOMEPAGE="https://github.com/PiDelport/backports.tempfile https://pypi.org/project/backports.tempfile/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/backports-weakref[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+# Tests require backports.test.support
+RESTRICT="test"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -e "s|'setuptools_scm'||" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" \
+		"${PYTHON:-python}" tests/test_tempfile.py || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/backports-tempfile/metadata.xml b/dev-python/backports-tempfile/metadata.xml
new file mode 100644
index 000000000000..ab950267ea60
--- /dev/null
+++ b/dev-python/backports-tempfile/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">PiDelport/backports.tempfile</remote-id>
+		<remote-id type="pypi">backports.tempfile</remote-id>
+		<bugs-to>https://github.com/PiDelport/backports.tempfile/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-weakref/Manifest b/dev-python/backports-weakref/Manifest
new file mode 100644
index 000000000000..eb8066cf795d
--- /dev/null
+++ b/dev-python/backports-weakref/Manifest
@@ -0,0 +1,3 @@
+DIST backports.weakref-1.0.post1.tar.gz 10574 BLAKE2B a53a64dc22d8d1ac93a157bef4a858156f620593ae3d9e69b99762298e9aed73a04fd0557d98f53eed8816e746869718bc028aeda619330ce7c031f8b6f346b1 SHA512 27fb7ffd3313e62ca5ac220efe5ce0a9ae2ba8a589c80d3c5cf98741e913da7f713e1ecf2af848510383f574fa3bc3b7b3c21e6696f0a252fb517fe836c07cc7
+EBUILD backports-weakref-1.0_p1.ebuild 1131 BLAKE2B 9582635c5204b4d6ccc2f6630b4f7b1d969e7454a32398a0bb64b593ec5a673f78f057f4b8c5bf99c8821db7ec0e1c7bc12f56b3bd31cc4d5da8f4b27c39d746 SHA512 faafdfbd5e8f7f3d99aeff64db06394c2cd986df20a10291a7b1d485b3c80a51277e5518420e08a2882f8d578960ed892c8cf77556670762c2c48eabf5d32a0d
+MISC metadata.xml 466 BLAKE2B a722c32d4462c21ac4fc1ce66a92571a26c283d10cabb187a8cc107604632c4ab79ad74290e07c318b3ee634a624459b667b9963c2a0a8485c470fba6ea982aa SHA512 77a6a25be5149dd2b146364f46e70585320f03cfd88f037f012df3601a8d74c789f33ab111d99d77667cc41be80050b398536e0b687014ac094436a7605b62d6
diff --git a/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild b/dev-python/backports-weakref/backports-weakref-1.0_p1.ebuild
new file mode 100644
index 000000000000..027168047eab
--- /dev/null
+++ b/dev-python/backports-weakref/backports-weakref-1.0_p1.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=${PN/-/.}
+MY_P=${MY_PN}-${PV/_p/.post}
+
+DESCRIPTION="Backport of new features in Python's weakref module"
+HOMEPAGE="https://github.com/PiDelport/backports.weakref https://pypi.org/project/backports.weakref/"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+# Tests require backports.test.support
+RESTRICT="test"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -e "s|'setuptools_scm'||" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" \
+		"${PYTHON:-python}" tests/test_weakref.py || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/backports-weakref/metadata.xml b/dev-python/backports-weakref/metadata.xml
new file mode 100644
index 000000000000..5cdefd31d132
--- /dev/null
+++ b/dev-python/backports-weakref/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">PiDelport/backports.weakref</remote-id>
+		<remote-id type="pypi">backports.weakref</remote-id>
+		<bugs-to>https://github.com/PiDelport/backports.weakref/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 38ec4cb3884b..d25863fa6309 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,5 @@
 DIST bitarray-0.8.1.tar.gz 46877 BLAKE2B eb6b78706b336c73cb9895bfa2645fdc2d8a2525b23610bd37dc959a0aa2bad0c5d746ee31c53ca73a0248f989e69e23ef173dbe9dc0848453e6a8a5b14b3704 SHA512 10f4872243b92cd5a1a77e1e2aca80135d31904e17cb3de4eb2c3f2c4d3f00ad0573b6bc4b9c9379594e2912cb0e5d5870fb4e59eb298e269ecb3778fbae7d1f
 DIST bitarray-0.8.3.tar.gz 36292 BLAKE2B a9e55e5f8e8257759ae8b6fb5e817c76ab9da6cd73699d492e111a9237e08718b4de22f20d97d1f633075228c503697e6faf032cceee01aaaeb4ef041fe39a4c SHA512 67e634fba3672faf986117534e9260566b7596c7fddc67d7195fce4c9cc13bf491f94b6d25005143aee1cbbfbce168be0c7a833bc1f293cdbb30149b29855372
 EBUILD bitarray-0.8.1.ebuild 518 BLAKE2B 72d83ed81b8799c70ec06f995eeb2a24d1a826587ddd923d1ae09e67e356dba53ad28253a8097716d7db556d012267c1ac574bd1fe30896ce7523cbb9a4ab316 SHA512 294e0b25205c9932b9bef2181323463a6c17dc39bbd3aaf01bd6c32091a092632da91e6ce7c16a936245fb3cd868d34b6d5d4af159c7195c0c443480e6829ecf
-EBUILD bitarray-0.8.3.ebuild 535 BLAKE2B f9e8c5f6a08f0cad50f4ab060a1c272d3388bcf935592fddc26e4baeb4d3ccfaa2f8952a2c98cc00a95b3475c64677a3d5fc2d883e09c4c20cbc7ad9fe7b7c4b SHA512 38377c7286138a2f4581aacf611fc78cab660dfaac4a7b594284b6fa8d96088f454856b2e93317eb2aa800f644c9f3fa69b0cae8ba7b3bb521de091f2dd05a77
+EBUILD bitarray-0.8.3.ebuild 549 BLAKE2B 48e34b4ded9368fcaab9d17d655f7b3947b998e9c9150de05556fa0b4483f9be2100a65f83c9be4c99ab888c3cf6297f578e7c7b68b6e46f4bc2b19d3c00b33d SHA512 ff040b6e7123bd62886d46e392d6e341460f0ba8bbf408903074d827ee084d1784af5fd0a26f6b14a66829e1146f61d42ccdcfe14b796c2d26a44918a0fc5af5
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-0.8.3.ebuild b/dev-python/bitarray/bitarray-0.8.3.ebuild
index 80bd2089c939..28cb5b7fa3fd 100644
--- a/dev-python/bitarray/bitarray-0.8.3.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 python_test() {
-	"${PYTHON}" ${PN}/test_${PN}.py || die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/bz2file/Manifest b/dev-python/bz2file/Manifest
index 78e66f22bd54..3e380eaa673c 100644
--- a/dev-python/bz2file/Manifest
+++ b/dev-python/bz2file/Manifest
@@ -1,3 +1,3 @@
 DIST bz2file-0.98.tar.gz 11333 BLAKE2B 4ec4687f609521a637c20a512b544cd99d7c334f7cffaeff71d2a893eefe131a10bd548b9f1e829c899cdcf181f5e877e092cf08d709bb3f1ba9901d3386b3e6 SHA512 2d28e71fe71b5fea4008d65a1fa91d5c6fafcacc09f891c5deaaa985661576bd97f2e33fe9f8c5943841f09c153f2079a2511329c066e57c775fb0b089b30b20
-EBUILD bz2file-0.98.ebuild 601 BLAKE2B ca50b77fda49ae8523b6914c4235db77552ad0cb262a28a44c94c3b86a3f180ac60447396a3c8d8c05448cca64eab72048255abf830d131dfae50f530fb86bfd SHA512 107466d2ea8a2876f451579b7c267a02247286d11fa41e0faefa67b0bb0c42e6f9ecd3d32c4582edae78b90141d147a0edeef6240bc997fd1cd0a8841530c7a8
+EBUILD bz2file-0.98.ebuild 622 BLAKE2B 7e11d2e8456437dff506d231b2d54cd144c5214c794196cd2e239c7b927f1d98772642035d79716803aec94f252f1ba7dc8ac0c039a1625ca8c2043f2d0c4e4b SHA512 18add4221d08561348bbb2b658c56bb813ccee22f5168a158ff9251776bf201fdd8bb1812940657e65e3f320bb8f562badb97d7f9498aff379f9705db1737c41
 MISC metadata.xml 342 BLAKE2B 8cd4d551724a069a3668b91bb8218576e23cec6c450baab71b70868670d673d51bc11952b7f077aeb76493cdee5ba20ee4175d091e5ccb995fe3624e3772901e SHA512 e511170e43873344d2652837b823c3207a8da885487abe5bff9a90e0807ae4a7736170759e8e9772957cfb52a9d81e436f19f4327636d411f0f9d73ab31a9d2d
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index 3fdb46a77dbb..2820eac7a005 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index f9205849c807..114c9c04f736 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,7 +1,5 @@
-DIST cachetools-3.0.0.tar.gz 20513 BLAKE2B e6fdfe2aff22a9ae35d19acb7a678410c5c06d3147cfc3d57725d942c3e4ce00d5aa8bfce7f8ee80960751643bc655d5d2226382e82c1c5c1eda746cb34a556a SHA512 7211e4d1525b94f5a74a89571a1a3696719d1cb15246f4b8158408082cc59ef03935ba82ddd78a34dbb31b271c234dab6cd82839c13b23159b80264bd552bc51
 DIST cachetools-3.1.0.tar.gz 20664 BLAKE2B acb9ecdc1a9ca4bfdea7b9f593aedd6c8db9f96c703b71fb3007ec6e255d4d99d53c22f6b61ba25d53ac9a3bdee8de7303d18ba05115017bd6ee63c2bacf1fca SHA512 1d03cf42b56857ccc1203a658a8c70fa3c0a3be2ecfa3b9501c14ba674463d4ffccf8a8a9daee13084545a5072ecd7757174a4b074d33b0619020f7ec89515bc
 DIST cachetools-3.1.1.tar.gz 22055 BLAKE2B 9141adb9cff5e7f76a370666c24664de09b1562a9e40636b8103157cc65b146dca96ad871065191618e2d458078cb7da30c80da21b4fded73097bda7916f4819 SHA512 23a7d9c91f97727984585745169dbf94922288e464196d5c05f442226cbff4efeb3588ed463f481bd75892824188bd3ab8031f4f2f8e52924c74428b1034714a
-EBUILD cachetools-3.0.0.ebuild 604 BLAKE2B 2ee50629f0ef6f39666b407ef0aa5c1f096d8d09015a1796711a528c983e3ea07e6bded44cffda9e39081f6e91ab475e183659a5598e2dcfd75a406a4534d860 SHA512 c1b5c0bb6f6e277d0fdf3b14e9b32f8b1ff8c7dceaa53ee3de970582415b8d71458703f5cf2036cac474ff2b44cb544aaefaa75c6b0508ace443df219f8efaef
 EBUILD cachetools-3.1.0.ebuild 606 BLAKE2B 9752544e0328123ecbae39d783147a423be6a043476648474ec5eb6f052f12481a18b849a8afb3694fb83da1d048744220ad70429f48cf9d800fae0179fc460a SHA512 ce7d28be334824cfd888219ce4868f60f8659f16ab1a1723203c2637edd4e082d4aa0e206ad7c4c6c6863b9c913de34fb0220f96f1f12c5830f561e5a86bd726
-EBUILD cachetools-3.1.1.ebuild 608 BLAKE2B 659b231464beccb378959b1bdd44a8a370e363ae4e4f7a01cd6227096acc417c06f2fedfe8acbb76950e959b6f4783deaa14f5ae3f675731060351627e3e6214 SHA512 12a75e69359ee3d1d31da2f410deb9525d5e27b72b2cc961b73bb8017b1a95c078d0a1295dd0553a94cf2f1b478b5de2860bfac12b307dc15a65beb0469fb2bb
+EBUILD cachetools-3.1.1.ebuild 606 BLAKE2B 9752544e0328123ecbae39d783147a423be6a043476648474ec5eb6f052f12481a18b849a8afb3694fb83da1d048744220ad70429f48cf9d800fae0179fc460a SHA512 ce7d28be334824cfd888219ce4868f60f8659f16ab1a1723203c2637edd4e082d4aa0e206ad7c4c6c6863b9c913de34fb0220f96f1f12c5830f561e5a86bd726
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-3.0.0.ebuild b/dev-python/cachetools/cachetools-3.0.0.ebuild
deleted file mode 100644
index 12fd0b6d641a..000000000000
--- a/dev-python/cachetools/cachetools-3.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/cachetools/cachetools-3.1.1.ebuild b/dev-python/cachetools/cachetools-3.1.1.ebuild
index 507ba0de8cea..4059e3eb862f 100644
--- a/dev-python/cachetools/cachetools-3.1.1.ebuild
+++ b/dev-python/cachetools/cachetools-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
index 9d2c52a4a978..c9e06874e221 100644
--- a/dev-python/cbor/Manifest
+++ b/dev-python/cbor/Manifest
@@ -1,3 +1,3 @@
 DIST cbor-1.0.0.tar.gz 20096 BLAKE2B 0e15bc4984155c1046836c94f3025f8dd451aaad438c78de25a739738e6de8d3ff3e737dbaeaace3d837be08e9702a3b7d18d840c0bc5459cd3919159eabd728 SHA512 996b61c7d16cbe8bd7b056d09286a17f3a6a29cb97ef9e5ca1d1bfe8c53393ae3d2b7565c937a283cb78f377af14c070bd663aabbce995dc7e5b9d2f69a6ba73
-EBUILD cbor-1.0.0.ebuild 474 BLAKE2B 3e9faa663b7a5f7738f95acd7c0fc98a5f7295f6e06dda4c5e374a87ea37bdecedcc8e61ff6347409fc3cf59d4b89b39889935933761999e7da674b23def07a1 SHA512 6eb775e710c689c76d534ca008d01f6530032f4358b7d17c0321ea4c720ac47ff25f9597b30f04e698c0f25837717e152f465e34c808fd3792ac88634203180f
+EBUILD cbor-1.0.0.ebuild 498 BLAKE2B 49f9d0dbdd9702e492bd5e31bb2bfe07e90afb97012edf11d33b6e000ef6d395a0e6f6fe742356e42cc5e83a845451ab78242560b176d405248838337dab259a SHA512 878b43c12bfd69b70d086e08cc9d56fae83ee53afcb85341ef7c66ed065cff73e5f03fff4270b4c7908d838b7959ab77fe13b61e71fe1341af9d29d31fa841dc
 MISC metadata.xml 1074 BLAKE2B 7621eefc67c6d29dff5ae32e9237e65d3dcbe4601250cdb524d380c7bff4216b03586ab600c39592f736205f1c9dadc73efcf55ec97e5ff65f126fa2a1893515 SHA512 6ad1e74d0f932664eaa1f635adf78ed6429308e354e195f6bebef74385ab414ffbb1c94739dce3473ad62751241ee3bafc8eb74bce63f431b4e774250e2c7bc8
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild b/dev-python/cbor/cbor-1.0.0.ebuild
index 9f15f4216716..3db5b91c12d5 100644
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ b/dev-python/cbor/cbor-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index b82c85274329..c0544905d9cb 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,10 +2,12 @@ DIST cffi-1.11.2.tar.gz 435142 BLAKE2B ba90cc377261a75557cef626f1c6b8c0c625c6721
 DIST cffi-1.11.4.tar.gz 436857 BLAKE2B 46b5d1adf4aca2a75ea02ba01ae934821d0e864accd9c355745a681d11a08ed34c33c473204c78ecb2113b2d59fbc762ca0607ff92f6cd2dc411907844bbdaf3 SHA512 184572ab8c1f7a72f00084c23894efe1691aa20f9e822a3f7184ebbed16e757586ac47e7f1d12dd7b14b4322bf5b88e35465dc3bc8b0caf0dc8e2b626a52615e
 DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f4952e3b1a1da79c0ad2ca5c6e450000cadd1efa06df53d14f711e0acd73a075bea45ebd61e667fb650a10ab SHA512 6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880
 DIST cffi-1.12.1.tar.gz 453584 BLAKE2B fb0fee63f5cc4dacd1055036ed6e7882452e848dfece99adadad7ebb1f0cc4171d1be5370fda5552da45127e374382b29cdc8e1f5122081d2551604630774cac SHA512 1863ad26d730d629e1397ba155bebd3f9edc881d661fda5301a5acb080c8e006925317c1b092f054c46834d693c437d6e91a687f379c9ab029223a9a159eaf48
+DIST cffi-1.12.3.tar.gz 456340 BLAKE2B bac7265ed9b0858d791443572f39316fdf809c8e40b5a2557ccd667858d994cb44368b4b74655813833d3c5cd5c266fbb5227d777db8fcedc599917f31dab7ad SHA512 9070f5cfe543c9261a79f995548899c3e7539ee20f562ba91a4a909887745bd28448b0e38241031d6b2ab87286fd0ec91768b8bf6577716427612d41b0ed3b93
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
 EBUILD cffi-1.11.2.ebuild 1474 BLAKE2B 1f0ce001d000ba4a133d1885086d003fea6a27038314b4f5c20a0cdfa9a913e2e1ac662ec097857c5aa6d2d468b325f689b273f105fb5bcc9cec3965f5bdb8d9 SHA512 a72b1ba5a439b84e82e3045eebab68a77b926ceefb725998d0e95050762dece1eb99dbb19a827ba6206315b21a98da4b8bbe34a4ec3c20cbf3882a726f8b222e
 EBUILD cffi-1.11.4.ebuild 1475 BLAKE2B b84c120dac17b729bee37757e6d4070263fe441f9150b3ca1d7179b179708a1c85fbd404ef76a19b971d31b0043eeafba211b8b676a61cf68e731000de5ac62e SHA512 e3f47947f108e8f3ef674733991d00a830719620f50629ca896658f389c6560ef627505c0040b8c177e9bdc1a497cb466d8e2e467de8b02bed76acc206e7424b
 EBUILD cffi-1.11.5.ebuild 1577 BLAKE2B 4184ecf6b972efa2b4be869bc413071bd564c2fc296f6df18ba7773b5c796c0c35dbdfd91d31ea59f47fe4c2eabe6bc9cc43971d9bd6e5dc7a2d7f20321dba67 SHA512 904c3b234a22e2242dc7cca693f8a86a576299c72bd3f981bfe0eba37f2d180b4f1fb5cbca06e0f483aa8556fbddf1847df0d740212c93394293de97d172cd4b
 EBUILD cffi-1.12.1.ebuild 1577 BLAKE2B 4184ecf6b972efa2b4be869bc413071bd564c2fc296f6df18ba7773b5c796c0c35dbdfd91d31ea59f47fe4c2eabe6bc9cc43971d9bd6e5dc7a2d7f20321dba67 SHA512 904c3b234a22e2242dc7cca693f8a86a576299c72bd3f981bfe0eba37f2d180b4f1fb5cbca06e0f483aa8556fbddf1847df0d740212c93394293de97d172cd4b
+EBUILD cffi-1.12.3.ebuild 1577 BLAKE2B ffae93eddcd6e57a46050bad296c976df412e0b03ccb1959695b7f3d856534995b84043026fed5070d959e8dfe284eae7659545e7066fa66e133aa2f22614252 SHA512 5be740d70f33e25bc6adcc73d65a16aa5eeda655e4e86edf7799f5f50cb4a4813a909242f5529ebe9410047acc419ac8a70f84fa38547b86a2611fc069e42640
 EBUILD cffi-1.9.1.ebuild 1464 BLAKE2B e93a0a3c6bb4be9847f1c0a676e9a9cb0ee3579402c64fb4415f65784669bb25f23de1aed50c12c773ddbe327ffb04b13e8ca899c0b07ca3d5a60a194a99b7b4 SHA512 17f402a1a9ada2ebdadf5b2337b8010874913b2a73023c8ca555b5dfae18ab5d85b375f4d67633d91a728350309d0e96a34c38bffb73877461860a6482ca5f69
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.12.3.ebuild b/dev-python/cffi/cffi-1.12.3.ebuild
new file mode 100644
index 000000000000..f8d5fa83127b
--- /dev/null
+++ b/dev-python/cffi/cffi-1.12.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi:=
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_configure() {
+	tc-export PKG_CONFIG
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	einfo "$PYTHONPATH"
+	$PYTHON -c "import _cffi_backend as backend" || die
+	PYTHONPATH="${PYTHONPATH}" \
+	py.test -x -v \
+		--ignore testing/test_zintegration.py \
+		--ignore testing/embedding \
+		c/ testing/ \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
new file mode 100644
index 000000000000..9e3b33c4f395
--- /dev/null
+++ b/dev-python/cfn-python-lint/Manifest
@@ -0,0 +1,3 @@
+DIST cfn-lint-0.21.6.tar.gz 2149548 BLAKE2B 36bb80d8b656eddc0e0a00e4728e46ff05f12ff93d70295a045602f09d570880bf087f25165ed21641e80f096b93e3cf4c9cf97b6498b330dc53beaba67aa492 SHA512 c263e6e5ccd03ff5b843e9d4ebd74844f1b4053fa766f5300e4cc66745c42e82771e6af73cf950c81bb66f09b4afd5d438bdcf8489a3b9d61d562a7145d04297
+EBUILD cfn-python-lint-0.21.6.ebuild 932 BLAKE2B f6fdc7ac67232f7acdb54e3ff36c7b945dbbef548a7b9036b54e24a9d4de9549641ee8941af2a5f4480491a2a79f427b9ee9b0c5b27bf6e3ba94f38a0c8ab331 SHA512 739166aaee339864d6d521df7141a895036d6170582629c8ec8f67ef4a6d328a6b5c0cc47c4acc899025a30e926e67bd06b9c251aa341081b37658c074189cb2
+MISC metadata.xml 471 BLAKE2B 3f9bf2f5249caa0794d35fa4e56d2504ab5576cba4b8d1e22d1d8eab30bf4f2e9fef843b4e6d222c478ba5edef63d7805a854ce788b7f2ba51d46aeb60ecdb81 SHA512 99c9ad08011f920bc7d9e5399e9b230eba05bad6da18be859211f83a0895b9a0a74613d854338ae9de9dc3f4308a7701dee819722b5b3921aef4449f1ca45d8c
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild
new file mode 100644
index 000000000000..6c7860dfb01f
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild
@@ -0,0 +1,31 @@
+# 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=cfn-lint
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/aws-sam-translator-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pathlib2-2.3.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cfn-python-lint/metadata.xml b/dev-python/cfn-python-lint/metadata.xml
new file mode 100644
index 000000000000..8b111978657d
--- /dev/null
+++ b/dev-python/cfn-python-lint/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aws-cloudformation/cfn-python-lint</remote-id>
+		<remote-id type="pypi">cfn-lint</remote-id>
+		<bugs-to>https://github.com/aws-cloudformation/cfn-python-lint/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 7dba2bb93aba..fe9badd90955 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,3 +1,5 @@
 DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
+DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497c1bb92a268e39339a9c55a348645cd6e0872ef720e19d0e891359ad6e0af3b6cba8416c431c79979c68c53f9aa7d SHA512 5ec7ddceff7c43e46011370ba00f693dc669a1b3e1cfc42b42483850879d6246073ed20d4ca92698984b4935f5b69e5ae0dd96dad82de3f296e38ce7b644a6d2
 EBUILD cloudpickle-0.3.1.ebuild 649 BLAKE2B b03f481cec5af1f73be2d7e6a64a524e6de9c11fbc80779c7b7bf4f77b1edc0e98a44906a8c3fea6f43ea8986ca38407a73b83c5a4b700f6ee82ef34353dbd20 SHA512 a0acb2a991270b87824512daf57c6f29b77b9c009e393951968d426d4e1bb63288c67baaf302096fa5e222f0e7ad0044ba4c0cf8d94e04586d40f2e1eeab9da0
+EBUILD cloudpickle-1.2.1.ebuild 737 BLAKE2B f6086c6877b7d0c3fe89821d6ffceb5eee9cd68d688f0f1e73d00f40e37f4accd43e9f69dc54be0df169ac5943795ac2deeba297b343c2e333acc44f0a4a1341 SHA512 56ab826330308e4e042496ab61ad333e716e7d68d769fad716e88fff18de2164888ed146c4d0451aa73bbed2fe1f0302099d91a61d16f98ed7b22a9575160d9e
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
new file mode 100644
index 000000000000..c99bc7ac83d6
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="https://pypi.org/project/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	pytest -svv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index fd68097c7eeb..b5d62b73c72b 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 704 BLAKE2B fde08969875519b1ce6d803f46a20d5f1035e263f0bf28860a905ed9ff6683838a1aa95d0bdd0c0611ca4f236e6664f775255cffbe3f42c36ed0c51336ca56e8 SHA512 070660709cf72fa2f64a9a20414fe3ded9e973dbd44444bd3c352cbad682e19622aab85e7db6e83b58ee01a9de6117c5fa1bfb8b6cb90760b0379dced3bfbc59
+EBUILD constantly-15.1.0-r1.ebuild 715 BLAKE2B 2f64c92672e10400d698de36dcdfca147268bdac865b03fc9893cbbc45b59e6677187f0254a214499c2bb3ae4bf6eb7b7724b9c647beda133b3d8e84daf22478 SHA512 2a1c4720ffc1ac0eb9fc17be6f42687765098ef9d0e69e77eb889546108df3cd2e93560666d484f49fc4b75be8cbf7f3abff33495dd0fc18190f1622afbbaef7
 EBUILD constantly-15.1.0.ebuild 564 BLAKE2B e35159a5947f5e20a90fccd5a8f7e157e2fb89e45d874daa1587b7a19cc12bef3eaf5a72fb805c2029378c527becf1e65c0980c3459859c4c8c320c61d794af8 SHA512 05b76c2db156f6283c43bec8143bf4e0be4b8696a071d9a8339307ed7df6c860eebc51fc4d6d338895406fbfab396b10231e0bed39df7525c882ebb90c049e50
 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 000f0918350e..c5ad25a45091 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 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/coreapi/Manifest b/dev-python/coreapi/Manifest
index a013ac752b6f..bf042b0e2648 100644
--- a/dev-python/coreapi/Manifest
+++ b/dev-python/coreapi/Manifest
@@ -1,3 +1,4 @@
 DIST coreapi-2.3.3.tar.gz 18788 BLAKE2B f7837d6a0430e6617a2589aa84a209b3c544a913773bc4388c3bdef7348c83577e1b216e83c14736b15174ede840ae297b050eba551b4fe22d784e4d51677956 SHA512 5a66cf9613a9e11046577684b837f48e17db2285d14a51a77aa47eb945eef72a9ee0525b7b1b1c57fddec102c144ce56430ed5a95717e77d906d0b617dce708d
+EBUILD coreapi-2.3.3-r1.ebuild 598 BLAKE2B d5600ecddf32dbb008270cacf246eaa0ea1d90b9ad8c9b761034c00c7b7e23c3289ec6449942c85680249202806357f19d522f89f419d0b37d82f0372c098ac9 SHA512 c1dfcdeafeb44a5e63934b716b1e9d987db79bdaaf8eccec26e4949475ade12aae9720c52dcbc2e42963256a4874529ca41817f4da696226a84ce8f8bd33f82e
 EBUILD coreapi-2.3.3.ebuild 480 BLAKE2B 68917051cd7f44365ff138e6ee4ce38de6d73dc7b3dff5faa53a8c5f357ad3b68f6a1181c338b1a7862e9a916d55972a67b12399ac877d0720c193121896828a SHA512 435d34273e6e66bfcc19ecdacfcba36cc6817ef520296451ffb140508039f72e1ca0a20204d673b604903be3745a65909083fea1a733cc012913244e517fd1d9
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..54c411dd20d8
--- /dev/null
+++ b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Python client library for Core API"
+HOMEPAGE="https://github.com/core-api/python-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/coreschema[${PYTHON_USEDEP}]
+	dev-python/itypes[${PYTHON_USEDEP}]
+	dev-python/uritemplate[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 8f485dd9a9de..45ceda9d0d83 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 756 BLAKE2B feeff69140a576e4a87f670a351fa394241bdb5ab52d9b445c32d4ca8273807b26f304e2ce4387c7f9210507539644833ce686be896a25ce2999bdb7f85c468e SHA512 31e98ecc96d9b1507d977ba1ffe1afe4e0df7dbeb86c4cebe2c263533e8f9d9607ec7733974e34335da3bdfa06ae6d683bb8c100fff79e119a2f5c9ea594d74a
+EBUILD defusedxml-0.5.0.ebuild 767 BLAKE2B ea856b26bb883c6e14ccbec41252a68e85aecfdf90244eb8656e9122e186ea3ef6d8a1a1bc994ac4c12a0ddc1071457f35c24e699d0459aa3e76e570da21aae2 SHA512 8139271fd50ec6505afc3f9e926d0a6811bf370127d5ee918307f4deb1bc736a7cac2045ce36d600ab9b3a4a131ce5d2dde5f1e1fd036554d82235324dd592d5
 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 08a065568029..044af3f6429d 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 ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LICENSE="PSF-2"
diff --git a/dev-python/detox/Manifest b/dev-python/detox/Manifest
deleted file mode 100644
index 8529405ba76b..000000000000
--- a/dev-python/detox/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST detox-0.11.tar.gz 8406 BLAKE2B c8ad67bdcf69a6a6f558b893be4e6da66dde3ac4a092445ed73e9200d2e80179f42e168ba3b639e59cc5a7b8c6a8f5edbeb327953c1bb91c1de267ddde28208d SHA512 326219669934f75886532920e2e1f0a887a5efa7f1efc1dc7549f5824254a6b354599fa058370ac235f1df6a6b4016fa207108b04368c8ec8dbe91e758ee559d
-EBUILD detox-0.11.ebuild 758 BLAKE2B 6ee5f8f79883db633cc64772f76e5d489b6385a1e56be21a35f192e661454ec67f012a81b4c69d11caf4627b75cdd6e2d7bf091d93ac8c4b883ba1f30c1b7250 SHA512 570ca6b5c3d6658e503b17bcd3a4009d84a337de796c21da0045b94d954b885d032593ca5cd1815d267f52e30c48c7885ddf3193a45683019b269283ce7e2cf1
-MISC metadata.xml 361 BLAKE2B 8e7c8790db91aaf75579a7430176f99b85a5572a03e9a6ae113bd131a434590b9fae5e0aebd18c3e5da8490ee246ec660dd6537df85b73772e648e8a5e23a74a SHA512 138ef583238329892e538f7b903f43391f63ec8669794c16536959dd4a1d5a1f3a269ad9062d6dab7df2363c7bc0d65c1d735cdcf27f6ef139b16add46b61971
diff --git a/dev-python/detox/detox-0.11.ebuild b/dev-python/detox/detox-0.11.ebuild
deleted file mode 100644
index a5216835ebe3..000000000000
--- a/dev-python/detox/detox-0.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="distributed tox"
-HOMEPAGE="https://github.com/tox-dev/detox https://pypi.org/project/detox/"
-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}]
-	>=dev-python/py-1.4.27[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/tox-2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/detox/metadata.xml b/dev-python/detox/metadata.xml
deleted file mode 100644
index 84721a9a110a..000000000000
--- a/dev-python/detox/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">detox</remote-id>
-		<remote-id type="github">tox-dev/detox</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index d16b86c072dd..49f4253103b1 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,5 +1,7 @@
 AUX dill-0.2.5-avoid-installation-binaries.patch 784 BLAKE2B 74f3c8ac45a1ab97dbbcff9965c7acc0357bd8253cdaf317ccfe54294c35ef08cf328a3be0586b123365811b56546a2190eda4d76702efe7f8e5289333de093a SHA512 cb944c7e4699a99a5040140f2dd1cf6bbe3148b0fe098c536200cddd4ed835545c7e8328072a188fc9a5d70b9b4f5d3a138108f934734ee9c8021b3e95126cc4
 AUX dill-0.2.5-remove-install_requires.patch 906 BLAKE2B b8d38d701448930cf8596be8ccc3fd81f85e4f72dc2a6b64c3003ba3a21f86d41dd16ffda86c89e2e2f2714a96d6b92ebd19d05a40676e01efcf656fefcdae42 SHA512 f984248a8280a1cf97bca6a8ad90f8d648da106a74c67dfe29f62e5d8591d7cfcb608bf827729430f0463f6ad0846dba094a030b5c2c3e3f8f387f39803f737e
 DIST dill-0.2.5.tgz 60572 BLAKE2B 43877e36cb62406b486f5619a54db0a4983f70b0a1712e39bcd77aa892fd17dc9ea774b85faa48441beaf993296a877249ff321fd0977a1317eeb25d0b020d80 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc
+DIST dill-0.3.0.tar.gz 151375 BLAKE2B 11f22f18c5491633a2a3136d6993c59a1078d478f2e45d40e5a71fd9929527f4db98fe261d406c2cceb0cbafa277f620a17068123c73d85a44dc2252be138845 SHA512 d3e36716ec264fab2532264e82dedf2a0923ed11f2517b3df6e5576159d5701f336125e7967a37f4c80c37f60abf584b9f7cd4225ed68f942dca7af500c091cf
 EBUILD dill-0.2.5.ebuild 527 BLAKE2B fdcda81ffa74b97883513ab5317d19879b43548a2359e3cbc6122705e1a6ca7f5231ba9bcc9446d13c56dea796440f9f92e3024771a8f4344a0882c23406f0bb SHA512 3b3e662b59be3a9c779165cbb845f1fcd6396c568de9cd3af097d8ba972f06992e340ef6b3fb8205fed26e48a4dde518a6b5e88a8bcf5df7ac05cc93c0a2791c
+EBUILD dill-0.3.0.ebuild 595 BLAKE2B 7888c6d5ba9f29fdcc36deb62f54126283834c48e84ebffee7b27fbe8f861fe21cd9a7e5fa1d52fcf9cf86bd3c8e4f68f1d0b9cb459d147b78f1fe70acee1ba5 SHA512 e68526b21a9227be0f9ecaefa2dce2f24fb29f1962c0a030c72daa0a3e35456118b84738f87696398fb3ccf70ca2e9fc4ca725850391f4e222850b4a72816167
 MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
diff --git a/dev-python/dill/dill-0.3.0.ebuild b/dev-python/dill/dill-0.3.0.ebuild
new file mode 100644
index 000000000000..2df94b7bb42e
--- /dev/null
+++ b/dev-python/dill/dill-0.3.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_{5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Serialize all of python (almost)"
+HOMEPAGE="https://pypi.org/project/dill/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+python_test() {
+	local fail= t
+	for t in tests/test_*.py; do
+		ebegin "\t${t}"
+		"${EPYTHON}" "${t}"
+		eend || fail=1
+	done
+
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/drpython/Manifest b/dev-python/drpython/Manifest
deleted file mode 100644
index 8300dbd4ea2b..000000000000
--- a/dev-python/drpython/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX drpython-165-wxversion.patch 362 BLAKE2B 7e965451cedf27ef0185baaec06ee0bea62c2fc578b3b552ecc43a25e38b58b7e4c9e787e725b0a9f84c3bc33a2c41c23ae46ef837b17265852558f03bcaa066 SHA512 f9b76986a46be5d3671646345b6d48e9dea902065a7ac3724008e5bc742b5962248d1d6806fdd8ab0aad8d6a377e70874b810872b670abd9d5ffda0c60405701
-DIST DrPython_3.11.4.zip 824982 BLAKE2B b160a8c65e8aa0f9a7b2b753fc325456f732d5ed5ea9743e6a5108f5a7c616a2c3af02032716565bb1ef08bc2e28d65492a29fa58a21183fe33f9e1a830d523f SHA512 13943eb28d7155e99e0ffb57903ddde25c964c908ac848f14041c456bc6aa71bab7cad1101e489c09ba5efb5af35e33895a518021bb607f5047844927bcebf2b
-EBUILD drpython-3.11.4.ebuild 1128 BLAKE2B d83d8d19de83ee801f7bb12ab4fa48fd5d4d9d9751561f8726c5bf21477cf04e18465f495665b5e820b777d45eebac1045359736e69443e92509d30514ea1dd4 SHA512 dc447cfaf48e7ee23edeac52fcec264b559a898c912530ca19ae26c57d9caf8ee79e3297320d2c09f350451109bb1107bafb94e3b4a2e059d7fa52ac1b48aee9
-MISC metadata.xml 777 BLAKE2B 77d3a5320dc535fae2c0a0e7411adb09ecd81a27ff89ae970bf083388616f155bed38fb7c18cca9ebd4e1bea3822c5d354add01b0e7c199f2457ca1070a544cd SHA512 baf982a19727f07a800dc71741af9ccfa5a3727d9695403bcc99eb8cde1a8ccbc5a704e68f82497eaae5558007985d33cba7f8d70b94700977db8fff99be6f00
diff --git a/dev-python/drpython/drpython-3.11.4.ebuild b/dev-python/drpython/drpython-3.11.4.ebuild
deleted file mode 100644
index f59c877bf5d8..000000000000
--- a/dev-python/drpython/drpython-3.11.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="DrPython"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="A powerful cross-platform IDE for Python"
-HOMEPAGE="http://drpython.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-python/wxpython-2.6"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-PAYTCHES=( "${FILESDIR}/${PN}-165-wxversion.patch" )
-
-python_prepare_all() {
-	sed \
-		-e "/'drpython.pyw', 'drpython.lin'/d" \
-		-e "/scripts=\['postinst.py'\],/d" \
-		-i setup.py || die "sed failed"
-	sed -e "s/arguments)c/arguments)/" -i examples/DrScript/SetTerminalArgs.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	make_wrapper drpython "${PYTHON}" $(python_get_sitedir)/${PN}/drpython.py
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	elog "DrPython plugins are available on DrPython homepage:"
-	elog "https://sourceforge.net/projects/drpython/files/DrPython%20Plugins/"
-}
diff --git a/dev-python/drpython/files/drpython-165-wxversion.patch b/dev-python/drpython/files/drpython-165-wxversion.patch
deleted file mode 100644
index bab247c2110c..000000000000
--- a/dev-python/drpython/files/drpython-165-wxversion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur drpython-orig/drpython_wx26.py drpython/drpython_wx26.py
---- drpython_wx26.py	2007-03-23 19:20:02.000000000 -0600
-+++ drpython_wx26.py	2007-12-03 18:36:01.000000000 -0600
-@@ -34,7 +34,7 @@
- 
- ## testfile for older version
- import wxversion
--wxversion.select("2.60-msw-ansi")
-+wxversion.select("2.6")
- 
- if __name__ == '__main__':
-     import drpython
diff --git a/dev-python/drpython/metadata.xml b/dev-python/drpython/metadata.xml
deleted file mode 100644
index ac5d572905b7..000000000000
--- a/dev-python/drpython/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>
-DrPython is a highly customizable, simple, and clean  
-editing environment for developing Python  programs. It 
-is intended primarily for use in schools, and is a tribute to 
-DrScheme.
-</longdescription>
-	<longdescription lang="ja">
-DrPythonはPython言語プログラム用の、柔軟で、簡単で、安定した開発環境です。DrSchemeに触発され、学校での教材となる事が念頭にあります。
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">drpython</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 32be42fe13cc..913f5907bd14 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -7,6 +7,6 @@ EBUILD eventlet-0.18.4.ebuild 2032 BLAKE2B 63837d2cd0c1bfc60a90edd9dd5fdd9fb3503
 EBUILD eventlet-0.20.0-r1.ebuild 2136 BLAKE2B 93e89d1901920feffc42f891cf588b23638b0ee8974c1653991d568dd3c407e69bf29cbd402677768f49baf99a816fda4b2cf685bd64236b9bca0353f473e7da SHA512 63897686d8a41c07c96047660a29b4c52d6647e65a9a0f832e445f43287b7d684ccf7ccb982d5814fc8e51cc2e680240fc09b50b815a986cde04e3a0d084662f
 EBUILD eventlet-0.20.1-r1.ebuild 2152 BLAKE2B 041c85d02ec79ee2aa0e7893d8b38f7609aff6b4b975b66eb1f1825fef6fe1584ea70fd7f8781b5515e7f77c1aa947cbdd0d4eb6179336f4d608da1db65de37a SHA512 6c6344ff54aa32452821c3b85c633b417034cb31d4fbed24d5cb8c735b81668d1971ea118b8e61a5fe5f2a0ecb684423f61f18f0e5822040332f9bfb342def5b
 EBUILD eventlet-0.21.0-r1.ebuild 2154 BLAKE2B 208f7c80894393af6f730f5b2e104b4e61790245b212ee4165f1f7c4a1072e1f6730ca378a31270a6e334ffc3eb6527543ed908cac608890dbbeb0d071040028 SHA512 12b9056a134542d0053ea237a1311b64aed89f4bbb7c2f61aba1c985b508b5ecaee92f86040ab2eae47ed8ced9f8eb92c22529349c9ef70cdbe75c8beb77eb58
-EBUILD eventlet-0.24.1-r1.ebuild 2293 BLAKE2B 36311de03443d82c23ef7c6efa593e1f03a92d7475e007ac0a43d526bb08552efa912340385e240ded4f97be46f9d8a8b8c2d3ecb691d3eb9cf0cc89ea3b0b25 SHA512 3226aa8326d476cdc85cf05a67cacceeed71e021ce3f44430df54467d75d4bdf605c50236aa75c3c23dc4dfa0a2a10ad2e0789ae77ae6fd158c1a1be95837316
-EBUILD eventlet-0.24.1.ebuild 2294 BLAKE2B c6073bb0f2e6a3ffdfff5690aab9c05baf831cee5a1974b48f8f4f2c4e3b11383a9693a33143f4a3490a939f97cc05460c2cc245df7762da682984a20ca8d73b SHA512 970bab17a538b9b0e4fa2468519b0ee916829c12ebf1b30f35f93f29fc0cb374e83150f674bc4bf49d04f12f00c12d9fad6e3efb95edb3dc34d05aa6e6efa11e
+EBUILD eventlet-0.24.1-r1.ebuild 2353 BLAKE2B 5edc04a9ef60c05729cff78da418afcf058e5f4808bffcae8eb55cc381dcda6698b4b5a53e6a79252360b65276aab54799ac6be4e71650fe4c27a5cecd722e88 SHA512 fa0d91230fb90c4ecc38d7b0b94d0faf3c662019f7dbbc7962c451686e8101795da587003a58bfbb544b7020f446a82a121c381234d9159a29a8f24d0e1b22b3
+EBUILD eventlet-0.24.1.ebuild 2354 BLAKE2B cecac273fa58fca2446c00882b94314733951e3c8ec2c369ff9ba06faeb9fd56408f26d499b3613d96d1473ebdec46c162b2470c1162603980653624035293f1 SHA512 f60b7379073e01931f2134f9c10bbd5b668fb7c1ada4df730f490c3f83fcd872b530afbe240fd1bd9ced707ad183940a4b3efd21d648d845b11ef61859adab89
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.24.1-r1.ebuild b/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
index baa91fcbdcdf..3ba860818805 100644
--- a/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
@@ -32,7 +32,7 @@ python_prepare_all() {
 	sed -i '/enum-compat/d' setup.py || die
 
 	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
 		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
 		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
 		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
@@ -65,6 +65,10 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/eventlet/eventlet-0.24.1.ebuild b/dev-python/eventlet/eventlet-0.24.1.ebuild
index 4b8cd5678214..dc239a70b4a9 100644
--- a/dev-python/eventlet/eventlet-0.24.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.24.1.ebuild
@@ -33,7 +33,7 @@ python_prepare_all() {
 	sed -i '/enum-compat/d' setup.py || die
 
 	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
 		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
 		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
 		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
@@ -66,6 +66,10 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 9483d0dd4100..48c9ccd0d53e 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,4 +1,4 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
-EBUILD feedparser-5.2.1.ebuild 1213 BLAKE2B 581a3ba38b5a77e15e634bf594122b1271c2972d5bed3e89eab185edc0605529d5d2b6d82353c3b1246affcbe187454af3e3061030e3fe52c0531bce7fa7f18e SHA512 c8db759bf1f338303737491f1523dace12842c2444dce88f81d8ed8be16ee49c5a235852edbec443d13f0c749287298f7554289fe35f506c3e17ad3942717908
+EBUILD feedparser-5.2.1.ebuild 1215 BLAKE2B 2a8272caab2e2947d74250bf10ea16ae65517f012a230faf9e9565cebc37fd0c609cf34b89a8e07ec498a13054e651c3855e1f59e0a9eb101289662711f49ad7 SHA512 23f17ed4a8cb2cf7d3c1bf630ef3985e8a6f92cee53b7572863769943ddfc00f91e30677e12d2cbe6f2d6849ae664e8161671db23c25e6c2676cb0ed1d1aa585
 MISC metadata.xml 545 BLAKE2B 259d08b124b1ae245af79e6c014da99bcca0474a63cf681343152b225cf914001bc10bc59af5ddabaf7144979614507cadbf4506ffe0ec69d69d6bb28c090767 SHA512 529faf4a7612e461dbae6746acf9e886a0ea497b11996e0c5f89de5fece30b544226fdf02a4e19915d132e40b0abcc5b180cce36b5a9f172cd6364ebe3d3f46d
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
index 24dc06b507ab..8a2807be96e5 100644
--- a/dev-python/feedparser/feedparser-5.2.1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 23dae41e4b19..0914e4b5ea56 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,3 @@
 DIST py-filelock-3.0.10.tar.gz 587469 BLAKE2B 8a116f038f344f282540243a757524bd2e72ab8419a0cbdc35910245b8794cab0f96f93d7d8e3b267018054aa1459892506edc9cbfe1099d141a44be9eaa937a SHA512 1fa4594eaba6689ea61149a60a71e86007297614a1c22dc6c94b4774520d396ff8ad03076dfdbb2ce49d2b6e42c374af065a115c167d81cf6107918abfbe52ef
-EBUILD filelock-3.0.10.ebuild 963 BLAKE2B 3480875709b658d449c5b357841851142a58de8851356f93cd561d85bae83ece5d7066307d19738f54f0acf44c681cef4f693ccbef048fa7995386e0a8fa7210 SHA512 d72324fdc0c4e514936732a976d5c144d47983a0c3967ac07859a99bd00117a6bf71d002660c2fc024b2526f44244ccab3c1155d38053804d25dc1e4889dcf58
+EBUILD filelock-3.0.10.ebuild 981 BLAKE2B dcc19368b0ad5fa3aef9442c17957c28cb35ee40eb8690a7edae8d260ecf2447a16ef754682f8e592ecaa559631dcbdc4f4b94ba26bd24b217096648eaa64cca SHA512 a4ad70ebab7ba601828f6bb20b26e985dc95e91781f7edc0e9c4c51347fe8f5ce485e7a42e1366553dc0839ac81f71ea9343b7c0e6e483df2b9bd2e78f585108
 MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
diff --git a/dev-python/filelock/filelock-3.0.10.ebuild b/dev-python/filelock/filelock-3.0.10.ebuild
index bc016f84b54c..2687ff9ad274 100644
--- a/dev-python/filelock/filelock-3.0.10.ebuild
+++ b/dev-python/filelock/filelock-3.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/v${PV}.tar.gz ->
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
index 79a5fa63a5a0..1854383ae02f 100644
--- a/dev-python/futures/Manifest
+++ b/dev-python/futures/Manifest
@@ -1,5 +1,5 @@
 DIST futures-3.1.1.tar.gz 26471 BLAKE2B 53c7678cec213351bc1c172de857c60bbcc392f24a0a6d1fba42eb6190f82d8f01977f8b830e9db5ba0628eb50f2d6dcf0d0421c4b06e42adbd1d429c0c28281 SHA512 7ccb041271ed2688591942f46ab2d2c92d806efbd5209ff9aba77c6d5d3c1a1495fccbeb1718d914894b0b8d936438687e8f3cc22b7ab6625fb518321084ead3
 DIST futures-3.2.0.tar.gz 27320 BLAKE2B b2a6c380955ce29fd434e30897d39d1fe1dbe758ec663bb243c4891849f3e45cf5eba10b71a9e6a028b32f20f876d5662188ec387d442492c7f4b73463b2f728 SHA512 e8c08ebc38d7397b5c2a5dc8c22567af1a1b6d5ce6fb8c189f663fb25b96f1ebcbade1ec0a95e9970dfac73606ecd5d7c6f79cc010fd62930a5b005d9babdde0
 EBUILD futures-3.1.1.ebuild 850 BLAKE2B 68bf47e27209822e72e0fd863cb93cc984c4e069ce19dbc42cd79c648aa46d1e7178925088f274f41e4c038a3f4019b660d2f9fa6b2e90f6f4bdb3ccf35f9be4 SHA512 bca3fe4b67f520223aeb10b0fac319383e0b835272e4141bd9fccdcdc3f24bac6e8f5eeb349bc782342c55341b0bd7abba48bdaf83c97836595690cd25812891
-EBUILD futures-3.2.0.ebuild 875 BLAKE2B 3769d925fa6fbfe76b4d22683dae9406569192839677e174f117f85e303b6a201737ae0211c0533591715efab68958c4e5729657fbf2c9ab1f5e437aba2675fc SHA512 5ececa1a824a7f6addf9ab7af50ccf56c19ace6bcb6e563f0e4a69e15c25301460a7f7805b88c9432c420a65f0a2e0e030274f6dafb077ff549a28e789e97b49
+EBUILD futures-3.2.0.ebuild 886 BLAKE2B d3a0ea165d19cbcb0dab113758011ed8f26f69f61acd1fa7a2f447cb1440257c7708344c0e571ee08b00dda2da2950bf3058be2eec9ff53eb87b22e3933e2ff6 SHA512 f08c9fdb3dd96be31763c1126d034fd53731d9bb448ab324d654d16b6941074b6038d5bea9169225c1639bf5a424b43428d7b78c9b10ea65a737fad9c9267149
 MISC metadata.xml 373 BLAKE2B 1e9903ae68ebe8e33d96f6e6f811fe125edb4f81b1c84c21fa9f962ce4fe7053269d00f29ef5699fcab98e70a755414ad86db30afc528be60ded71e6f60f9eea SHA512 df8ba320e5dfd914b6cc6cb15dbd5efc19047c0d57c44a60fd401de9a7f9c59e06b5975dd832c78202aa34fad94e0771e8a5ff6f16f246c220c5640ec2c84921
diff --git a/dev-python/futures/futures-3.2.0.ebuild b/dev-python/futures/futures-3.2.0.ebuild
index 493a8499aec4..c4f2d8caa84c 100644
--- a/dev-python/futures/futures-3.2.0.ebuild
+++ b/dev-python/futures/futures-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index 9b1462317a8d..ee3354d9e84c 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -4,8 +4,10 @@ AUX gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch 345 BLAKE2B a743
 DIST gcs-oauth2-boto-plugin-1.14.tar.gz 14980 BLAKE2B 1123633b419291433d7cfa9a284303a7ae2a6b407f487b45897df6945a63f6b0cce733a5940e74acb70bcd9740a7c0cbd3828abfb4163f7ab845a9ff2c652a1b SHA512 86804a599c969c63587387df21a2396a27509981cc13a3f92bc98a645757362e77c63b68956ebd2663a721bb51993c9e61679db85a67de48d017ddad7de044b7
 DIST gcs-oauth2-boto-plugin-1.8.tar.gz 13248 BLAKE2B 831a1b88035d6331ac2cb122fda5ffabd6319b7a030ae8c46dac32be571bdff034d6e60830e5e4403b65a414487c874cd4743f537a9c1d3674bcb1461e457945 SHA512 5504fc38d58ee68a78ee2b8e6c3757045494d000748382bc26888a65085cec08d2d137c63cb51afd1cef72d31b3f0cac5d40014548cca47c5322a67a7f1ef204
 DIST gcs-oauth2-boto-plugin-2.1.tar.gz 15789 BLAKE2B f98eb41d07aede9379bb256723c217be1c2fcf2cda18e555a5d7e85bb402215052ff4d7770cdb4066fd989f7e78d070ea19e1a469f5e6dec2b94a367a6dc3c19 SHA512 26b519fa2987e83a687907aa72e0c9eb8b2a2c48143bc1bf13bad79791379daaae190a23f9f35d1a570e21c6800d5860bbb94f3c3f3b2ff7bfcfec8a5a39af7c
+DIST gcs-oauth2-boto-plugin-2.4.tar.gz 16721 BLAKE2B 38816f6f3e5a857967fad6698aa9a35df8d31d42f083584c1e24c4dcb9379b5e8dd18fbbcf0533dccbc2db9f5e4f400d8cd1f8baddf582894af918a2d2d1b23c SHA512 e3e6b7ffca4405a4c41ca1408f05e3c61acc342d236dd2dd857854242694fdca68e155baadb8be64239583954297dac82a07a73d6391cfb93a53d29f9bf67c99
 EBUILD gcs-oauth2-boto-plugin-1.14.ebuild 1432 BLAKE2B 9e1041feb96197c6ae9503cf2490b24323366dfb18c00a3429c0fd38f77784529730f89b4e6f6b76230e5b099831ccf4417c1e990a58258f596ee0c280af7cda SHA512 2c91bebc4c002fe06ebf114d427a70b0e0b9fb43b7b1f7f29fd5e4682a1d0622eabae9d6b3693a0799b6ca47eee0a7ca3c058b82847e5724ce4602204ba49c7e
 EBUILD gcs-oauth2-boto-plugin-1.8-r1.ebuild 1039 BLAKE2B 861b5581f1522c8e648b1c081843071f30bc066a53d26e6826494760258a3dbafb71500ba9bc45267ca026b1e5b519ee4b17105a96b2f48a81287aabd6abd3eb SHA512 4026ecf2f8380a7371cd87dded9837632a5711cd098d4d2bfc214308c2ad687e8c0e452f120029fddbf3fd47085b9d65aca011a22d79ed520d4f0ca52eebd6cf
 EBUILD gcs-oauth2-boto-plugin-2.1-r1.ebuild 1399 BLAKE2B cab46c50743fefd5269b0345bdf08d730f443748c158f8fe1d286fef95b40164f2e6a56192156316ad743904a8b0e5bd41b179d3961ea47804311a6bc88eef65 SHA512 3d57e238a406e01b4bf8ca063202932a06b1a0bde8d92e86e2fcdea5edb4e95fd46a802cce6f1a7a92daf04b843dacf17bb576200842ff83060265888ebfedd4
 EBUILD gcs-oauth2-boto-plugin-2.1.ebuild 1344 BLAKE2B be3aa59dfab3c30030e4c446e03814d75338d6bce93151bdd268fbe47ca455e96352c938f9257e6f9d11a91a35d9778a9a2f7124a10acd80e71e1fd28115c0bd SHA512 cadbe1d47e264ccc57e36ce88b63902d38978f5b2500f24b72d99cabd9bd3598ef39313d0eef4c84cfb24237d3ee1927cbf5a7b155441985098aa90b4c9336b0
+EBUILD gcs-oauth2-boto-plugin-2.4.ebuild 1404 BLAKE2B cdc14a6f094e3c2406c2ad1cf7ff6c4f459fdf6ad4533a1b849994ac0eb31ce86dc53cbddf0ab451d06bb3a6e8496379d70339371f01f868423a683ea3493ea3 SHA512 845d05f55386224ecf8bb3c2bebf480bf38c525ed91ac58410ac9cf4ecf6db46f3bb4bc97ed4101f89c0c4ad16c4fffde879300d864f11b0c017ffcdb42b7657
 MISC metadata.xml 335 BLAKE2B 11f766d7bfb5e7ddb78ea1d749d3d2d79496d69e07b1054bede831ba7824d8705e064e5842c71206a0c35cea37e40558a6cdafd8ebf8460ee99ff8dce3f26ac5 SHA512 cb494f35eba6442585175997cb16c7d4f6eea841e56f2828386f0894e68a7d917c010264bea46d7b6ae1957633763c66a5b669606fd8b0fcba3b4555fa926807
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.4.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.4.ebuild
new file mode 100644
index 000000000000..1f43500e98c1
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.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=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
+)
+
+# Keep versions in sync with setup.py.
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
+	dev-python/google-reauth-python[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	!=dev-python/oauth2client-2.0*
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e '/SocksiPy-branch/d' \
+		setup.py || die
+	# Make sure the unittests aren't installed.
+	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
+}
+
+python_test() {
+	${EPYTHON} "${S}"/test_oauth2_client.py -v || die
+}
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index 2c5e2566aa37..a3c6d76336f2 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,5 +1,5 @@
 DIST git-review-1.26.0.tar.gz 56557 BLAKE2B c8af82d7cc222078c1ef470da0ffac7b698df91ed991ba43c8d34a64bbfa3996bdbe475d9965d6d1ef8cca84293613afb92ac6405c0397232e568d2ec2226202 SHA512 74b2366d7884963caaa9b4614301fad56b7997d1cb16ef333cd2dae5df5a5343e5b891fc089078856b57db0083584a8b4ceea98dd67c401651a100fc4fdf7d81
 DIST git-review-1.27.0.tar.gz 58471 BLAKE2B baace809949fb5bdb22c6cca251deca7a200b070573840f391ad24ad045276d376616c58355c5159086dc67b481686d6382c71604f2bdc8adf0b2799240a976d SHA512 e9fff7e54457b300c269378062e5bcce28511dfd6662035dc8d276e33e6a0f6b6c68bae98fb3a8a36e468f669c4eeb461e96cdf073a831c42156f8c0ef14fa0a
 EBUILD git-review-1.26.0.ebuild 660 BLAKE2B c43e02f5f93f363d5c07368a900e33317ff30e63c9a36020ecd091175b9a9b22e39ffb1263bfee5de410fd932cd224aef8c5c0e183f0435b08d4d1f166e491b7 SHA512 72ea110f91672ad032213b2a0e7e5845fabf67f9a1da3fd88a08df0535ee2ce2b6c33259a9220db44957349fb486d3ad1e41ab93c0b6493123ad73a6e9113a98
-EBUILD git-review-1.27.0.ebuild 660 BLAKE2B c43e02f5f93f363d5c07368a900e33317ff30e63c9a36020ecd091175b9a9b22e39ffb1263bfee5de410fd932cd224aef8c5c0e183f0435b08d4d1f166e491b7 SHA512 72ea110f91672ad032213b2a0e7e5845fabf67f9a1da3fd88a08df0535ee2ce2b6c33259a9220db44957349fb486d3ad1e41ab93c0b6493123ad73a6e9113a98
+EBUILD git-review-1.27.0.ebuild 696 BLAKE2B 169eb7f9dadfc8b87ef67332de23d6057ad81ae6275818d4b3847c0f4f7f9f5ec363200ad2465f425be67f5e4bb98f0625f29ca251874583ee2d2dd2e2fc546f SHA512 274a9ec4c1cbbc0e4dabd2208c76a3261dbde7c112513d5fdf07929daa53ca1bb8e0b10d9f1cf6a9a6bcc0fd4e4c9642ad30ce2e6b8753026002fee3cb24e44c
 MISC metadata.xml 337 BLAKE2B abf6866cf38fbd7925eabe5d6f2a4cd5887dc263d419cad65ca4105a20ee975ad41e1a661696520fe016318ce55651dc123ba7e6a735335a70d3aaa1b10f3320 SHA512 5bb1243f031097419ceadb6935e12567d359790e5fe63c19687f1cfe4a64f5dfa23b5704232d5777c6dddc1908b0856a780129dc08b787d786d2b867dc40ff46
diff --git a/dev-python/git-review/git-review-1.27.0.ebuild b/dev-python/git-review/git-review-1.27.0.ebuild
index 28dfcf4daf6f..a238bf2d7236 100644
--- a/dev-python/git-review/git-review-1.27.0.ebuild
+++ b/dev-python/git-review/git-review-1.27.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/google-reauth-python/Manifest b/dev-python/google-reauth-python/Manifest
index 17a2091bc786..68fdc8f93a5c 100644
--- a/dev-python/google-reauth-python/Manifest
+++ b/dev-python/google-reauth-python/Manifest
@@ -1,3 +1,3 @@
 DIST google-reauth-python-0.1.0.tar.gz 17720 BLAKE2B c78a43f1062988ada715c9e1bb64c2252a3debd5b9b366df9780200717a006c5e4957bf37d81e645989c6fc74c5e5b4354c88244309bb1a22a936ef74f6172c8 SHA512 b92b822b5c59d74f7ac747e66f35eaa906a0e18ccbb791e0904551c6ecd9b904ac7602ea38333a16396ffa49638a1b4991827429c7f52311b9506f55400bf117
-EBUILD google-reauth-python-0.1.0.ebuild 1102 BLAKE2B 0deac59960e11c619b983305ac20ffc9542b4e64a8d9b988e7d9e96eb0235d775b97729ba4027dd054db601246dc7982e00ac058cdf07a461171aac228ec1e55 SHA512 6304cdb32c90b8dbae086289dd1fc43983e82c56e1287db0f8c36c92997cca625249c2d0a94f3786f90e292a494b825a07fb220e9b7541f65612135240dd6e51
+EBUILD google-reauth-python-0.1.0.ebuild 1104 BLAKE2B 2ebeb83c52052f287948677a7ffbc11838a0ee58f83380d6bc2f548926fbaa8bd631e84ea1bfc8a7346038092de2d56d0f7bf9f371df7d968f11c8d5c5f5b720 SHA512 eda084b2c4264b3d15f8582b60cb7f804794f97f1a1fab4dbdd7e93b9861b3247cd070d56bb30baed8d8be76ff038d8803686b9873a12fe4fbcf87c8e8fcc3ef
 MISC metadata.xml 387 BLAKE2B 3c273fa005cf2d68f977f8556723ae4577d05998471f3cd845f7335c84c610d4d4af9c971b6ee2edcf51b621e24eaf2083c20dabad714111b2d21cc99116d376 SHA512 7fcd5ff43d0f70d110f62c197f5e8f4ed6bf3192c457402c0d4bfdda66f32ba5144008d07e87d1661289ffaf1f2b637f7467dc1a50b65cf6606c17caf283b96a
diff --git a/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild b/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
index 39b3cb884ce2..8567dfbc6569 100644
--- a/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
+++ b/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index e1750299bf6c..c4e038af620a 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,3 +1,3 @@
 DIST hcloud-python-1.2.1.tar.gz 63592 BLAKE2B 9a6d2dae97ff405ebd9b92bc833c9d953c13840e68be4eb43fed375a60e55cf4bf9b4b742b26fb03401f631b7f7127815961861cb673adf4839c829141c8ed00 SHA512 cb70d190350457fc3c6e474bc6c943070102762595dac2f386041956f64255f390a928a2f2411be861645cd65b015ab9e0c931b36aeed0076b06d9f67ac72d1c
-EBUILD hcloud-python-1.2.1.ebuild 1057 BLAKE2B e3e150a586a21f819202687513e4cd98cf80a38f017322f99cfaea2fb1e57c9b3dd13b6cfae24b53ca1ed50a70689a26c47253e8f62d80d32fc7b3ba3de0b3b4 SHA512 c1c34c485aeddd153d4ea714e15d31d34b94a3da28a026b9e6648382ca52c5c0cfa8ab6fa56801abcd0fe6cd142efbf57b9fe3d455a986b808a9d5309279ad18
+EBUILD hcloud-python-1.2.1.ebuild 1056 BLAKE2B 94a8aeb9cf22f4263222ab52e186c8604912c1a0931d96e3a47698019245d318753fc5d5686255fa0ef6f9460fe55a94b2125804407da5f94ca92f4577189a37 SHA512 ac4b6bb887fb0b1ff076c4ba02dd1a33256f238eab49f250db3b8a1908c68784dfe5c51b5dfa2b7db7f5dc57496e472c8be8d50d152392984c2f2c6674722e18
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
index e9d98103d9c9..e2e7a998b313 100644
--- a/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples"
 
 COMMON_DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 49392b52fc3f..5d424bb09207 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 751 BLAKE2B 75d916e3f219e4f22bf22beb036f66819f14cb701805975a278d718ab2e0616623c03fe649a52bbea7ef802a368d462008dd4cc262b0dcaa0d09e5589a4c4f96 SHA512 3a41f60aff8489ab2f8eccaaf60eeb059b0413b316882004a9d2a1629753ec6a0b8051b6dc21c54d84ab27d61d601ffa89ad7232ce1e0d599dbaa19796dec308
 EBUILD hyperlink-17.3.1.ebuild 775 BLAKE2B 024f3053f640d72207be5e49378f34999a33b9895100825593a336f5b232d73bfaf968dead1bd3d17462301766fbcae11d0a04ae79c14e5ad48716ee5b2c0348 SHA512 b9d28c8433845c743795138e4c4ee057dd473d2992d92d99d08ee568e230b109d6360904521b7d2ce849bacf39d93e7bd04086fa193656c3828d22b57e484d2e
-EBUILD hyperlink-18.0.0.ebuild 727 BLAKE2B 4b30273a21885fb739b929bf954a8b508e074c39439c976c1dc08a030061502d820567e9efe8dfa1a27fd824d76256b8c502f6af8b1dfbfbc08b75adbdfa37ea SHA512 b573cb941ef52c224935c8e2987a4f11db94eab715e7d577bcf31f54991149cccbce597db43486344fc884a0b95070dffa720afee23b25f0ca147db2f7db42b9
+EBUILD hyperlink-18.0.0.ebuild 738 BLAKE2B 8dfdff6f28f3fa0a337ac245a126960e74ec52ffc1e141dc32a9bb34af0f5841091b4ad20f269c2aec717e9b3c090299e46efcb8bb7450755c96c8250caaa67a SHA512 8864982ca704b2b3557ba9c96c4dd47cfde792051775b8601c66d0c8591cbb0fbcd59084a6bfbe12d43bf5354b23f56e1bc35cc6bf7f14c3e2ed699ad050e6c0
 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 23dc4055ee0c..a1191546df81 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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 68ebdd35ae99..2fd61e5eee2a 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 601 BLAKE2B e4ac8f04289e31f2c5d49baa67ceb1fb916ce02de98f00a99e7eb837683ed30a1070b013ab820745ea51f1baeaffc5ee6ca9691bbe60c87aac5d48e88daa68c3 SHA512 6732f772a2cfcb1887d8301d71372c0f3d659434d9a2d6b5a7f404bfbdc9bc90b39fe067afcdc9e5b3958fb40784af1063bd8abb361998015b84c49a2915853c
-EBUILD incremental-17.5.0.ebuild 642 BLAKE2B 31916c409a9a0ca5a92f2fac63fd707ccec5726cacc49d7081dcbcae448b204ee1166d0346375681a990fa8eb02f0a864adcb9c779bc9d03bb9e8276ed382d0a SHA512 e9cec768b952d229e03770908a8559a1a2777bad80304facfb7348fe839beb84a6061dc6e324d3d2061fc4710394b76bdf62e26dc0fdc90d08a9620949bed63b
+EBUILD incremental-17.5.0.ebuild 653 BLAKE2B 60e257fa5732e4cb562bf0a38dfd744fb78867f58579bd4030460ad02fdc6d9f7fbc6c6ea74140ef80249c757595225e5a977cd62ea765004c5c15057c025dc7 SHA512 6fd3944a48aa7c99b4f956ad580343cdf31eeedb4cc5466a79a56d82533419cd64e34a97d6a96146011d38b5c297a707ccdc5f1aaeee02bfdbbed134cfe1bac2
 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 ca1fb238edd7..4455b80d7d30 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 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
new file mode 100644
index 000000000000..7221b806b2c5
--- /dev/null
+++ b/dev-python/jsondiff/Manifest
@@ -0,0 +1,3 @@
+DIST jsondiff-1.1.2.tar.gz 7803 BLAKE2B cbfcfdb2c6c3bb721b4db43aca1d66649257db2cd9feb9655015e621fcd90c72af087696b9553a10ac89cdaf5f23d8748463e1a13bdb19207e34e12e66629544 SHA512 ca96bb80a6f7a34c8c5bcde74856dc1c4935b3e2979330ecfc33432aff83968e671b2aaf310c77f2c7d431be1ae6e20a960879700ba3c903a09a48b23d4c0288
+EBUILD jsondiff-1.1.2.ebuild 850 BLAKE2B bc74275bdec736747e7607022c16d0ebdab4e097fce4e63787db9e719790ac28fc48ee551fa2c67e93576793dda58f9721cd0c69b0988986caa31e65df8000da SHA512 ed1bd63e25afe9e68e1d3e221aa1d97a26d1282ba1e587b1073384fd59aa8f222735a539a47915701f62bf9947c79e029f4c420bd02c0e998c8422e5f1d7c2b0
+MISC metadata.xml 435 BLAKE2B 3ea5af8e9063a07c6d3d93225a712395a351a368bf689e512b45e6225e23a543771839e756ee53cf51142b6309f0b1ecd20fff6203a69ae754c44893d09c5274 SHA512 d1b50f01a0a5f2381fe41e4da073fd00afd4443a76d692c7a2227e50b178e9b990c4c40b72d1beeeab7cc8e5f1a9a52beb758a5adbd088eb787b9f2d08844eff
diff --git a/dev-python/jsondiff/jsondiff-1.1.2.ebuild b/dev-python/jsondiff/jsondiff-1.1.2.ebuild
new file mode 100644
index 000000000000..4f246f930991
--- /dev/null
+++ b/dev-python/jsondiff/jsondiff-1.1.2.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff JSON and JSON-like structures in Python"
+HOMEPAGE="https://github.com/xlwings/jsondiff https://pypi.org/project/jsondiff/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+# tests require nose_random
+RESTRICT="test"
+
+python_prepare_all() {
+	# Avoid file collision with jsonpatch's jsondiff cli.
+	sed -e "/'jsondiff=jsondiff.cli:main'/d" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jsondiff/metadata.xml b/dev-python/jsondiff/metadata.xml
new file mode 100644
index 000000000000..ff1d5858ae38
--- /dev/null
+++ b/dev-python/jsondiff/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xlwings/jsondiff</remote-id>
+		<remote-id type="pypi">jsondiff</remote-id>
+		<bugs-to>https://github.com/xlwings/jsondiff/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 72447c1e26b9..8d7e8a040a79 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,3 +1,5 @@
 DIST jsonpickle-0.9.3.tar.gz 60489 BLAKE2B 4767809a3bd5816343e9081bdaf45cdec8dfd1e28b832675e01ae415c1ac081d0a84e2827051520999d11d0dc28a62bdd09285cf384fff0f941d3a571064e2bf SHA512 38de2ab2c15e0e28323a8cc83b0c0b0631f2f678f620e8738fee19c71492f011aa7eec428b859574a0066b9e24a08bde911a283736757964035befe3042f2e06
+DIST jsonpickle-1.2.tar.gz 74693 BLAKE2B 65f9c18b8693351995f84815d27f2d86ab65fe7a620cda0d346b88db56de45ff6aa21b7ae941e8820e16e184d9a5ac55d56caf112f3930083e63b50751fe2dd8 SHA512 0a5bfb2e77175c9174ee1783301c613e25fcfa60f07e610206d1e1e34053e90b21b12bc1b1045dd03ff2d4efe5940d85d852800037ca01397994c022f0ffb2c6
 EBUILD jsonpickle-0.9.3.ebuild 1540 BLAKE2B 670224c291caa2b087cf02b055de38bccc811868196eb8e25afc8666537ca247d6a0dbd8059619f8d8cc159cedfbf155eb175e22d885270d1f7e05cbd88f3ee7 SHA512 7cdd4db2d62db30b2627f15f22081249b030b4e4364ab342970595fda2e43876a639641d5a2b5c424a742ed47cbc6039a2ffc6b0f7ea9625575334fb612d22b8
+EBUILD jsonpickle-1.2.ebuild 1532 BLAKE2B 88afbe861162bc9d29a11e9663bed964a52e9f3e477b77d4f422725cc23a53e4c1b1d1541697808d25187b42608e1193dd02d589ca1c9b160c6a8d8f203cd19f SHA512 34862322b3184f4baf1dbb86f0e029e38b7292f1e8ebccad2132dd1ba2960cf1373d6d01a8b8acf535bb6ad0c40a257ae4b77df91d4ac9acbb4b961c8434d789
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/jsonpickle-1.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.2.ebuild
new file mode 100644
index 000000000000..f4a6601fd81f
--- /dev/null
+++ b/dev-python/jsonpickle/jsonpickle-1.2.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,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# There are optional json backends serializer/deserializers in addition to those selected here
+# jsonlib, yajl.
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/feedparser[${PYTHON_USEDEP}]
+		dev-python/ujson[${PYTHON_USEDEP}]
+		"
+DEPEND="test? ( ${RDEPEND} )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/sphinxtogithub[${PYTHON_USEDEP}]' python2_7) )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && { python_setup python2_7 && sphinx-build -b html -c docs/source/ docs/source/ docs/source/html || die; }
+}
+
+python_test() {
+	# An apparent regression in tests
+	# https://github.com/jsonpickle/jsonpickle/issues/124
+	einfo "testsuite has optional tests for package demjson"
+	${PYTHON} tests/runtests.py || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 387d863c212c..44885d83d7a2 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 1218 BLAKE2B 557c674f096982aa69f048e5d85936737cb7856363ba83386c4dcd30ab5fc452e888ccf1d6bd7d737ade17415af3edb1b17018a286f0ae0f635c945333014c0a SHA512 c5d3a2bde7e5f3d3c6e7f36d01441f46c816e6d6f3a0897be6307d5f0f33eff8344e2d7f8c3e832f6f66c6efd91b9d1b8321a8c5557d99c7d9283ca7a189c8e6
-EBUILD m2r-0.1.14.ebuild 1287 BLAKE2B 3fbf73794b2e0125fad50d3df51b2c27b7640e3dc44faec8d82d72ed7b3c2ea6d28cba61731957329934a4906312d3a0260fb78673291f762d5e35ed3c60d41a SHA512 7fcf173cfa549f9deb4c4034cdd6f717fe8610e404913d517776e3aa1bd0799ddaa6c858809608cd18b72f2cbd97d6bd932af05a5cf01ad5cad9ef03224a2f33
+EBUILD m2r-0.1.14.ebuild 1298 BLAKE2B 9c729388bb13f154935f096040e5dc3f81c5886144b31e167cf6b8421f2c5023c95cec1ec82f6fd984706100b23e015aef5f9b13e9fa422b5bb440ddb42fcc7e SHA512 5013eb2fcfc96e9b947bf5cc52488cb9598c23830fafd801c0531f51b11f1165bc74f9929eafb24000cdce8fb35f3172e54bb766b011b97e20f93945f72f59bb
 EBUILD m2r-0.1.5.ebuild 1271 BLAKE2B 21912af5451c48c9d6611e3f35c111a0f865c406695aece7fd8cfa6acfa280a5b333b37e645fd7a3f44f789c076cc8915f9bfe1483f3799017d66b608faa4b7a SHA512 1f9409bed0fddab84d52b68fd219ba5edbe867c5783df9c872ece636a5b3b7137eb87dc6cc1a5afc6f452041fc384a30fa2c114c93c1210cb0b8ebff821cfacf
 EBUILD m2r-0.1.6.ebuild 1271 BLAKE2B 21912af5451c48c9d6611e3f35c111a0f865c406695aece7fd8cfa6acfa280a5b333b37e645fd7a3f44f789c076cc8915f9bfe1483f3799017d66b608faa4b7a SHA512 1f9409bed0fddab84d52b68fd219ba5edbe867c5783df9c872ece636a5b3b7137eb87dc6cc1a5afc6f452041fc384a30fa2c114c93c1210cb0b8ebff821cfacf
 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 d1ca28818631..c7376dade390 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index edf8e8ad0e8b..96498e21c02a 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,4 +1,6 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
+DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
 EBUILD miniupnpc-2.1.20190408.ebuild 748 BLAKE2B 67ab0e95d689347412b7c08b9949a059adedd4c62b0705c8cebba7347bdae1727fdaab0138200457289ac1a7eaf425163894b850e69268e9bae55cc660784b1c SHA512 bc8300b2f4df692141a7a46307858677ae37c57b64655f21daad9ded09d51c7d9bd28e861482d08b7681fd4758a3f65ac169a150a0bfbd29be464b567a176ba8
+EBUILD miniupnpc-2.1.20190625.ebuild 756 BLAKE2B d17960d77602df26cde5b78783b1201a066353baea6895363e0a207cc318a7a7b3ceb62bf4494f2e2200c216743abc35e169b5c5bf6d5d24fc2a8a3ea2ae4cc5 SHA512 9c7405c5f98f2e5ae579a5155213f7b8827bf6458f47cb00d277a0d84cc3be2db982fb2042ee13a83aa86503638fac960fa844e31481eea8c22b4a899f9a5cce
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild
new file mode 100644
index 000000000000..b29713da4bc7
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,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/moto/Manifest b/dev-python/moto/Manifest
index 4dd4f17f3d85..821f2db18fe5 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,5 +1,7 @@
 DIST moto-0.4.30.tar.gz 614008 BLAKE2B 2868ab25414e488299cb521ce814239698466d69e806245fd86ceb9d5835d08fa530f2da0a5a16f595a88b3c0e421cc264f361bc68d31841726896826240fbab SHA512 ece27979911f46adbb0aec9aa3755b13c09ced00b24ea136ab9c8a8a992550e9c38dac15d8b0c71822953f070761083253ee5fb5cbe44a4b108d140ab4407699
 DIST moto-1.0.1.tar.gz 731617 BLAKE2B 6f20c07c0635a8c10f8f70530aeaac5ed7c2136d4fc87ff57774a95f4d2e1ea8cf1100b9f0871b29138cec9059de5746a9c01104d856f8248edbb648cc4a78e0 SHA512 3171ea3e8f9d267960a7b82caf7e42b86fceba5a80e96d35b849e4e72b7fc6aed94090161219a520f9c1b4050f7de12e0f6c0d560ab1f90ca43fc0387b62d377
+DIST moto-1.3.8.tar.gz 1571716 BLAKE2B 8e79808d8488bcf8c15e8b5a55e93392ceb5f642f1f52c0af441cecb7adfe23a718f6d283e473e5dab82ddd21bcbed36ecb52b444cbd933405d13c8818e4f74d SHA512 901556249a2a28885b7f77e9f2c209b06391efcea66b78ce3c16edec14bcd03b251c37ef5d800d8f7a35180d59ce7568a68bcebf18e25b092eb5de801db6c587
 EBUILD moto-0.4.30.ebuild 857 BLAKE2B 444ceb952a989c9464811cfb42f042ec7782fb5492410c5653a9b3772da113f4025f3e983e0565badc061cadfe97f56c11b5b7f224e8aa550eaefa329cc82f20 SHA512 179362a90cc09caea49019df697039b009ee86ea03079f8c148ed226c83397614c6fd5ba1362be252374fa0cc2e028238f0d23a5e96cb37993e638f70a679b41
 EBUILD moto-1.0.1-r1.ebuild 1286 BLAKE2B 12e25889b037ebae406b65f3cc482e6a545c5a670ffbcdf4d2810d855f7d4cd474dae4ac6765cc74e5e468eb35c5797b8976ca82583271251e703424dc2b5091 SHA512 dee6ca369ffc4d1703d8c06c849d823550685a540a9de1e540609ae3732994da21f5e92992d1cfc2d48f937bb0c702bd626b00703dafaa0e6d842a3abbd5b461
+EBUILD moto-1.3.8-r1.ebuild 2442 BLAKE2B 3b4215dff97712e2850f1fc1663fe8d01e97a834348e130c58b8fa394d18952494d2f32cc40619ded1d5107281b1a696207b1d403848afb8f9b0ead7c816bbb2 SHA512 bd3ceb59958484697fed08d1134a68ccdbaa19a2dbd96ef496c01b8719f3f66a6f41ca61f865744e5fe5fccecb170d021c6758e9687883ef5182ac8c14e28210
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-1.3.8-r1.ebuild b/dev-python/moto/moto-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..85dc90877561
--- /dev/null
+++ b/dev-python/moto/moto-1.3.8-r1.ebuild
@@ -0,0 +1,76 @@
+# 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="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	dev-python/backports-tempfile[${PYTHON_USEDEP}]
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.3.0[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.86[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.86[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/responses[${PYTHON_USEDEP}]
+			>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+		  )
+"
+
+python_prepare_all() {
+	sed -e 's|==|>=|' \
+		-i setup.py moto.egg-info/requires.txt || die
+
+	# Disable tests that fail with network-sandbox.
+	sed -e 's|^\(def \)\(test_context_manager()\)|\1_\2|' \
+		-e 's|^\(def \)\(test_decorator_start_and_stop()\)|\1_\2|' \
+		-i tests/test_core/test_decorator_calls.py || die
+
+	# Disable tests that fail with userpriv.
+	sed -e 's|^\(def \)\(test_invoke_function_from_sns()\)|\1_\2|' \
+		-e 's|^\(def \)\(test_invoke_requestresponse_function()\)|\1_\2|' \
+		-i tests/test_awslambda/test_lambda.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH=${BUILDDIR}/lib \
+		nosetests -sv ./tests || die
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 6b0e026e76c6..6a91abc2cebc 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,44 +1,25 @@
-AUX numpy-1.10.2-no-hardcode-blas.patch 3295 BLAKE2B 300b64a2867cb55fef23aff58069187c1c743740fff75442f56da9e817adc4a857a29dccf5c543ff4c63da5d5618a34fdc1f640b65d8f8f23dcaa96c6334baa2 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd
-AUX numpy-1.12.1-no-hardcode-blas.patch 3473 BLAKE2B 442b505aa6a09aece4e3e48c43fffcbb35e129f99097233d7387ea41bf3926ed72be4666025d4c4bbac7a5e9e557e54cc0c439d748cbbbff6ca075e7a1969c56 SHA512 0066fdc822151b13a4f91cab522000ab43bea52539100070949d08e0baf6bd35e9c32e13e877e22c40041c3fa0e8d716d802087b3c9016d6c1e05edd0e48fd6a
 AUX numpy-1.14.5-no-hardcode-blas.patch 3767 BLAKE2B f580a067b9c91a53f99daffd33f38306abb3d2852f4d513152531fb0796f50371c9031b7c685fd35801afbe2a5b649efd4d2cdca9c239f119893b1fde19bda3b SHA512 66a7d9988ab3e6f5b1788df7db9d81719c43ba641edc3450a4912c46aaf0ffb3ba6030dc458182adfb11eafac91f2ba6e1c5aa9b8eb077d6d8c776b2ec5ad2fc
 AUX numpy-1.14.5-py37.patch 5417 BLAKE2B a6660b06a6f5ebc436b8bef4f53934892384889304f3b48ed1e9e84298deb78528e431e2102856fe1bc44b5e9a472b3a0b51401ad824b7072465d8c54f6aa939 SHA512 78b6a1640cf51e9b58478fd9ad5044bec2efc1319cc050f0a1345fc367b57b9170954ce25b88b2851007b438a00ac380eab48f6b699fed1115d109972ec553ad
 AUX numpy-1.15.4-no-hardcode-blas.patch 3841 BLAKE2B 19ddde096b5b0b1d3c0a98e16c14b96cf9c16ec5d96736ec561f14535fe240eaa8fbe71f396d432ce557b78b18a98ad8684724614f201b1d6151c8edfd07f483 SHA512 8f870f8a52c096f6f0f614dc64ff6d5ed8d8805e14723c60c6e85b69cf915fc698e808f3fcafce75a6ea9e7eb728949dc56ef823d70963d25658e50aa8becaae
 AUX numpy-1.8.0-no-hardcode-blas.patch 1153 BLAKE2B d812ddc3069d23f211026c14ca36aa907c254b5e5305e720bc87bb5fbd51dd032f93eecd245c222ae8fa81dbe1541a2ffb1524e685a05f238758b4487e3532b9 SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3
-AUX numpy-1.9.2-no-hardcode-blas.patch 1821 BLAKE2B bba698b76576a29c24f69a5aaf92173065d11d2e01ae8e76a66650484f18761b62cb49d348e97a62350cf74d9c728f2d26e94b903b62c59c903e7022c31fefc5 SHA512 59d498f7b0a1e6f4bc37e0eb7121812e1fe974e06176c7b80e99e41c49067a618bc98d925bcb667607462f5e7823f0f55235c8ddd685e318dfb3385b7eb7dad6
-DIST numpy-1.10.4.tar.gz 4069996 BLAKE2B 9f315d1fca4415b148d4b3bff6f223930bab3d0cb9e19fc5790d71218549c9f0031355e8a95eae9c866ceaf6391a3aa41206bf3f48477b6cabbbc52e0287c246 SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79
-DIST numpy-1.13.3.zip 5021189 BLAKE2B 5a2890a8e08425a2d537667cb2c621a57e1d442951d0b06aee2a9a153bf76652e9c4cbaa11716697a85c580e1f30043d5eef10fc24245074e6431a873ff80c34 SHA512 b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737
 DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
 DIST numpy-1.15.4.zip 4473522 BLAKE2B c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090 SHA512 9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
 DIST numpy-1.16.1.zip 5070040 BLAKE2B 0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e SHA512 e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
-DIST numpy-1.9.2.tar.gz 3986067 BLAKE2B e5ae6717badac01186a5b0f36729c1c01dda1fb4238978858c778f08f17512c5d1f3902d551cb0c67a77c1246ce238e588556188e7e6466c27ebdde09879782d SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9
-DIST numpy-html-1.10.1.zip 9663942 BLAKE2B 436ab4185212f8eeaa3d61e29c2c547c9f24bf0869984cc674e66a7360177e999cc70a6573316711e478db62057d5cee90f85b978d095c6b47f1dc3832ffbdf7 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9
-DIST numpy-html-1.13.0.zip 10324817 BLAKE2B e16357e615b30249a4c41582b46b194e2c3113996260f0ff60e5b64ce9b344a05a5f372095a9f1187e8474bda4078f41ad8372c801637278d3478176de455eaa SHA512 2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542
 DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370 SHA512 578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
 DIST numpy-html-1.15.4.zip 11158615 BLAKE2B eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001 SHA512 1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb
 DIST numpy-html-1.16.1.zip 12132467 BLAKE2B 050a8cba160e36a4c547f1b67b8ab2b9220c9841a9f8343dce6f3221313505530a1687efa2116384a03d3bc9172a0298b4ea5ece2f423841d595e45f565ccbc2 SHA512 5af356313363e00f05db560902cc7578162c7d2ab9c1ef0f3713854682b63d76297d55eb9aac0dfc7f4b687ccea93a53462e2082ef1270e29e19680e1222b34d
 DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071
-DIST numpy-html-1.9.1.zip 9839137 BLAKE2B 84b4c15ee20d8a1e6514baf47b96ac770690357278ff22b48c427509534c41df9e14165483f625955a7c6c087b0b5e13e68bf3d06951352a8511d6e03cc65d9f SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4
-DIST numpy-ref-1.10.1.pdf 5382006 BLAKE2B c360d40c6ac3d2975a760dcf32ed312f30e9ee6b096020e0513bb22af600de62f5f72309603414b3bbcaf02a1aacd79e84545a6e5d50611bfdabafa9f6441a10 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c
-DIST numpy-ref-1.13.0.pdf 5047809 BLAKE2B c7e2734311918c6faa46b008c4802bb090a728ca22337695755e885a7d7d341ba76d5e489c9c56cf89a9d0545bc9b24787e193c4bc1af2631a368b812fe74083 SHA512 0fe28be029602f8b8dc12987da273581b42f123a9d605321084d4c05233cd31ccff0efb17b99c3e8cbfec5f8de11252a99c1ee5c43d37aa5fa57d712f4bb4aca
 DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a00007f2 SHA512 717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746
 DIST numpy-ref-1.15.4.pdf 4843444 BLAKE2B 26154930a8c881f49e7eb7d9540d1deba27baed1acb15dbacd42a659c05f50605cd44b63b2474e66d1d22851145cc65b3e3f26302f8966e141cbd2afc666c654 SHA512 aebff74389e785bd588ccc287329aea4dbc3ef51b46fbffdf088853342fea724f79f712733e453877949e756a52e89de3b257e5feba86e830df84ed8f9bb0e30
 DIST numpy-ref-1.16.1.pdf 5175448 BLAKE2B 5cd692a0fc825216560dbbf48738a49b794973d4539bd778f0f9a2f7f72b32d3061675f9a76db4cbfbb38eec0793c70046180fcb07e23ffc6177dee76b16bb92 SHA512 6cad03e30d7c2204fb899f4e4d1167fefade60d20dedf0ea87ac15c70139fbcca8789cdf17af5a2d221ba06eb78e9376b4b542621f9d78772041c83ab2405d1a
 DIST numpy-ref-1.8.1.pdf 5348248 BLAKE2B f087fbbd3c789adebd2902db0a2acc8a8748ccbb5a1e7e064effdc91e92c7dcf087ae36436fc52d7afa12a12ca2fc0f5f5617177bcd8b9745a7155acd10d71fc SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5
-DIST numpy-ref-1.9.1.pdf 5318122 BLAKE2B a893be075c823ab1a6ad3b2e38e8c05aad20cc2abf9307af9dac87b12f029fe07b535b1f385a4315bcc9590fedb79e25bc5e1659885ad61cf010d2f45ae6edf5 SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba
-DIST numpy-user-1.10.1.pdf 406114 BLAKE2B 88d43e87071eb88223c84720001671677c6f8c1e745b4434331434a9c48cee4591e67740ef102e49e839e4b2aa690798a5415fa25eaa79d823dbcfa29780fa85 SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4
-DIST numpy-user-1.13.0.pdf 580593 BLAKE2B dcf86d0a87ceb7062b8fb339d37bfe3c3fd5e166f3079a079d50f6afb51bde9754d050c97b3e4aec237aaf797d70a2458fe0f26beeeeaf1594330e08c07e181a SHA512 d3891d449b72c2d97af28182e0bcb12559abc114f8dbf0e0c68362c1af50e6aeab565b31b4aa44ab079e8d47f550081a79a4066c37fc52a1c70c05be45eb5c11
 DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e0b03fe1428d0b3497466fa1164ccbad84969cb7bc8daebb5525094f0d0c7710e1d661b1c6bbaca0669bfcbf875 SHA512 fb00305408c56ee203ed71ac042474592e7e933f14a639f6dce0f6dc80206c13b844c2425a919f9072a114c7af2c2f9f85b78a07ba3874259e5d173290e51a13
 DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212
 DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
-DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
-EBUILD numpy-1.10.4.ebuild 4088 BLAKE2B 2df8e688b7b0f34de4b5f2e13763bed5c545e29bcd6800e4d3ca7abbe08674857c888a38d679c5cd815a94901cdfaafa721bdfd928b602461cb37acd599320ad SHA512 e5018be8bcfdd2bb962bffc293962beb10c578a056c29a782c010f4e1313cd88fc73daa4fb8b558a68d90801ac07e3e41d68e2fcbade49046b0317310b872136
-EBUILD numpy-1.13.3.ebuild 4635 BLAKE2B a695ee94fb1ee5c3488f5e49518291fdb7ed52cb527e6e91d7faccd636834ce1b158feb84a3cb1a6dce0e62c77bc85195dacb7eaca233d2e9a45911dd3b781ea SHA512 675a4040a4e705f5a258810d71c0870e1e637dd7e253126c7a650e8a00bdee94fff4b914eb4a7926ab6fdddb1c09ecc799bcf1ab471f7416f5c96ab6382bfe5c
-EBUILD numpy-1.14.5.ebuild 4051 BLAKE2B 28efd4ad6c7c117c186bbe77288ca6cf60545ce854d730e2cc57e96265ab46f7a924aefdc46752b3954a3c3cbf0eb2301c1263235adf873bd3a8618b06bf6400 SHA512 65fa07023ac08bbd8bb2be0d193f7c803643c62c1ceb88d9b34b2f16c42184de4b7f769c91ae9982442357609467098a6b5a55a9bb000284eaab5d36644e6521
-EBUILD numpy-1.15.4.ebuild 3861 BLAKE2B 158d3c146dc393b324e14819f071d0f032a80eb0a2f2da1e157f845892d148bfe1ba2b2d79c3b74d329780fafc0cd2cefbc33e36831a1d76ebb64e66e79f9026 SHA512 879e5d68b90dca3a73d949372b78ab4180acb8a2d81174b7a11c9e13e5ae169c62bf39f51e337e6ca575c8d80aa3d43a9eb53f51ad51842166594625f6624bec
-EBUILD numpy-1.16.1.ebuild 3881 BLAKE2B eb76a0d12403d7e33ac3753bd1b818163a17ad80435dfc3151d491a6aff0e0bc39e2e806e1ae34aed96d8bffa1a2a506e05d152e0d86bdafeee0518bc4cd1bf8 SHA512 f5035c7204544b167e6442c429a076c9dd749a1548b6ba5289bacf1b8d106ac0e2f95631cdb487a37bfb51382542c133a96e7f5c849014b73664ef0a5be19415
-EBUILD numpy-1.8.2.ebuild 3936 BLAKE2B 85d42317419d26345f4d0884b45d5395ab10f63b3609073c7f4e085e05e55a2c317290a0e86a8d62d1498d6780d20fd17deaf8d348cbe69378a7d2a493b9bdbe SHA512 23bdf79bd29250f66242e1a4d1190fb086936d202bab37901e7510f778dcb9238c2da4e5545708a0ae46ed6d84ee867fc7936ae96ba3fb961c1fa38a20fb9e4f
-EBUILD numpy-1.9.2.ebuild 3953 BLAKE2B 385fe68a2a526082a3da9998b8d0d88cbb15c47b206fee3f9b326a8d0bd4ee6af02543f85d9d263d06e7aab9b57b453724cd6f3f0767818d4178c79911f80280 SHA512 e9f962dc6a20737cffdf20e4a27b3e9c92c26c42644578c0592749648175340a1d45d26a1b680d60c766490ef4ccddaac7fea83af0cb0b6afa5feb5c884b4658
-EBUILD numpy-9999.ebuild 3334 BLAKE2B 03a00a5fabbe1db51f3eaa57760e16fe02316f8330c51e9d3a218406fe33f1e47314cec3628753434e2b8e6f5cfb49cc737745133770b4f06478414766d14be1 SHA512 978a2f089c25428d9b8afbd9b19eda02e9f7e2a538c44fc1222ae196b546f4a3587ab36baf9616bd1fff10ff441c685dc286b0ed76b27021e94b07957412315e
+EBUILD numpy-1.14.5.ebuild 4101 BLAKE2B 98d425bf7dea77b228764e3485792f810b4e2f0981af7f8cbca1dbba62ce8f93e3b0a045a7b19a67352c1de889fcf5295fbd49d0f4ed384b171b0b6f30bcafd3 SHA512 47e4bd19139ef23fd58265005cf536f6c4cdc82ae58e238b9d6f5bd20dd016e720d0456c5b1981f2c89755ee8f6bc5cdbd631e58fffa6a1ce0c8127e632d6d71
+EBUILD numpy-1.15.4.ebuild 3911 BLAKE2B 93ec5d217f42a505248509d642a0039c6342d2011b9c41cbbc45ae9ebb34e8445b6aeef1e8e827b99a78525b37569e33b22c4a0ffdd1af4b4d4237d8dd2bba43 SHA512 c72491e09fb7d85bb33b245eb9106fde1e6209c891651d46c101ac43174d934f1994503f93db3ff032292ffc6a59c3b78e747fa310d6a9dd2a7fc4dc092cc431
+EBUILD numpy-1.16.1.ebuild 3931 BLAKE2B ab8432f6fecf5b5a7d54410ffb22786808d958cbacac260262929d240721a00df3982bb679f47e238c3f769ab24cc08b1cc31a20c524dd85d98d48f9567d9a00 SHA512 ce0349a7b111f50cdbae132fec2de20647b0bb254c69408e5e68d8837a8a9039e8ce2259f4af1182876966f797b467857361f2a87f0ff3d1e78ff1f423acdae9
+EBUILD numpy-1.8.2.ebuild 3986 BLAKE2B 398fe9fc9afbaaf6e92a70c311a18fc47856453446bdd1a0db578c9885c53640a6faa1a6c8bc5c61450b4eb6bbe07eabc5593cbd2ea21eea8c51a68306d68b4a SHA512 58879a52e5bd331fb7dd363f8f5548a5c85a7b931b2cd5ab8b87e6cbd735997bfa9ae9e58bb940e3cb3766c1cac8929a4043fa256b40d1ff5183b56a4eba2d8d
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch
deleted file mode 100644
index db4a47d4d67c..000000000000
--- a/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch
+++ /dev/null
@@ -1,64 +0,0 @@
- numpy/distutils/system_info.py | 29 +++++------------------------
- 1 file changed, 5 insertions(+), 24 deletions(-)
-
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index d7eb49e..aa62b09 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -306,26 +306,7 @@ def get_info(name, notfound_action=0):
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'x11': x11_info,
-+    cl = {'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-           'fftw2': fftw2_info,
-@@ -1690,7 +1671,7 @@ class blas_info(system_info):
-             lib = self.has_cblas(info)
-             if lib is not None:
-                 info['language'] = 'c'
--                info['libraries'] = [lib]
-+                info['libraries'] = lib
-                 info['define_macros'] = [('HAVE_CBLAS', None)]
-         self.set_info(**info)
- 
-@@ -1722,16 +1703,16 @@ class blas_info(system_info):
-                 # check for cblas lib, and if not present check for blas lib.
-                 try:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
--                                      libraries=["cblas"],
-+                                      libraries=info["libraries"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "cblas"
-+                    res = info["libraries"]
-                 except distutils.ccompiler.LinkError:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
-                                       libraries=["blas"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "blas"
-+                    res = ["blas"]
-             except distutils.ccompiler.CompileError:
-                 res = None
-         finally:
diff --git a/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
deleted file mode 100644
index 81d6084be3d8..000000000000
--- a/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- numpy-1.11.1/numpy/distutils/system_info.py
-+++ numpy-1.11.1/numpy/distutils/system_info.py
-@@ -312,27 +312,7 @@
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'blis': blis_info,                  # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'x11': x11_info,
-+    cl = {'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-           'fftw2': fftw2_info,
-@@ -669,10 +650,7 @@
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         static_exts = ['.a']
-@@ -1685,7 +1663,7 @@
-             lib = self.has_cblas(info)
-             if lib is not None:
-                 info['language'] = 'c'
--                info['libraries'] = [lib]
-+                info['libraries'] = lib
-                 info['define_macros'] = [('HAVE_CBLAS', None)]
-         self.set_info(**info)
- 
-@@ -1718,16 +1696,16 @@
-                 # check for cblas lib, and if not present check for blas lib.
-                 try:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
--                                      libraries=["cblas"],
-+                                      libraries=info["libraries"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "cblas"
-+                    res = info["libraries"]
-                 except distutils.ccompiler.LinkError:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
-                                       libraries=["blas"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "blas"
-+                    res = ["blas"]
-             except distutils.ccompiler.CompileError:
-                 res = None
-         finally:
diff --git a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
deleted file mode 100644
index 674dbfadbf08..000000000000
--- a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
+++ /dev/null
@@ -1,35 +0,0 @@
- numpy/distutils/system_info.py | 21 +--------------------
- 1 file changed, 1 insertion(+), 20 deletions(-)
-
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index a050430..d0878a5 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -303,26 +303,7 @@ def get_info(name, notfound_action=0):
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'x11': x11_info,
-+    cl = {'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-           'fftw2': fftw2_info,
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
deleted file mode 100644
index 8c5a98e53ae9..000000000000
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.10.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.2-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# we don't have f2py-3.3
-	sed \
-		-e 's:test_f2py:_&:g' \
-		-i numpy/tests/test_scripts.py || die
-
-	distutils-r1_python_prepare_all
-	epatch_user
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 # bug #660754
-
-	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
-		${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt )
-
-	if use doc; then
-		HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-
-	docinto f2py
-	dodoc doc/f2py/*.txt
-	doman doc/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.13.3.ebuild b/dev-python/numpy/numpy-1.13.3.ebuild
deleted file mode 100644
index 8ac8b7ff9a0d..000000000000
--- a/dev-python/numpy/numpy-1.13.3.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.13.0"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.11.0
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.1-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# we don't have f2py-3.3
-	sed \
-		-e 's:test_f2py:_&:g' \
-		-i numpy/tests/test_scripts.py || die
-
-	# QA bug 590464
-	# The .py files from numpy/core/tests are just added, instead
-	# of being bytecode compiled as a proper subdir package.
-	# We trick the buildsystem into accepting it as a bytecode
-	# package by adding a setup.py and an empty __init__.py
-	#cp numpy/{compat/setup.py,core/tests} || die
-	#touch numpy/core/tests/__init__.py || die
-	#sed \
-	#	-e 's:compat:tests:' \
-	#	-i numpy/core/tests/setup.py || die
-	#sed \
-	#	-e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \
-	#	-i numpy/core/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_makeopts_jobs} \
-		${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	DOCS+=( THANKS.txt )
-
-	if use doc; then
-		HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-
-	docinto f2py
-	dodoc doc/f2py/*.txt
-	doman doc/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index e43fe9a2e538..86c5bd0abd06 100644
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -67,10 +67,11 @@ pc_libs() {
 python_prepare_all() {
 	if use lapack; then
 		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local incdir="${EPREFIX}"/usr/include
 		local libdir="${EPREFIX}"/usr/$(get_libdir)
 		cat >> site.cfg <<-EOF || die
 			[blas]
-			include_dirs = $(pc_incdir cblas)
+			include_dirs = $(pc_incdir cblas):${incdir}
 			library_dirs = $(pc_libdir cblas blas):${libdir}
 			blas_libs = $(pc_libs cblas blas)
 			[lapack]
diff --git a/dev-python/numpy/numpy-1.15.4.ebuild b/dev-python/numpy/numpy-1.15.4.ebuild
index d3396c42c0ad..0a92bf83573f 100644
--- a/dev-python/numpy/numpy-1.15.4.ebuild
+++ b/dev-python/numpy/numpy-1.15.4.ebuild
@@ -67,10 +67,11 @@ pc_libs() {
 python_prepare_all() {
 	if use lapack; then
 		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local incdir="${EPREFIX}"/usr/include
 		local libdir="${EPREFIX}"/usr/$(get_libdir)
 		cat >> site.cfg <<-EOF || die
 			[blas]
-			include_dirs = $(pc_incdir cblas)
+			include_dirs = $(pc_incdir cblas):${incdir}
 			library_dirs = $(pc_libdir cblas blas):${libdir}
 			blas_libs = $(pc_libs cblas blas)
 			[lapack]
diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild
index edcbf60858cc..1ec2abd0447f 100644
--- a/dev-python/numpy/numpy-1.16.1.ebuild
+++ b/dev-python/numpy/numpy-1.16.1.ebuild
@@ -70,10 +70,11 @@ pc_libs() {
 python_prepare_all() {
 	if use lapack; then
 		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local incdir="${EPREFIX}"/usr/include
 		local libdir="${EPREFIX}"/usr/$(get_libdir)
 		cat >> site.cfg <<-EOF || die
 			[blas]
-			include_dirs = $(pc_incdir cblas)
+			include_dirs = $(pc_incdir cblas):${incdir}
 			library_dirs = $(pc_libdir cblas blas):${libdir}
 			blas_libs = $(pc_libs cblas blas)
 			[lapack]
diff --git a/dev-python/numpy/numpy-1.8.2.ebuild b/dev-python/numpy/numpy-1.8.2.ebuild
index f8e56c0e7c8f..e9e6e79381b1 100644
--- a/dev-python/numpy/numpy-1.8.2.ebuild
+++ b/dev-python/numpy/numpy-1.8.2.ebuild
@@ -68,12 +68,13 @@ pc_libs() {
 python_prepare_all() {
 	if use lapack; then
 		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local incdir="${EPREFIX}"/usr/include
 		local libdir="${EPREFIX}"/usr/$(get_libdir)
 		# make sure _dotblas.so gets built
 		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
 		cat >> site.cfg <<-EOF
 			[blas]
-			include_dirs = $(pc_incdir cblas)
+			include_dirs = $(pc_incdir cblas):${incdir}
 			library_dirs = $(pc_libdir cblas blas):${libdir}
 			blas_libs = $(pc_libs cblas blas)
 			[lapack]
diff --git a/dev-python/numpy/numpy-1.9.2.ebuild b/dev-python/numpy/numpy-1.9.2.ebuild
deleted file mode 100644
index 84d1c5679678..000000000000
--- a/dev-python/numpy/numpy-1.9.2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator
-
-DOC_PV="1.9.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/*
-		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
-	fi
-
-	# absent in 1.9
-	#docinto f2py
-	#dodoc numpy/f2py/docs/*.txt
-	#doman numpy/f2py/f2py.1
-}
diff --git a/dev-python/numpy/numpy-9999.ebuild b/dev-python/numpy/numpy-9999.ebuild
deleted file mode 100644
index 1a6cd293f26f..000000000000
--- a/dev-python/numpy/numpy-9999.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 eutils flag-o-matic fortran-2 git-r3 multilib multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.9.1"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/numpy/numpy.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="lapack test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
-)
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# we don't have f2py-3.3
-#	sed \
-#		-e 's:test_f2py:_&:g' \
-#		-i numpy/tests/test_scripts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt )
-
-	distutils-r1_python_install_all
-
-	docinto f2py
-	dodoc doc/f2py/*.txt
-	doman doc/f2py/f2py.1
-}
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 2013c1d9b98f..4c348a89dba4 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,9 +1,11 @@
 DIST ovs-2.10.0.tar.gz 98548 BLAKE2B 9ab3ea02dbfab1622106ead1e19a96b279d73ee758fbdcfadcb50526b8652a80443c817513b0df92b78a6e788d7215386f18c5e9e59d71536cf481eac8b3a264 SHA512 9b7de41aceb2f3c08df765b97c5149cd66579f361b427b3bb6c24ab20cf922de688a82a99b1d98778311f15b37c73be2769a95b01c96db4fed122e272aab2adf
+DIST ovs-2.11.0.tar.gz 98933 BLAKE2B 8735cd4db64291790327fc1e8b144b76e4804472a99990488d57686c9eaf51ec1ee4cc0d4e1b0c3aaf979b547936c77cdb6f7656b0b16e16df45fe0d9b8c5f8d SHA512 104d9f783a1ff0bfe93fc17235c7a9d595fab5007ee3bb490ef064f7893756fdc4c7306c0b03f4c2fb5179efbb038ed163ca4de8c9c417426c6e157c0f17c39b
 DIST ovs-2.7.0.tar.gz 73714 BLAKE2B 3edb76be6ddb20243b6d85c7bc67024c274f625c2f18cd4dd2fdbfa94b01d241edc4d83ce380aaa4374a75f4b392d36b79bd5fb81c8522be88dad4c277858be4 SHA512 6732721f494b0de24dd6b79ca12d45d7e2da8598906384c6fcc4cc0de4dadb87a822c5e0aa4c07065138a0837a850e7d07ae50e6dea9e0752beba667bf154e22
 DIST ovs-2.7.2.tar.gz 74222 BLAKE2B ecf1cfa9cde4824ba927f4fed610ca11129d221f4ecb2c0f0fc701f0fe2a9b86fdc67332b0e0270b0eb1047aeb49fd41d153a212416754180a35dd916cef59e4 SHA512 568f256a2ad204d5b4a237f1f52c903a1041bb03e30b56e390ea4995c646b49225f69eb5804faf996a9db56916398597100a16ff86bd6798d01ee427073c89ac
 DIST ovs-2.8.1.tar.gz 74483 BLAKE2B a90904e645316b625c7fddcc323270bbb6246d59432392bfbcb05ed0ae258f1fcc0afe7a3716dad519d47725a3f765c99c59dcffc30bc5343de59ccf523cfa76 SHA512 b7133f5c2ae00d508d77122952584cba840d4a22231d1a42105ba2918cf598b12b58c47408c17405bb3c9aa90d24a3d0a9257299626704e367badc982aba62ee
 DIST ovs-2.9.2.tar.gz 77160 BLAKE2B 09304ebb6bdf22a2f62d7e89b159a99d861d4121fa52972ca6bd9d9667564e485a454d99aabb243556f2ba1db7fca8c635c9a4f237aee9ac8830c9b19a51039a SHA512 aa5e5ebf633b36074278dc7fd67da05be71b5fcb139955a8398e40bd3dfe51654b016ef144477b818e5682c5612a16550487a89aa76cb41ee75509d62319a66b
 EBUILD ovs-2.10.0-r1.ebuild 494 BLAKE2B 8b928ab15e48826ba8ba27964cf19760f9672f47be1d48a32da06dd3e833644bc280638359a8e4675a2694dbe3400f742f7effeba28b4df4ac1f33d79a526577 SHA512 578128668432bcb6943b4f3020e9c280bec7ad581a1429ec04c4cea7b0523e6f127b03f0238a90fb85edf667cedbed165c6f37785dab0e45c23752dba502376f
+EBUILD ovs-2.11.0.ebuild 496 BLAKE2B b121159166e0868f641dbb81f1728bc8143dfc69ccaf61460ae8dba92e49c13f3e8b0e4ff8acf9be6a3e055dc2dc95c9ac72afa161923abf99ab0f2a52d80df8 SHA512 d8c479c79c5c823c842a1e9ac3c7db71a745c17622465fb143f056a352a1794942f169ae3722f208e9f7346c70d0f1adfa5e4ae7f82763c47c7774607da6a8b5
 EBUILD ovs-2.7.0.ebuild 476 BLAKE2B 1ccef3f920918c6df8f603d6319e4a059a81adce4a94d6b41119dae0cf43c08a4d4707a8d5cc15a5392729debf14e7603c36e06577c89cd7a9186e16ca3c2c30 SHA512 cdb623a67c2f09d60fe9aff8dbb55baa7d9747bfe03b1bd0f7fbc0ad17cbf0a4c3483da909f02b1b25982c0f3103ff241a8209a3e478f157043d641f52956ef9
 EBUILD ovs-2.7.2.ebuild 448 BLAKE2B 68b809ba263d8e37b3c1f1805e1bb4dde25489d4fa053d2f3456c483ada0bdb2563722eea0930c28f1f3671e77a2ea7614e183968250c10c24cd8e4e4b6fb1ff SHA512 3d4a85dfe147d849be000e4233b408dbde3589c95779fc3b49eb88520f701d7ae8725c4bc2879ebd77e4b5edca084c6f1014b995b0acc8e44e849d58d94f97c2
 EBUILD ovs-2.8.1.ebuild 447 BLAKE2B 8f96b7ce08452416475b8611abb560e7fc69e35128f81bff0d45c4d72d38703ab6b38707119636f23107cb3c6819b9aeb2516683d3db52c8393d9c90cb4968ec SHA512 4858f63af77ba5d69659d93633e143888565cd6faced0e37269fc1d9adaa7a859e5e1c6028432b44c5a84470bb8bf45490282648f87b02513dee4a297fc6b9d2
diff --git a/dev-python/ovs/ovs-2.11.0.ebuild b/dev-python/ovs/ovs-2.11.0.ebuild
new file mode 100644
index 000000000000..446dd3058554
--- /dev/null
+++ b/dev-python/ovs/ovs-2.11.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 30551b8c4492..023c1d4ce690 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -10,5 +10,5 @@ EBUILD pbr-3.1.1.ebuild 2799 BLAKE2B 7fc5c0989e40826d776f6d283773eb78156a1263b6e
 EBUILD pbr-4.1.1.ebuild 2596 BLAKE2B b050f3bb60cf293be73a0e9887af8436bd7554460265b9a1c29f876c9e623a5803742c1ae27f95863d5d13e9d3e33dad9609c038cb48ccd33673792bfbf84cdf SHA512 d62da9bbb03786e7a9cfed84a433bbb374d8347260711723e6d4f7a1b58b4b573e080c48823611c89ec538dab12a1051aab293d535f2789beac9faffd84ff9ee
 EBUILD pbr-4.2.0-r1.ebuild 2738 BLAKE2B a273d6bf3a05185b99f89da55ccc56dfce9b97b23e6d4ab324bea271613efbeb0a0d2ef68062de59201630527eaf9834009d320ac2b64447b392766f0288b49c SHA512 6b51f70647310f68108d3b8ac014ceb7d65ac4c8b8d2032dea1497a6b2dcbd37e7d0af2d87900a7befe3ecd84ebcc39755c6c24b8de2687f81c17f7a3fbd5b32
 EBUILD pbr-4.2.0-r2.ebuild 2781 BLAKE2B 001ac048ddb5bd7c92c90eae777b37601e1bb68fe7f21c2abc33b7745605935f486eeb4aa48aecf5a39e00000c71dce1ec7f0e87de489b0b73e7b645a82fb9ca SHA512 b39fcca60f50ef17eafe9811d0bee1f6abfc1826751a091331cabbff5135195f977643338d71aaec1695dfc1f98ef2c40f39b209ff1a1dcb5d5776958fbcc822
-EBUILD pbr-5.1.1.ebuild 2919 BLAKE2B 50f31cf4380bb5ef1984a89e9c770241d4ea2c9d1589b041b868d315c19fd2bce3ccb3d88adcf04a13dec3f3ae6c2bcdcc1ef8507d3ef8385545c6b405508af8 SHA512 78443df47c54acc95202a13e6eecc5f2af48c9fa552afaa62c68b0e9decec99ce03509e802556764986d2fabfeba9667f5b6fe41460c21702f2f8cf62a89fe82
+EBUILD pbr-5.1.1.ebuild 2931 BLAKE2B d2cdc28970c08d255aa470d842e489d2a250c1c2edacd19583813950154c5ef641a3f3f6b7616ec9def0648a0b12de8178bc0d6bf0cd6022acb695b0fe19bba9 SHA512 cc688083045e25fef07ce951c3e5fd1547aaa4485d271dcdd5d293f26b9a2092297a17bea3409e882cdbbb2a2179e7b5becaac3e92dabef71456c08b978fa697
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
index 6b887279b330..59bf982d33f9 100644
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ b/dev-python/pbr/pbr-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index e6e42f4ff88f..b2229c0fbe36 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -12,7 +12,7 @@ DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc2256
 DIST setuptools-41.0.1-py2.py3-none-any.whl 575966 BLAKE2B 332986453a35e4ec36ab2bdb80a8b0a70ffe4fec1bb874f481b0d8e31016a26d53070f90d0eea9030b8c48a1f9bc21a54d8a5a2b70096e1f8db84d42449903e4 SHA512 c84ddf1d1ea90216b2c475f3e4879f4e6792a859adf61db70d67f49a35f2cb4df6fd6d93049881e6d2a8d914768edfcd091475206bb5da3ac66c41c4b9147102
 DIST wheel-0.33.1-py2.py3-none-any.whl 21496 BLAKE2B 41bb9ed91d43f94209a010c286d541da9d68b9e727ec8a339fe3c24fb806746b1de5b62c6cd26d2c2841be17406e1f99353b6d172f5258540faeba014945e9e8 SHA512 761ad8cb96557b146642871e1f8ce75849a9828193d992a19d072236b9f8452ab54907a3b82bc7441f75f036155ae21b7450120e0c4c19aa5100b58337945ac0
 EBUILD pip-10.0.1.ebuild 1370 BLAKE2B ce5cb9a267f445b689a017e22b69e8be077180110b45b4d32de6a2ac4c1a753f674d79a751e2d9c51aac20b085f1765cfab294d36ca384bf7cac8546e7c1fab0 SHA512 fb02b5083dffb94195e0f74bf782900f01a73de888d27f76ebb05093b337ae81418939c86062f78556785d6871dc7018c271387dfe36296d0a47701f1ca10828
-EBUILD pip-19.1.ebuild 3467 BLAKE2B e57d949ae5510e7389cd8a12ca7d8ddf8051e8296e3ae8343e967d7f777fabaae2fa32ce283b7880858804630c8fc7e69d4dc4b7f762758b9fdf1a5bd6b71bdf SHA512 890c6da6d3bcb8a569a843d32a76a057b803c556d00f01cbc8e14708d3b2427adc04b033be34b25dff89e294d5d87425ba8c177f2d90f3ee85b17e11738bba48
+EBUILD pip-19.1.ebuild 3465 BLAKE2B 647982e0fa28779940255e9869b94521319c01559fc92f521b394cfb88e19719f0b069bb226a1c3add8186554456626ed323b429948deab3fa334614331a3c4f SHA512 89a138a6cb171b7e0e9ea60387038ebd7d515a627d9e9ba121dd55ddc60822da295e6718dbd75d63a91bf5a6c30d685524c2162a1ef801d387ea8a1a1f284b05
 EBUILD pip-9.0.1-r1.ebuild 2331 BLAKE2B edca4ecfeac1bc3bffbb066b83fa87669304ccd59dcfe165fd4cb207f8155ba2836df80a2e15c954ae5513b060fc9bab1df1d5a15870815f199bf51e19781b50 SHA512 711042823b41c10c1db502afc046424c71f081c38dc173e5bc06d58de5ca57f2e3106d4ef24134f8e79e557228f63f49c91eee1e037a2416cdfdbb592fabe221
 EBUILD pip-9.0.1-r2.ebuild 2486 BLAKE2B 6603040dcac85d4ef25da1dc4c2d16ce95a596154cffc9e28dffa3599a6a63cbb2cf61acd6f21a02d41cb3c33cd296808613f274d562292504e319cea9983b14 SHA512 65c03aea96b4e5f76cb26b4fb0f1da824ec670a87c0cbc2965730ff0292b84874abaffc8aed84d469dd19d97c0816f2ae8550af04340f64885551b7a1c6223a7
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/pip-19.1.ebuild b/dev-python/pip/pip-19.1.ebuild
index 1d2a8c7a3721..a60686a24855 100644
--- a/dev-python/pip/pip-19.1.ebuild
+++ b/dev-python/pip/pip-19.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 8436cf8d5f2f..afcc0000fec8 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -3,7 +3,7 @@ DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fd
 DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 EBUILD protobuf-python-3.6.1.3.ebuild 1338 BLAKE2B c2992acc2383bf7ab469f2a538dbd344ecf65d20bec9ebfe1209de791c643bf069c75dfac08e7b8ce1d450b4a468fee47e4903fd2cd8c4df0d4fb8643147986a SHA512 522fd9478da9a732828c8ed4ecfe468ac15218b8527d41e797f792c462987a7e293c56928ab12bddd79002a24772eecfb59f122244e327182f860810cf7fbdc8
-EBUILD protobuf-python-3.7.1.ebuild 1584 BLAKE2B 01a96f943ec8318f2df4287e96995fbb9a2f47e30d0ae14f1d517a99e91c22dd0432626cb33513d4ce4157e12c2adaa9ec0a63372fbd02b1802529b9b2f1de1d SHA512 5abd4eb6b685e0129cbd8ff5cff55ee4b3a427db5b6c8f95354106c19ebe4177e2f5afce6a35d87223415df212cdd9314343b176aa44211ee34ed8ae62db425f
+EBUILD protobuf-python-3.7.1.ebuild 1582 BLAKE2B 6f8a76a85b35af2e6379f5903147d3288dc025a07c1f9ef18392cbbcb7574e793927ef8db68bb2cb65a0204f65dfce16794cf1c9658865a46998acdefc253b84 SHA512 ce7aee11bc82e0fa16127acfa7db828f3d1c66b02f16b24fe41b8464d51134d7c8dbefac54f6c80810885afcd68f86199051abe1aa12a394493102ca0980f81e
 EBUILD protobuf-python-3.8.0.ebuild 1588 BLAKE2B 2f3c23571352caebe00d924bc854a63a4c74edc3b1f884ddc1b621de8cb65cebcb881a0f2f1a505418df8a69dfe0d7413460f647c673e3cae5e44a476be6ddc6 SHA512 1764b45ebc7058d29a447f35d55bc4bfc17b8437d9152096f504e1a2df934a2d94d45e014985fbcd39d2e94343b98a2d0e3307e8665fe8479f26bed13e80f941
-EBUILD protobuf-python-9999.ebuild 1471 BLAKE2B 2c292c8ba9421e355473c682ce42f3b9d71f51918ae3d4bb3852520d708a706fa46739b3de8d221fb801716f5b635b101234da52700f419edf8e0e9dedaa4910 SHA512 884ee3dc8ed3eabef60e94b74a3eb9f3211f44d88a0db633f97000e06521fe0e5ef09d1265bf183d76db67eaf6e0d8be35d3903bd966e590da2121478876d190
+EBUILD protobuf-python-9999.ebuild 1471 BLAKE2B 96473eb9817c078af97121297054a8dd253f22b3741a40d7df78d1494e229391111ade9998973a2f3b4e4f045f7f8389c4123e64fc0d764545cae35376ca6324 SHA512 f81f1b8146f9c26a9a6d343d3121e456f4b71dc6c6b42fbf8c73777d8b48f58088d3bb966b47da7fc01576f2a0989bcbddd414c19412060a2df8af1e97155ab0
 MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
diff --git a/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
index ebb4bb429bc6..adfcc5209541 100644
--- a/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/18"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index 1ab43ec56dea..8d11dac7b374 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -24,7 +24,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/19"
+SLOT="0/20"
 KEYWORDS=""
 IUSE=""
 
diff --git a/dev-python/pslab-python/Manifest b/dev-python/pslab-python/Manifest
new file mode 100644
index 000000000000..a76688e1bb37
--- /dev/null
+++ b/dev-python/pslab-python/Manifest
@@ -0,0 +1,5 @@
+AUX pslab-python-1.0.1-no_install_udev_rules.patch 313 BLAKE2B ec6b728082006c23c500959e639cd2c80c432922e4a6277826ffc3ac6236fde35983b00391475b2d3f0563f2143360e6e83eb3d587cbffb7d4a6e0a8a227255d SHA512 7af64c38503a9857e724a0d5744b82f569d39effdf2218628ba72ea29008b666384c0666c6b26ed8a84bcaa9caecf45885c5ec965757791c77047256d7764051
+AUX pslab-python-1.0.1-sys_version.patch 296 BLAKE2B 317af730f51ec96b73e31f5d1da981b71ed39bc48fda426aec177998971ae69db457a4eda6193cdc1a85f0215196c6da17437c5de5f70d50bb97effb3d5ca1fd SHA512 36b6f18af550a8bf72e79fcc99e53e356b359e5de62043829c7e52d51753e17078a170b6bfee68ab5225cf4282c5ebc50a8913bf050b7a9258d9be52382f324f
+DIST pslab-python-1.0.1.tar.gz 15460183 BLAKE2B 6837c40352eecdf563fa700617ee1712997fc0532483357d889d0fb03645732e0febf5ac83cdc8c766b7ec6d9ac9a436a313d0f44221c2ea69044be6f4c11fa6 SHA512 939f3649a0060a59a39ee97b57134075f8602b966fb3d14250c8ae96c340a4ab33e9fa8d7c5d8cf09ae9297b762c203e4a256bc29b9ff6006ce6ff254c468ad2
+EBUILD pslab-python-1.0.1.ebuild 875 BLAKE2B 4cdf1f82db20b8bf1c01e607366032a743e34f0548599b31072518b102c187f688e32388fd23630a2194567f1cc4cec3ff410e5b9c91c36100fb099adb51628d SHA512 2d3bbc5586b2aee1e5413b4a716f07607601c03aec4f79995e0b0bbed5dde70383dad50658753691ebd212e64b1746c327045cda2ea04704ed0d267abca79bfe
+MISC metadata.xml 331 BLAKE2B ec438234de81318bd3e0d6e070fffa79cfa7ce6bbf7ce2ae8ac3c02d3cb797048d0606d403f9c7f439d5b8772248ea72bd2d034364678ce5208dab8df37e9884 SHA512 811ed0f495c2ffaed32234a72c022e1b4c23f5b33d991b943c33790176f7cb5eb2365c8801997a1a1d50a80133c0b40d1a94167b4c3aa47572461dd4ffa16422
diff --git a/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch b/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch
new file mode 100644
index 000000000000..b721e8a8ab03
--- /dev/null
+++ b/dev-python/pslab-python/files/pslab-python-1.0.1-no_install_udev_rules.patch
@@ -0,0 +1,9 @@
+--- a/setup.py
++++ b/setup.py
+@@ -50,6 +50,5 @@
+     packages=find_packages(),
+     #scripts=["PSL/bin/"+a for a in os.listdir("PSL/bin/")],
+     package_data={'': ['*.css','*.png','*.gif','*.html','*.css','*.js','*.png','*.jpg','*.jpeg','*.htm','99-pslab.rules']},
+-    cmdclass={'install': CustomInstall},
+ )
+ 
diff --git a/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch b/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch
new file mode 100644
index 000000000000..474850a34b08
--- /dev/null
+++ b/dev-python/pslab-python/files/pslab-python-1.0.1-sys_version.patch
@@ -0,0 +1,11 @@
+--- a/PSL/SENSORS/AD9833.py
++++ b/PSL/SENSORS/AD9833.py
+@@ -3,7 +3,7 @@
+ 
+ 
+ class AD9833:
+-    if sys.version.major == 3:
++    if sys.version_info.major == 3:
+         DDS_MAX_FREQ = 0xFFFFFFF - 1  # 24 bit resolution
+     else:
+         DDS_MAX_FREQ = eval("0xFFFFFFFL-1")  # 24 bit resolution
diff --git a/dev-python/pslab-python/metadata.xml b/dev-python/pslab-python/metadata.xml
new file mode 100644
index 000000000000..d93b6e0e2749
--- /dev/null
+++ b/dev-python/pslab-python/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fossasia/pslab-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pslab-python/pslab-python-1.0.1.ebuild b/dev-python/pslab-python/pslab-python-1.0.1.ebuild
new file mode 100644
index 000000000000..b3feed3e6281
--- /dev/null
+++ b/dev-python/pslab-python/pslab-python-1.0.1.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=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for communicating with Pocket Science Lab"
+HOMEPAGE="https://pslab.io"
+SRC_URI="https://github.com/fossasia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/numpy
+	dev-python/pyqtgraph
+	dev-python/pyserial
+	sci-libs/scipy"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+BDEPEND="dev-python/setuptools"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.1-sys_version.patch
+	"${FILESDIR}"/${PN}-1.0.1-no_install_udev_rules.patch
+)
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index da0f9334e96c..e7c043b2b8c6 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,5 +1,7 @@
 DIST amqp-2.3.2.tar.gz 105854 BLAKE2B 8bacae52f03118e2d0fb93a6494628f18f7139d655f1c4b3e7cda9fd81eba5d92f56038bc01dd4a28a89168be0fd51013db0060e945e7f7c63e1423892feaee6 SHA512 c9c99a238cf64ab5590eaea5756e9f68d58769b4d74af3405321d5c129171f34e6a5d20f2125ef2828e843b637fbd115d1ee9391726fe6ff09d233f0e6bdd511
 DIST amqp-2.4.2.tar.gz 116265 BLAKE2B 1615563ad4ea86ebd970641ed409d3f90aba86c4f4eb4af3fbd528cdbe68642a83e05bbed8b8bcc5f503c227003f078c2cbd444f56218af5d02961f1008319ec SHA512 dba880c07ee8b503e02f11ea5804f559ac2eb85717118d796558b1890032482babd15930af78f9d11b77530d496fce3ba8c8579eec71ce5a3f76b8d8a181af34
+DIST amqp-2.5.0.tar.gz 117022 BLAKE2B d05df3699a73ee3cc9540599b7947b4ad9fc1d74194cfbea81787d85c0f83262d109c153669d746ccfb67a1ecb21755da4615043ebfa67c84c8f108ef61ecd3c SHA512 c0675b85bb4d8bdc7c303bb694153c86eb503fa3c4fe6b6c4dac6b1f3aac2fbfa75a4ec39ea8bbdedc297a6a3407a0a5b560885df761e667e3c0770f5979156b
 EBUILD py-amqp-2.3.2.ebuild 1179 BLAKE2B 940543c5320f5b9f04f090145e38a979cd7beaf45615a688736974ff8c3a89e35f3fe6acddb6f8959f966b533485802e237428c5d76e89686e60c684152ffe28 SHA512 7abe6d3e85aca17167978fa6321b311a2221ea1cdbba11eff702a726d3f5cb65e39fa073d151a3d71b6939e335a70008ccd0afcffb7ae04d14a6268e03409c20
 EBUILD py-amqp-2.4.2.ebuild 1180 BLAKE2B 150425bdab6c277acc8b9891297961b9265d0853965bc242c1462047f97407a87fc51a307df116ea7ab7010d48ba131bdec99f8d68f50e5b23c0154c7c460189 SHA512 a7f87217532e032db5192a5916f2c8ce22b7e1401ef20f8b2078533429b40f40770483a7bd69f0a215bc2bc5723d4ff54a81ef1d579ef8c80fa34bb842e71cf5
+EBUILD py-amqp-2.5.0.ebuild 1487 BLAKE2B a4eaf9672a7a6ede8029772fb443f3e639e71c795167e9b9970ef066f9ec32a83b3f8b3b3b1f113c4b9b4c20bbd1c89f00bb744d1d8ad3e809079dd4851e64ec SHA512 9bf2d0eb739c333be3e29464463ca385270baa92c0f9099f156252759dae8d0f04081d65c73a33dbbbeebd3cc3a2136cfe3d5bad9629afa1ce74de8753552ccb
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.5.0.ebuild b/dev-python/py-amqp/py-amqp-2.5.0.ebuild
new file mode 100644
index 000000000000..433312fcdbc3
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-2.5.0.ebuild
@@ -0,0 +1,66 @@
+# 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="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc extras test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_celery[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# pytest-sugar is not packaged
+	sed -e '/pytest-sugar/d' -i requirements/test.txt || die
+
+	# requires a rabbitmq instance
+	rm t/integration/test_rmq.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index cba2b3573da2..8d6ed26490f3 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -2,6 +2,6 @@ DIST py-ubjson-0.10.0.tar.gz 44653 BLAKE2B 91c40aab4cc66200d863fb13e4f0b64f4b190
 DIST py-ubjson-0.11.0.tar.gz 45473 BLAKE2B b74bfc20b30a2a45fb4511aa730d51245e6810fb8b00980dd61ae5bfa7cda1f60397de8c9d914195dffc48e4ec9582f839b9e133b98dd897b0a47a03abfbb67d SHA512 2c5dd111ea91fff1cebd722c62b312422e198bb8cc614e1254a3913067f72124efd1cd9879bd83ff88c2fc12ff2ef17fcf350ef7a3d6587c96a58c8b9e8ca547
 DIST py-ubjson-0.9.0.tar.gz 43338 BLAKE2B 8bcf61d1329931a2bfb7399cc27e72b14f9641fe902f0275ae190b1b256c67d78fe9b436aacf6b33912ef0e29a008e4e7b05a12b10488714ecb5b31451c1e69e SHA512 d9f061e548405d16a22d235f487740b3d4abeab8b555f9684b632cdb5e2f655ba8413a207230f90e7f3f352fa3289b16bb9a56b623c0cc5fe02f61778a8f78a2
 EBUILD py-ubjson-0.10.0.ebuild 433 BLAKE2B 8400c323d203cc5a59cdd7b2de731ae2619cf75087b1d1cd1795f76a2d8095ee88d2f0534265b47d7213c01d133c5e5da82198d16f0a2b4dd6dcc4261d55311d SHA512 fcde8d7440caadd017485c7528b16d9ff5f32b221b2b378553e86494c193a034f0fda54a477f462526b110cdef1f101fffc5f9e79942d0c44dd930a2faa148b8
-EBUILD py-ubjson-0.11.0.ebuild 510 BLAKE2B fcddf93340771e6831bb5d079f262e1871816912203e986f6ca7120e99357c0880a739007a40e983ee1825fbb0ca81a876e0f180ea0f17e02efdef093f47d8a7 SHA512 632435fa402ac659f8b8b2cf0a0996d127e45935a8a2b9b48343d2e56a0845732631f402bd78ad997ab55879b7af8c123f37e6f444d29f32dd15989c41249c12
+EBUILD py-ubjson-0.11.0.ebuild 534 BLAKE2B d8596f01ee83423118c8a05fc2006f0f77d801dec5de9734f640af4f3dc5a3ce1d5c2d1ca5c31da36086f9ca5b39742d4145f6959a9c0e22b3100f46a367e471 SHA512 c24fb2489235e4691bc8080bf0696a94e54320a5e3b63c01f6ccdd878c9954314f48bb5e99d3e7eeffdcee40eddf67dd71645c26cf2fe9a2e802af442072cd17
 EBUILD py-ubjson-0.9.0.ebuild 461 BLAKE2B 207179e60d31b7c6801bc379a85d017ec20c526163086241bcd8ea4bbbb71b423db2bc675bfb8801333db7bc0e38c28befd3861a7c202e618167e5cf7b9fa653 SHA512 e584775f50d56fcf17fa7a9535e74ddede873fa8594085c5a6a7a5d6c81413b3681fb6a5c8b5868fb161484356bd16ffb79ac6206fe57b2c06f6b1b0bd099e94
 MISC metadata.xml 712 BLAKE2B 69ca065a27809d3112fccb2a0e812fac18a216d88afca7ec654df0a181701be32365863a41f1339a42260d551a3c8aac678451ff7d9ab6c58d8b4eebb76ab33d SHA512 18ee84822f59b8a2b8172c4703d0ed93522a9997013ee0d533acfb4e23343ac2df70f719d8b161dd40604e5875d4c74f1243880ad0725726b445cfb84398a767
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
index 9d539e717e1d..d7e4b709f1bc 100644
--- a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 96328d21f74e..43fc6c5790fd 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -9,5 +9,5 @@ EBUILD pyasn1-modules-0.0.5-r1.ebuild 903 BLAKE2B 7efd0f1c7e8b079b0a3537fa76dc85
 EBUILD pyasn1-modules-0.0.8.ebuild 887 BLAKE2B 35523b17a68939c4e3cbce2fec2d67d37826beb319f09998257b4197634ed764f35eb0874e418cf151541e02f1bdd4bedba7be8bf0c43da65e3f6df159d1b69f SHA512 6c932454ed73f34feb05d3981beda142a01f9df7522d144f65b889c08225aa723affb8adffaf738fb381456e51f3fb638b10fc8d6b080c3e1e97f8d9a71868f1
 EBUILD pyasn1-modules-0.1.4.ebuild 897 BLAKE2B f033f5739de7ed2fedcad8650347caf11be6d67c36c8a95296d819982249a9ef872971b59dbde84d3bd4dbc9376d575b43c413266ac98ccd2cf9f3cc07da493f SHA512 8d39e65b2d552264b747e6ec9afb634a685b67e34547639eb4ccddc583b0f4f4b99732794791a57f2873d975c3e34d180adb9b5dcab1a04f37c3530e96d0a342
 EBUILD pyasn1-modules-0.1.5.ebuild 817 BLAKE2B dc8a1d08a4aa64cc31fab23478f991a4e6bae71337ebb9529c69a21c18e0b98ae78608cf6378f4fbfa8072707ce431d6b20c5c7c096f91351fc5dc53933a5918 SHA512 4af73730d2dff74d3a3efe3d6a32482a145a40b0ab0f21cf584a184078398366ab00f0c2704ae2748f6731c37110212370d36d4a23ce9b032e9feb649ba5acfa
-EBUILD pyasn1-modules-0.2.1.ebuild 810 BLAKE2B 63ca2727191e010d31a9f0030480af21491ef116d1ddb6cb6d91299d6823f5ac1337516c7a3f1416c5d2d53b6ab9d658b6257b6e02964e7a9515a99eb65fe058 SHA512 fea677a06f1a3596c1f56a6e1583531ab0bf15ca9b4ee2feedc85e1a8f0185bd2108c7d0cee980df292525ad29da836b8ae51b3a31930276d10d34a8f987beef
+EBUILD pyasn1-modules-0.2.1.ebuild 821 BLAKE2B f12da15f07eb6af5946f946ab786d6bbeadbe61175352ee65189a3593ef75f0edffa9e79bede1a2329951828fa77df56fda896107347d64baf5eaf1d060cc178 SHA512 a082ff240f8b0d285e7ad95a9dc91e059c7b5b477a85d1d6a8f6d9d45a0ce560860f59350a1222ba657c0deb38059169d682946220dbfc9d25af97a14880924d
 MISC metadata.xml 380 BLAKE2B 0f3336d6484687fbe0a61cc0c88110e51ae40a8905bb0d5d5b166ed6f8c49964f9abedeb7539cea85118a3d2ab548444680bb89ea57d5e44ff52298e95f557e3 SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
index 8b39ecc4d924..4898b0c27315 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=">=dev-python/pyasn1-0.4.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index bd9ed160bbf1..fdf3f12f9aa3 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -4,7 +4,9 @@ AUX pyfakefs-3.4.3-tests.patch 1725 BLAKE2B d2db35dd471ea803a9ddc65ad458cb3b17e7
 DIST pyfakefs-3.3.tar.gz 141704 BLAKE2B f805146024d9886ce6cb25b23f6f818bb37cac00a51528375b3da3e728515cb5ffd292352888861ff2b434ff71dd730bfbd84874fee0ae1f4d2cfca974f73771 SHA512 0044643964a4f2329d777476940b38d2d63c6de8f854992b4fba7b7e49f1186e7ce9811f83c9870655cbe33b7dda816c1aa1ce685e800e55c06d175c281748b7
 DIST pyfakefs-3.4.1.tar.gz 151662 BLAKE2B cbfdd7ab4c2936d484b5ff1e22852438c5c653e8875b7d363324e0a1aed0bfc5c492c2cd5c64a47052fcb4d043f567819f32067527b870ab42da8cfd92d40be3 SHA512 1be0254455f6046f1d28bf4377d17e0fb943b4b0db09e933c114f587f3d917877b23ee1610cf83a6330b406bb9ae66fe79dea31a6bf75c0b9c2b79a88d07e753
 DIST pyfakefs-3.4.3.tar.gz 156896 BLAKE2B 2450cb67dbb25d2029a113dd95c3d51e60ef66c6683a5898ea73800ce1269d628af9f8daa85195d5b473f18b7c3262f2f26fc9c17caf80ce2f5159c247ebea5b SHA512 aafcad5d801f625273239221c56e46229ff8ab622cfb474d92f8555cfff90279ad9a092c20878279454c59033ad23d53cfe877023ac5d20c5a67a610b62ba7f1
+DIST pyfakefs-3.5.8.tar.gz 171519 BLAKE2B 18eb784cf62108c3363b3b5fa137ec4ce830583d263dcecc6f007e6cdeb8a8eefcc4f9eecfba4a9b5b485508749f6dc75a47ff67bc8f5e77f2c0abae2cdd1778 SHA512 e72042dc80545d4a8602bf90bc832298184040389c8fd182df1ef33712061b4937623ca98d70e59b4a388677626f861ff096de939b5caa372849ee10fc3dd8bb
 EBUILD pyfakefs-3.3.ebuild 713 BLAKE2B c99fd73a3ea526c5394dfacd6514ee55e87335b1b284f96143fbd784aca335a586bdbdb5ef66eb2ebc848a9d1ee553568c8a4745d84310fdb3b4fbbefdb546f1 SHA512 86073016b524f588a2d2f4a9563387dd29899e9de118a8beeae1528d2e18d111a36f944bfdf8341c1f56d72480bf076593a47750baff53233f3d6fc1fef83ec6
 EBUILD pyfakefs-3.4.1.ebuild 716 BLAKE2B 700608c3a0b2ff41b42d1caca4ba9d00ab78df2627ddc2e82b038f3de3d6a69dd99b23ccbbc1d967fdae1a450d8988cb5082a355cd3b8b32b2950616bbff0bfd SHA512 61d88ade44f0bcf5390ed91c64548abb5e51c31acc3bc8dfbb8a4e614bd9fa81e20984b47d0daeae851a2bdcbe540d17dc4003a3db393279531cea14417b06f8
 EBUILD pyfakefs-3.4.3.ebuild 720 BLAKE2B 85c1a1a4872d622a9cac95d418b58f491e883a630d02fd77c19c92b7024713b387ee47b9e9947a9e7945feb54cc9a5588d58729396c5e489c84766ef601dbfe2 SHA512 d176ab413688f8150681d5456d7182b1a0d35cb149042820e2c6b365d30890a3764e7d9e6b9058c0a4c6882a1cef3005eb8ce8b01b3d1ff463013a360e3ed7e4
+EBUILD pyfakefs-3.5.8.ebuild 836 BLAKE2B 1c0b92e9fb43bd36e6d97c6feaf6888fc84a0c162d912b38e98c63f3016d4fff4272ab6d68a5b4e28abac018cd3623f1cf248db201d2ad2af155acdadbb6f049 SHA512 00e640ec836454dddb85f0c5860b22da2d43ece8ccade4316cbb263b7301c7bf0e90275e46bbcbee249548b1c5f2999fb512a1425726cbce0c9fb587ce7c18c8
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild b/dev-python/pyfakefs/pyfakefs-3.5.8.ebuild
new file mode 100644
index 000000000000..b96e426c8e2f
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-3.5.8.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=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="a fake file system that mocks the Python file system modules"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
+SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/pyfakefs-3.4.3-tests.patch )
+
+python_test() {
+	"${PYTHON}" -m ${PN}.tests.all_tests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 885ac253810d..94e252f54c2e 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -13,5 +13,5 @@ DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd6
 EBUILD pygobject-2.28.6-r55.ebuild 3537 BLAKE2B a5b8ed9f09176314ffd8584203f5688399c9aa4320379765c0867c4605e38d2fdfc51986b58960465506e36b70260afdf48e68d4de385b4ce0d0113a20309d40 SHA512 c605ab80a65d3a8e71669c22675b4cf54cb94fefad28126df05504e84b0d867bb5608952c0b0e161df4c8895c159159035622919b9321d81b1f26b34ea677b0a
 EBUILD pygobject-3.28.3.ebuild 2781 BLAKE2B e61485d38a4ecb0fffab6b2be57ab6eb7f73b7b3d93a3dc5b6053a590b3dc5b8808e015ee799e97e385af58398312c9d4eaf3253ea8edd443e68d7240ee681d5 SHA512 26d77d8707389f991564abcf4367cd8219d41161eff8a8e0a780d40fb678e204ad8873e25813b20fb797fd7a07ac41b32cf2e6f9fe7fb6551ea5628a47bac6b1
 EBUILD pygobject-3.32.0.ebuild 1799 BLAKE2B 30ce722d41ec0cfe78a21bfae59657bbb7c0b247e23ab33753f69922ad236d9939fadb5a51f6d30009d116c5eae973e180bf6ba4d06755e8ad2edd084730ee96 SHA512 3ed9eac4109e19cff59c189da5c04cf53f4ea7f63dd828b5a95b91bbd306f1c5b41eda1cde0a68361cf58da9109d2a9c5f3d0547409e83a4bb92c041a2e65f35
-EBUILD pygobject-3.32.1.ebuild 1802 BLAKE2B 394c540cbe4eea71805384d1a37d8275577fd37b8ba879166d3052536626d6c2f1eb0eb5a96ca997bcb40c956a5c90924a2c5cf94c030f82208ae0dbf87588d9 SHA512 4d86250c47f9634833102b22a3277d463049fe221a4ae93fcd5333d572bc23c864b3db326c11e0965171d65fdd0ea51a706d6df8d185b2970adc3dfb15c5bbc6
+EBUILD pygobject-3.32.1.ebuild 1801 BLAKE2B 393a2f7d9df36498b9f37ae206564370101eed3d7ca2108c130ee1564707820cab078d8e704a4c0c62954ee7a38c232f952fe6da384c86367ebf5b5c3db5339c SHA512 5e398fd87ab145f14675e5fead1cc4531b8e800fc8d67fb83603fd20de34784ebb14801d701e06da089be1151db234d7b1e169f57f28e76a5b863e93c904795b
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index d43866976437..153570a2301a 100644
--- a/dev-python/pygobject/pygobject-3.32.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 0a89ffd3fa22..de249cd383d5 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 1329 BLAKE2B be51778288391731b9c6247bdaf0bfadd66b5356ca2d200c096823ad705e40a955e3b9959d9a55cb0cfbd4bd3b913f3018a413fb4b8205c7162af85bad45e741 SHA512 84448f687bcc05174ef8910a2e7d8df2e64ea7b0914510723b56595de2f6abc5323ea4e4263e111f748ce52c27989e77624fc64f6208052671ec1e3e64c1ab10
+EBUILD pyhamcrest-1.9.0-r1.ebuild 1340 BLAKE2B 4b0a5e0d4def1aa42f9bd2056c77f38d56bc51adbda9f0d40378f57154b45067fcfceb6bd6153a8b10c3a75d48831c6da0bcd1b17831e96cdb0f73e3a32dc151 SHA512 8e1434c065afb7cf5cd132309919a7518f6b62278792e00786d17a5e433a08203cd49a58f3e6d1b7fce0282069a2511ac5d13886e756ad61151c5a824e9b2bc7
 EBUILD pyhamcrest-1.9.0.ebuild 1222 BLAKE2B 5b50d8b8823b1d399ae78ca675b6ec9eeb7235b6fc1c59c70057148d0ecfaa3a47bb907411ada7a965d1ba42672fac671379e129f5d035175d05d01816b6bd69 SHA512 eee23278b27afc96cefb11410a48a76fb23daf64b826d66c16756a949ee7cd2e18229950cfbea1778f3629eb46df837446127511cedea8c33c8c400fff707556
 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 6824c3807675..21d36581c516 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="~alpha ~amd64 ~arm ~sh ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~sh ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 3d2f981f1564..79c1e0e1e3d0 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,5 +1,5 @@
 DIST PyJWT-1.5.3.tar.gz 73044 BLAKE2B ae2e3caec52ddd768d573e0398bbc355c6eedca238db9b1808ff1d723b9fdee0845cf119d78e561833fe770e5ec39000905cec43a5e96102865f60e204c72c22 SHA512 b25a9f6a04bd072020fcf00bb559b7560902adb79746fb880432c01fa356748238432f53f6b9a21db50ece3e59ed4c45ca3f48ecec0ca3c4095e6a739a5c150c
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
 EBUILD pyjwt-1.5.3.ebuild 1269 BLAKE2B 029a126096e4d8e9bce8f2b117cef9b7ea4d90adb87690c3aee3019b9743624e506f5264fb67d1735e58bddb966c64be558d5e8dca07165f51fc7d0e2b2b26d5 SHA512 09963a2355477bc077be04b9e39e8ee8a498fb50ea9eafbf47add766fdd20612a032cf8c7cf7b7c201f369698a01707f4fea87440db6c031ef64195666fd0a00
-EBUILD pyjwt-1.7.1.ebuild 1269 BLAKE2B 029a126096e4d8e9bce8f2b117cef9b7ea4d90adb87690c3aee3019b9743624e506f5264fb67d1735e58bddb966c64be558d5e8dca07165f51fc7d0e2b2b26d5 SHA512 09963a2355477bc077be04b9e39e8ee8a498fb50ea9eafbf47add766fdd20612a032cf8c7cf7b7c201f369698a01707f4fea87440db6c031ef64195666fd0a00
+EBUILD pyjwt-1.7.1.ebuild 1293 BLAKE2B b3e3d4fbc02bb13a2d35ecf4ce99748e675fb04be106a02961cd67a7edae1dd857a8714389bee4c60efee72a5cec7ac8f34b8595775f57e8405c3afeafb5c0da SHA512 1fd0ee6e9e2328a145f6d1b3bd72d6cace4c8dc576cdeed09c3a146fdb28501007b735a14ab69d5c1b6e2aeb5cc843b6fe10c6054ccd60de758267ae6e31608e
 MISC metadata.xml 374 BLAKE2B 29e7fb2995367400d4f8d836cda63346441ff6008ac4554cd06859827d92924d3c34f2fb9763291766014a364d1e02af1ae6412fb02d316c775c3c0c13dcb22e SHA512 87a019a49c2e355d19148214f8ac7212758f7a36f77e7b959d32df1146c145b764f93707fd7b45a8c5276209a66380c888670181bf78bc4d241d5a7294a032b4
diff --git a/dev-python/pyjwt/pyjwt-1.7.1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1.ebuild
index f33db9856c96..ae65e8a6c4c0 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 928d69b1bfb1..a976d043529d 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -5,5 +5,5 @@ DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb839
 EBUILD pynacl-1.1.2.ebuild 860 BLAKE2B 9e00b4a7a68828c4729194110f2124d11a1b29e78158dc14d4787a5ecc555cb1ca731e41918b1dc2ffca31db9585277f327850ea378412b0d026fff179fc90a6 SHA512 454e4595cf84bda0a3d0da5a121d4fc468b5a065d40d89b1f7d5c38b7ca1f8454089625091aad753eb8943bb3487a97bac49ff6548dac7d8b25e341d4dd84d41
 EBUILD pynacl-1.2.0.ebuild 856 BLAKE2B 56c28a21c37d39eabc4fc27189c65a0938b00f43f5b4a18a3e73ce7b698196026f315bc30978fd9c4150ab9da3771b20d777753a576473260578515f5be9b160 SHA512 c11694426a8cf630346c546085b969fe903fee4421d688f3a8732e8545d2866c57b4533db3c050bdadfd3f7b8441a33662a554b691816ee1c0f40400453c3ad4
 EBUILD pynacl-1.2.1.ebuild 1002 BLAKE2B 56b041a58dc7c03d1076fe281e61c0efafd0bd78052980c0837342dea22fd93fd9452ebb0a2fce5922564db8bf5736c0f576bd06e2c53e85ac3cb78138c75727 SHA512 ad89ae2a1112ca2fcd930fdb9b1d70318de20076d97fedefbcaf14edd30fbccb023a59d1d9a3c342fc66b3bc5ec3d6fc73ff25275b568849d9b16d68c077c488
-EBUILD pynacl-1.3.0.ebuild 1018 BLAKE2B 725de06eeb53b2c7d0a48a2e57d8429566782ebac223a108ea2af4d0c2e5b2140b57f6f05e79678384fbfa56e604e3f6db9b58989028de56281f72b7341a764b SHA512 6e5038698c439d3c8c4237b0e3a4e8b44502ad062e2450648a2db2820549d41c80784f9ddb02b0a5f85b9039d580ac1d8c36828e6605f30a6e1aeabd5e14e62b
+EBUILD pynacl-1.3.0.ebuild 1042 BLAKE2B 780d32f4198884886c260c76ce469406037ebde9864ff501b302a03093429fa14af93db3c38a563df66f94bf9fcaff48f87e7526704fbdcba9d8bdd67368e5c9 SHA512 2445255676649fe25321bb44f1aa3e5bdb9012a89ec5d896ed34ff7933e9a85de527c4bc0d088da242aa12c7ac5ffec7ba0f084027130a461c377acc872ef196
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
index 0e882379de60..3e5e29f6dece 100644
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyqrcode/Manifest b/dev-python/pyqrcode/Manifest
index 76681ed020a4..6e92d0568514 100644
--- a/dev-python/pyqrcode/Manifest
+++ b/dev-python/pyqrcode/Manifest
@@ -1,3 +1,3 @@
 DIST pyqrcode-1.2.1.tar.gz 36989 BLAKE2B 88d5274a503abd78d0b8cab462d12be0af925a5eee2a6ad2b47a276559710eac40643a8aec99f26a9579f94e9084182894163e7e71f0abd486c5c2913e510080 SHA512 784262cb15c10f3581b0caeac6bba046686b35b8c0709ee78684b805b6cba49f4250a004dc5f7d393cc25929cbf815c6c3a94e284a77d20ff7224a8dde3a036a
-EBUILD pyqrcode-1.2.1.ebuild 670 BLAKE2B d716f2e29f55fd482b8819b22de1c930eaea7cefd8ba4a5f8eecd4fd23ffd5137d859a808768f68e0f3a705cc90fc2d73a5b430c45df814e6f5849b553ca11cd SHA512 1915bdebe4cb5a8cf8382c717774af2462a6a0f6d9e3244e31a76aca5bd00791848329cec54d550340d86f37fd57775f5db3e122bc33c11a388ec0fe22327d0f
+EBUILD pyqrcode-1.2.1.ebuild 694 BLAKE2B 9feda9dff7b441612a0f1cb99093b7e4afec193b1c35a2410a353dcc1c344821abddcc853e5a703292f4f7f4073928e8f39a5145386e0360ff2239081dd9a444 SHA512 8e6531b2a0e0d2e28e482c376c7a39c0243e8743a46617d702d8e23f862f6ae33dac237dcc025c1af33c1f18600f6d8a813654c629180c97814a5e0781c49ab4
 MISC metadata.xml 763 BLAKE2B 8145476a3c29c4c43388021c2100a87c233f5b67f28ce84de8ea1fada589b82be9e0ebf62b92a623ae74ba7d1993e9141bf8fb88b0100d65cca32ad3c2a5184e SHA512 de826d98aa1166e3a5746fbc363b14b9700b81f36cf5cd4e4446b3db79143650cc11e50c1af92e6a6231d85b0812cb109b66e8cf06eec560557cf949b7566f1d
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
index 5cddca1d3c3b..609f10c59677 100644
--- a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="png"
 
 RDEPEND="
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 9467312f7334..b0550f2d7807 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,7 +1,9 @@
 DIST Pyro-3.16.tar.gz 298769 BLAKE2B 8959e0f647b854fafaf1928601ba60921e9914bd85e2ebbca96a11b701cbfee733e73c1a2c6e5aa65bd45a6a1007a92bc51a78116ac385c5340896b4a684787a SHA512 d0e4ae93120a6566a2b06fa52b66e20daa972324a9d57d639ca68171e1e6e5c412250f7e6af3fc307631d2270be3731ea5898ad35819dc0369e6a2d8341d5965
 DIST Pyro4-4.41.tar.gz 502294 BLAKE2B 0df5e593551d9ea95d01e114cafd746dc0dd55e3157e167ac7337e316b19d2b7811d2ed4c9b3f44a45171bc63aef3d20124a8da8b149037bcbaf38be6562dd95 SHA512 01c3f16448b39cd7a83c845eec86013315ee183a3e50c6caee1d327308e67ff63732833b413b189ebcb77cdb3fc65bbd7417ecbfc8575775ff79550678bce020
 DIST Pyro4-4.56.tar.gz 455253 BLAKE2B 3c63963bc2e248706727324078898c3e2cc9b8b32d228c0f2b87aab776a0e3437f72096031b8658c756988814fd823fa2dc1c8df0b971cfd0174b437f25bd0aa SHA512 88805f5d7108432f98d38267a7a881e35fc1e34ae32cc7a1640f4b6e0d69718a86bf195fb4e4eecbd53075667521585b7006cd5c5736e5ff1ed39b5212b91bef
+DIST Pyro4-4.76.tar.gz 477132 BLAKE2B 49621974ecb485e1809366d9933ccb1027d62bfc827c3f800750095ebe3eb3a662e041a9ff97522ac866b93b22f9c1d5257e1503aaf4b6543d2d74a9a17713ff SHA512 48cc63bc74d483fff1b4bac2dd9ecf7576503bfd91e721512a5cea2b5a115ad6480ad0524218aee31e412a867261a9e838d85650dd0f7a87593a4a03cfc5cdc3
 EBUILD pyro-3.16-r1.ebuild 704 BLAKE2B 1270e3906b70a94640880fde94d51122843def778a244791c095dc4a353ddc7794d0494087f013662866f5703ad505ab133ee8ef280dc622aa90a09de1c63618 SHA512 6bcf4f64cb78d82e0d682c7e04112a127228e1aef9abd4977db00136d2eaf68c6a1d78515f71f6dbfd452b2da1737a15efaf67d5539641e2f7ab874b12207d58
 EBUILD pyro-4.41.ebuild 1872 BLAKE2B 51de78b3672b040abfc65da0b245510085e8dd051d59152a4b901dd4e7fa9e6cecd801c5bc17d5898f7acbf5b80c6a065ee033808aaacbd321149fe696301ae2 SHA512 e7ed9d0c300e62123b0b58b959ebfdee5097c58df9fc8cecdf62a548eaffbea7766eddd556f5d21af15203ce4194e676b97b39deab74a35fb7f4463985e03afd
 EBUILD pyro-4.56.ebuild 1872 BLAKE2B 509bbac0dac628598e27defe07f99ca6a025ca5d23522f1ed0f87eb24d069b32ffe3002b81d0afb86b18c93960c5e72d84c34fddb1a44c539652ba1a5f02ddaf SHA512 b7f57aabd06b9a21e5ee18c2012385d9e15e1d91b3668d19cc03f13af5f93ffb8522d5fe69107e3f01832b9e860094fd6438d48f8be22f953dcff87e1b746b9c
+EBUILD pyro-4.76.ebuild 1440 BLAKE2B 06cbc35ed39d8296a6a519368e30bbf1022f2a86d569d06055035452e94daad1adf3681ea53610fe1347ab2e7c608b040ddd77de8596c649522b8e839c3d1317 SHA512 bf504b1b66bd0390cc94e500859b72b8f17e0cbdb3198802e236b182e2906c02808c1aab602ae8f9d8f3c0ba6a53d0eead47476b31c5b72f58e06323835c119a
 MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
diff --git a/dev-python/pyro/pyro-4.76.ebuild b/dev-python/pyro/pyro-4.76.ebuild
new file mode 100644
index 000000000000..4df5e84f0a4e
--- /dev/null
+++ b/dev-python/pyro/pyro-4.76.ebuild
@@ -0,0 +1,64 @@
+# 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
+
+MY_PN="Pyro4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Distributed object middleware for Python (RPC)"
+HOMEPAGE="https://pypi.org/project/Pyro4/
+	https://github.com/irmen/Pyro4"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-python/pyro:0
+	$(python_gen_cond_dep \
+		'dev-python/selectors34[${PYTHON_USEDEP}]' -2)
+	>=dev-python/serpent-1.27[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/cloudpickle-1.2.1[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests requiring network connection.
+	rm tests/PyroTests/test_naming.py || die
+	sed \
+		-e "s/testStartNSfunc/_&/" \
+		-i tests/PyroTests/test_naming2.py || die
+
+	sed \
+		-e "s/testBroadcast/_&/" \
+		-e "s/testGetIP/_&/" \
+		-i tests/PyroTests/test_socket.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/. )
+	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/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 2947fdbe6a1a..b23d45752a07 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,3 +1,5 @@
 DIST pysol_cards-0.4.1.tar.gz 16635 BLAKE2B 8c4ea9257656e3da66d464e8f251add18bb143bc2152a6ae7c5385650867453b806f1e6bf80abb87af0bcbd3c8072c89dab058b4e7578e8d977123a13489c996 SHA512 96518549770a9d85021a60da17a0d71f4928415f7226fc7d7aecc1c84345b0d46cc16cc33b197f84b31143bc0c91c6459db19c7bcb763fe956a7f5e6a47735d4
+DIST pysol_cards-0.6.2.tar.gz 17032 BLAKE2B dd93ccaf14ffeb9cfc8228d129005b0733ba96ea90fccb105f97ad92fa6077cae30876150f8a866cc6c977563f3ff81118ebf49e87a3db8bf6370afaec67121b SHA512 99ca6de08c1e1cbad0e57d54e1482d021ad8b7c9d4c956df0f199ed4d6a1a367ab5e821ba504f300f38f5ec329f67564aead99df728df0e498d733d55435c7da
 EBUILD pysol_cards-0.4.1.ebuild 546 BLAKE2B 5116be48b217caaa7153c359963aac67472a5ccf4230a6c5b07e47104f69551ffe4917a0f41cc3c738a909f8b26ad0e52a84f16a499d11dbb225c1b994053a36 SHA512 c19a25f44a7d484442bfc05c9eca4ad63d2fe4bca5d4c134a5c46274def61d0e12625ddbabfe696ed3d87b4099f6528871b566849a5b20a16fada803539b9c7f
+EBUILD pysol_cards-0.6.2.ebuild 546 BLAKE2B 5116be48b217caaa7153c359963aac67472a5ccf4230a6c5b07e47104f69551ffe4917a0f41cc3c738a909f8b26ad0e52a84f16a499d11dbb225c1b994053a36 SHA512 c19a25f44a7d484442bfc05c9eca4ad63d2fe4bca5d4c134a5c46274def61d0e12625ddbabfe696ed3d87b4099f6528871b566849a5b20a16fada803539b9c7f
 MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
diff --git a/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild
new file mode 100644
index 000000000000..5fc779fa07cf
--- /dev/null
+++ b/dev-python/pysol_cards/pysol_cards-0.6.2.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=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Deal PySol FreeCell cards"
+HOMEPAGE="https://pypi.org/project/pysol-cards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 72ac6f9fd82f..239e866a993a 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-rerunfailures-2.1.0.tar.gz 7687 BLAKE2B 1c5ba90ab2b67c6a7b58d0569ef46847594dd6dcd5224050537fe3d645d131c2b450aa14a032151a81c6ff2c8b56d4355d03dd33a0e0f998e31a5df94df44c3a SHA512 9c3da462df07f334dcab865bf7f828f75bc611c93dfeb2306a802f2e6ef973332ef502d97dc8d676e09330ad77c227bc6a20ae67ff31f1446a5fb1d608d638cc
 DIST pytest-rerunfailures-7.0.tar.gz 12755 BLAKE2B 26ec453504439ba02afc2dc5912ebffad70a4e8fedc1f4ee75fbb3c187af4a657d8d29a341cbfe570423d2b743974286c00f911634b847536a66768d78088070 SHA512 df26952f4c88c43a7df59cc9b41d794987e4d7c43cf4b656fb2e10734e16b0218ea0dfcc184943f96c39add800fe519ee6b8843b3a0f4d36e9feb59109199df3
 EBUILD pytest-rerunfailures-2.1.0.ebuild 542 BLAKE2B 311f196cb68a1148ec02c98518f80b6195b25b731237baf6a12c43b203864fb9b2ab014a9823519ce9d8f93175712967a937432bdbe2d6d733d7880c6681deb2 SHA512 9c1dcc6858905a36732ce2d09d8e6cc63aa3d1997dc5973c8c51064bfd18273921f92bcf3ea00ad3c0e891cb9afffd5f2f9ddfaf62448ecd2433b3d46e269b19
-EBUILD pytest-rerunfailures-7.0.ebuild 609 BLAKE2B 6fe715e8a4c389df0d37b1d9ead454ddd696259fbe40bd3ce8020fea7ea401b628f8b35c667441cd7a1363f262faec75d16e555104913387a4ce54487a8757fb SHA512 26c61867d3229d8f7a664841951b92614b2a96b412009e1f4793cb9f592d9ea778f47b5ab50af5b4eed1c9159b8b000c666b8bdf39868994185e92807caefc70
+EBUILD pytest-rerunfailures-7.0.ebuild 616 BLAKE2B 2065ee119c686b81550d1d5bdde855e22d25c59f1d8ed8ceaca31d353b029f64fd38e00d6f7f84c73a62fafdcac212a22c0ae3a7146d62ef8e2c0b16fefcbe96 SHA512 403fcb733e44b68fd81a6b87c44f5b27f00ed135ddd30612eb81b838111c704b7ac7bda988a73b94a0e88c313a320b5f2e54b59d5dcfbc0aba89186818750e4b
 MISC metadata.xml 333 BLAKE2B 73b35ed1679008982384ced1ded01ba9a61c4b82a6646f7f4a1ad318690d3ffdf3752d438a7ca4064e1a39855a353e3f928329f0759f7f7dfb8ba45b01667a40 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild
index c94eaa19e7eb..49a0d735a682 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 683dda9d60e7..b75d8178ce43 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,5 +2,5 @@ AUX pytest-xdist-1.28.0-strip-setuptools-scm.patch 926 BLAKE2B 1943edbd4511b40b1
 DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
 DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
 EBUILD pytest-xdist-1.23.2.ebuild 1030 BLAKE2B 989b87f68c288b535533c9a00f5b797c4b81b90ee2635b9f85e6366d165723a5f57c56400c501bca6c3326d8374ddc7f3aa5bbca6cc761e4c65ec0e910ddb90b SHA512 39a00470970930c6efad4db30661ca0aa6268540b4fae4a4116f31cd84e8fbb447de5a277d0479eed66881d963ee99b42e87378dac53532acfbf1e76e726b692
-EBUILD pytest-xdist-1.28.0.ebuild 921 BLAKE2B de88052bd65ac5c8dd9623bb024aa5ea3efd430cf1e7a20fac16412434d5c9ba73409bb0b83a642a2fc690bb6496be2de4707da16cc1511d6bf7c71453be77f5 SHA512 207b7bb0ab74e9eba667107372c3df2e18b6f11326d7bcb16adadd0d814dc072e8ae3b8dbd87e0befa2ae7fa2ec4fcd69a3019d8fac104a556e7f3e43c65f022
+EBUILD pytest-xdist-1.28.0.ebuild 939 BLAKE2B 201252800266a6841c4f29a9d120a0fed3d08e25d8eb35aa444b08c3496f3775eb6af1b119fe1f4a737ed435877fbf0c415198253e5b9687cc82c80dd1935128 SHA512 df01680f31ec14a0a0acdbee92b22afc94113cbaf8ce03500a70d477071fe7e95788f09a59e66f24ff42a506651f59521e2213ef5b3ab6d9b152b9c30a8ed67b
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
index 9564d7976934..d716974cfbaf 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
new file mode 100644
index 000000000000..4559cbf807da
--- /dev/null
+++ b/dev-python/python-jose/Manifest
@@ -0,0 +1,3 @@
+DIST python-jose-3.0.1.tar.gz 86726 BLAKE2B 82ad3cd1139b367d179e965aaf0e33f3592883da6b21ecb3a91e9fe98ff05dbe358e56156a3d34366ffc0d7bfa9efbcdef67c41307d803ac16144a0c0ac3570b SHA512 a39c3aa9acc6bcc0030e4435e499581043a820c54aa1a4b67ae478cf95f96f28755b03fa4453e484932a64865a61613a1ff4afe30249216e8f392638485693d7
+EBUILD python-jose-3.0.1.ebuild 1218 BLAKE2B cb7dfc89f219b129b74ee05baf9a99b9130021799d05a7bb8e8c4ceba80de03a6c7d33bac636ec9e68136ac7c04a66cc5aaf2d5a5971c2d02240654e79b53bd0 SHA512 83542feba70675671f48dd3c40fc93fcda01c72f0129d58f56ab56ae16f08eba2d30f69f820d53091e475d8b58c7109b8c052610b276bc416e239c52a81e9b1e
+MISC metadata.xml 444 BLAKE2B f253d760dc81a5acb23c11eace88f17410135ebe2f336077e598b01f897e1a4304191feffdab06bdd5a04fb46430bbd090597a40e1ec96256865190a59a486fb SHA512 74ba057d1ffcb3d1995e1efe6436143260d8a973fe5cc9c1ffab0694932b2b3dd8eeccaf457a1d79fbb31f825b120fbc98fc3c0ad7b0796233e07df82357d160
diff --git a/dev-python/python-jose/metadata.xml b/dev-python/python-jose/metadata.xml
new file mode 100644
index 000000000000..78d20636d80e
--- /dev/null
+++ b/dev-python/python-jose/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mpdavis/python-jose</remote-id>
+		<remote-id type="pypi">python-jose</remote-id>
+		<bugs-to>https://github.com/mpdavis/python-jose/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-jose/python-jose-3.0.1.ebuild b/dev-python/python-jose/python-jose-3.0.1.ebuild
new file mode 100644
index 000000000000..73f6c9b800c2
--- /dev/null
+++ b/dev-python/python-jose/python-jose-3.0.1.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A JavaScript Object Signing and Encryption (JOSE) implementation in Python"
+HOMEPAGE="https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/"
+# pypi tarball lacks unit tests
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.3.1[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 4a00dc8f78b4..bff287ec3376 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,11 +1,3 @@
-DIST python-novaclient-11.0.0.tar.gz 302163 BLAKE2B acc249b58e0bbdade3b7db7bdb6cd5be790a36cfb429aa72a22c44b4fae58d24411ea0d7fd2e0e7da3275e708dd34a22e9079ec9b5bbd08583ecd58f02071bd7 SHA512 6a7101dcb27674115817b724dbab877d875637503a69a2342c7a23f6f79f8065e9aec68806c8646feb0a83a704a11141a4af9f49a6596980b69a689b9d7fc74c
-DIST python-novaclient-13.0.0.tar.gz 312459 BLAKE2B c6be6e7f4f7ec554100adf7fa0ffdd07e6f2c6ecb19ecc289966dae39ec1466f972d56be6eba87270b38b382eb05f29fbd238341eeeaf3fee6d0cb8f5d1335b8 SHA512 91994e5f0ea5537d27cb0fbfe1c1412c9e3e423d8c0d0028a1011645722d2b1b30718fa7a502ffe154a3299e603ba9bb4aa51f1187b67c1cebce564203030981
 DIST python-novaclient-13.0.1.tar.gz 312975 BLAKE2B 8f512a6b9e84e352d77f82b81777f1f9d9c8c6b40e86639c9400dede461c7f61d222ea304b8f407cf1775558aa3efe2519e03ee7ee83b17d80d5a7fa0e965284 SHA512 cca8eab5a11a784d5b701a128125e5de25c802081defa61df99449cbd711b0d6913dafeceb28e452fd9a33f901e04b5875b9cd641622af5ac6f06c00c30f7bba
-DIST python-novaclient-7.1.2.tar.gz 284152 BLAKE2B d632444db1393d69c9e87c2f487babe8931492c339e2838d4f024e01d78a2d1b2958feb0c9f22637311dbc5a6c51e052b241798a7507914f56ec10c3962ff27b SHA512 6b7e4bc80e07b09756f61624d2cf7b81dccd1d102f22cb9609b7e1de6f091061c513691095467e293b742c40a62c8cabc2d3ff8cbc5492d07763655de4d6c516
-DIST python-novaclient-9.1.2.tar.gz 279803 BLAKE2B a26e80085200de4eb1da97a37feeb3da0a70fdfc4adcd837ce0e18a275ed819457e140aa94e74e7d07003d2607a245aa0a263bed954c7252f4f28092cc7b74c0 SHA512 d71008a32b022d452b43babef6b600f5ee2b2ad3a4e1a473731966f08132c5de813d9387982e4111c055d0266be6527cca3da5d58ec8b7bda8d628bb8189ca1b
-EBUILD python-novaclient-11.0.0.ebuild 2361 BLAKE2B 36f5934e3b0aac4351cbeb523b72215c7949670dd7b03d5db971b13b54ab0ac7cc7eea8fa802822cf4f09c537829f5c9ec4621f61110d69a38abb95f5231798c SHA512 96ca79119a1ff1d534b52870acf9064f2899aeab0f84f9e5152369778dec8ef2bb2065b078fbaa8151ea14c1cfaf31f3b006805211818a21c78c0e2c52000ee2
-EBUILD python-novaclient-13.0.0.ebuild 2359 BLAKE2B 309dadfe3778a0e64155ca7120f818eb480f315946c660fb1d9f74c5e6b6aaf07a2adf3d69dadbff2960661eb076e169e19e6dbc7e342710ed32fe78e1813efe SHA512 0b07d9959ed84c5987e713d36aa9e9ea89f00e209fcc632fc4a671ed06561c69c6310106701ff1440d2e48c96c7c547d5637e2f76f922486e83dbfa57bbcbbe5
-EBUILD python-novaclient-13.0.1.ebuild 2361 BLAKE2B 2b04ef23f6fe57f18ef724be3fe0f38766ebf4204c9a07d7a7eea4556c9aeb02fcbc1a858b86c00fb3c76a50e903ae733787a7545d395cda906eebdff66de4d5 SHA512 dea757d772bb814912a7510c3f26d6216c4d294667f328a902c5a091ffc04f752a998004b2b1dff8408b47514a6ed830c3ad67dba4540818ff163b0d852c13ab
-EBUILD python-novaclient-7.1.2.ebuild 2390 BLAKE2B d4a856764ed0d880d043e75cdec5229245aec40e73dcba0b90f396d911a2e357b176b9583898b682b8dbf5ca14b78ca50357dd9409f6cb276d0c8234b1824579 SHA512 ce9a3af7e47badcecafbc4085787c5095993d76a99b07c48dbb00946021f636fd1c589fe4c93182a8f01ac498fa2057c4ab638279ecc24639bbf4fbb239874e7
-EBUILD python-novaclient-9.1.2.ebuild 2567 BLAKE2B 0c9aa58112f0b5ebdafce403fc8ca71a40de279e5d27a7e0e9ed34f6018fc7ba9c541823878bf691369c77a8c4b208bef391ee9eecf81b0fc22d82aa89fd0204 SHA512 1d6f0ba892a300a79f24a7999f6479f3184879b9ed6937d92ae5d319694741df0c121969a5fb498795fc64d6a9cb24a3265e18c42dd95a0ea5b6c09b0200ecd0
+EBUILD python-novaclient-13.0.1.ebuild 2359 BLAKE2B 309dadfe3778a0e64155ca7120f818eb480f315946c660fb1d9f74c5e6b6aaf07a2adf3d69dadbff2960661eb076e169e19e6dbc7e342710ed32fe78e1813efe SHA512 0b07d9959ed84c5987e713d36aa9e9ea89f00e209fcc632fc4a671ed06561c69c6310106701ff1440d2e48c96c7c547d5637e2f76f922486e83dbfa57bbcbbe5
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-11.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-11.0.0.ebuild
deleted file mode 100644
index 027b093cd49b..000000000000
--- a/dev-python/python-novaclient/python-novaclient-11.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-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="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/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.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}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${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/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild
deleted file mode 100644
index bfd223c9f5d4..000000000000
--- a/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-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="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/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.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}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${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/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild
index 5c078c718de5..bfd223c9f5d4 100644
--- a/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild b/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild
deleted file mode 100644
index 258bb46c99b8..000000000000
--- a/dev-python/python-novaclient/python-novaclient-7.1.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-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="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild b/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild
deleted file mode 100644
index 2a87164e7ee9..000000000000
--- a/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-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="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/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index d048e80151ca..799a309c3e6e 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1,7 +1,5 @@
-DIST python-saharaclient-1.1.0.tar.gz 81664 BLAKE2B 8bfc8ed2bcc4cc13e6894d7776f7cb99c8a72632e132801df689832ef847c56b7cedf39abb112223a2919ea3ef52fc99e31290f7acb555f76505e11f195c48db SHA512 0799549d68bc65792cdf0129f3590667a1a87697182ad24c5c41e9c01abf5e133a16a60fe0331f313da44017aaf0503bbc131e8a62536a692032af36ae9f1386
-DIST python-saharaclient-1.5.0.tar.gz 94824 BLAKE2B cacc3f2e8a1df5f7e50f5b5c004745333ea4b287c0a86792247212fb873ec55329719f16472c3c7fef196f2ce8fd05c760e8db33b84e0ea949f7e89997c0f960 SHA512 8b845ad0eefa05b564659dea9e619a3946e0d62a981b46a4fecfc2d4aab785b8eeb2e18266d5467efd8e0ca31c441af7da41a816ea42405a8cd137adeae2793b
 DIST python-saharaclient-2.2.0.tar.gz 111804 BLAKE2B 5a52b7d51c3cc283b7785e7e3495ded4fc3b0b92ff8a8c01c61e6f04a6a54458f50e5505270018586ba08a9e55af809139f4fa892f9e9b86e072d12eee40e47e SHA512 88e630ab1b28404329572adadc3c923b592c47e6a2ccecbd40f79a0f3d6d65eb1476d62c6c5dc0f2d2e6687dbb5e1cdab4011c5c6355f29033b801b8c25f206c
-EBUILD python-saharaclient-1.1.0.ebuild 1829 BLAKE2B dafeebc667e00766acb1a8f12fe18f0762659d95f5550ccdb07c744dd53b68b982af1b1bd151c3693f882254267cc5932d4f7f30806afbcc3247758c0ad3beba SHA512 1bcca092d5ac2fce9240a578c4e0e8efce2a09fd35ad05e92b3f3d80c6ac0e1055c7c399045ec3590339dff1191d2a8f4cecaf169e69c7c1f30b2d02b0b605f4
-EBUILD python-saharaclient-1.5.0.ebuild 1987 BLAKE2B d85be213f8fdc1e2ea654fa5e211266f9d6c2b1e68ad7ea876fe8431e0b134b64c3ef7039d98bb398f97480aa59c3b6550cf31bbceec195a505a3ff418234e26 SHA512 f65fee64c47762e6531d74c07cf00c79502e1fc40aaa34c5eb7bef2d482e20ccbdb1ee646f6f0a907ae7bcbe6c0a69c6bfb743aee4bed89f7f76ffdd55ba58c4
+DIST python-saharaclient-2.2.1.tar.gz 111417 BLAKE2B b4545a161a630caabca9318eb0ead796b417d686cdf2c134f7e8022e3e62e7b01e5db7cff1950826d49798d6e6ea41334138bcf918dfb23a2eaf6527c0788fde SHA512 f5ebbe76d00a9bab4239bc19df2bde30b133b261bf8abb63db12cde9539c5bc92fb1a24b6c9ed6e8a509a44ae2abe98f5e8b74655517a1e2c2126938cc5c517f
 EBUILD python-saharaclient-2.2.0.ebuild 1738 BLAKE2B 554ba20d1cd4c03bd61d54664d548fa0a16738f5c1c45020d7ffccae6aaa61bdc9f7e1347c9fd1fbd8e21942ebba3af991efe4c6f945e8cd8f18fcb5e02a0e30 SHA512 443bc055b43dd26fbcd95843b875bd001af6ac8404b4fa444a139b8dcfc01a3f6f95b27355c1b90420106e55ebdeb41aed2085a94cdce74698992e5d7ef9c0cc
+EBUILD python-saharaclient-2.2.1.ebuild 1740 BLAKE2B 2219c123ff2263340c36c37b3db16292627c0e810acab6652ff28b57291b603c952ed97e52369b434800db251454a60e000de8189e36c827f3fb9e5eb3128b03 SHA512 02a31f26bd75027f6df4d67bd55fe49fabad560f898ba3d14e6e349e89ea686104ac171cfd182e60b1ece19c8ea72a00f9cb3308c5bf7c8220c234c8ddde990c
 MISC metadata.xml 643 BLAKE2B 2a3c45ea4f9fa3c045cb88796e093436e66719daf71739c7679882f11123f2ac405926c8405046aed4efb55328d7235619192b9b7f978f7571c673e306953834 SHA512 4ab105b6287560e19a7b6ba8e999da16bdb520ff8f1a812e0e17ebff9c1edd2f7ec1475978ee478c556d31af8c201555669c92ff388de45a206b45005ec95d2c
diff --git a/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild
deleted file mode 100644
index a17244d2959e..000000000000
--- a/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
-HOMEPAGE="https://github.com/openstack/python-saharaclient"
-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="test"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
index cffa8d92287d..981baeb7c401 100644
--- a/dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -23,21 +23,16 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.11.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index 5283b0b6ed2f..c25f3f1843da 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -1,5 +1,5 @@
 DIST pytrie-0.3.1.tar.gz 94678 BLAKE2B 12631652ea33d2f1575f86bc8c42982543f8fa146debc9cb86e1139ff089f0657e04e50bad97b9bc344f4a270d102ee98e03fd389eb2c56ba3baac32b2288670 SHA512 72cb4ffff53d01545658b27b6c0b798736404f95013bfe34586c51c8823cc923ac4b3a8e874a938b26e3045784ce98ce2d8e51ab70dc435ff50075ffaf9d6c51
 DIST pytrie-0.3.tar.gz 228709 BLAKE2B 84c415722a724ac668624b3da29bfe29998c2ec8662ad21ab0035bb2a694e94759e9d09de980842887972b5c1690d699e43de41bf9f62e84ef3fbee86477d0a2 SHA512 f1dc6f810e51385fa4dcf2cbec76cf7fe5c184208f8d6dccf6212d43260591580126095e68d28ab6c8b01a631e6e16b275fa088643ae81568493ca231dcc6161
-EBUILD pytrie-0.3.1.ebuild 598 BLAKE2B 4222725494f7a381ce122f1f3f8ce0c483485229d989624f621a54b1d41aab1d834b6fb4cab8d98a3ad0b8627f5e5d4c4246d8ea2c0937dfbb5615bf78a3e3eb SHA512 0627366cca1658439b508fd347a6e9438f9aa69a08f33b5050088500935387f20effd2cd10db41e17f3bc499caa1564c3cccdb5b915fd2ccfc51a351e4827b86
+EBUILD pytrie-0.3.1.ebuild 622 BLAKE2B 8d6d4e1641c91167fbdfa7ad29c25cb67b99a9fc1d643a4eedcb1866eafd1424d586db7ee554751a5942d9c28907075b1762ad375f28f43aba8fd8f28afb1129 SHA512 9bb5173a125a36057eb5f412099915f287f4fc552a6e7f87aae16a8e28f49929871db341420eef12f10dd60344fe932d788fa6f7c3a4deb59d953e06cf8b3cf6
 EBUILD pytrie-0.3.ebuild 595 BLAKE2B 862638b14fd5cd871b5f241bb3ccec1e57afee8f8fef6b8c04e372245c02fa78ffe8fa3233d9a64288a32b1ae4de569bd06c06638b0adde7374594b95c96f75c SHA512 c45e370bdadbdc262d7d2390baac51dd3860804f67b52eafce89dba3c07d0791e3cfa1aad4dec211421b42218440ebb7ed658cfe13e21b14b84fd35a11b50b34
 MISC metadata.xml 964 BLAKE2B 9fbaa7700117c0416ae610f5f4d15078276cd6beb5fa6064b7a2649b5e1410b3ea957db671a6fbf7b3c387df22493df21246a5dc0ca563fb7f74c4a62d05a822 SHA512 cb64560edf2a771b3bfb856db54b4a6e41831a8ef51e6f2d9e045dc4e01db3a79a670d5c39a3ecedec4ed3c3f57473ca1ba5057b1e45a0d76f22275b888000f7
diff --git a/dev-python/pytrie/pytrie-0.3.1.ebuild b/dev-python/pytrie/pytrie-0.3.1.ebuild
index 2193998d888e..15cdea2a11c0 100644
--- a/dev-python/pytrie/pytrie-0.3.1.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index 9e52df65c832..95c382ca9334 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,3 +1,3 @@
 DIST pyu2f-0.1.4.tar.gz 38797 BLAKE2B 4240083b03bd596d1f87e42047980ab7c75d0064eec0ed2050d77bb92d26fac651af515c2c9b10d338e27ecd778e80ff47b5c33a68cd86328dc913c0e70cb1da SHA512 16f948b812edd5f0e4d97350872809b7c1b52f38eea49170e4aa21e0f695935dc0d71d4fa077ee1c1a3ef2f0711d62f0cc49983a89c841aa31aadf7b76340035
-EBUILD pyu2f-0.1.4.ebuild 1105 BLAKE2B 1e72f850690dcd8fd29ce5b12eb0bcdb1fbc23cdd039fa10ec4e18e52f466c20d617b44c7d1666fcae6e5c091e82d7690878ead02968e885bb602536640663d8 SHA512 61a4ae003e8eb384a96e7a077c6fc8a19ff2842613bc514728a769572670ac8dfb48e6fce901753dacf4bf60dee285ae94df8c4285a4968569b0699a05abcd54
+EBUILD pyu2f-0.1.4.ebuild 1107 BLAKE2B 2f32be6c620c29498c203c80aaa31a9b7a6d853ab76c4355f614441f7d4657e10d01a94035143d8650a4949d11c2f7892cd007a52d648f482fb726d579eb466a SHA512 7166d259ac8dc4dac3a4487cd4daed3053ad997dd66af008703254c55c0170f32b80d315ba9f7e213073a40c93cbac356ee2f2e636464e091fbe38960e4abb4a
 MISC metadata.xml 364 BLAKE2B f739254d4208658fd33151170987b9214670cf97ec8babc6c97ea4acdd19f3cd29f35e9d719b8462d90fbf0ff71e3bdbf30cadc2fd91ee54f2868018cddeb220 SHA512 d1f71740b09b54385ca269bedf3ce44ac424272e69881245a77796eb6c9e618e63c8837009d097b43dee477c765adf31b9e4bab7fa26606e57c3894c7bed429e
diff --git a/dev-python/pyu2f/pyu2f-0.1.4.ebuild b/dev-python/pyu2f/pyu2f-0.1.4.ebuild
index 2abe40f42e21..59de7660cc44 100644
--- a/dev-python/pyu2f/pyu2f-0.1.4.ebuild
+++ b/dev-python/pyu2f/pyu2f-0.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index aae6b127b20b..b744733c8fb2 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -5,5 +5,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
 EBUILD reportlab-3.3.0-r2.ebuild 1654 BLAKE2B 75324010068f8d97897151151776bfef87401dfa7859fa7b825d59b667843dde3e5e514e4039893534f7c5a6af5c38a937ab18ad48629c43f7f9a67c28671646 SHA512 a80631147edfc37e13fe28dfb03953e343ce26dfaa8769eda29809c0cdd0c5c39e51e3605e682a15a957268a6a80156e6edef5f9a2eac4949a642fdce8b260d1
-EBUILD reportlab-3.5.13-r1.ebuild 1524 BLAKE2B 7535f150f42242d62361bd2fe180af4eff52cc38c64568f2078ffe15e864bb4e1d8734f0922782e9aada8eebb4e99d9b0af46db7993455c5a8aa0ca6e8a5c656 SHA512 e2244aea8aaf03c52c6cf268af8cc935d4122c32cabc1c82f6cc567cc0a8b277171b2d45f7701f11b33cf27f3869de1cfb05fa9353f6552358b894568ad8c5dd
+EBUILD reportlab-3.5.13-r1.ebuild 1523 BLAKE2B ebf92f9a176a6d8ab70463e79a73edaf8b77800342d73e68c0b2318cd771d589ee19eba8e627796c8ce73798509a63b14ee5169dad748a52909476c132908858 SHA512 bf25186e74c897c81da65708ee57792532bae693548e6fda7fa7bba2fc87811601f35ce6fc2ee552c0c1c5a1b4c062fc62b5f4906ead7d06d21670ad14dd0b0b
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index d44002faf06b..ffbe40647e32 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index ed1b0320022e..ba53712f4739 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,3 +1,4 @@
 DIST retry-decorator-1.0.0.tar.gz 2835 BLAKE2B b04d127ba3d357a61fb5e35a63867b297834acd82d0d7cdf736a69efe95fa33a263309799dcd4d8ae42e72ad5adb12b6c52557a81413ee8ebc49f5e0e728fa8b SHA512 f650740dd6d05010b7418b4d5ae7351058eb4418dabf7329390eaacceb72db60363bae8ff0bb15284301f0b5bfd9bfb731e71fdffb7231065a4db7ed6ce86da2
+EBUILD retry-decorator-1.0.0-r1.ebuild 546 BLAKE2B 6979cb267167269f4e5afd6b90bff20f2e11eb6ca67a3b43fbb5a102d7e1e004fc8880270fe0b22ec1571dca491e6d07010cfbe734d72503952ecf015b955b09 SHA512 01487b7e9745bea214675810bbccef9d4eee2d40606d40e1828d1a779caebedf5ee95b7c44d5f0c32a53b758d5bca07f2072805d815cd7d1b5dc7d865328d57f
 EBUILD retry-decorator-1.0.0.ebuild 554 BLAKE2B 3a97a8b125be55583d91b16f652b40c87fea4fda9482b94b59a311fafb61780e8e259774b18736ff83793e0bb82fb33ed863b35b70c29bb20ec97c1b026ff671 SHA512 26c9861ed63f79d4f8c2d8e639f996bfa452235b586bc39f09d5060abc8da9c44a90939daf5c24fc6caca3b3d57552ee2fa03cd22b311a399a754ca0f523d2bc
 MISC metadata.xml 337 BLAKE2B 29715a3b27a3e28df0232103e6f826dc37f91a4ca981b25b3c4a786beab1c242db13fb942c1fdf0d646567439f7221862ff50c77ed87d376aa6ed6b04686434f SHA512 b94863fbe276838245ce8de2206145c0a0953cf8ec520ccab8dd4c01d6a58d191740c7ea1af0c1692567f41660ff009a5f5cc3147126e21299864d5957c979b7
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..ca6ec3bfd7e9
--- /dev/null
+++ b/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Decorator for retrying when exceptions occur"
+HOMEPAGE="https://github.com/pnpnpn/retry-decorator"
+SRC_URI="https://github.com/pnpnpn/retry-decorator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst )
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index 52de2f30e62c..31a7e09165c1 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,3 +1,5 @@
 DIST ruamel-std-pathlib-0.6.3.tar.gz 19520 BLAKE2B b403338cec80b38104f012c2b2626d473f12d557c2300d606462f2eb009bac72cec65b2f4e5a88192832a99dfc28573ea9ba8e7b73078ad8bac77136dd929040 SHA512 1210d8f7ae77c6358fc857c3ee447b2eb9802eaa31a210804acd74ec23dfd6ac9dec90dd7b21c79dcb4845dff4ad3614dd615c4798d3d7a39cc3a877cb9b63b0
+DIST ruamel-std-pathlib-0.6.4.tar.gz 20719 BLAKE2B 7189b10e61c941d2bba9bcbff3b61f2ad52849d78160b181721fef3bf3a9170aac823631e1743de98d1c132e38092a38781c9c8d0d213e4b94cc1e6051edb2b7 SHA512 591aec63c14c269d6b0838ae4867d58bd0642cf84cff841eda53a4d60f076ba68fdcb54d7e2932b248ee61feb773bf28b6309947886d350af34ed9f580c9d939
 EBUILD ruamel-std-pathlib-0.6.3.ebuild 846 BLAKE2B 89e0a4fff0428409d032c876bd6a64c49af4d3b9f5ba2f4b32ab056d634fddd4abd0fc6e96ba5a334b1fa17187708c0b658f9757509ed7bb8bc3ff3d91f4e9ca SHA512 925518e901f52b0be700b0f5117f9c758df4747833ba816b4b13df83130ce6c3f19bfe9349b54c06f1c16ec4166d68e8c6c24362afb9f68ad6548e5e6e572e7b
-MISC metadata.xml 501 BLAKE2B 88f269dd28386ed5c49fa217cf58c68148fb67a8b33c630ca497e8c8ca328a3d66e9a04fc4d5a18c2ac0133ca99ca2903a22d05106f024034480dc72a2fe30b1 SHA512 cd00a071d94fa16a83e00864ceda1d2c15d6d3d0b581cac9dc3a2f35c794c1edc4d6049fc074a5ff1695555b7a398059d267df9cb0e9eab84595095eecb34d2b
+EBUILD ruamel-std-pathlib-0.6.4.ebuild 849 BLAKE2B 240d76ade12597f2d2ff16dd9ac6574bfda9deec9b19c798fed5447914fbaa890fc26a44edf32853131103ee298507e78ad534335e9b1f7fc603316743a4bf22 SHA512 36ff9b266082db1462d9350ff15bc260275f9416843bae98a70ec102483e9c24d73228e02c43bf40f1be93b72f893a768e3cffdb4af524a6800ae4ab3926dbd3
+MISC metadata.xml 501 BLAKE2B 2f6ee42e968d9135f317a1c6f9b2ed2b6949587ee0059c227a60b20b5e3ddac3aeac4d3f782ba5461c0efe64fd9729edc87e863f66d4e49439879334fc214d79 SHA512 52dd1e3a6cd36e1c24795584779030c5e2cde11717628bab030d53d9e6cfc70cfd36e0c0cfe2fd72281b706a14445eb30b8b10614d4b5a6a7c27c4e3fbb09dc7
diff --git a/dev-python/ruamel-std-pathlib/metadata.xml b/dev-python/ruamel-std-pathlib/metadata.xml
index 8f2f19173a83..c7efd631c106 100644
--- a/dev-python/ruamel-std-pathlib/metadata.xml
+++ b/dev-python/ruamel-std-pathlib/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>fkmclane@gmail.com</email>
-		<name>Foster McLane</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>andrey_utkin@gentoo.org</email>
 		<name>Andrey Utkin</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>fkmclane@gmail.com</email>
+		<name>Foster McLane</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">ruamel/std.pathlib</remote-id>
 		<remote-id type="pypi">ruamel.std.pathlib</remote-id>
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild
new file mode 100644
index 000000000000..7e6f20629557
--- /dev/null
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN="${PN//-/.}"
+
+DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
+HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://bitbucket.org/ruamel/std.pathlib"
+SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v _test/test_*.py || die
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 688c8f6dff9d..59fcecdafe35 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,7 @@
 DIST ruamel-yaml-0.15.35.tar.gz 344241 BLAKE2B 3e77f5da4e2a7f64099da1d79a108adfb093c5e47baaf11611462637ec6e29091924088e0ce261b21283a0ab07123da45a1ea7b0c522692d1e96cdcc27502541 SHA512 9e335d627db20b85ec0384f16d7ea03c310c01e84517e7b9bced1af9289fe542b87eb31da8ad960b17d26f35f2cc33a87a5a5b976e0e5ca587339b21b4b53fca
 DIST ruamel-yaml-0.15.96.tar.gz 399206 BLAKE2B e17f25d9501dad9fd17688b003d33fb0015b700f3c51d405710ccc0635263ced7a86140a3ed7a4aecaaf9e2e73f2eff17b99e96fbd9d9c1be3e9110c28758a62 SHA512 be76a03c46ce8826eda365791e212783243b64781318a998cc48c201bafb9af6b318e7544241fa10ce211e25bd6b26d3e57ef6a1fcb0c1be6dc4552c341e5492
+DIST ruamel-yaml-0.15.97.tar.gz 400728 BLAKE2B 04b957ba7739ceebcfc802d86252ace5bba8960cc75ff0bea00ef8ba25e945e80ef878a9699d1a8d1664ed8e39d23eb47542f2bf70e0628b1bd1904d80e8c034 SHA512 2c61609867147c3fd9fde77d03c589848765a068893197ae4aab4417933a7f54b46c4eb81e9359d116fd45a37f5e5e357ab3ea19d0b19455f2ab3c022a40349e
 EBUILD ruamel-yaml-0.15.35.ebuild 1086 BLAKE2B eaba5af40051c8a044e8a0f8fefcfc09902e7d9aa85d0c2c4c76ffe0aa338bea3d86e8efd3e843d007abfc87ebebaefd88fd607afa4060a3aa8b7716dfefe704 SHA512 684a05a511949ad7ecec491cf454065d5f6ae442e12020a2a3b8ac966bb5045f7ad4cabccba3ed8d2c75b75547a634cd8cd3267e53b990941fdb70a646a56a46
 EBUILD ruamel-yaml-0.15.96.ebuild 1087 BLAKE2B 63cad1654b1e8e61ffb3a551157624b127a27534e95848fb1d4818e3de85c6755503257510c69844abf8da8ca06b8c3c89080d867abc249b81d829371f205d78 SHA512 3805a9192505c37e533a8978e6757d98dc0b2a9ca28bc6ab7239302d8cc12e49821daa067bffb55fcf79e51b97f1be4bb5319194328fb980c931b2447a63db83
-MISC metadata.xml 487 BLAKE2B 3564fcb4d8426e84f8e597771f9d5c8fb89a770ff6324f1af2112ca4e589cadd4f83503c9b9151ba5fb983b3afd837403fae0b0144da9ed3fb9677c0b5cdbd86 SHA512 d0db6519618ae2dc134a7ed8840a7c1dbf1e49c43fe781ccabf8ff8508ac6dcc7fab92e61b8e6cc6179f30aa5bff2c772721ca09fad15d57734a16d372c6f0fb
+EBUILD ruamel-yaml-0.15.97.ebuild 1049 BLAKE2B 8e1ad596af6c57feee0172d5a36eef6161197383398985fe2024292e4e7500b51263a1728619dd1d31e68f7bd475fd4d9abd0926ee9e7061bde66b988dfb73b9 SHA512 6a3dc8d1f4a9cda396afe167391ff62a753600b0f232d2205ffce46a82a165af4bc9129fde618bde7a47fce4feb7e96de5a199d3bc6ac4e933301614fd9fe4ee
+MISC metadata.xml 487 BLAKE2B 1f1117b83ab85b56b1277601cae14752525805739f74a8919e04395585fcf704b4dc4994c3bf090d02fa02315f88c5354139867d0a4cd637d4970caf586a56f1 SHA512 3dd5725605481094d184e1deb16bc9ac0551c4a197012f0e3e902535d2f294f69f7c40144dd858037d0057acfd8a2faedbf2cbf6e823789aa7682cf4274ec710
diff --git a/dev-python/ruamel-yaml/metadata.xml b/dev-python/ruamel-yaml/metadata.xml
index 8c9ad6241320..e81f94cd2794 100644
--- a/dev-python/ruamel-yaml/metadata.xml
+++ b/dev-python/ruamel-yaml/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>fkmclane@gmail.com</email>
-		<name>Foster McLane</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>andrey_utkin@gentoo.org</email>
 		<name>Andrey Utkin</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>fkmclane@gmail.com</email>
+		<name>Foster McLane</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">ruamel/yaml</remote-id>
 		<remote-id type="pypi">ruamel.yaml</remote-id>
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.97.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.97.ebuild
new file mode 100644
index 000000000000..f1dd453a1207
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.97.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://bitbucket.org/ruamel/yaml"
+MY_PN="${PN//-/.}"
+SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# This file produced by setup.py breaks finding system-wide installed
+	# ruamel.std.pathlib due to shared namespace
+	rm "${BUILD_DIR}/lib/ruamel/__init__.py" || die
+
+	py.test -v _test/test_*.py || die
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 06e7256f31d3..782aa8c133b1 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,5 +1,5 @@
 DIST ScriptTest-1.2.tar.gz 7208 BLAKE2B 07e63e636ca88b47c0cb9129cf4fc02838287b4ea1cc6b2ae47eec1320ad200179d4a6b8f59860aaa24aac75edbe1d55e45da2de91ef222e621f74667ea79c49 SHA512 0dc09e6af5554f38aca6ee45b9afad2fa4c1c53a4d3c43edff95bbd6ea8d57e94bf6b7bdcfd26afff6bf2b10690795bd2816013801911f726c67e8171546cad2
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
 EBUILD scripttest-1.2-r1.ebuild 543 BLAKE2B f155cc6257076459eeb3ce5b4cffb30dd1035da6f987bfbfe49995d6d6d3b497d9fd603484ab98fb686be5450b1e4e14a6264b1bb581523314a11d088e6582f6 SHA512 33787bcc9603d6e0038912aef34bff3825f4c3e82da172b8cac72cb181c91fe8101c1bd2f7abe499d83292a3bc65631e5758ce4a171202f390ca9666530452bf
-EBUILD scripttest-1.3.0.ebuild 634 BLAKE2B 48127d198b62934e330babbefa22337f8347701d3ae2fb0d8982a311c3df1d1f571713309835bc2bd18e6afdc46500d5be05d9741aec8891dcc5637201537a9c SHA512 a875e45f45095205221924c179f68c4d859e2439209ced063710525cedab1155f7ef23f0d0e57e5a6c5cf284daee93a3221ae49734c44860549c10ba805cb5f8
+EBUILD scripttest-1.3.0.ebuild 632 BLAKE2B 4e5b0240612258ee64f259595ee5c49d95f2d1731962483f38929c7de9078f7a2e64b90bc120a3a02bb7a5436aea1e2f65ae5e048b050797e26159e726d169b6 SHA512 1d7cac1b5c693fbf1cecb9524e985961244d690a8dcdbbf2fb6d98b5f47163669fca60b5369d09c7229b519738bbde4ad701e62f05b56c172fa74abd1501c1f9
 MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index d3f0b87aab1b..d505e0bd6127 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 2187eb45c79c..3b5d9abb6c3b 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,3 +1,5 @@
 DIST serpent-1.19.tar.gz 12055 BLAKE2B 1adf86abf58b4afb82a9d2ee3b8fff4107f3e1cd383a33359687b80b2b917ec1af8f15cb5b849c0979035daecf2aaaf1230553a478e59480f160d8df456b5fd2 SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd
+DIST serpent-1.28.tar.gz 26912 BLAKE2B 7608e1a25b4157b8e304fe6e2265f0204a3056c752a58ac0c7eaafe41b4fed9246792147a8af87dcadf5c6e94d3d494f7b561a073e1bf91e412b60a286b00a10 SHA512 776bc497c7cd815c4ef44107bdf53b62bb92229beba0be7efceb9fba57dc7c677bf09832db335485df3e466acdffe6ebf4b3636ae9b49e60075379a7419a29ad
 EBUILD serpent-1.19.ebuild 605 BLAKE2B 87ed39a8e009c745003c852f4238752b643f91aba1bd7bd9aca7823106963a8894abba8050fae6bf67bc8d825419cd03c210fc695fb3dd535de2b976f02651c0 SHA512 3a9d52c6be29f56645ff16920ec553d2ddc8b1342ce5a47ecf97b96a82592347943dddc16c5bb42c5f2a8326525b1984bae43599e0fb5b1f869fb656a7a26bb6
+EBUILD serpent-1.28.ebuild 544 BLAKE2B fa637862b7eab1f819fc1006f5b3a883ce8eebdb25fa7433eaa96c160c20932b408b072d586a2a38255ba071238236bec5ef8a13271969983b47fc8c06a86911 SHA512 de82090c1831b797775fad9057798afe62fe8dd7c70d7b4d1f81d07ad49ca732c37920d9e12e4c20dbd3de395fab559396c529625d175cf9cb47ccb4d1632b36
 MISC metadata.xml 363 BLAKE2B f40df45db2fe2c0b0a35e6a9554ea3d39f25575e6e83dce3fb235a72bd1cfc3bd07bb106661470fe3f01f79bcae06d0e70ac8213cffbc9119bdbf4a3c4475eda SHA512 c0ecbe2e072730e43679dd09334c4fa300c1660a740cdb7071d6d87f112c25493b169f0ca7c5a99fe4a978a8d81f87a409519170cbb69430994f16a8bb193500
diff --git a/dev-python/serpent/serpent-1.28.ebuild b/dev-python/serpent/serpent-1.28.ebuild
new file mode 100644
index 000000000000..44dc1e5ccf25
--- /dev/null
+++ b/dev-python/serpent/serpent-1.28.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple serialization library based on ast.literal_eval"
+HOMEPAGE="https://pypi.org/project/serpent/ https://github.com/irmen/Serpent"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 05e8e25ff407..f88730715eda 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -4,6 +4,6 @@ DIST service_identity-17.0.0.gh.tar.gz 29078 BLAKE2B 4fcf8ab697d87c13268da880f8d
 DIST service_identity-17.0.0.tar.gz 23502 BLAKE2B 49218eb0c4021d7a69b09ca79d60b3f421c3c35b606de9bb47812e949b0f1284f0fed5bd9e18615bd569ea31b426339fb8ecacaa7e30cca0cb0abf488bea02f7 SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec
 EBUILD service_identity-14.0.0.ebuild 1155 BLAKE2B b39f819091b816e5ed9284c8fc75e83c85685f95110739d39019ded932d061c6ccbdfa5e6b20e8ee2c155f7d7dc37e69bec51085476ae0110594dc97d2529801 SHA512 d84a7f560da81f6cb182a768cf3ddeccfe78e3decaf3e5477bebaccda2c55045c03410539808dfec7fc5c6aae29711b8ed306b4df4c73a94a9123b81712ee222
 EBUILD service_identity-16.0.0.ebuild 1151 BLAKE2B c502f588e8ce2d5d1b4871248e2782d3da5130fcf916438d751ad6131199eb96a1d8cac8d1d011c0d2d1051e0b4a93c32d2c4b988ec3649977a78d07ced1bf76 SHA512 8d0448cce9c3801879415cf4c16c58b976f4083dd762dc6b0a0d3470b56cee876b4836d60bfaaaaa71eb810e26256670b41bc46d3e9944c0e48b68a2809d683f
-EBUILD service_identity-17.0.0-r1.ebuild 1233 BLAKE2B d79c2a17e769de58c5c931322a6b0390cd02f7f9c5b3b3c7cc8c73ef13ef9067dfe9d1208fe5bac8579d6100b73b80a019b5dbea77a30205619029f671cbb6ee SHA512 465aa2f3eb3f88b1a2b0d25dbc6a29f33406cdd736097842b1b4d7d5c21802843a3179e8ce72aac3c4e9ee339a95aaf80e4c131882a945f1771edac6469ccf59
+EBUILD service_identity-17.0.0-r1.ebuild 1244 BLAKE2B be6b65f9f514db65b3c1e614349b8210ce62f2cb2643c9825120bb619ad4bb757ece2e2af8c28f8c24e601ffd77b532f8fb39672a8717877048b2512c95eef1b SHA512 bd1a8f9927ac2935c84edae2122949d8fbe1d0bac16a0e5c6739e99bc485f25e90c7daf8e5b1aa879e1ca07389a7db7603f904d6909420309139d7be2aa2915d
 EBUILD service_identity-17.0.0.ebuild 1229 BLAKE2B e28ed9a4704f7c3d9a62791ee92668c5646fd276106298da9ed39985743068c1266fc049bfc48dd4bc769351f79e245913032c22f3aad8f147e06bd14071c148 SHA512 caad1dea6796888cef1fb294eb1c6538688bed3adf0cbd2c7baa3ec000d6ba6aaa8f9f132073ac090ff1a3af730f05dd0c9e2f7ea74380db5c6c74d464fb017a
 MISC metadata.xml 392 BLAKE2B eb095e560878b45595b6b82e8acd6e07c89e68af20840190b09acfcc03191167f3efccace6debad6187c64a204191ab5036f40a4c47cee8a38727b24f9115057 SHA512 2140a0ffee3fee440a0ed3846b557ed7be08e4bf37be391ab3c3b7e6823e1f3a44dd30f143927e4fb75b50b029413dce3a69ff1cbaf640f6e5563fc65d9cb5e8
diff --git a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
index 3451b3452247..f153bc88f5c0 100644
--- a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
+++ b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/service_identity/archive/${PV}.tar.gz -> ${P}.g
 
 LICENSE=" MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/soappy/Manifest b/dev-python/soappy/Manifest
index 1776dc85b7f9..4bba1e4a3d1c 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 1013 BLAKE2B 935960ec95aa535bed46bbcd79a9a5649408b060f92cb57864f2ece21bb5a1f308714a1b7d9e0b4a8b93c89c6e3afc94d29745865881150dcd1e9aeed290fa6b SHA512 9eed073631d94158836e03b845e62b5e5ad48b40cb12556fc26bf63f521945d6c5db1c02c205b65a222e182c4c4e446a73a2722d703e4709265b6968e375ebec
+EBUILD soappy-0.12.22.ebuild 1024 BLAKE2B 31ddae245ba383dc135443d04560884415f5178bf3e28135a5fac553ce458d37ce3aeed810f71ac12c7d770b75cbd70606692b57137e3fa17083dd395cde228f SHA512 4db4a2c12d984aaf14a861e125841eee1cb1ef0d1bc523eb25bf156a38bc9dca4fb22fa9ffa37eb92b1097ed0970bcaadf5642b0374d8431ea2b01ec4c08a899
 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 3cdbe5adc915..26ea4a60a540 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 ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="examples ssl"
 
diff --git a/dev-python/sphinx_celery/Manifest b/dev-python/sphinx_celery/Manifest
index 15a525cbd828..ee6bf5cd5ff0 100644
--- a/dev-python/sphinx_celery/Manifest
+++ b/dev-python/sphinx_celery/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx_celery-1.3.1.tar.gz 15334 BLAKE2B 1e6d34e35327fee921c884c47b948b624f900eb3b98cb86b1e45d4054bee596d5525c2be2ddb4605d03d27167183844221e3789e27ae1f5834983e9fcaa5e66b SHA512 b3d11204fd02f85426e1f4bcb81e61557f04440656be946a18e142087180a50f864ca4bbb53d3fff4eabd7623bf5c3682d3c1e00b9adf9184de99a27de98b2f6
+DIST sphinx_celery-2.0.0.tar.gz 16203 BLAKE2B 439a9cd20e09071491338016ba83514e37c7cdfa34966e93e3c6062ed94cdaa0750351a0de9fc7b27be1b7e557b5625be73f01f1de59d15f36335e9d46d35cae SHA512 1beca69fe9b56d04cd3c42aa9244d50a364a860e9cf53f94897c0f690b8465f4e2a7b10ed6d310d3fa706d86f5882a338cd982a3ac7cec36586269756e9128a5
 EBUILD sphinx_celery-1.3.1.ebuild 548 BLAKE2B 3c9a850db716bfc33665ea8d16470ea5557f79553214defa436b2156928883c1d87085085800a3910a47dcc186249b623abaa25eb7a6af71d079eb0e61588812 SHA512 286fbacbab1ac4c4c705a4eaf45d9d941743d827023652c9678e75ef0e8b801b5fdc33568a95ecd07f9a29e616530242e35b1c386f6edb48bb35508f8580c8bb
+EBUILD sphinx_celery-2.0.0-r1.ebuild 530 BLAKE2B 5c7ca25520b64935abfc299cffab32f45c417c4376486d0d21e25c114048e8e86002f44616300a1fef4cf094320792ca2e57cd0634f34294b368e10d57cfe7bb SHA512 79c63129068188fd3e5b7ae2afd50e131a0474815c7f10f40a30de7938e800a5b16ce2d4ffdbb56611e1b0f13fa57764f05df7aca4afffe4c9a7cc088b21c2f1
 MISC metadata.xml 354 BLAKE2B af4b7d8c61b6eb65c84f867501d50d06730f6e651e3284d7200065a72a120e50705fcf96370b26aff14f5663ee6a2caf6af5ddcd8207e2081be3d4d954705ad6 SHA512 4cf6fdfa14fca7fe26e253a25bc81221e25220f34b13e08c88496d44a3f779dd2607fe4698682b27fc66158128d5a2e5f9d61a0ee58ca59f7b744ae37f909dc7
diff --git a/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..4fb97cf5c686
--- /dev/null
+++ b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.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=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Celery Sphinx Theme and Utilities"
+HOMEPAGE="https://pypi.org/project/sphinx_celery/ https://github.com/celery/sphinx_celery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index 32879cf0c470..df574b1d5aed 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -5,7 +5,7 @@ DIST sqlalchemy-migrate-0.7.2.tar.gz 105862 BLAKE2B decba0b4007143c2e98ad0b36880
 DIST sqlalchemy-migrate-0.9.2.tar.gz 124175 BLAKE2B 9c4edbec78074ffcc4be800c952b7c38a919ffd4dd829da34c5f4b3b3b06d8b31bb703e71dd43555bfd68cb7e82bcfbb632a362f9382fa61890a27b1f18c0c22 SHA512 25b218ae97e9a99ad126e4185621bff04da2e9d47d2e47620965974a0b865a9dad161c4d284aaf316f01f0241743d11dd6578942ad6673f2843476fbeaaa4688
 EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1444 BLAKE2B 99eda04d0e11425f264806d38005dd9feb85c0a175097b2ab221953f4ef340bb05d96fa2ebb51aa8806a5d74e1a2321202780ea9cb511a9bd542c7b167836d62 SHA512 21707e1856b9f9a42cc0a1eab9de99ac6fadf2b32177c405aa4f36df19946a1b8342d3a1938b3986a4a1474ab3ced6e8c53cf38eb1304a5bf5cac9188876a200
 EBUILD sqlalchemy-migrate-0.11.0.ebuild 1637 BLAKE2B e7b472317dbcc24855c93292044f43c035a3ceb43eaf21d4fd1793cd6702473089a789097dffe9593f6f78f46f8a0b44dbba71f62c0076ba53a59ef79bab9ccf SHA512 4941e2f3fb78562d63509a120fd61aca7f8af2ecec24c611c7df47cac71c93043e1dbffc15099744c42d8ca0248504d4a4a86d2076f7fa1a62e9e548343d3c2f
-EBUILD sqlalchemy-migrate-0.12.0.ebuild 1398 BLAKE2B 072162856ce71b2a00ece7cc3253befea2121cfed4bafb88ef335e1fae76584b50d7f6970bfaf234c9f09da5ffd7c45fbcaf15f140ecf85f36d5416129636755 SHA512 c5fe439130b279f349f35b5f4e145cff397b294bd5a509868d549ad7b2f8f6ecd87092222e7b262ea773b40352fe46b575d4d488f9be2077f5c6a91c90b7934a
+EBUILD sqlalchemy-migrate-0.12.0.ebuild 1422 BLAKE2B c2b7580d7f857ae25e567d9f4d7bfbf19edd1e3b5e43d28e679224049da94ace744650baa5e0dfff81683b8f92dd437e18a97c1343fb28a5eee835f70942ac98 SHA512 abb8367a09a9185de687827b745dac64f63056210286e694bce35f7a9178e56574d333cd06a6fb49e8abf30270e48af21eff3341ce0ca6cd124369d6d6b78fdf
 EBUILD sqlalchemy-migrate-0.7.2-r1.ebuild 703 BLAKE2B 7e9385f0fb1dc023875e821e8a80bc4c64986e5077959a85c6f564a60509275d75418549f94b7187337a5661bb4d45dfbe2395916cc267c8c7529117eb2f32bc SHA512 34de48bf99f44bc001afc6dccec0fd01832ac3f8175e518a6ff6c370f48b8803e337dd5d1dc3cd4c8159702b2dc6300a58b99d255cd1d2d0c664782f8366bd13
 EBUILD sqlalchemy-migrate-0.9.2.ebuild 845 BLAKE2B 95799089253a2bb9403b41c1955aa285f007d771505115af6fb15f7111dd8977de5d4d87782418c7f0a0b8037df1615e90fd1358704115a9b90f954f3de20448 SHA512 889dd37145600cd04e5f701bb88c15e80fd6bed35bfd43a0ec8351798028968c0ddfe13e2a1f8128c9b4840afc2aed7bd023496e6a60d3bc3fa68a036bbf56f1
 MISC metadata.xml 331 BLAKE2B 0f9105a458c3ae2b81bc9d2a6697d5b3ca8f249a8111564d34c49850d9017f21f2b85e1d0f1f7e458546f1b28a1d90e5e5c33286e78b77695598ac85b7c9d53f SHA512 6c683c14c1fe2acf94b25f6d17cd02d3d74db9259df9d241b3a2efe9abab2076f04a70e00327a06a3d8411244323a3061cfd1bd82d59eaec8b56682e79e41fc0
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
index ff55b1a73d86..b45e9b97e52c 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.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 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/tempita/Manifest b/dev-python/tempita/Manifest
index 3b19b8c888c1..86e55bb18edd 100644
--- a/dev-python/tempita/Manifest
+++ b/dev-python/tempita/Manifest
@@ -2,5 +2,5 @@ AUX tempita-0.5.3-pypy-tests.patch 933 BLAKE2B 9b49ab761c894a54f883645bbae9eba93
 DIST tempita-0.5.3-bitbucket.tar.gz 22756 BLAKE2B 59d273b1dc206eea452f7e5265d59b3ef1248b2d920eae559d74f4c569852b2a127e2a906f866cb748a12663dca944d9080413410edd5c69bd93b0d9574e3026 SHA512 cebe443bf0fc7705304fe127c796801acb6cdc54e79315c2afddb79ece1d04427852c1d0924ab9dd54520b584ae09a0644a20ff2dd6ed0408ee103f5b3fb9410
 DIST tempita-0.5.3.tar.gz 12707 BLAKE2B 921087bf09454506db8cab7b37c780bba5298b206113e246b710367b92364f03055afda6b826ca3008e34e4ea8821c6aabf045a735ac0887db1ba8a82e048ddb SHA512 43bafd42ab0c07bec636d637bfcd42053559d188e13bccc66527dc5f735fd9c3ec30fcf29f3e650d88315fe8f2eb2c5af280f51d2c64db099e08d8a70969a1c4
 EBUILD tempita-0.5.3-r1.ebuild 606 BLAKE2B 84e961e0e66377afc577dc6c89da0a77a581c831f2edb954e34a4c2bd8342820a3401cde4bdf93808acef73c6e14a20da2331f4766c2064e712459f2531056da SHA512 ffdce81e5e92be1d71219d6a0b0a168a981f8ed58c99e542ad68494156476348cc95e43b6974b7cc1a3e334691a6e55c9b242bf76ee570998879fe2593ced4ef
-EBUILD tempita-0.5.3-r2.ebuild 1362 BLAKE2B c22539139336ac5036897142d6d65e7adb8d5a5bc496dd6a68c16c8b9a0ffb293e8d5387357c9df8cf4cb669d3b40ab5d35b027a1ccf0643b755e3a7e046be62 SHA512 5c4436833ac17d1444d197b206efc84d1eb433373495b78ac3f133f3ea1c9c5ae3fcad2038ec67ea6aaaf9356cfa55445a28142012d43fedcae5f113766abcf7
+EBUILD tempita-0.5.3-r2.ebuild 1386 BLAKE2B d06e6476c58d9830b5760017b89d805e3f4bf6ca7d75f33f380832a50eb0457ba1d852ed743cea2684b6a93eeaa4aebd0d5f612e8a2e19dba6b1d00d74bac4eb SHA512 9e070f8f90b78b5aabd63851cecb5ab7dc144c1ea6fe1d0c9fc5d052426c90ea0e39d970f4d1f25e9835dde5d0c9daac0c46553b908af74e782217f6a539742f
 MISC metadata.xml 320 BLAKE2B d26cd9d2555b7d1a56ad44c86fb280a249a4f2d45c3f320cbb9a98de249e826701d49b814c209e6270d183084b8955e177fdac69af0136a7432cc5370b70fb3a SHA512 44f0ea2e06ab198180db9be4533b29c56e7cd0f3af9f522188e063cf787ad1eb1eff9fe2e09debe97be85769a09375385c1f838a7eedc2bc92835e846320f109
diff --git a/dev-python/tempita/tempita-0.5.3-r2.ebuild b/dev-python/tempita/tempita-0.5.3-r2.ebuild
index 5d73a31b3788..f0f7d351d2d0 100644
--- a/dev-python/tempita/tempita-0.5.3-r2.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/ianb/${PN}/get/${MY_COMMIT}.tar.gz -> ${P}-bitbuc
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 24558babdada..66fbb8ef5bb5 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,3 +1,3 @@
 DIST toml-0.10.0.tar.gz 16719 BLAKE2B f7863e9cf0ca5185a59d64010346b4b960c40bc3711d4cbd1ad907d15da823319b748df1a5536465e9f36428bf1599624ede3b1fa68cb420684a52ba137227c9 SHA512 26f26c38ce9cd48305218c2c34c5a5407b00aefc25a933f044bb7be22c23cfdfa3b8cf2da952d17760c4b9038df62e405fa039cc7b63dd3e94c9c312f04f9182
-EBUILD toml-0.10.0.ebuild 564 BLAKE2B c5d295bb330297024a29d6a7096b1f75fd23829d2ea8b2b1d482e06ebb83f39a7916bb9e11a9c65f4247523e872c3483757ef29c14dd59d59dc68636583689a7 SHA512 33726d2645bd719a37a30edb1ad00af1dfbd1ed4f9a5641d5e2848956fcfce0f27cb75a7b5d41e9e03e22737385e0c3da6a24b309c7267914558acdc2f211897
+EBUILD toml-0.10.0.ebuild 570 BLAKE2B 1ba72e409d75eb5c2abd6c4f5fdda95805cb6fb1ad4ec3621085cb0b97c9441fb03e0d4f070b4a213578759b103d3cbfd5f48307123a233019668189775e3c1e SHA512 a5b6c0115af3e9c219b2ea85b454d7a2022e1cc332f244ff011335f2813215b0d67b3b59c5792437896b9dd382fe767bb573b5f2734a477fb3584aaa5748d76d
 MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.10.0.ebuild b/dev-python/toml/toml-0.10.0.ebuild
index ad45d93349b5..6f9915920a42 100644
--- a/dev-python/toml/toml-0.10.0.ebuild
+++ b/dev-python/toml/toml-0.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
 
 # peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
 # particularly worth the trouble.
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 3ffb468703f3..f015ae58e823 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -4,6 +4,6 @@ DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540
 DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B f9523dd73e57889bc345f1e6d9e47a70b5c63727bd029fd0cdeeba79ca0e6c523248c845270035d4e26d70f31ea788fe94e2d69529bb99625db2a1f49880553c SHA512 09987e74d9cdf82fee990dc7e1813ed8df54a8ffbc157413c6fa0b61763853640066c108b78556601d16f278bdd303d572f4721dcc8dbcd7f4183187f4fe4692
-EBUILD tox-3.12.1.ebuild 1413 BLAKE2B e1e77b0c5a69bd9b03939d3ef4772cccc1f3fa1c2610f3e5d019bbd3c43db3f3ccdae375e33826f57ceb1ee1f2952ab7ed92148cf2b6545dc8643bedbbaabb41 SHA512 358fff5b4132a1748afce6c1f78d01f9ececee57853fa154d6169afd0a8a64c25ff8a6e753e2e2f5a46c718d3586541e3f8841318ff57b08de97cb0154662434
+EBUILD tox-3.12.1.ebuild 1419 BLAKE2B 1f0e72e54f89624464ae9f46c70f0d61f584b9e2523e73795e612b2022cc1244ae8802e2be685a549e7a9469028b482b7bd31fb6fea3852144b51a63ea3a0992 SHA512 57a64b605d495e672f780902d2b89af27f625817f133e9250e62131652fda714d302d86a54cafa91bec6addde00ab66744ae44cb9350220754816fbc31f48056
 EBUILD tox-3.2.1.ebuild 1953 BLAKE2B 20ef7befbe5fced2de522b65745e159fdbdc323c887eaad5feeda601bc68180651716913e8c84a5fe778a52ce3dcd0db2b7ee76309cd3e7583c2b90914c0ad74 SHA512 255146b77fedd2a709cb6b0bffeac1469811028d7dd806219107139bc27a171826dee2cb0d65672e8e206cd8c0d37fa5d84dab8d81b53aa6b5627b39a9e0e376
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/tox-3.12.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild
index 95e8d9f9534b..00af2159a863 100644
--- a/dev-python/tox/tox-3.12.1.ebuild
+++ b/dev-python/tox/tox-3.12.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/trollius/Manifest b/dev-python/trollius/Manifest
index e61887eb7d5e..bfd52f3410cc 100644
--- a/dev-python/trollius/Manifest
+++ b/dev-python/trollius/Manifest
@@ -1,3 +1,3 @@
 DIST trollius-2.1.tar.gz 276425 BLAKE2B 3337712e482c19ce06bced64a4169effee74f8e6d33e60f4ab411d636acae586a104766639f63d0075fb12a39f09ed7e54c7396f3295aa99db04e0b60aa433fa SHA512 d800e060e13da22c83fc20f2c0e61d6c50cca309d90e8faecaf24e68240d78ec7fc9cfbb68a968ba7e9d73268e974353d9bd9063eb0ca02a4f0e88610abd6018
-EBUILD trollius-2.1.ebuild 640 BLAKE2B 799e384fc08f890bf199ebf92c19ec778dc93e891d645bf8bea38047b6645c092e98571c7dc83c42c3dbd49257e131d0bc57b5184aedc58a2d2cec5e82050446 SHA512 ae6a9b641ee8ddcdc6a98fa552443954cf4128e532b9bd3ddc2a2f5599a0f672a0fb63149dd51279c388988e1aad96c6dfbc1a5f5c6d171e207033558baf6fbb
+EBUILD trollius-2.1.ebuild 664 BLAKE2B 379ad7dfe0fc7b384ac8c1c6f3f2358aed06ab68596fa0f95997bd9b0ed7aae8ee8dc3b45fd1565a41a846773cb952257baeefd54ec1c07b59b866825239943c SHA512 42762d8e9e55efc8a058e025f2fc82a69e090f6d4dc400c524e712652d9bd7a41951fbff0000ff38738a3f54486bf75da3539c6644f0b710386a8e5efdaa6aa1
 MISC metadata.xml 439 BLAKE2B 3b7bf1ea728debb964c4fcf499d81bf98d1afe4b478d3df3f2567d0b184fb95a873e52405169e8bdacf64e7376d81100f8408807347d6b8d7b1bb099d072b391 SHA512 5d0bb280c9e1a08248701899de4f30f59252232121939655aa27af4ccbd77e1cda800ec64e0e051e3437e055490787d52ed0cbac4d9e47319832b5f262d08915
diff --git a/dev-python/trollius/trollius-2.1.ebuild b/dev-python/trollius/trollius-2.1.ebuild
index 53f2c1cf532a..e48d446fcf48 100644
--- a/dev-python/trollius/trollius-2.1.ebuild
+++ b/dev-python/trollius/trollius-2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 661ad0437c5a..9b5f2ae88056 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -18,5 +18,5 @@ EBUILD twisted-16.6.0-r3.ebuild 5723 BLAKE2B 411a5ff087addcd0878fe287b146a8735b4
 EBUILD twisted-17.1.0-r2.ebuild 5749 BLAKE2B 1614cfa819f32b04cbb9fae2fc259a64f00412f6edc91110cecc386533e692540fa3173dcaf1de1b7ba99cd450c80e48d2a555e24ad7465c692ed8b6553c9336 SHA512 a822ab7ec889b81a51070a404dd320ae2dc6c9032bf2a817b35daaf1fee51e37d78764fe95f8abed6ed01ca2997ee7fbe239b0ce8649b7084a7db1fdca0626c3
 EBUILD twisted-17.9.0.ebuild 6038 BLAKE2B a53ba87f2da96ea47d8eb881133f2cc45050d530188068456985e23d75db7f25f22896f664c23a28821c64ac2b3059a54db6b7d171e4f068d0542683378d73ff SHA512 67b0f2db8226962fe50ace32cfdbd577c059d2deeb271a10e2c5716ad6b70adcf022f2ada7ae36abccef3c535dea77d2349de3b558d7a08e942416656e3cfe61
 EBUILD twisted-18.4.0.ebuild 5906 BLAKE2B 7d42db9c36190293a920fcc14fc9292692019aab8edc16e21219cd8f40d0dc194a7684dc26f1c6801ea496f6f550e189852aad71b7082e2a2e3450b5fe79bc57 SHA512 b4d5a722e9fb16d5ae88b985c24eabfbcca44ac1e5cf2ca2c9ea9a414a1d58aa7a81c2e10a12d00d3af6663c97ab476ae08913fc5351696c322273c49eac1086
-EBUILD twisted-18.7.0.ebuild 5983 BLAKE2B 01fbdb71c345e7ba043fb70d0a3631a760c3d53efdb0b07b5d3b50e83d76ae409bcc953513bc15af2c1f3e5cb484ff9029be6c6df2657ee1877c6df00676192e SHA512 d25e0372ce450570cec3eeec71b3b42c84ba36ea4fc4fc1f51938dc4599d181e0366b4b77d1a23eb52e9cb641880bfb9762265e0c5eb9fe114cf6677b3123149
+EBUILD twisted-18.7.0.ebuild 5994 BLAKE2B e94ba7c7e065bfb1a4c3688e131b0dbe37a94f81e8146eb35cd09846ad179f01ae0edda956befe9e0cadc1f41a4313f9d1f20074817cd4b411c169c1006b26c3 SHA512 85c1bf70ab48e1383e1d9096047e43b00f5bc620a96abc8b0e466214a4889525d800f2d12073eaccf01e2e3bb60926990c91dbccd1a15f4d0a9978016f930c21
 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 3a89c887bebf..a3d79b03733a 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 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index fe3dc079941e..873e8f7d5566 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -4,5 +4,5 @@ AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7da
 DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
 EBUILD txaio-2.7.1.ebuild 1810 BLAKE2B 09527c0ca4e9379f8a2f8719121d9365d08d39146d6515723d896fcf13e84c58328427555f64c973485a1df497b042de1d27e14c49f2a24027547be468f364b9 SHA512 074f40c0ff1522b67766e8bdc727e21039351cb41e08368f468f342fab8a791d812e8b1808cd0bfbfc608fabdeccc0753d84844d259751f50c15af8ad5c2f79c
-EBUILD txaio-2.9.0.ebuild 1416 BLAKE2B caf7eaf4cff6b555b159a8ec4acd7c7a62d3b98df420fe79f69d49e003802e5b92ededdccc9699bb4e93c70182e4032c11d2f6cb4b3f87fcdc5f35201477cbfd SHA512 89bc32881e5c70caa604041aff58a69bd26680a0f225147e8dcc1ac3334a37de6f7f0a1cac19bc95b6a412c3e00bdaa3994b3b423e8117fb8c2ca75cb176622a
+EBUILD txaio-2.9.0.ebuild 1440 BLAKE2B ad2bdb7813f58f8af9a52d248e2cdf3238299e4e6e210f6c7e2e554841f7de875c088326629787c8ed1fc6c49f77dfe25a21d5a44252abb459e2b7946e9fb1cd SHA512 4b869d7ee69b57fb122a62d3ed314359c4a66cd09edf3e4e821501f6b1efffac11020f5e2f52c3bd2f5932480f05b970dacb846fa023fc536cafad7e499b64c9
 MISC metadata.xml 565 BLAKE2B 6ac243a37d1d168acb5af08993ea9ebe89003b5d1de5cc123f00f8bb09df9d106164c6b6fef4ab4923ec85b756efc175ad6ec5235bd0985f3af214003b27a33a SHA512 65e8db68004013282e5db56040eb37ec7d1016c5057accc2a1f512b72d66e0de1967cc6ec2ced38cadcd700e21a2c1b2c0206004eb72c26f2bd4b134eda9f77f
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 8edd4804382a..947a153fb9e8 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index ebd4ec908484..91bbc785d087 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,7 +1,9 @@
 DIST typed-ast-1.1.0.tar.gz 200587 BLAKE2B 09dd6d65513a37a57ecb6df2a505100f5fc08a49a244f1cb83af363d20d9b1b76f127ec5da6ef115a56ae6dc560ab40dcaae4740385fdd9e305bfd2ec26fdbaf SHA512 439e949082ee5cb9434fec99021c08401a46ec2ad16d96296c6440aa1fd8158f6605efbdfa55e536c3fddd4018bb0f4c5ee4d5a4a32954242b7902b9ce3463f2
 DIST typed-ast-1.2.0.tar.gz 202702 BLAKE2B 79e919019763f4af0a2f24108cfa418693dc5a1d791a0045a49fb128d715f91ec5bcca6d4bb6812e19b7a5438bcb27d239f2aba7de8b859d4e8e73027c59665f SHA512 801f59cdce48f7be3045c44d207a5a269bc1cd5ca9f0536d3d16f10ce82794a7e5cd5d3c83982927cebc52e1b1dbd47532140bcedca0ca4ace45b726aa0343ee
 DIST typed-ast-1.3.1.tar.gz 204285 BLAKE2B 209911e0dc7291ec4b48ce7c5163d738ccd0978027d2bb1b64004c0f08feb7567d83ba8f04dfe48975ecc2116ee365a903f455dddcaf1bc07cf5deb08572f92c SHA512 390547485878ccb7e3a168e24b8b63c1784888ecedfae980562c3c0c0073c73ebef27190feeac99745c205d18061ffe5e3eb0830068968176ef2a06fd3ae4b2a
+DIST typed_ast-1.4.0.tar.gz 206620 BLAKE2B 59d3ed516b63643e37d9530dcb82670dd0e36f436650880f9fb304d081c3a72ecd494646dbf8f62fe95d2e70742390a5be711bcb803f1f0b6524dec1bf43c8c3 SHA512 b74e7fc51cde16439eae7cf41f0bdb95b5998362eccb73cf736f343cdab64daab63bc0f95f05a4911b229761749bdd31ac83423b58f2f3e1e1dadc7e6015bc1c
 EBUILD typed-ast-1.1.0.ebuild 409 BLAKE2B 71cb7ab5568e37a8e72861e69a453289b21903bbc3441f5a72cdc47b127e65e7ddc78f1f2442d22f2cf8f05e918a7aacf96b4264987765b3ba0c6ad8aabbdc69 SHA512 aff63468afa0ea05f89c2704473c34eea72d80cdd8f9df76f9f89e49b47d36d0d9ff51aa5899cd5ea57b53a809b8df1e117e9d29e3b19d26bf277e36dcf5e76f
 EBUILD typed-ast-1.2.0.ebuild 451 BLAKE2B d2d3901d15afd51d55c47e4d532d11f5508d8319fc8ff8d5b17600dc8aa96388ce19e6383a3af890f5b48106024effe6c83fb47712b8bc4b461e9d80514777a9 SHA512 6d2629184ab9d972644c4f7c033aa5e73f7678e71f5851e13a28f68f9df9d31565e6eb46a1ad2ebda37b274453767576236af38910b038b7ba027fb029efaa4d
 EBUILD typed-ast-1.3.1.ebuild 470 BLAKE2B 1ab1e81bb5b52ce2a5e4ce032e34146ea01a736abb74c436f2f64a853b1f2d88ea771791952a67438435c744fa67a4153643af3da67b0dbda219f74cbda961db SHA512 fb249bf63ee8008cac8be6b5b3e5d8109bd223bcc5e20b95dd011d67b3511c5f69870c1f63a6d3d559a7463271bb61600e08092ec2b1e0a39adfb9748cb5bea8
+EBUILD typed-ast-1.4.0.ebuild 682 BLAKE2B 01a5316706bdc889862c17d042db4011f200650d5c7c0445039197c496ec3ae4d94274c429f8a75dabece9dc61810ee14db6a649145a3139b521e7609dba58ff SHA512 259b68d97f61d9f1671ee4bd47fcec8d04209ff32e872cbdb79e8e89d2d14cf309f425b8cfb53aef43281989911297c183aee09e009a94a7a384675454cd0830
 MISC metadata.xml 371 BLAKE2B 79a6eb0c3d333193154ed5bb5364c38afe787e0e0a845ed1c77e98e305c4d5f396c0ae10303e94a8bb6c407f937674fa48b9f8dc27c2c41cd36f74bbe05563f7 SHA512 28a6e9c5ac51f6b86cfbb1f5cf06a1dbe524326a74e69ca63ff2440b116a4780d87de84d9de4e070ad3669d0732be5e4ff87681570a57ff22e395d59e19a1c3a
diff --git a/dev-python/typed-ast/typed-ast-1.4.0.ebuild b/dev-python/typed-ast/typed-ast-1.4.0.ebuild
new file mode 100644
index 000000000000..6b7dab0ca1c0
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Python typed-ast backported"
+HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${P/-/_}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
index f621b7a9fab8..7bb64860eb28 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 749 BLAKE2B ac1343a449607d1d9ee9d3e9f8b1c252e55c2d0bbe4aa88c8898788136edab6373c01b1a3b8129f34d403fa07b86530574366fd6433dbb1b74c624ef4583a423 SHA512 9b6ede95ba2f0435ac5c01b0606549e4f6b0673ab0f9ece75dc5ad718af28f0b4baf28ad043209d7b2c4c9b96dced3a4293050df4785ff83254b3d886c297f98
-EBUILD typing-3.6.4-r1.ebuild 773 BLAKE2B bc47a34fc43df781a0f586868e70725a03a8e2c3b15c19d0f0f7df5fabe7fec4d323ff7006d301bd0da649b35baf7c7d0fdcd5b91b76f75b4f2be0382e16a98c SHA512 7006593878f208fec3f2edc2d098031c527f37c728c225618d728a9ccf6329a9dfee944730a6728c20e8c6e6c98bebad08e620b2a4ac01338bdd89fcfcfe1e52
+EBUILD typing-3.6.4-r1.ebuild 784 BLAKE2B f3578b8f3570a3c2eecac2d0b63e0bc95a92e56a17c26b5f3f72cd806ef2b8fe0ef387fac2b060f7851804ca3b48b5287b0819a41bcc8d427e6de29bb072f093 SHA512 0c7172e00f1555cd8b7034c954a144ad0149d720b4bfd1b9e8578932a3a479ba629af7d4e04b8aa0ba6d82780e77e8bc2363b553db70ad69b8fef3c68d0961b4
 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 c20796641b5f..c74ab766569d 100644
--- a/dev-python/typing/typing-3.6.4-r1.ebuild
+++ b/dev-python/typing/typing-3.6.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index 1a38e1335b23..09f4e52aba92 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,4 +1,4 @@
 AUX u-msgpack-2.4.1-little-endian.patch 2129 BLAKE2B d7bd75e409753dedc3e1e7ce984fd2401cb8dff71af6b3da90950b00ea7f2af35f8d3b87af0fa333b61f916bd904934ee5ca09a124bf17a4099f334afe76203a SHA512 978c6eede0b89238134b31b596f9e0fd87d31431fd95d9f44578bb782b17fe8c39fea20bd494581a633219f8137c23156d5bbc454040c137552c7a72901525b5
 DIST u-msgpack-2.4.1.tar.gz 12026 BLAKE2B d8f9c5558daba3afda53c4c1b8e10edd6baa08a58c82796171ae0752c10c638b76abc608349e2ba090e83b2df66611a5c0c03febd38c2a13c45fb617b6bcf74f SHA512 4c3edb72455e8eb8fa7a4ed9b6ef4461755b782391f2c362d52d0fafda3e790fb40d0d239d05ba99beb3ad4cfd9e200175e2a1917cd64ee1e5d8cc3c4e8b3f25
-EBUILD u-msgpack-2.4.1.ebuild 826 BLAKE2B bc0e16fe09a92f18bfed9082ecd0cd020604e2e0d59655cba6c242b56dd84075724faf8098c67356571fcb6534294c7d0b378fd92ae389fb8f7da4302475704e SHA512 b61a3f1f04cfcea474010b74be94901060ca1844ce475a37038d08325565cd1e43648599db874a0d5490b2cadcc691529835e22530b78d6cbb116812a44875ec
+EBUILD u-msgpack-2.4.1.ebuild 850 BLAKE2B 729c8284d7db7627d060b8d01a76ba00301b36d50c2cfb11b3080ef9c4b7c388cee7bfc062916816109f5e696d6fa56115506cd5779a35d9b56d1c321a74dd2c SHA512 003482b450fe6e393dbf5a11a26287f0753e101c9f64684cbbc44ccf764fb4efe37270bbe8e60645a817276b1e220a02d96533996a3733c91e2a8bc1090bb166
 MISC metadata.xml 985 BLAKE2B 6c8134062eec629a9e15fe23321a10d4248f00fd92cf14d43d35395b29970c7668661500dff63f3f004925d2b00d0dc8fe91487d3a056a77b7b2f1f3a33d5d91 SHA512 642fd0a2bed62a5218a3f2765f51f7e221ab57850d03a03f018ffbe1469705e34884b82c51958bc83c4fb722f00b818fcfd85df0366eee2c0550a58d0fbe91a8
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
index cd17ed911254..ed14463094b6 100644
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 49105b20dc63..5839b191a6d5 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -8,5 +8,5 @@ AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f
 DIST ujson-1.33.zip 197034 BLAKE2B 587e00292340d69fdda9720d66bb360ed646f8c709e279f905f7fdf2db79a2ec51856dce998fd3e2fe5b3bf067c72ad661f77154bc3d63cee4c3eea10bca29ec SHA512 0f1f66212fbf94c03e048ba64c3bd817c50443d1a29b87f6a3a38f697a050f38821be4ba36a3b17a96930c69ee92973ac31bdd41851dea071af14cd4bbaf8480
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
 EBUILD ujson-1.33.ebuild 1133 BLAKE2B 98a14f835918b7462b7e5e37f607b26b72e4b27ac536b3586e14c66e0c90d88b6fa76e74d5d3ed5904d64e4bbb83e4efd883666607dcc7b82b320e7965cb1594 SHA512 2708294dd79e31a4c4cd5452cf07d88d174a495075b89e99743c68c3773e80514026e29c0f6de70b986598ec6217106cafa376e5a91ea85e0c93a315485f18c1
-EBUILD ujson-1.35.ebuild 960 BLAKE2B 485af735735f4c3ef95c60c8b8e215a03e7afc7e28867256fb912e2e53cc9b97f34c5c33a6816033ab4e41d632d831ac2a5ac00e2d7866f565e8eb2210171d43 SHA512 fa1fe1bc123f6528439613e62bac32c0a5ff83d719d9d9efcb950494bd056328fbba343919c95d852bf82ed35015d3acadd2992f0e5e76b8b9785e8ec8b14da2
+EBUILD ujson-1.35.ebuild 986 BLAKE2B bd3e25ae75e51bfc638d86a58cfc7b62a782e9c9907c4ac605746e514e30fc62517702aac8b46856a25a80af632c5cd2f9f7d72d6ee8edd04837167e5ebafb82 SHA512 f96d217eac09bfc694aeecdc48619b3b7948471c5b0668e38e6fdf655016fe8ccab268a4387c803595eeb06e6d317ebc7a3a1a82e2d16a509d08d2e450ed4ccb
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild
index 59f05a077fb4..e74f14482d79 100644
--- a/dev-python/ujson/ujson-1.35.ebuild
+++ b/dev-python/ujson/ujson-1.35.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index ab7a9d69a3d4..e690612b71ee 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 815 BLAKE2B 50effc345d185bf1d38e1f8753f64172dc2a844e0c43f097e2cd332dac6986b01806318836028c3dbce416e701478504aba1e98581974ddebbf73e115e22c8d1 SHA512 622dcc21964f5ca491ddf1b2ecb84a077e1073e7ee835a7c61a68714520dedd96879056294f6bcf5b041da5727c01d19cf3b27361a9a5d6091fea9ecbe3a96ae
+EBUILD wstools-0.4.5-r1.ebuild 826 BLAKE2B 52c18848a9529b02e246128724620710b56539cb6e6a6deec9111a663633c9a38353b12336721edb4e836d1c5ecbd64cded7ef1984ca3ffb5069d7dd936f5980 SHA512 058c708c0aaf648a993afc7ae5d41b37e07478aa6dbb45eb2f5041522e435557f17d4d3a4eb017079671993130f36fad49e0a2941439b317b582961b1252b1a6
 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 71653c7f358b..1a86936da3ee 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 4902b4241a11..912099edf95d 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,10 +1,10 @@
 AUX xcffib-0.4.2-test-imports.patch 902 BLAKE2B 386d1a45dff2454925655b09f8dabf8159ab3be6dd0750723d0f70f85b15f75b48d7989d37ab808a090bb4723ae7cbbfcc271eca390b1653a10dc2244ce0564e SHA512 f08590fb2d5979f464d56f9c7e45b83f20954005980f98d2ee3d2c6ce5c44554431059fc911040943ecdcd4ca786c345bab6bae733a46379ad58fa487d516697
-DIST xcffib-0.4.0.tar.gz 74715 BLAKE2B e0e7d84cdb39a022225623fdefab7a5f8e6de2490b31b28b3a37dd8cff73286c5d418a6abde704a306d7a43ae1b4bebc8bf63aa27b0a055b21ed52bab8f6767e SHA512 ac144ffdfb559ae2ee8d4a23c937989ca4e28f913b2d27f1240725c8398ede1a7a010a0d861998151923d235d5e04799d8df8496c9ec8005a2286825dcd59bd7
 DIST xcffib-0.5.1.tar.gz 81274 BLAKE2B 17e19d16a5d1b5699a10bc93c80327ba2d4c38d18c704b99f7e81a083ab8879f19dbb67b11cd0eebc47b8286c3f4413be089759bc49455674847593465dcc97e SHA512 ed13a43e301c6713c3831261bd94444d3961f805c39cc72dbe05f986eafb24e4f53f653045b84b57b4046a3ac763b20bd661298af5e6cc57978c57d68d2a0a39
 DIST xcffib-0.6.0.tar.gz 84360 BLAKE2B 0947e1a20e9ad73f77e6cb000ed9fc8d70e45080edb74c5d25642c2d5ae388cc97461633e8cee1d7676557735b57b9cc1a3de459e54f96888cf7d19451d24c21 SHA512 de78b738f2a75e6569a0529d1fe2844b2cafe48623f25c20a9572ce881cb97325c3823dfe883a2e14bc93d01342f20c4ab561928312f65d0a67364fecb5c8ba5
 DIST xcffib-0.7.0.tar.gz 83895 BLAKE2B b2f8f2a4fcba20bfedc4e174d61900ea20bb8968bbdff73700ceeacd6c9fa36288bfcfd67a7d4206376b3b45e6e51481604e3ea3d6aa6d9ff68eaa49df25a414 SHA512 ad655e897eb08b898e396290c0b4b64a1e228b21fc5ed1fbcb3cc73bae466fa5255d539d864f1a9fdcb1396e73f60a981e00aab82efc343c7f83c8f62a6d31c5
-EBUILD xcffib-0.4.0.ebuild 790 BLAKE2B a7e28e48742f6dca33b19bf6f5d4404ac91e6c788f2a9031916ce8be082a7865705cf7280750007b19ddf2ba88f4845452f2056167d83e3f4b6c4de370117ca1 SHA512 8153721cc8a472635df7b72b57dec507c250c9773a0e050e00436684c723d9453e7f23e7e41d107b7bb577b82765f923dc7b3c1cac82e8aa2c0bfd03e1c62813
+DIST xcffib-0.8.1.tar.gz 82979 BLAKE2B 7f253a1a6faf77830f2835cc51ae3e2138bdc826b30afded951e276056e2f6b4a1168d3440874e11d539cef84de47e02e16ec435dc7ec55b5bbb933e43f0eb8b SHA512 c7eed1f2c31d87c9ec9b7fa01e11ae3c65d2d9493fe3f4c7286901c65cb4c81382b1c41906ee537372c98b58f680530d708b81826d41eb66be45d62ab22624bf
 EBUILD xcffib-0.5.1.ebuild 890 BLAKE2B 1dc7ebca1abe72b6ed8e8c6393fff37ebe2377619d33afc3b5a22eb51e296aae7ae15623de71c6b40aa563f71585788d21a8ee5aaf26b59de1d37a4e16c3d0df SHA512 ff3101101bc7099cccd4583d791e3219636c6a3bd6ade87b8e504f785824b0060ad3a27108c71025199347622e7617348bb0d9d4593fae623f9a797f91687645
 EBUILD xcffib-0.6.0.ebuild 893 BLAKE2B 466b877470ecb4300451bb524c2d9c387a006c0fa23d36d4cbe291c0b3b298e8935fac5ac258e65809b1a8b55604e60e165104ff595799778350f653af25aedc SHA512 5dfeb4e32b27d255c13f83216bda18ec79ca35648e88afa9e7fdc40e2b88573774707c3b98ca946dbea2543534d42b8a47fd6ef11e4a2d18d685ef20292d5ce7
 EBUILD xcffib-0.7.0.ebuild 929 BLAKE2B 522dfd6f97e3ae1763c6ee13e78079f77a3d360791651335885d1be7a2ab6a4209e8540d0b5c2fcc9bb063ab4b2dcdec8d0c789c0bd3592f3b942f13c83c591e SHA512 7284bdbf5e1d6847ee6d96a8dc4e018932af01780ceb6f15e4e7cccc1b6083d0e1f71e90a85d1abd8255c5c0d56c4f5c5d73fc424774c38d3b2ebcad1c69332c
+EBUILD xcffib-0.8.1.ebuild 944 BLAKE2B f25d270fcfcdcf04d8764f2721f52bdf3be807c04e83266c047293475164480e1912b43824b8c6e9b3483acc8065d7b63362bb0d1f7b5c46fb617f56bc7d40b2 SHA512 b88cf9edf951acbd2deb39ff5f593154546d691112ac6ffe1945326567255dd2ad2570e840bbf5a63de60b947ccdd746ed387a520ece6341a031598bb12b6ad7
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.4.0.ebuild b/dev-python/xcffib/xcffib-0.8.1.ebuild
index daffd4b61302..528b8913b976 100644
--- a/dev-python/xcffib/xcffib-0.4.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.8.1.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
 DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 HOMEPAGE="https://github.com/tych0/xcffib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 COMMON_DEPEND="x11-libs/libxcb"
-
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
 	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
@@ -26,8 +25,14 @@ RDEPEND="
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	${COMMON_DEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-test-imports.patch )
 
 python_test() {
-	nosetests -d -v || die
+	virtx nosetests -d -v || die
 }