gentoo resync : 18.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
commit: eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree: 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /dev-python
parent: a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)
523 files changed, 2076 insertions, 1825 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b70401e0a315..d827b4481f2f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Ming/Manifest b/dev-python/Ming/Manifest
index 9e6d9c06fdc8..77e645f1153e 100644
--- a/dev-python/Ming/Manifest
+++ b/dev-python/Ming/Manifest
@@ -1,3 +1,3 @@
 DIST Ming-0.5.4.tar.gz 62412 BLAKE2B d8978d78c4aa105c89aba8c9d9f6d9e49ace5ac90d16e99a5d64d7aa874d790b4a69f48d7b6a3eeab54243c25de7fc2fe5229bcfc226a66004f121a3e6fd3440 SHA512 93e280da04feaab2d7162a4b5d7da4b781d4a4140e114bc1512f695e1deee206397e5bff7ad3338eefd224e4646958e021353a323b809f45bbe7d56c43bf14c4
-EBUILD Ming-0.5.4.ebuild 856 BLAKE2B 61f9d3dccd90a8aa99fa570885d5615218647b14676f9079f6297926b06d4e13804f47f0d18f500f2f63ed9ed0cce0bc2c4193a77f8ed93f02a01a509d7bf4ea SHA512 7d7b31421a8b1b1e3d3fbcba2a3a027d72d5fed2b6f07a0a7e160609c3112a1a86bdc56b7bc1032ea1e2449ba9c5d19d879a269bc6f0cfd897fad994a9bf2010
+EBUILD Ming-0.5.4.ebuild 858 BLAKE2B e70126d71a6a0c47119dcd73fa023689d98488f1d9ac5c66a7b5e7c0f156d161b50470222f1b55fd0d2c8fe0b220d3df95fcbec26439d9826d91d88de0542995 SHA512 1ab652b3cf4e338f5896c547d13364f07ef64fc10225cfcb34d862df2a479774163674388189d46be38364e6c76d5acc38b915276c1cb0bf7850f94305e8a0da
 MISC metadata.xml 295 BLAKE2B 9a1ddeb9ad603ba60c98702e07782a38a7b41d367e171d6c55df9746fe21e30ec684868f40bce528ca279ee2e4271c1354d0a69d8872465ae9d72419cb3ab103 SHA512 29d423b14460deaeb257b5196f7e762e5403b1118998e0139c492282891865f290e555f2ffa46421a98878dc808e2d3cebba259be1da4c7aecbd715ac9566d84
diff --git a/dev-python/Ming/Ming-0.5.4.ebuild b/dev-python/Ming/Ming-0.5.4.ebuild
index e0460d4c7c9f..4e3551dd2ba4 100644
--- a/dev-python/Ming/Ming-0.5.4.ebuild
+++ b/dev-python/Ming/Ming-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python2_7)
 inherit distutils-r1
 
 DESCRIPTION="Database mapping layer for MongoDB on Python"
-HOMEPAGE="http://merciless.sourceforge.net/"
+HOMEPAGE="https://ming.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 286472b78f53..41ce55afe457 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,3 +1,3 @@
-DIST sip-4.19.15.tar.gz 1053921 BLAKE2B afe0f1c2faf839305d21da05a667e649c37ab42c95df86d237bbd8f39a6b8bb7224da547467311bf82a85ce8f0fafd8bb6dd7cbf6050f2b157773339438d6277 SHA512 9518a5e90d54758b13dd8752669d4deb175cea8d8cdf810deaf554cd157d32ab7e394d23c774993fac3b7c02d56445b80962457d59f5cda543917a0251816422
-EBUILD PyQt5-sip-4.19.15.ebuild 2123 BLAKE2B 2f67b9d51eaacc89582a6ea84f94140f79652804a9c0480e26acb72362cc552d3eafde1a8fa4528ef92aae74bbd89518b17b0186732e373b28ed4bda6059422e SHA512 6ddfef96ce24694c2035a6dcd232e6f3a23f32357f35c1126310432d828db82a94638e3ecbd3dd4bb4ca624d50956859f1fa50fdb72a54f63b3cdf6fb2853123
+DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
+EBUILD PyQt5-sip-4.19.17.ebuild 2123 BLAKE2B 2f67b9d51eaacc89582a6ea84f94140f79652804a9c0480e26acb72362cc552d3eafde1a8fa4528ef92aae74bbd89518b17b0186732e373b28ed4bda6059422e SHA512 6ddfef96ce24694c2035a6dcd232e6f3a23f32357f35c1126310432d828db82a94638e3ecbd3dd4bb4ca624d50956859f1fa50fdb72a54f63b3cdf6fb2853123
 MISC metadata.xml 654 BLAKE2B f52693b58abff10e80d2fe004ccca0b97aa157e07c27005c72fe79bc9ba3894c33042c9be2d10f8fc15aa8f0451041b60255eaad96ec78dedc422e7ca2f58564 SHA512 4ad600dc1af2a9f6494350a028909e51deea7b18bf6a50a6f1860163310bc0534cd530ac5d6dea043e7b7e532fd2219069e12b33271cedc00c7a9dda9161711f
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
index 7a8d6adad884..7a8d6adad884 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index d0382ccb34d1..36a06ff7540f 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -2,6 +2,8 @@ AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.12.1.tar.gz 3147086 BLAKE2B d5a018f1fca401b9f70dd16e2a28ea380c8a83f5e18dc8577e317dae5904a7b95f8fe979bf7f574f95e71222c514565fbf051b1de87f97cd2ab70c09d04e86ac SHA512 f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67
+DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
 EBUILD PyQt5-5.10.1-r1.ebuild 5790 BLAKE2B c75e543814d465ddac56368ab5398aa37c1c49b6985bbbaf0b739893023a00aabf94765715e30309a5f511fdae853b69057e4c4f50bf2854126e311f8d96d884 SHA512 9c242c66aac8d2d9ab358ded73ea2defd4a8e562c919d01af02d1f104becdea0532d7a228790f9eb73acd2de4c893f0be7f25d0a64b2c4f0bc5218452035b33f
-EBUILD PyQt5-5.12.1.ebuild 5848 BLAKE2B bec35b735fcb80149019293301a28f43bf913448a84cfb10b308ef8a7ae9804310f410adf0606e6de814921b9dcdaa24e4e7a6dc913a1a820b56863b9d36d2a1 SHA512 beac1dd8bef4252a7f62117ff8570ad360bd4ef712849678530c4de48cec0f45360f65e2488dce6e9dd01e0e2f2c9a09b26e8ffab3ebe490aaeb5c2d102002bc
+EBUILD PyQt5-5.12.1.ebuild 5851 BLAKE2B 4df140ee298f0b6978de8efbe0118ad8526fb9ca9c76da79392e1687430da18b04f6508d2f4a26790b5a14450b7baec9167a06c81c1c80a27a3775bcc24f046d SHA512 82f32da1d670326cd3b08ac7fdc0a44da2bb383f0e82407dd42dda527f0f486cd880e5a211743a260d73c7040ea712c53614df26ba5564d8b92d677bb800eceb
+EBUILD PyQt5-5.12.2.ebuild 5908 BLAKE2B bfc735c4c3606d2247a5486c8eded9121bacd4af52f8d73f87f054ab17054c30e8be576a935e3c618362e71225d6311c7e37b743717c7c08d32819742f266719 SHA512 9fcf1fcbbd30288f06b268a9819263482868a3f4bb100754d7db9fbf76f9d65bc4506b9d5c3c5db098e80973586b2c9e67fbaddb097155fa796e9ad599f3f8ee
 MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
diff --git a/dev-python/PyQt5/PyQt5-5.12.1.ebuild b/dev-python/PyQt5/PyQt5-5.12.1.ebuild
index 909fa142cd2c..d6f960d41114 100644
--- a/dev-python/PyQt5/PyQt5-5.12.1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12.1.ebuild
@@ -128,7 +128,7 @@ src_configure() {
 			$(usex declarative '' --no-qml-plugin)
 			$(pyqt_use_enable designer)
 			$(usex designer '' --no-designer-plugin)
-			$(usex gles2 '--disable-feature PyQt_Desktop_OpenGL')
+			$(usex gles2 '--disable-feature PyQt_Desktop_OpenGL' '')
 			$(pyqt_use_enable gui)
 			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
 			$(pyqt_use_enable help)
diff --git a/dev-python/PyQt5/PyQt5-5.12.2.ebuild b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
new file mode 100644
index 000000000000..dc2c0203b8b7
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
@@ -0,0 +1,200 @@
+# 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 multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_PN=PyQt5
+MY_P=${MY_PN}_gpl-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
+IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
+	network networkauth opengl positioning printsupport sensors serialport sql +ssl svg
+	testlib webchannel webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	networkauth? ( network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.10:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt5-sip-4.19.14:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
+	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webkit? ( dev-qt/qtwebkit:5[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-python/sip-4.19.14[${PYTHON_USEDEP}]
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--bindir="${EPREFIX}/usr/bin"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(usex gles2 '--disable-feature=PyQt_Desktop_OpenGL' '')
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable networkauth QtNetworkAuth)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(usex ssl '' '--disable-feature=PyQt_SSL')
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Fix parallel install failure
+		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets' ${MY_PN}.pro || die
+
+		# Run eqmake to respect toolchain and build flags
+		eqmake5 -recursive ${MY_PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D}/${MY_PN}_tmp_root
+		emake INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${MY_PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/WSME/Manifest b/dev-python/WSME/Manifest
index afbc67a587e0..f698d8fc0938 100644
--- a/dev-python/WSME/Manifest
+++ b/dev-python/WSME/Manifest
@@ -5,5 +5,5 @@ DIST WSME-0.9.3.tar.gz 124775 BLAKE2B 393168629333c4e304689758c9462164d638cdc529
 EBUILD WSME-0.8.0.ebuild 768 BLAKE2B 311d5878427280f16fe403f2773c74d041671fa64b8d07811f6a9762f29f17369913509449c58a7396018f5709546e86507e4901eba106297b6e64a90735e72f SHA512 041c4c2014147cd1b28b965b3c50a21944f8d9495c3ce634b571a9b55ddeefd41816f5401c9bbedba01f021a5f0bc02d4435add426a4ad2bf086d8a35cd951b3
 EBUILD WSME-0.9.1.ebuild 768 BLAKE2B 14dd0758c1b0f34b059d5b5d171115ebad3d15c4f1da425f7b36f02e43349813422453c8905494fb3103d4d31a1e6bdf77821a3ccf57bdfa441ef15525cb543a SHA512 768d32c250c474892fc5a18b26ff003a12726949011fdadbf9c7c1f4eb7db0006200735b803f784a036fdc008703ad96d265d717c92ff6ab5647268c426bc2a9
 EBUILD WSME-0.9.2.ebuild 778 BLAKE2B c203ec38c5ae93488c91849066c51e3b724102029098b74c3dbcd9aed32bd9d67357c51003b54136a22d3989b8d1dd4fc4d6522b5586cafe03d48eda0e1238fb SHA512 47fb9f512cc82aff9a35216ccd068d91e89449b57eeba8bd9ae71e9f665431a6bb96bdd464d14248c8f24f34df29b955e726dc43b8e75d3fd012e63d0b03c9f7
-EBUILD WSME-0.9.3.ebuild 790 BLAKE2B a3582e43fb369526a3712daddc3363a5e7d07d8d4c8f1f0e6727745a3ff10267edd3d0c57efb9741e1a13da71612970260655c4019741e0d7cdf60787d47cce6 SHA512 355e7f35344fad3e63d02328cd7dde0008595715a0d3f6eabd71536f8e4dc3cb11b2649578e92aa7c58c43390ef47a59769d991ccadb23b49071a262fa140461
+EBUILD WSME-0.9.3.ebuild 788 BLAKE2B 5dcfbf1290cf986a0081b6fba19df0309ad1bdae008f74b200537fab53e0ed9674036e0294f4a2f054b7105a3d3bcddbb6ab3d46f7f9993968627b4ac2d2489a SHA512 2517153b01d3a2720516a0bde86ca8dce88c8445ece72e29b26d1561fc27ca6d507adebf8b9f9364af25ed6e3e137b0daad79081a9105203800dd0e2ee45bee4
 MISC metadata.xml 575 BLAKE2B 124788df9210c22a2bd71eae838d413f3faf231eb31dafef6f6c4cc15a65cc23098e052d18353470f23c8874bd752503cb7d44f629dc1faef562309479315162 SHA512 d57f5520e1f102f496ac66c0f9b2842ee4511ce96e9fca3d4e166ee81307d8033d36ed1d0d90fd91a8285d9516a268691dd3502beefb398e7b1303b0af0111af
diff --git a/dev-python/WSME/WSME-0.9.3.ebuild b/dev-python/WSME/WSME-0.9.3.ebuild
index b8c06a9e79ec..3a79107a5fd7 100644
--- a/dev-python/WSME/WSME-0.9.3.ebuild
+++ b/dev-python/WSME/WSME-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 44d9fdb91323..c0179209702a 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -5,5 +5,5 @@ DIST alembic-1.0.8.tar.gz 1030713 BLAKE2B 67cb80ed064e99f27e41a7ae2e42231794c177
 EBUILD alembic-0.9.3.ebuild 1389 BLAKE2B 8ef3fc914ce908ecf605659b0e17757813ea0f61cdbfbafdb032f42d2763ca9ef5817b8b88e71dbfb42536baaccb197456ebb9908348fadf4a0e0057d3add351 SHA512 ce2d452f81d29a667fce6879d9be9a95021007c58ffcbea19444a9af3bd4a600825d2530bac83e432e4762a3a1017761efc0d4a327cfe0e2ed39ae1ab34e27c2
 EBUILD alembic-0.9.5.ebuild 1391 BLAKE2B f3b0bb6f107afe49cc5a858833f041be5a93bb0be45fc14515dc178b5382389fd924e679548bf9c03a7d387867c9921e51aa62fae27d1d771bd52deae28f727a SHA512 cb0ad8b9b833b2aa24fa720c4efb9e4a39ce27a56c11214ae8577ec49d9465dac23239886b5af1376c335f02847fccb1a2e6fe55c195d01be8c128561a70d53a
 EBUILD alembic-0.9.7.ebuild 1389 BLAKE2B 8ef3fc914ce908ecf605659b0e17757813ea0f61cdbfbafdb032f42d2763ca9ef5817b8b88e71dbfb42536baaccb197456ebb9908348fadf4a0e0057d3add351 SHA512 ce2d452f81d29a667fce6879d9be9a95021007c58ffcbea19444a9af3bd4a600825d2530bac83e432e4762a3a1017761efc0d4a327cfe0e2ed39ae1ab34e27c2
-EBUILD alembic-1.0.8.ebuild 1395 BLAKE2B f98f60e0d5039dc6cdc920d8d3c6ae95086a52b20d53b6053442fd1586a25c80c51aabd54bb24802e3923a8ad9b46e238981a54a2d824b91c63f5e98856a976c SHA512 c4beb3b3707d9832c8617b8e1cc37923c1bf052b4b0b30aeda73d521caae42b8eeb7f59a701401f577e7c9f2b6f50c2adfd251a0d031acb81cc6a91344d2791b
+EBUILD alembic-1.0.8.ebuild 1393 BLAKE2B 7988f856d6a83164779055c00b69041cd8021319295a9088ae6b24bb5cf80b2d81ce76e495216958c9ed0ad4147c7a3fdb31ab757362f31dca9ddf087b3c73de SHA512 226ddaafb9c43381489e013eadafea8debff0c6bf7e68cbc1d9f28ada6ff6239793d6bbbefa95c2d90548443ff5bfb961ce02a9fa3eeea0e1f3d3f394c946d0b
 MISC metadata.xml 379 BLAKE2B 8fcdef99cd9d57757692cf72b6f43bf874b7657899197d754ad81866f77d0a48d0fdaf168eeb37ad29ec975ddd7533be90f1e9926de9faf1bb56c3ad4e1d7513 SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83
diff --git a/dev-python/alembic/alembic-1.0.8.ebuild b/dev-python/alembic/alembic-1.0.8.ebuild
index 15b7861ef3cf..53daf82daeb8 100644
--- a/dev-python/alembic/alembic-1.0.8.ebuild
+++ b/dev-python/alembic/alembic-1.0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test doc"
 
 # requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
diff --git a/dev-python/aodhclient/Manifest b/dev-python/aodhclient/Manifest
index 2cc1773cc727..f7be354b02ff 100644
--- a/dev-python/aodhclient/Manifest
+++ b/dev-python/aodhclient/Manifest
@@ -3,5 +3,5 @@ DIST aodhclient-1.0.0.tar.gz 40704 BLAKE2B bb097a62bf52f77df013ddc9301bd357bfbbf
 DIST aodhclient-1.2.0.tar.gz 41043 BLAKE2B 2ced3205427291470e2bacdadfb4328e5bc933aa57ea3bc8b92cd4781102acec53992212caf323b134522c72ede98a2c036a07230ff6a78ce8ef03e5d9129b55 SHA512 2422847c83c2a331ff4b6778f8819b6cb67e840626854961e865c3fd8fa00ce34ca6cbfd8eed17a0779daff784cae2c9084b163aaeeee8df1563a797bd2832ca
 EBUILD aodhclient-0.8.0.ebuild 1029 BLAKE2B e37ac2b5984ed1e54d44ecf2d4061becc3a264d368272d06a9d2e436722ff2702cdb248d484a3eb0b079f10498f8193f5c2596b603232cb2738b45ccf5401d35 SHA512 5f757270c6abf5d792eb23ba78aa34e578e00fb2229865b17f72ae98dcac4ba3241918033ea7bc65fa7218d575ebd47c6716dd18d809c0bf8388e293f5f3901f
 EBUILD aodhclient-1.0.0.ebuild 981 BLAKE2B d4c2ae33339d64556a1bffe75a0bfac6b399a43875267b049a9034e9a5dd23fee4056d0980aaff5f8021a27053d4ddd11b885b1705c7313bb09fc545f65347c3 SHA512 960db49e8f5927a2e59a0834d322489d3d54d8147c8c6020bc560d19527e8b508df7b29b86ced303666f19c1df65354ea24358b3323d1dc9cbf7dbd3bfd4348c
-EBUILD aodhclient-1.2.0.ebuild 985 BLAKE2B 79d216c4bde00d69337c0bc284156f7dfd786497443a66cb8c9996e3189c04cca11863d4738ee73c148caded6f4beafae79579979ae1ada5c5895afdd25000a0 SHA512 abd4b3da1a8c2c0bf6f1438a31cbeb3d1cd3cb1ad9cfbdc2e262be009115006fc32d576b67d1ad56e4e5c08d29368fd9b519458f90c40f6ed5dafa0611c9cd0a
+EBUILD aodhclient-1.2.0.ebuild 983 BLAKE2B fcdb0cc007f8c8a4c26b8e08acd482ca359d597ae3e8754ec1093aecaf67f23d33d1dc0de1a10400dda119206282797b73ec467465449c470c69691af06e868d SHA512 b3c819375d62d75b2fd31e31fcd598944e537a53c5c1fbacabcc4542293e8435b6ea33b8328da5816d9bc6b31d5ff3986bae9ca29d0d311501541f6b288c35c1
 MISC metadata.xml 604 BLAKE2B 2389e07026b35c4cf96b7caecf3c29f7f8c7f5f8a7cc6b9c576043163826d97092999ff76dbf6f52b49475c001a89409095a7af25c182bc2069bb9e7c6ae0536 SHA512 95b484267b9f6eceeed9f404fe3ca3140d364aa9551cb306e0a40769b17afcd927b1570fa367eff9c250b1fd8bdf8adddfb4f61f506d297eb011f83ab4676aa7
diff --git a/dev-python/aodhclient/aodhclient-1.2.0.ebuild b/dev-python/aodhclient/aodhclient-1.2.0.ebuild
index 7259a98347c1..ea55a45b4d92 100644
--- a/dev-python/aodhclient/aodhclient-1.2.0.ebuild
+++ b/dev-python/aodhclient/aodhclient-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 56e25e0c310d..6d2a42ccb454 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -3,5 +3,5 @@ DIST arrow-0.12.1.tar.gz 65356 BLAKE2B 671f1094bc71b4ab03a967929cd81cff46e0b48d5
 DIST arrow-0.13.1.tar.gz 148509 BLAKE2B 7a47f8886cc2f50f6dda682daab37c599aad15c7e4a0c76b1324f9fe3a1b8168e3a2b29352bdc9c4daf0fa3b3843fa919d5256997c673bcb24ca033312242b60 SHA512 4933e02fe4ef7a632d55e5c6d2cbcefe6840467c809e0377be92f02d0dc10b5b2421cea2be7ddd5158236ec80f44848125253bfeef5a2ae635a3b9c5761fa105
 EBUILD arrow-0.10.0.ebuild 699 BLAKE2B ec52de48854de1a03a40a00adcda986c83e6f43b855b9e0e1b89d4d7e0e745214ac22e898bf6452bd2178f6c0dbb167da27f9cce6e2837635a059267a93b24d6 SHA512 8e5685078cd125e720fdf6e1cff541d828e52c42cb89aa39d48d9933f835016f787b82d59ccab4eedb7bf5ee13ca415d36bd0141b0e2812c19a9c85b45fd6b24
 EBUILD arrow-0.12.1.ebuild 709 BLAKE2B 3c43c3bbe2672187fc81516b5a6fb2399cdbbdd6e93518345336643247c15b84a7a7a45a88c14360e2ae4439278822f3cf0b8e7d8cd9317501f0f8c5eda344d4 SHA512 6f93c211fa0881fcf8c7ab4e7574162ab4fa934bfb591d1b4389b1a1cc9de5fdd5d1bd65368e9099a165668dea70d7b782a8378bab8f066729e940b1eb55f243
-EBUILD arrow-0.13.1.ebuild 796 BLAKE2B 6ee9d1706582b95d44be5a83baceff55c5b2777ec730f16f289ca4dad368c4b3acc89ccfa421fa539f18366a58f0096a2c10ed03d4fd1a2e64f1157c167d4cc2 SHA512 b68189fac3ff2db4aef48fe36f00aded7f17ecc5db506854157f8f48b8fde9846a308586a820d3933e7c9d879ef9e6c88a44c1a5b9a3b0e825a62dc603964de7
+EBUILD arrow-0.13.1.ebuild 794 BLAKE2B cdd0b89fdea0ca047481c07140ac931b9c27ef154bdc35225c3e95727b25767008e870b7a29c7583a2ef8882cf0f60922d7dbb7060604bc04b0b0cd3c82e2be4 SHA512 e6fd216f62559f1bad11dd0f670945b1b6dce99e2a0dcde53985397fca2f218aeb055ed599081c19cfeb14ee86d5ae09e17ffe5ff4c8eb99208cc1f9d909e672
 MISC metadata.xml 364 BLAKE2B c9cf1b8e27d0ae03d522628edffd052df05f37a857d671df00ec0f2868c598ba983b32b66a98c0f4ff814f8fb5fcad8482592852c38384c7eb99bb71f0ac8b32 SHA512 4288f06ad48ba051749472da3ff12ab53d50226c053764c9c175ac13a24b8817c731350ae153ef83ee02db04aa6ba7735cb30b8e35339badc0e46b6998773015
diff --git a/dev-python/arrow/arrow-0.13.1.ebuild b/dev-python/arrow/arrow-0.13.1.ebuild
index 8255f0c50711..08d9c7d2fffd 100644
--- a/dev-python/arrow/arrow-0.13.1.ebuild
+++ b/dev-python/arrow/arrow-0.13.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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/asdf/Manifest b/dev-python/asdf/Manifest
index 7b10c7b33cda..28097a9a1658 100644
--- a/dev-python/asdf/Manifest
+++ b/dev-python/asdf/Manifest
@@ -1,4 +1,4 @@
 AUX asdf-1.2.1-Disable-test-that-require-http-server.patch 2043 BLAKE2B e0f25fc217eafcdf451bc5a6417ca2b4521db0a17b7144e6654c22d949a3915b8b4194bc1c0ab1a92add64e3b1e20384a521afee58b3ef946339670133dc5981 SHA512 0bd18603e37027d4daf9227fb7c34b48dfca47bd01771dac6be894938c625b0753769764e7ac7b9b23463c6f1d52f7732b960764ccf3ca8d3904e0d5de88e2e7
 DIST asdf-1.2.1.tar.gz 320828 BLAKE2B 8050b24616ba56ac8d946a579da1a8962e54f22db45c8c95c45cccf4552355f68e6983c3831b60aa18d7c33a3914b1984ac31ce3461568bd5c4dee6625c113be SHA512 ac8b94ee1c0e2f1d99d55e38d13cd78e7fb14fbf8b5e15a725c61560e14ab96401a53909954ac6cde825121c6a1205b2d3b8ca474499b90461a2f0ebb5db4638
-EBUILD asdf-1.2.1.ebuild 1321 BLAKE2B b998f9246e4467c8a71d112a7f03aad5b548703cb0c5d9fe8e5d7c21c9229aa15b1caade41cdd2cc5c521e7820b21d9c15a50fb081113fa44682c3a3e7ba57ff SHA512 c6dbc60079e785df7d063522c8c4749cb2a2aec49e52fac0d45f16ee27b39a0231b5a24d8a7d6a1b60f46fd9276f93e0ea39d244d6320aa55717144231ee9a16
+EBUILD asdf-1.2.1.ebuild 1332 BLAKE2B 0acfcf0f367257a17ac60369ba711ea31637eab7271bd7b38c18c7f42c49b95b5f5275ba8251d27011c439df70ae3f5466f04cf0223eca4ffe62a969248e30e1 SHA512 20868dec05eaf368493a679be63b0b03e19c1eb0468c3f1a112fa28e39ac6b0fd7dd58914bda782a2d4026915eeb858944d85e3178981c5d1a569c7d3da1ebe3
 MISC metadata.xml 912 BLAKE2B 71dff7af9bd8506d3819e00a21b45659088ef3876f0f8a481809ed7f4f8c53e04044ff6ac6adabbaa60be00489cd4482c3c7c853bd240789175c2310885a8b82 SHA512 3594bcaf9bb04369baeeea29f728653efbbe2e77b2b77127a34d6b0bc03e5cfb7405f21341df351e86accd774838808aafd73c533c8995d875882436cc898c66
diff --git a/dev-python/asdf/asdf-1.2.1.ebuild b/dev-python/asdf/asdf-1.2.1.ebuild
index 4b287fcb4b80..eb130febcd26 100644
--- a/dev-python/asdf/asdf-1.2.1.ebuild
+++ b/dev-python/asdf/asdf-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for the Advanced Scientific Data Format"
-HOMEPAGE="http://asdf.readthedocs.io/"
+HOMEPAGE="https://asdf.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/astrodendro/Manifest b/dev-python/astrodendro/Manifest
index 2d95fe892d6a..8bc80a719a3b 100644
--- a/dev-python/astrodendro/Manifest
+++ b/dev-python/astrodendro/Manifest
@@ -1,3 +1,3 @@
 DIST astrodendro-0.2.0.tar.gz 4594802 BLAKE2B 19499d75d6ecf024c399595926c41fcd19b7dda017cbde2d6466cc85c9a7e5eec15ea459691589dcc89013b3ca8c76532d85eb565635a526283a63e88b9fc5a2 SHA512 2079e2844537b74b8c40a5e2d9c04a2e7940f12fa0ac77dc95f39d7ea623ad43d8635043336f5cedff6076599a44c4b8908dbd0b67d33c47310408496bce1b1d
-EBUILD astrodendro-0.2.0.ebuild 1360 BLAKE2B 18893be2bf16169f2dfed0434fcf26031c99318608ad3a2ee5675960b51e3a7ce008bf56a5ac8e489e59573a27729009c9e8970351878e4521a57724f71ed818 SHA512 1bbbe102c4b24b961e47f47486ecda8cedb33f5ba127db9e9a5dcf3fdabcee676a393981b968c2e4fabd4b8c2e8db248ece5c16a551a567b9b2fc39b09c4f6f6
+EBUILD astrodendro-0.2.0.ebuild 1378 BLAKE2B c85f67c10ca8641e84ba4843fd9d89765594961c4828037baa8a6011ecd4702238106d285a7d681587e6accb7a1aaae245591f74d1f020c0dbab3b275b7575ef SHA512 73f3894c34c18f94b22ee2bc89d2466944a67477a93ff20afda7a7a0d8d3cb3a9020ab3af44605634d0506ee16416787e863465df787c251ca24d4ac6d5db9e8
 MISC metadata.xml 530 BLAKE2B 46d64e0eda7d2d5f8001dfe42f9036a96ba8ca0da9a6a3a535407c91bff68adc559144b0937b9d37b08630e69de46402dd3728b73099e7ade1ece8a710ef9a63 SHA512 939a42e5c9eca1901749e5ab2242cdd375df94cc85a68076825023a4bd48d7866400023b74d2ae7271d638bb706155cebb049b9e190aed0b286055937b9f8aa4
diff --git a/dev-python/astrodendro/astrodendro-0.2.0.ebuild b/dev-python/astrodendro/astrodendro-0.2.0.ebuild
index 467ecf3a7e09..bbce2e9315da 100644
--- a/dev-python/astrodendro/astrodendro-0.2.0.ebuild
+++ b/dev-python/astrodendro/astrodendro-0.2.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1 xdg-utils virtualx
 
 DESCRIPTION="Python package for computation of astronomical dendrograms"
-HOMEPAGE="http://www.dendrograms.org/"
+HOMEPAGE="https://dendrograms.readthedocs.io/en/stable/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index acc84be48da1..d5c2756322ec 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -4,5 +4,5 @@ DIST bcrypt-3.1.6.tar.gz 42216 BLAKE2B 280e2d01d3d5195fe7d32426b9e9bb7b4544dd1c0
 EBUILD bcrypt-3.1.3.ebuild 1000 BLAKE2B fa1787361473ef44fffdd0479092bf0b39d1edf03408330d4e6c14154ee0ae3a65f9a7bf708a8bd8cc4895e62bac200252b333901d1d7fd052336b6cd4ceeaf2 SHA512 5623104f2cb5fa264d62f0a9edb36b8ed14dff554d0c9f6cb3f764df6936a99f9d64b470d491e2a9ec5c25f9fe7329c9d65c671328ebd1a0ea0d7c8442c78842
 EBUILD bcrypt-3.1.4-r1.ebuild 1019 BLAKE2B 354ade145be1ce0cdd1f3f9903c31f14d7c6d18015aa65d4bad23dfdc5284c8d544b58988cb866bce94465210c7356f109256df0859624fbacb71e656dfac5ff SHA512 094c0848760d50b4bed62d886087e20d6e9e46f4505bc67f2140bddae3b4736a3648a21f9984b08988f2a1aeda5075bf325047bb323875584a89f42a20dac7e2
 EBUILD bcrypt-3.1.4.ebuild 1017 BLAKE2B ebfaa84c4a013461937c2e9cdd4a1f1f068928a2916b1e74a24afd32dc66d1aaad87319bccbce3710dbbed40dea9fed119eb7ca4fdca2b1ad4cb966af7d82e5b SHA512 6e9123c55a949d2ea8a5d59bdf1a78445e2343397b05213e281d7b8f3ca4439551eba678f2fda229a998d9bd26fa72b40b17f00144a0091ccde145e1610e313b
-EBUILD bcrypt-3.1.6.ebuild 1019 BLAKE2B 354ade145be1ce0cdd1f3f9903c31f14d7c6d18015aa65d4bad23dfdc5284c8d544b58988cb866bce94465210c7356f109256df0859624fbacb71e656dfac5ff SHA512 094c0848760d50b4bed62d886087e20d6e9e46f4505bc67f2140bddae3b4736a3648a21f9984b08988f2a1aeda5075bf325047bb323875584a89f42a20dac7e2
+EBUILD bcrypt-3.1.6.ebuild 1010 BLAKE2B ad3b2f3468485d0f901d7c3f999c0a25875c172600850364e4697365b473d24ddcde440f75713a1d8b4386e59b7d8bcce25c47963433752db702ca7f9218f36c SHA512 6390e43e845c07658db33bf231ad089cc4f05cfff32d9baaa21b8c1901c0a02bbbad6f12e67f63802faf286154d74142ac8064b181fd2b6945014950f0d843e4
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.6.ebuild b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
index c1403f50de9a..a317f35e7f57 100644
--- a/dev-python/bcrypt/bcrypt-3.1.6.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 0adfa59f4d97..1dabb76fd9d4 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,3 +1,3 @@
 DIST betamax-0.8.0.tar.gz 78398 BLAKE2B cc9546eb028343621ef47a9cb7992f1d3eef4a2b6837cc8b670ff7d0313020def203ff06bf1e21c2d4ef26932df65e71562110b14bf27fc5c1a6ca3ba9023f54 SHA512 52b330747b6add52390b50dd63c05851adc01ccd238fdb5c3401efdfc26be363a3f61145dc0e1f3cc43ff520e1457e33fa47952d2929c7c3e12c3e2612621f95
-EBUILD betamax-0.8.0.ebuild 762 BLAKE2B 7efef95426c09f1b14d3689877aea14cd978e388b6e69bdf81cdac8069ce032f97f1bd4e3d5e9627aaf0264e9fec59d7ef77584df0388284f47ed78c76291910 SHA512 d5f28487885c3f050fb65bac4288d1f7ce8043bc1c112fb8d3b5152d4041475b9aac94d9ae31ada40c2563073f5257ddff761c7ed247f4b7711aeb2eeb57f524
+EBUILD betamax-0.8.0.ebuild 765 BLAKE2B 6f19eeebc83e10b1651bdab08dc9f23963632c17a945471d4d0b9bd5cbda204f5739a5e8ca2849a62a9383cd674dc4054e0cf1afd0e695f4e0e0a2d8c58fe061 SHA512 1a877d6715b15eef9c03421aaa2c9cdb536071be8aa92b72b14fa97dc88a54d8f6bbc5279404f300dd1e26b1919224e10f177b6f12e0a4b4d29de42f3378b17f
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.0.ebuild b/dev-python/betamax/betamax-0.8.0.ebuild
index ae1dcac25819..4de0f8b0a576 100644
--- a/dev-python/betamax/betamax-0.8.0.ebuild
+++ b/dev-python/betamax/betamax-0.8.0.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="python-requests HTTP exchanges recorder"
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 2a4f1b555f96..d9c828e976dd 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -5,5 +5,5 @@ DIST blosc-1.5.1.tar.gz 641172 BLAKE2B 2305c8a4b32192393182306c1ae074caff1bab28b
 EBUILD blosc-1.2.8.ebuild 847 BLAKE2B 9ee36efe828360509204e330ecf1edf6b5718d67d60f2fdb4f20318c98d8563d48f861fc551e5c0ab3aeef51e96da70175efb2adcd779fe4cc3a59d0439dac8b SHA512 c8c3f06823b57af1d9bf8ced885baba1a44ae18cf4445bbb0dbd9d9ffd70c354dba45d6d46a822844e0c532c26192d7d31fbca92c4252bb94e5052313420478d
 EBUILD blosc-1.4.4.ebuild 722 BLAKE2B e5d40615a033605cac38249c978aa6816035361ff9120194135208b78e31d60fb1880b8946119b19f0780b7f51591c563cb4992dda8f8d62055c0f9ef3d5dae2 SHA512 190112893885a08b6ebca500db45848cd8d053b41c8b569839dc0e5744a96540c0783d10912d6d472b80ebfb50f2d8eb92fb54bc56d075974a5886d7169d7903
 EBUILD blosc-1.5.0.ebuild 789 BLAKE2B 314ff2c46533471eee06225aa084103727670f2d35636c58a584221f4da3a2eefdd56c51e8121ab56a4ba6905e2fddaf713f7cc6046a9a54d77b9c555f06a7f2 SHA512 bcd4755a9c8842758a0f58bff2d4b02b937c6bf1c977119ea8115fa10494de123deeb55f55dbc3d6e3dc6731ad4c88b741f247b870b4ae649c6d9d3a4e55ae16
-EBUILD blosc-1.5.1.ebuild 790 BLAKE2B 61c721b6a32ca51c4ea430d2ce6cbb548f789ce48526ea284c5a95950e183f071e2a31d7602cb071a9c908e61b762339636d1ab2722a64714e0d5ea02f22e10c SHA512 67f540a485c3a692a4e90d476573dfff062d9fed12f8a9e3c2db9717aee69c74920bf26c7f46a5e2907a1c437812f622cd5c03b574be55039f1233e333dc4778
+EBUILD blosc-1.5.1.ebuild 788 BLAKE2B 357dbf005510828c7440a3b97e7b855523ce0e97153183002c402380d4cfcef6abf69f40cd9b5fbb2a411200fa6f1566f71e96e3181d4d012cf88fb7f56ccdc0 SHA512 0110d8a8884d10c4a33dece2b57b3852977aebaacf4fbd45b5e0f783172f3eb7a6b968fbaea9e58a3ce1248ab1bee7b65ecf0cb9f0fd8481868e840ccbe5200b
 MISC metadata.xml 891 BLAKE2B 2ed113aa84063255dfc15d018340cda188c9441a252a4d5c86f1821d5b7f16df6084a4469f05bc7cfca16439538b7d2f5fec105ac709aa9b056c537d8840edbc SHA512 e4ece5eb12f91e4416a8a685260f6bfdfee12ca64b7f2ad4ce0cdaa81287a24b1f51a156c7502b1e16341088743d7df9fdd36aa9095ab9d02e0bfa28536bb9f5
diff --git a/dev-python/blosc/blosc-1.5.1.ebuild b/dev-python/blosc/blosc-1.5.1.ebuild
index ee4e23b499f5..5b16d3962528 100644
--- a/dev-python/blosc/blosc-1.5.1.ebuild
+++ b/dev-python/blosc/blosc-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-libs/c-blosc:="
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 5d9e276e2bbe..f537d91ae606 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,5 +1,5 @@
 DIST Bottleneck-1.0.0.tar.gz 363223 BLAKE2B 6dd8e18d14675c08010850091343856f2599de71ef57ff1b0bf1b748bc7f2e6d2d0fd0ad8ae1bc00dc38b9dd92676531b4564558b7ec0f9b79d2ebe4061a028a SHA512 b3edeec0b4c2beeebb08eed8cb7aabb92f736e47c657f1fa580ec36d839941d3d1955209b2286fd9d41c4941b46b97a27049c51bcf5a098d27a19881f570d2d6
 DIST bottleneck-1.2.1.tar.gz 98920 BLAKE2B 02fd35eaa15761f2008e46c459d842cdb5ad16372a03ea51a82b775ae0fbfa81beb0f1f304dcf6565956dc2d6deded579d8e400eaa250f9ab639261c085a6525 SHA512 0299eb1a12d808f18b8c4259c2205b47b34af4c1245867ab0857eb34a1aad630507cd3307a16f522db461977bd3f70aca688fb6a62ae84d1f895d18165132781
 EBUILD bottleneck-1.0.0.ebuild 855 BLAKE2B bb260d115c35ac3a276ee7676f3a07673aa6b2f39587f4ee7bc04cdb14c22576078cc31ed2e8be12c4bad17f61ddfa5728667666746b4dac54639f64bd56ee95 SHA512 4bf97834231323a7bdbc7d95d1facb45cde9b8d3181b727bb0f71b7214977e2824bdbaf205caea0938eeadf02e401d6f38e4512d15df07fd617d961586d524c8
-EBUILD bottleneck-1.2.1.ebuild 698 BLAKE2B 7b62ec71600d00b8fbb8dfe1e5ddc3bf95f167bb480f9f6597e003abff765d095e3e2ad7bd736a4465443439a3f3c78ed2db456f31f6c3ef14ce42b88ce9ba69 SHA512 5f3ed0ad68d073f8696b030d5291dda3a1c92f40c48c74f1c9c44ec7717e0049ac8f0732a2b43f245badef3899ea0f1c57aa341585963173730e29ffdbe1d499
+EBUILD bottleneck-1.2.1.ebuild 696 BLAKE2B b8e0c84d2d44be2397760bde789fb26f6e3d9e9f00016a1252d1867c124f7a09bd2b775d092c5649ab948a46c0d9b73ba69b8a8b259f7240cdc66ed59527a150 SHA512 4994d740a4864c43b899ffdee260196689440b90ca4191630da141d7d158611d7bc16b4d760b86330e5397b56fe936aa39236c0a5a7d078ff03f2a1823ecad31
 MISC metadata.xml 471 BLAKE2B 9580e4438e0fb3dad08815f43e730b365be1ab25b4a308ab6c90b00d0c5c58a1bae8063fd2df68fb68542010cbc14e3626b4baf3b43adf8f38f44c7d87b74038 SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def
diff --git a/dev-python/bottleneck/bottleneck-1.2.1.ebuild b/dev-python/bottleneck/bottleneck-1.2.1.ebuild
index 9cc238413382..72753b53fed2 100644
--- a/dev-python/bottleneck/bottleneck-1.2.1.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index a7203a33c9fb..857f35c65914 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -6,8 +6,8 @@ AUX no-data-files.patch 881 BLAKE2B 6e8709eebe73d3686ee401a7d5db45471ba1a53b894f
 DIST carbon-0.9.13.tar.gz 47509 BLAKE2B 0f967d81846139164278b99aa31237c8065b7d60a13c9a6153cf3904dae52bf0e8e502d156a178f1dfdbe098236d97f8982fc10e6442351270d103adef2bd74e SHA512 89c843ac67ed4b68c28273459e5a96594851e5d2694fdefdfb71cebcdc6555d4aac8c45c1c6d2ca61a15405bac7ba3d27836470fe152d5d7a4936bb2d00e6776
 DIST carbon-1.1.3.tar.gz 68824 BLAKE2B b5e532fa0d0d8dc8ab8c3c555dea6bb3b918cd5b516ea4c754f9b3cd37230f54b63d202cfead9ec4242ebf78031c2671050354dccccde2980c4101b9699b1393 SHA512 0cfa9260484de147660110b7d2cc7e41bcbd7751c80bd5c557534b2a52c2183fdba94d40f8654fe54f593b2ab34581b2480e96c8a6dde4d47de783153a2cbe65
 DIST carbon-1.1.5.tar.gz 72365 BLAKE2B 304e515fd3cae806e141d0a76983d13967885a7e57c310d86c0c83560aa306a573676fb0135fceccf14cc7ed42d8a9dcb7869ab0d6ac3b2fc00c2fb088011873 SHA512 1b3a0a0d4005e2ec8d5bca062b41f0e18329c1bc4d3a4b3eca5e8f7c94c20387281392eefceaca90294e51860eabecca242c487068433119f1f249f8659ed560
-EBUILD carbon-0.9.13-r1.ebuild 1850 BLAKE2B 9bb0919ed111c51709c87cc1a67e83c7f622187d6a3295a3580fb3ea4426ac5a43fc325492b768282df912505fd6ad77af002d5c1c3de7901b8379b1a493f6f5 SHA512 4d3121f3c8a2d6c04a3b8cd5153ad9132e3e573ef9b8c621f015b3eb3b46833a8720e8f3f0c36af142eaca6cf8d950352949038cc3cf3a05e6f064281b69b673
-EBUILD carbon-0.9.13.ebuild 1845 BLAKE2B 3c63c6659740da27a9bb63137122503b1c54692afa994c8fd87369fdd5f96e9d9298f6aacdc26504b85467228331cc8a6ea0637b3fbc92adbcd1732c9f26ba66 SHA512 19be871a4fb56b058990eedce3bcb70eae0b913c0b6bdb4c46236aa9e65bcd8b9bce3b2790ee591fc9494ea36e008ea98f904a5c6dd99fe7e55cc6d63c3d5182
-EBUILD carbon-1.1.3-r1.ebuild 2126 BLAKE2B 38b57be6a36815a6a38cb4cb9b688576907cd4379a04fe379cac58f2c01e73b337abadd8394e9ecfae99066b22a29e2ecdac1e720729435df2cfff0bdf1a16e9 SHA512 9c6907c92264e43c0ba1320f2da33a5b379171f6761375c0e465fe82817238d26b0d7689fee55f9111bd187976728717dabf1012ad0a9e810b4ac845244bab06
-EBUILD carbon-1.1.5.ebuild 2037 BLAKE2B 2a11e9b42a00e84aa24ceb784007d35ecebc30d506797179d401b032a391d39ed7989bfa442a87c5066cac38cdd5442cbb3fd88aa5e7e5d0614680d3e5990edd SHA512 fdeabac1767cfcb9667f3f7e0ba36f2046d9e0ed984ff5cc1fe4c93d19283da2414e320f020937d91cb1d7eb29fc7f818c96fd4049d2a2a69b803192c9a12ea3
+EBUILD carbon-0.9.13-r1.ebuild 1843 BLAKE2B a8ba9d28061af7db44af73e714c33b96b61fb90af199fee1ecc6fdd0d6db5034cf876e33cc73b1f8b6826c94c76a62755cb56eb650c2e70353ec2e9c2be9fd9c SHA512 e82fd28ed25b8e10c3f3cba93fe307f209a09a5bdba8ef1b2e1acfd2e696cf45b3c2ed36f0fe9e7ec1e74b4e6a533e93d95c705a42c4575ca1ffea50e117ce75
+EBUILD carbon-0.9.13.ebuild 1838 BLAKE2B 0810875d6f256a3af040a41d8c05104fd2c860d00e50a0ce4f2e19fe97716408e777fb8dbd392d3810549671b3c2ffbf8ba6a9e59556d9c1ed389cf6e9e8f094 SHA512 97502916be13d332389c68b30366ef6b254270cf1b8c702318f18efd2019950ccefae0815d17a467879e60afcb557dbbcb6b412ccc21c9f84e0cede6986a843b
+EBUILD carbon-1.1.3-r1.ebuild 2122 BLAKE2B b48821e8a76a6eee30f792b80300e8ca5c7d88c6d9626acf99c4f1b70471641c2a2f3b158b4fb3499f01ed1c74fa2a650a3fda9bca8c5f4759ee2b98318d6d5c SHA512 3f488796d83611b16be5882fd682818cd86c6eda81301f18886f866994d4912ed47603eaab1101477f1951070ad1b38f6d96382b4b9b3a5cbf7743ed8ac96de0
+EBUILD carbon-1.1.5.ebuild 2033 BLAKE2B 6216c5245122c4d2b51b678333942377fbdd9c390bc32a4e9a0feef9d8cbd645822d027d869c2ffa196fb37023be7e45fbf5ae166526e9fbb9e2c8703efda643 SHA512 7223b47525b5ca1adf9fbfda0fe59a0de86e5cac481b25a5989b8acfe55d281e90250b52a3281c5815b0564b5e6dfd1db11ac08bb76c893f48872a2d41070962
 MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
diff --git a/dev-python/carbon/carbon-0.9.13-r1.ebuild b/dev-python/carbon/carbon-0.9.13-r1.ebuild
index b861686a53d5..2cf0631d6fc3 100644
--- a/dev-python/carbon/carbon-0.9.13-r1.ebuild
+++ b/dev-python/carbon/carbon-0.9.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="http://graphite.wikidot.com/"
+HOMEPAGE="https://graphiteapp.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/carbon/carbon-0.9.13.ebuild b/dev-python/carbon/carbon-0.9.13.ebuild
index e30fd7dff586..6bc41708af67 100644
--- a/dev-python/carbon/carbon-0.9.13.ebuild
+++ b/dev-python/carbon/carbon-0.9.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="http://graphite.wikidot.com/"
+HOMEPAGE="https://graphiteapp.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/carbon/carbon-1.1.3-r1.ebuild b/dev-python/carbon/carbon-1.1.3-r1.ebuild
index d6ef612dffed..3bf8a434141e 100644
--- a/dev-python/carbon/carbon-1.1.3-r1.ebuild
+++ b/dev-python/carbon/carbon-1.1.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="http://graphite.wikidot.com/"
+HOMEPAGE="https://graphiteapp.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/carbon/carbon-1.1.5.ebuild b/dev-python/carbon/carbon-1.1.5.ebuild
index 486fd6365975..98643b503262 100644
--- a/dev-python/carbon/carbon-1.1.5.ebuild
+++ b/dev-python/carbon/carbon-1.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6}} )  # 3.7 dropped due to dep-hell
 inherit distutils-r1
 
 DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="http://graphite.wikidot.com/"
+HOMEPAGE="https://graphiteapp.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/case/Manifest b/dev-python/case/Manifest
index fb5a35584581..3f127092a7db 100644
--- a/dev-python/case/Manifest
+++ b/dev-python/case/Manifest
@@ -1,5 +1,5 @@
 DIST case-1.5.2.tar.gz 58382 BLAKE2B f5924a7bf276087e469ec43780791e7eb223daf9649eadb79060066ea0125931e5534762b148b0b3b65805bd05c7111bdb0b598df12d056535c01662260eeb5f SHA512 82c0ed9a788fb57c4109cdbe24822fdaeb59fdfd5d7ebe0c93a39e8e2a2745e911d6dc1b679ac46e263eb6041bbc0ab46b20f3850c12f8f63324cabe145ebdd6
 DIST case-1.5.3.tar.gz 58469 BLAKE2B e535664cc616ac14d1b13e01abe44544fa470030895237711456eefe1aff0b79876b2225344065416149f7de444bf4dc5bef22a184b148e059a8b1f38a394619 SHA512 ae98a571c282f80c685c42ab1dc578847fe88cf8cd07faff505a8df8e3282a602908a8780ab88b36851e3ee6f3c178405e5c50776fd0f49fcc990087575f2958
 EBUILD case-1.5.2-r1.ebuild 591 BLAKE2B e606a5ced40d2efe228c30539c2f9519887a4bd95149274ce0ee36395a544427092d0039506898c052be7674a892b8662550821ef9523ce0634b819bee46b08e SHA512 b0e4ba07b7becd688068f7521c241546fa58460e7c20238860c83d79576a64ad1a55479a26920c9405c494ca42dc5d13aaf7382d49b1307706190d2f7a26db47
-EBUILD case-1.5.3.ebuild 593 BLAKE2B 72cce3da4f98d74553777990e4b44666a65fdeeed4243592e734a13241956c9f40c3091a2d066624bc3edd6b8ab618aac738a4bea00bcf024f77754041007367 SHA512 7446390a8374eb2186ac72614855454eb29a1539f790d09a08db76acb39187825719573befce99b406b77204fe3f9b3594d1f58d7b74ed6d148c85264cf2b935
+EBUILD case-1.5.3.ebuild 591 BLAKE2B 96f6394b97718d6a1c9de0b91c2f70774269b98490baa9114ee9e4b390cffe9538bc9ebc4fd80545cad5a676e0c7534e66edbffff6fa6cd30d0bb96221c253cb SHA512 ca65c4cf3d19448ecca13bde8f4fc3d4ebe588298b3039e7c75b888ddc1cb6aa5b909e6cd28fd4ccbf1dc2fb43278da43a573bf84fd6b8fbcc8930d272252b54
 MISC metadata.xml 336 BLAKE2B 4190ad7722be2f40f19911895aa86b9181bac364174de9b3e9016c541b0f1ddf53114533a6ccba680cebd510d411ac2a1f5d32abf04a71016dd7243143d8c7d5 SHA512 c0fdd3bfed03072c578a781b4aeb08728b17c8f9b22f4ac346cd993604fd634de8f94b7803c73f7285f87bc4f0a2245536f9a9bab8a254052bf10b8c979a3a28
diff --git a/dev-python/case/case-1.5.3.ebuild b/dev-python/case/case-1.5.3.ebuild
index 915c62d65920..ed1215f2e85b 100644
--- a/dev-python/case/case-1.5.3.ebuild
+++ b/dev-python/case/case-1.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index baa56384735d..2d7af22afd00 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -3,5 +3,5 @@ DIST castellan-0.17.0.tar.gz 61193 BLAKE2B 91f9a4d6b495bd4bb8f1f00a9b2435a892a7e
 DIST castellan-1.2.2.tar.gz 67085 BLAKE2B 5a6af5fd91e1371ed9024bf09f31bc5b9e7d55455a61c6c23f62fe84d80f717e83c96f2c72375c37537fe4fb7484b7a16e668f6e37ffa14bfa04f6e1fb69eaeb SHA512 3777180ecc2a2a26c917d89dff28d2ff9e20e1de86249b0e5cda63027394dd8b5a763314135bebba3d2b6194825068c9a7c1c32a4a1e3185caaed74a105aa032
 EBUILD castellan-0.12.2.ebuild 1421 BLAKE2B 640fb3331c3de63ddc6682375f85937c28ee34eb94cd4cb1d6dfeab68a50a16cd0c4e1e4ff497bafaf7f6d9b891cf4a37caeed848b8301547f37e5b66d2ef271 SHA512 7ee40ef7618f58aa6c859b06cdfdd8bb7b3e88367816203ce18f6f85376128380185aaa90b787cbd92a3c7fde1ed4cc7cb5da570ff32f57aea50db36925ff038
 EBUILD castellan-0.17.0.ebuild 1277 BLAKE2B db956a21ae27a161bfda9840fb4592e3c4726c135cfdcb64f334e53bedf20dff5c769125168a2c349f939cc17894847d0799e4eafbe782e2cb16437b9e1d5961 SHA512 0b1186adc1767db61b4d316f8f768004f0d1928c39a9ecdbe665de38b8992073e333fadd15fab9a502618bc6c65104bac0516f74c66073dc4bb4d197904339df
-EBUILD castellan-1.2.2.ebuild 1112 BLAKE2B b505f68ccb769932f6841a1685f82d955f320739cf05a732af2ee3cd506103fb97e8165527a3f15bff79c4e03ed984c5c0c211563c6e2b0aa217b288d8388b92 SHA512 d4e9ee0cbe64c0d00cb9b545c5bb99b36c886f99b7a10981f2bc1e3b7c75a9ca125ccc692fd7008760c19b11b17fe979b0b2599206134e65aa3797c8d7d24f91
+EBUILD castellan-1.2.2.ebuild 1110 BLAKE2B 908cf045e448c3e3935cb64a37982cf4c90693037a72d0c2ff6a143b4e83c1609e3e4ffe88e166f5b16d0ca84b92eec46dbc6b21ba6cde73f3ed80578bc48f59 SHA512 3ff9e4c61be7c8310ec7c7e002d8a6a95ea48fa8369bbfd9bd3d9ea5fabc75444beb5495ac7cddd6c527607d454812f8f62fc2439bce46d2d13664a7d3f5d376
 MISC metadata.xml 326 BLAKE2B 5ce95fc1eeafa570c9910dd492a822dfeb251bb98c5b341281ee99e7402be32234fc38bbca1b7ea0fbb67f8bc88e9b1a1c85da73f79d2a9ffc3a69289da507b4 SHA512 f8d928ab94ac70a7a3c2548b67a6296b8e86b5e239a9c74cc4b1a120f64c1e2e2084612b025e26fa3c02099f543ce156e5419a5f6ea165eff79b2dd77e9a2d66
diff --git a/dev-python/castellan/castellan-1.2.2.ebuild b/dev-python/castellan/castellan-1.2.2.ebuild
index b2cdb27bb24e..b9201cc5b8e9 100644
--- a/dev-python/castellan/castellan-1.2.2.ebuild
+++ b/dev-python/castellan/castellan-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 3448540f1124..7a881ff8568b 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -2,8 +2,10 @@ AUX catkin_prefix2.patch 1620 BLAKE2B 7c6824c35ac840429646e1804e417ea09971be6a49
 AUX infinite_loop3.patch 1236 BLAKE2B f236f05623b5ee4414fe3da7efebf61d62ed8617d47a659e980907aafabe3c0f4a0fc41779c73872235a186c7457ece6991433c67acace597fe86f5088ab9cca SHA512 4d07d04cfe1a10531129494000be11fe6b2598c077658b212f888b24d3de997fa6730641055caa181a5a071585f41f82cd4783c46b314cf66fe1f34b70f538cf
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
 DIST catkin_pkg-0.4.10-gh.tar.gz 61272 BLAKE2B e4246d602fd8b8a8b8dda4f412aac4f88ae3328bf2602268566a0f761fa7c435412ae36f563e8082a2e0497c92ca302ea7505dfb32802d3ff00fe4323cd361b1 SHA512 55c2a03c922f647f25e74dce33486d09070c3089dfe2ae26d0673752298d6bb55652b9079b32694c9d80f52ae55fef2fac9f853b6d0b9d6121e6e8c233dc3530
+DIST catkin_pkg-0.4.12-gh.tar.gz 61535 BLAKE2B 9b1a60cfc6bfda6e0f126f062cf62636df162577d693aaa07c4e7433f74383686224c31e0d567a95de20e2643c39f84781be3f82b39d9dfbbd1aed0dd397587e SHA512 227a6f07a46ab62d51f408a8aa08d57199a8f4d7c954421bf9a605fce3a0dc447c9379987bcacbed3bce139f00e95bd565286a530b7177acfc29a172da30f7dd
 DIST catkin_pkg-0.4.9-gh.tar.gz 60919 BLAKE2B e7d4987022359fa7306df77ede2e07b2371bfa16b9787e513dd096ffe3988f9b7e6cbf61b96e00992334dadc6052811c20e0b7ea6c9198db332c1eac545c5031 SHA512 53e8440c0768b221526d134c5609c3088dd02e214150253469fe5883665936472486792db2d69c05fd352949f2350bda5960e71cd54e3f1d9164e0915c963295
 EBUILD catkin_pkg-0.4.10.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
+EBUILD catkin_pkg-0.4.12.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
 EBUILD catkin_pkg-0.4.9.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
 EBUILD catkin_pkg-9999.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
new file mode 100644
index 000000000000..d24c376aa411
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.12.ebuild
@@ -0,0 +1,55 @@
+# 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} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${RDEPEND}
+	!<dev-util/catkin-0.7.14"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix2.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop3.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index f40b02cdffaa..6baa8f67e874 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,7 +1,7 @@
 AUX 6.5.4-fix-requirements.patch 272 BLAKE2B 9694f577198f94ee1634468750f4ca8a1d66014fd8f3a65719d53bd27d99855a76478a5946e4a5c9f3515ad39be28bd12829f7672e83c7b887740ae0dd2e6418 SHA512 de0d3be2d062cb6a3088eb4e75f0ea97f57c81ee2d207acfb28780a757adddcd4e1e718ff6afe27cf98981db5d8347186ba74bd89a940f8b7ac406429a4759ad
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
 DIST cheroot-6.5.4.tar.gz 81067 BLAKE2B 5304373bb8c7cefa341260d4fdb8a99b9e22041260342a716a6b95ba324b4f31d20fb44d8dc10840fb35d3b04de1283deb9aca11bc78772655bf7ad81cf16f3c SHA512 62a48ced225bf9167259b82f5e88a953bdc422982a6c0b0121b28e895cc8347cc033f573b57a048c59167586e0b21e94ad233ce2b65a1b72feb01db82b5ed411
-EBUILD cheroot-6.0.0-r1.ebuild 923 BLAKE2B ff72b830aec745e210946fde5bdecfeb3743fbe1e6b8dd1d92858c558dd8137af25057cf0d22c81f0fb0d49734b16ea41df4daf0f9a4b58c315590c516d2976e SHA512 05727925bb2650c81221a915dc604cc9fdc7fa03f38d9aed0f56d65f3d93d0bff671b8f197b574d3976d38738f7fed8369a1896428a28c22bcb4c430e1eaf223
-EBUILD cheroot-6.0.0.ebuild 926 BLAKE2B 569db581d44a9fc15a14b5bbbeebbb47ba14f126b1009253561c33ae689276c44e65ad97c4e99099db61f01bf4ae0e4c5d9b8246673686640b3a4f9f6685ffd7 SHA512 af1fa77a0de54abab339f30a572df7d443d2f97b754f9008a6f54f167fd98953a736bf10974fb961cc87978c0eb5a345a8f97c63d3124c665038cf9eb759f745
-EBUILD cheroot-6.5.4.ebuild 1752 BLAKE2B 140cc296160996e337e1f854b38973d8cc380d4090001836e752d143d54af038f751226408d516ad70d8f13825c1e6780aecb16d594433612c6fefaa9dab64da SHA512 0206657bb019b32371d7ee6889f55b682856452bca1f5d5e6d092a58fb262edfb9df92318768ed4c179aba60bf0147bb1ab4fa45f784e4a938b7c11b8c50c3d0
+EBUILD cheroot-6.0.0-r1.ebuild 920 BLAKE2B 12fdfe0dde2dea1e41140a2c55fd99f7b5ae0e68d55e639992ab6c7965c539f75680cc543d54c56c49fdaa3242450f4c3006552d4d09caa5641502894468829e SHA512 7e62c7712e58d3666c9c1a309d9b0cc6a56ae526fa9bb7503cb7e10699cae8fbe417eb357980bf1eb2c3099b2e371873bdffbce087dd7116331e2dc6d4eed50f
+EBUILD cheroot-6.0.0.ebuild 923 BLAKE2B eb5a969eb7fbfffc1ec62a2d9b449fda59d64b187f0d7414d536bd86b13710bba42d55b13f6d1e8d41f03070d831e5cf785d2a23baa27dc3363d2c8705d8eb38 SHA512 9a6a50af9f739c9e985d415afaccf5c9bb0659e4c4f6300faad6f3b6935e5399123250dc64009dc2ff6016aa142a390b992288f5a8c259eef86e06d4be6a1d80
+EBUILD cheroot-6.5.4.ebuild 1749 BLAKE2B c2b8667ad88c37b326a6e1d6c101177c3415491f870e620d9f888dd1db9e1ae87dd0ba9477080b86d5fb191df8cb238c1a5650ec45380f1121dd87dd3c69e6a6 SHA512 3d9c52ab09d402c3b2bde8ea8485ed90450bc9259a72de7b13c8ed439274260a42b240dec2a126294bfeec8dd0a165d8e95c8b66f8cf7679f6e82efd5a3dd5b3
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
index 25e349f6c3cc..c2af48268b9b 100644
--- a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
 SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index 06654ad2fa61..21f4fc2d47a6 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
 SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/cheroot/cheroot-6.5.4.ebuild b/dev-python/cheroot/cheroot-6.5.4.ebuild
index 3761c357fb7c..91d2b9382e2c 100644
--- a/dev-python/cheroot/cheroot-6.5.4.ebuild
+++ b/dev-python/cheroot/cheroot-6.5.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
 SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index e571cf662c6b..a93895df4821 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,13 +1,11 @@
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
-DIST cfe-7.0.1.src.tar.xz 12488668 BLAKE2B b80247b5caf81661dfa715d9bf454b8023221bd27ce49b6bd8cd66f40ffe01448e40fb828fbcc64e49f059af7a7c5a95a0737b0b998454ac5c1dd39388150fa6 SHA512 df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1072 BLAKE2B 19d846f9e6dc2c1671c816f70ef0a1b766cde0ac96040032cd16d0dcdcc9996849725442981e2f6034872ab043dc8f952126852366b1be34a056dc1335aa5a26 SHA512 31dc85d0fe65832a62aa7097661b8db78e9689a627225f9634755a30bfaec9827fc8822365d2c7e29188224a6c4e3347ceec2e3b925e40931872e8b697cd6231
 EBUILD clang-python-6.0.1.ebuild 1090 BLAKE2B c98cb3a9f8426a3ccf544884459a6e551ae22d51ae45843aa63daa10cf0da9bf4d22f9a1ec635e0dbd045d3d93a9349e79d8dea840bb846285ff07619215278f SHA512 0b274c8efda44e4d1a3f9de7cd5b8fac5bb0a60ea5b1878fe8c07df098abdfa9b8a2700debaad7f425951c4b5c4c336fc8661acd8bdac6da4ac97e152e6c13fd
-EBUILD clang-python-7.0.1.ebuild 1099 BLAKE2B 28f23947826044651ab666dffe31466f1c7f8000eec9f5f3fdaaaa6c5380400d144587c305aea974da935938e1c4921e434442cf5d57a8d611bc93b0f7e7c791 SHA512 3a05a76fe779227853c3ffaeb453b2980bc290b238527d89b1a1b3f5be07610b082369d7e42b3e09b26e8408c9db08b55236743dd3f36dfa26398a6bba6c2953
 EBUILD clang-python-7.1.0.ebuild 1099 BLAKE2B 28f23947826044651ab666dffe31466f1c7f8000eec9f5f3fdaaaa6c5380400d144587c305aea974da935938e1c4921e434442cf5d57a8d611bc93b0f7e7c791 SHA512 3a05a76fe779227853c3ffaeb453b2980bc290b238527d89b1a1b3f5be07610b082369d7e42b3e09b26e8408c9db08b55236743dd3f36dfa26398a6bba6c2953
 EBUILD clang-python-8.0.0.ebuild 1099 BLAKE2B 28f23947826044651ab666dffe31466f1c7f8000eec9f5f3fdaaaa6c5380400d144587c305aea974da935938e1c4921e434442cf5d57a8d611bc93b0f7e7c791 SHA512 3a05a76fe779227853c3ffaeb453b2980bc290b238527d89b1a1b3f5be07610b082369d7e42b3e09b26e8408c9db08b55236743dd3f36dfa26398a6bba6c2953
 EBUILD clang-python-8.0.9999.ebuild 1052 BLAKE2B 66a85d6ed0832b2c743738fbca508552fe6b5ce3c9c98336acafefacc9765d8e7c2797d4f8b9406e4c757ad26c893e49a1dbb4e7de8fc88eb841b051a7a29f21 SHA512 f86c607c0d2d78d2555e0c1f1103634e37187d4a7bf369191f34975c3ea3f6ce7d6e28b4e0ed03a987eb36ef3897b43641b8fb6d34f4020fb9657b743f78a17c
diff --git a/dev-python/clang-python/clang-python-7.0.1.ebuild b/dev-python/clang-python/clang-python-7.0.1.ebuild
deleted file mode 100644
index 314fe35cdcb1..000000000000
--- a/dev-python/clang-python/clang-python-7.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit python-r1
-
-MY_P=cfe-${PV/_/}.src
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}/bindings/python
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index e20cef6d6f37..05a7c5267054 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -3,5 +3,5 @@ DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b565
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
 EBUILD cmd2-0.7.5.ebuild 896 BLAKE2B 7099810ad7eddeeb703bd56d9292bbb99b299452527d18662f10e072285af7ca395f9b09c7403da38ca13cfba86d6f7356c6fe9e6038eec47121c69dcf34d2d3 SHA512 2ec25bce60270182d4f20d1f514492821b899f3be7c1e9c1e372509adc06057e666c60a153ef7befd8e5529d762e8d9892125610ed77f31dc55cf0090e7bea2b
 EBUILD cmd2-0.7.9.ebuild 899 BLAKE2B a475b51f4ecc87d0df39bb21550aab47331d2355310a05d051fd089e5a8262e7e34c301fcadb9559fc850e8f7fef452f4d187c51dcaa0d1a3e09dfb8d55edd3c SHA512 937f70ff38800622db1c2b50e159d53f5ac1628a6f0e16a3ab205f5d1aa4b6f74702b206b4be2bae9d1d0afb5a88db481749a52ef5f777f12dd414cb3304fc3a
-EBUILD cmd2-0.8.9.ebuild 981 BLAKE2B 84caf32b3084a9415b1e67c72d84e14bec984209f88fee62a1ef8e20db2b4033e0b0628395d916e316daf81553cc2140a19d3ca93804fe3da64b307eae5a6b0c SHA512 a3a5bb691e686b49da85b49a788a5f3b214f83fae3f449812c26ab035270c0152d402f08995d8bf0f8f21af5672bfd0580fc29afe11b108dd858a67365dfed8b
+EBUILD cmd2-0.8.9.ebuild 979 BLAKE2B 92cfdb67bd7c9619239b8d3b742ec9e004b5c628caa8790859a19ba707d6a2263b63dc84f7e0c5afbf7ebc1a336673507c3de76113e54332c87da1d3661c87a7 SHA512 5c48cf31cc0bf761822c8b78e99a605753023b4b82b8fa634e322c1dae0973c969866ca3f00312b5236aaff59082969165e397ac584d2079118dd57dab2f05ef
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.8.9.ebuild b/dev-python/cmd2/cmd2-0.8.9.ebuild
index e6467b0194eb..7444fcf4634c 100644
--- a/dev-python/cmd2/cmd2-0.8.9.ebuild
+++ b/dev-python/cmd2/cmd2-0.8.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # restrict tests because pyperclip is fairly unstable...
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index d3af7a2f6081..e66a21fe48f4 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,3 +1,3 @@
 DIST configobj-5.0.6.tar.gz 33248 BLAKE2B b58a22fdf247f1c3022108e24abb4de55620ce75f6aeb5f269f008a5668e07b8c1d0c49e4059d7f4c4c361d269ead39c3784377635c7718f92c2381e69c56cb5 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963
-EBUILD configobj-5.0.6.ebuild 968 BLAKE2B ed96a0f60f872be6608d14d5fe49209123ec245eb2d1976ddda1b63f719ed81e40d6d6d361a9a9919968bd8db635292bcd287c44e34bcba7f60f5e803d9e7cc9 SHA512 346fb9e5f4d81b606c0c50e680f1cbd69cf155fbcb37aa85330abea61f45a6cada946f3ff252bf66423d0f7eb16a413e081a7eff33970865bb1e2f9650f205ee
+EBUILD configobj-5.0.6.ebuild 970 BLAKE2B 82bf4fc3d240963f5dcc2e29c1d0810e85cc0f27b1302d3a1be95c5cc550c68e7399978329e05280772caa26029915623e38ce0830e288b1aa8738d4bc4c1ec6 SHA512 e4624dea31537884c520977119f3d3119cdefbd53639184f0f70869c859a63ac28b42b215c16eb0ecaed2548aff8595c6a62aeae30407f4f931f878880a49e57
 MISC metadata.xml 663 BLAKE2B e4c20390482c920c99164449489636bc0ce8305f38a96673898743a79bade7b6c09d6c9cb0fa5f7df84dd3791e7b78ac0e685e2c32dadfde1c44ad48f427a655 SHA512 c8c5d8bd7b5efd97310af1bc9dc172f3623f01b45b44c20ca33f92ad0d09845bcab10e6afd704df1188a747660ee4e7f519a55dc40ca5945c189611740e9c480
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index 3874f3568783..69cc5e395b21 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index 6cb3bb467a3a..4ee02038ebb7 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,3 +1,3 @@
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1.ebuild 556 BLAKE2B c93994981c23fd93c12164be16ef2f1ae9fa4d69ebdd41af2285f1e7a934c62042439c6c8a5d9174a19dbd8e455956d78960c739a86585237ba929cb7c154c81 SHA512 de48eecdb19e92297de0ee9e2ee31f3e4fa84c2ce5df9468870c7f79f0ef72f7f8331a9fe572d0a39f7b81b52c40c66abb00c09d7173e0d7b23ec050805bb994
+EBUILD cookies-2.2.1.ebuild 555 BLAKE2B b6329b746b7fadb23797f655f19f01f8550bb3ac108d155bc0a5799a2ad5aca11fb6732847ddd106a3e7d8a3af58c6433fc5315ba72bf7b7114fdb91d00ae1d2 SHA512 013afa45a602cf73448d3346fd8e46a05addaa96bb574a924159879f449ee2385faded53ab23a9952a58f2da3e4d5b0b7c9f35a84c27bbb600abfdd0fb3c1d6e
 MISC metadata.xml 310 BLAKE2B 3f44f9692738692ca4eff801de2fa67bf33220d8b5a94985dcf33c21d1b18b78f6dc8f13bdc42b4edb4afa96a869583c6caa0643190ec68a24c57852c4212d8b SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b
diff --git a/dev-python/cookies/cookies-2.2.1.ebuild b/dev-python/cookies/cookies-2.2.1.ebuild
index 43c4bf93cbff..5c5d5337d9b0 100644
--- a/dev-python/cookies/cookies-2.2.1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )
diff --git a/dev-python/corner/Manifest b/dev-python/corner/Manifest
index a6ceeb5f72f1..dd676bc13556 100644
--- a/dev-python/corner/Manifest
+++ b/dev-python/corner/Manifest
@@ -1,3 +1,3 @@
 DIST corner-2.0.1.tar.gz 10534 BLAKE2B 7ea10bce4c45385aca7083d7276415168e4f2fc900020df5f67a81e86ddcc4f9df5e5aa76270fee72c41395c7cc549bb9630c3b3eb24e0640f10c387adb1c976 SHA512 ebd625ab1e4591b4c21d25ec706c35d37f560b727e1e0d6a79948c4a112ee6f21d3ca30162901a27715074e1345f3bdee1a0345c63e5fec24113e495fb094127
-EBUILD corner-2.0.1.ebuild 575 BLAKE2B 869ec90226a8513213f0c4534742ba54ef0b51ea41e59490fda945cd08eaee32ddc652af31ece8c5733868e68aef9bce0ccadabfd16376f00b33392c5f2e6827 SHA512 eab6455c72430ce61d0ddcb05d899dca3db9197d80c9ce30e1af8690386f2cae7665d51e00537a1732fb577c77e0ab8c167e0bf931cb71b49626f5e36e395b0c
+EBUILD corner-2.0.1.ebuild 586 BLAKE2B 03697dda7685733378ed3b14d84ebd739b2f82a7934f2d258234c335dea44f87e3652330d62ca48339be6c09844e011cb40de355e10772715c886542fb4a2b17 SHA512 a144faa91fe2260ffe7f65ea7374c2b0afae029c8b22129e0f2961826f69307fe2c9994167baf561fdd54470aef8a21a020d494ad579fa04edd1a8b677148269
 MISC metadata.xml 906 BLAKE2B 09ba82ccb3f2d27db911b5cffc81e9255340d262e1cec1ba59c4caaba12e295c6b320b4d489e132258e18a7debc2fa1762b6fc813fbebc55301b3a442922e7ec SHA512 aa1c5cdff441cd455b25ee307f2afcf274eae44fdf5b6cb65d1e5492c39509d5a6edafa32309545c387619f95773bc93d799be160d432cf33bec6eb34d820e2d
diff --git a/dev-python/corner/corner-2.0.1.ebuild b/dev-python/corner/corner-2.0.1.ebuild
index 8b154e743296..0c44d2167259 100644
--- a/dev-python/corner/corner-2.0.1.ebuild
+++ b/dev-python/corner/corner-2.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Make scatter matrix corner plots"
-HOMEPAGE="http://corner.readthedocs.io/"
+HOMEPAGE="https://corner.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 4c40cadd4f0d..41444e8162b0 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,5 @@
 DIST coverage-4.2.tar.gz 359873 BLAKE2B 4bca9c44922ad99203d65387267c62bee02b0368dfd70c758dbed959ebaa1352366603359865662cde863ca1518de21a4d33d22b86b78ff75c2c23aecf4d726c SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23
 DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c979d1f5192a7863a0ab0089f9deb3a8e63a39bef528ed7c58fbcc7cd4bc193fea3a135f5996a6655268a6b7a93 SHA512 0d98c8118648a319ac6f3b4c4c6f1ff8a92085bbe8276dd5504c8df4638933f920d7382d8e6de8e16bff43b62091310e0eab7b7722c6d28c976baedbfae3d03e
 EBUILD coverage-4.2.ebuild 1240 BLAKE2B 87f8b5796ec421adfe04b3608b21594ccea747e4b64cbbcb9d80a06ac7711ebd3331652952a121fe94b1d36645f6236857a9277cfa56610bc66c00835c1a93e5 SHA512 6f939bd5dec5f94964b2a202e0d26e22bf4c835967d3e621d8c3b562394620ee0b2dd235e1b3e3dbdb4f054b611b0f36f8ec161e542db54601f687e9b932649c
-EBUILD coverage-4.5.2.ebuild 1252 BLAKE2B 0d5b7f2efbab33c54cf20ccd6719079f517b12c51186e106ec443badef20e6952596610288a2edea6a01a000a81faf387ea57fa7840be06a4f728faa5939026c SHA512 91ae49543ca3fad623ef42bb5abd9fa298630be0455e844abd29ac4a7b9c8602e7446ef110bd6a0ea760cc9e5cf023ec27c51e798f96d8e9957a8dc425ae0c56
+EBUILD coverage-4.5.2.ebuild 1239 BLAKE2B 51a0d9a645f03afef75a30e5b91b6a324bb88013205b5eafb5b9d50a54b1ebe37b321bd9b4d3ebb8ff0464f29244eca530e7bbcceb6eb8c653f79a6160f5bb1f SHA512 382e62271050ff95881bfa60d5a66fa2cb4388fa48766a0f94c8a540d42e5c3dc6517dbcff8c66bb7439ce4a99938e3df80aed99cfb9ac2ba3e3be778c5ec526
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.5.2.ebuild b/dev-python/coverage/coverage-4.5.2.ebuild
index a392a63643ea..f3dd4a6dc0b3 100644
--- a/dev-python/coverage/coverage-4.5.2.ebuild
+++ b/dev-python/coverage/coverage-4.5.2.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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 93ebe87f9b3b..6552bfb6ab26 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,5 @@
 DIST croniter-0.3.17.tar.gz 17362 BLAKE2B 59887df1cb1464046612fd87bf82575355361b9baa934817d92ea17ded6a440100015168d7622952a218d96d6f8d3a568ebdcde85f2a7ddbe8a31a44b201b3b6 SHA512 4215fc7461843cc2c62fca05424d5eb7d0c80c21cc1e637f5ce3c4891da458cd609d6ed501fab7fe244bbb234e9834ec8a12b76289eec10808ed6c30c1b4d45a
 DIST croniter-0.3.29.tar.gz 20276 BLAKE2B 951b9f2e998be496420dbf08e06a60a0eb3eb8538d9e63bf11182bc449bc49eaec36c1d1025269974fd0ff24430e16c3cf410d2b50873498d077ac22e0b52fb8 SHA512 0333e8d801aa7453ea6bc2b49abcabb24390535eecb5af2050512cf69410d21179405ceea14b8037c8f107321ee53a10c6060796c86c9b24ae48af65068e9b87
 EBUILD croniter-0.3.17.ebuild 705 BLAKE2B 334c85369f1742c53af673b644a8fea6ad2a9610431c5b32cbb741c207aa9a61f3988d818d7838e76f9f5329a23b873270c39b2507b55bcf22cd45192d85b844 SHA512 64bbcf594eadf1ee101dd2c959c79665c42a31eb69ff419c72ee22a913ac2b3977382558131d3ed5850b07b62a9150ebd4cba71090ffbd5c77a183d50edb5a44
-EBUILD croniter-0.3.29.ebuild 709 BLAKE2B 7e780000b3e15366d15467805f9ec8ab3cf70322561212aad92bab87c7019ea0dd518370b7528c32a69fbba724e326c6e760ed3fdd22b0c1283f63e92f82d504 SHA512 5349f4d0d96aa8b6a597c7170446de0b69316262e23855509527be9174216661c1b72e557fd63844241df165d62237a2c20c554fcb37f6969b3a1679d6e867d8
+EBUILD croniter-0.3.29.ebuild 707 BLAKE2B ab0d3248a765756c0fff00acf15fabcc87b5921a7537af27c17049a4755b06cd0f7f9b279f3880cee8cb43346761c27b059facebd1f8f453fcdd7592419baa7d SHA512 0a74da3662de834545fbba5de8d6b9ceb2f4a06745b9d0a74cf6348980712c60834406e66a23b6447382ea19bdadb6b96523bd7c44c94e5f0efec47ab65b18f2
 MISC metadata.xml 344 BLAKE2B 1e0acd7a1c4fa483433385eb74da9459dc1348f00cc2bde0d8f5b98a0e298f943628252e15d60b1a3c1b2858358ac6a7683394c51f0e06f3467accaab2af6ce7 SHA512 13584ced1986613a6ab7550b050531bb5049b8f0bafc6dd59045620744513d785635aef91f5300cf9eb302b385e6049107691201a866d51061ef2411a24e9a2b
diff --git a/dev-python/croniter/croniter-0.3.29.ebuild b/dev-python/croniter/croniter-0.3.29.ebuild
index 7bc1326df135..456ec41e07f3 100644
--- a/dev-python/croniter/croniter-0.3.29.ebuild
+++ b/dev-python/croniter/croniter-0.3.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index feb42fe92a5b..0f0f68f2a21e 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -9,5 +9,5 @@ EBUILD cryptography-vectors-2.3.1.ebuild 708 BLAKE2B 4af0ac29aa18a9981687c97e39e
 EBUILD cryptography-vectors-2.3.ebuild 706 BLAKE2B 232c46859a6bc10de44db964149fd451e9129883f44ba2972354e13d957e512bbc47e2fb71717282bf7b26712ce3f966d3821a374b5c1b08f7cba33c8f885e6a SHA512 7ad83b772e9ec0a91e9d512663d3b2ea00916e192f8deca2dce09ae909432daa301fc6f0dd3e46f67764de7dd606ddbd79ab51600e26f2fd52182678fbd53bd1
 EBUILD cryptography-vectors-2.4.2.ebuild 706 BLAKE2B 232c46859a6bc10de44db964149fd451e9129883f44ba2972354e13d957e512bbc47e2fb71717282bf7b26712ce3f966d3821a374b5c1b08f7cba33c8f885e6a SHA512 7ad83b772e9ec0a91e9d512663d3b2ea00916e192f8deca2dce09ae909432daa301fc6f0dd3e46f67764de7dd606ddbd79ab51600e26f2fd52182678fbd53bd1
 EBUILD cryptography-vectors-2.5.ebuild 706 BLAKE2B 232c46859a6bc10de44db964149fd451e9129883f44ba2972354e13d957e512bbc47e2fb71717282bf7b26712ce3f966d3821a374b5c1b08f7cba33c8f885e6a SHA512 7ad83b772e9ec0a91e9d512663d3b2ea00916e192f8deca2dce09ae909432daa301fc6f0dd3e46f67764de7dd606ddbd79ab51600e26f2fd52182678fbd53bd1
-EBUILD cryptography-vectors-2.6.1.ebuild 706 BLAKE2B 232c46859a6bc10de44db964149fd451e9129883f44ba2972354e13d957e512bbc47e2fb71717282bf7b26712ce3f966d3821a374b5c1b08f7cba33c8f885e6a SHA512 7ad83b772e9ec0a91e9d512663d3b2ea00916e192f8deca2dce09ae909432daa301fc6f0dd3e46f67764de7dd606ddbd79ab51600e26f2fd52182678fbd53bd1
+EBUILD cryptography-vectors-2.6.1.ebuild 693 BLAKE2B fca6d15447ed2bb690c11174eb7232611c0cc5fb71c064a7902d847fb6e94519961c3a0fd0d6784f60511ea8cbeebe73b0e2f5b4f85f520f9b439dbda02f8506 SHA512 cc88ec4012c7faa0d19a4518773b8225aa0e88fa739fa02ceb97314841062375cb9e786a830d6b1f519ff69ad5b518a8d20c19709ef7b8d3bfcaa1a72560f1d3
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
index 81b79f99f0cc..dc0a39a494d0 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 7e34eb505838..fdd627efb4e0 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -13,5 +13,5 @@ EBUILD cryptography-2.3.1.ebuild 2162 BLAKE2B 107ab46113d303cb65ea7a525dc52cdbe4
 EBUILD cryptography-2.3.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
 EBUILD cryptography-2.4.2.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
 EBUILD cryptography-2.5.ebuild 2132 BLAKE2B 1820f42eee23ede2b0248a3a962493030873c50c82f46dc76bfb56fdcfd7097ba3fbd078694a0ac19178ea5b929a2a31d8e4ca30f5e25fd3f1397243b1f6ed19 SHA512 a3bef75e92e4ecfea739ee7cc8f94179577bfc2d99d4ec7a5ae19a3a32afd50a0cefb0b83d2456e1f7b3c1c427a718702e70b3a16648727a33f10fc99c122146
-EBUILD cryptography-2.6.1.ebuild 2227 BLAKE2B d448b0c080b465f1655f246323236597d4e9b23552a79851eb635577aeed26d73203315558936f9a86ec377abf000ea8cdf526e472fac77707f9e43ca74d6df1 SHA512 508dde227ecca8845ccb0f1d694becdc453cb126e95b75241b871f49a118c93e7aa7d451f42160e8ce3d96484baa31d65be43b9f5fd15db22a5d90608bfc1795
+EBUILD cryptography-2.6.1.ebuild 2214 BLAKE2B d51e32a3c2db9738d4d23161f1edb549e545af19a613915daefc532d712c92c8e74e3770960ba2a862c525ba6ac2fc03ee109ea246237970fb2b461ec83a97e6 SHA512 9ce23cc07f0f1672b716c10eabcf84eaf76329b82f5da0d46f7715c9e150a9f15ede451a6f404a2c24b047a239339d34dffc86fe9bfec09531a329c33d77ed72
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.6.1.ebuild b/dev-python/cryptography/cryptography-2.6.1.ebuild
index ea8da08217f5..cbaa768497c0 100644
--- a/dev-python/cryptography/cryptography-2.6.1.ebuild
+++ b/dev-python/cryptography/cryptography-2.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index d4f54e635b10..d4335f8dae53 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,3 +1,4 @@
 DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
+EBUILD css-parser-1.0.4-r1.ebuild 456 BLAKE2B 7058f61f5f8ee1ba29a69de5fc522f8a45d94b114146966dec43f569a7c092cf1d99fc77c2577a809458a9d4a2bc2a3e70b7df6c04d34f654e36993dd22da1fc SHA512 3d0906af51d8b800cd4ec1711305eec4fc05195e4f6ce30c244723134358abd64af0aa1f4e651fd03ed5f077a9b183b3e29ec103fcf702100bbb95c73637ee3c
 EBUILD css-parser-1.0.4.ebuild 513 BLAKE2B 0f71bdb613060632b0aa263ad32a1dff6f1cfccd2622c1e5b08dd80a990b27e79e29107a5adcb53baa378b5418b78d1afe7826352c34701b06a76b73ce53e305 SHA512 42eb2bc62415953f4d34cb550380c5c1a26fad3d34008be88b77a43086d3fdf3f6ee3372cb518080f74c778c5f632b5db10690c0d54852ebdac4f42e84da93ca
 MISC metadata.xml 313 BLAKE2B bf6a2cf19a6d43b19692e4d932d695a811d10530fadb6b33a6f329be4ce815bb36ded2c7a1b3b0081237543954972d58ae115576d4ff0c3d4fc0309fb77f3a58 SHA512 1ca073d67b4f5afa950071e961b091993c0f14a66073e28f33604bc5cf5820d9f4701901d93f8db46a91b1fb6b7a05b8164a749823e2c59959640e8771b3126f
diff --git a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..29254e698e30
--- /dev/null
+++ b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
+HOMEPAGE="https://pypi.org/project/css-parser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cursive/Manifest b/dev-python/cursive/Manifest
index 54453e23c713..65e17ff8b8fc 100644
--- a/dev-python/cursive/Manifest
+++ b/dev-python/cursive/Manifest
@@ -5,5 +5,5 @@ DIST cursive-0.2.2.tar.gz 43065 BLAKE2B 2c007b357c3cd1d560f74958b78d157c97301b8c
 EBUILD cursive-0.1.1.ebuild 1024 BLAKE2B 7e15004a489ad21afdfd4facfe2ead777f5b6356bda08578c566053a563e6d3be98d09215d8469d7104931e5b7f0134d0cb89a1da71b7c57bb3a07d48b61353b SHA512 43cf103dc618027012d545c4a27e987d7c3461aa2e808eab479e212ae0a0deca504d467a52565540fbcf34e472ad76b89c45b5553c6cfa12ec64e990b87d332f
 EBUILD cursive-0.1.2.ebuild 1072 BLAKE2B f84019d597c2ce7639b15019556a3e1c057878f28812efbeeeb23450605625a750a9f450f029d3b8bc920ccb8a23a8eccaba75054104ee48baf65cc412232fbe SHA512 ab4b0a34b69341ada7eb69088e4ca75b78ed954618f01cb966ec6e896b4ffdd647e579f0f3c4e8880e7cf7d62d3d04bd6d34e4f9f268a801a7e14183034894f2
 EBUILD cursive-0.2.1.ebuild 1076 BLAKE2B 06f46d3c096ef59f06d638819bbc46c06d5c03257143204cd29041525178ee03ce1d9c5df1a218637f5ddfa44f94f53e66bcabcaceb70b0af0ea5061b3c15f96 SHA512 7d5d6ce6306737317d1a58713df1aba9e725f380bb437479be28338af8ac445f2f0db42528a695c7cda60b36f6743dba98000794f5cea8727603f4ed0942f170
-EBUILD cursive-0.2.2.ebuild 948 BLAKE2B 756132d07dda4feafd47974f3039f49d9797c475dafb7cf6d597115df1833d0d8a04a454a876b20ee8874ba21bea92c3d94b013526dc8bef365816eb4f6209a6 SHA512 803e9f33fe5a14763a01571c72d410eacdd29aa9bfe68a0a32a1d1388f7c319ec0060254e4e75bf3558ca3487b47e56ffe5067a725c84382839fe3150973f7da
+EBUILD cursive-0.2.2.ebuild 946 BLAKE2B 95f13dbf597295fb1aedfe3856da156873f5d2158864ed916cb896e7f65d070c9dc857941cf42819828a57c6298fbcf0bb173902661dbf0ede7f2e6b02b67ebf SHA512 b1165d9a306d4988be4da92baa4e3caaa6dcfe4d13f6fa0f67b115486bda0d786827b8f55e38e34cf46eca48c69bdebbacee0cfe540366d9934cf1060da98511
 MISC metadata.xml 633 BLAKE2B 7b363a0b8ced131965cfbe2616dd30d3608d3d61b1c402b1885eea0e10c379e5d82e87e15abe1d805349ad2d99b94a2c2ebc2df7e8df7a5a095a4fffdd174c52 SHA512 0ab2f1ce6ef8d6e2a53a9dad20c26a26beddb6738857e3cd360362e0c1ad1c562eca6551cc88bb8ad4a8e08f621224934a4476b1ff22aee805dfe6f1ce352c6c
diff --git a/dev-python/cursive/cursive-0.2.2.ebuild b/dev-python/cursive/cursive-0.2.2.ebuild
index 04731d725b2d..d0a0d192a7e0 100644
--- a/dev-python/cursive/cursive-0.2.2.ebuild
+++ b/dev-python/cursive/cursive-0.2.2.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=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 99429a6ed747..eecc3dc101ea 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -2,5 +2,5 @@ AUX dask-0.18.2-skip-broken-test.patch 1349 BLAKE2B 8ebe780c900407dcf9052828059b
 DIST dask-0.15.1.tar.gz 2147022 BLAKE2B 79c3355e8f3c202e598b32ca057c237d07db283b04b99ea713a820869207af9f46cb80ab58c0a058ac327873851f2d89050a4b9d7ecac3c1e1173f6be5349848 SHA512 44e7119c2a8d15efb89e265e5752edb117dd06da8a5e7511b68c5859e9068aedb3595540645304f0322f869c83df79a497d731bcade79612f8fd3f4eaaf3763b
 DIST dask-1.2.0.tar.gz 2381831 BLAKE2B 88d48b9bcd4444dfe066c8049eae2a8b65e6ae1a7e4f4ff89697c254efc365091a61b298333b0f8d660cc9f760d3960a355beafde2555dfd912606dbe4a49db1 SHA512 c00886768b331f48ac9627f81c39368afbb4f1083ee9f7e3ebbe64352cc48c3c580fccef8d5466592f5bf772f873bef2ac084a972d30e7c1b4d1028e1d456059
 EBUILD dask-0.15.1.ebuild 1081 BLAKE2B 17d861604a85af431910ce38682075eff341482b1aea261a932b0db8f626349a2cf6f369adc5888d2fe99d5ef599ca4dc2082cb9ec638335103662707322cb55 SHA512 4f06aaec93231e040d56c61c36312c1d82688e268d65173a64207348d6a2dd9b7c5b48b65a22cd22242a7d2751da513aafd5fce885c7bd4529cde170309725a2
-EBUILD dask-1.2.0.ebuild 1191 BLAKE2B db27c783bf8cfbc8b7aee4bab01e1cc6d981b9d222bb78a59a9974f5fc3313f1b005fca2311b595477a53bd352297d87d7f8f5fcbed26241876cbde89a42e332 SHA512 2cb37533c55e614c6f15b6daf7c51d6a6da0b594eba8ac249cd50fd3dda3d48049afaf9e2b38105d476cd236bcc5a3d326895db075c4441299bc6f2c0dc2c5d4
+EBUILD dask-1.2.0.ebuild 1189 BLAKE2B f165198f51404f050ba03eb826710e8432433ae9ec46a5f947c63c6eb379510142e52e356419f113f396b96ac9717be9e81edccb6f3f4846738e9ebfa234b843 SHA512 1ad2d9fc1a9f3706946c2fa2f5b2fff6c1782a1be8e2228315a262657b3f0b3297c970988742c11aff043f5ee53bb782b72f19ec20259aad7e46d61ee8455278
 MISC metadata.xml 777 BLAKE2B 5574aa56065f36366ee721e25b1bfe06127a22a94666bfdcd1b62e4d03456948bb22db23f64ac7ffbab9816ad508f97fe23a2c9a0e34cd58a61946c6098585d7 SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850
diff --git a/dev-python/dask/dask-1.2.0.ebuild b/dev-python/dask/dask-1.2.0.ebuild
index fdc031a5b83a..2b8195101a62 100644
--- a/dev-python/dask/dask-1.2.0.ebuild
+++ b/dev-python/dask/dask-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="distributed test"
 
 RDEPEND="
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 9e1dba8ab389..f7769ea42cef 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -3,7 +3,7 @@ DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e230735
 DIST dbus-python-1.2.6.tar.gz 778893 BLAKE2B 1587bc9b1795e5c416397468b2061c869d923aea0983e604862342b27d37b946b1fcdd3bf07a612dba30087bdc6a5fa734906188c55756edf38d50eb67b7eef6 SHA512 6f2aec81defd2528d9876ec9a83843f8767275a5d6cf1b2b7b7a094f892f552f9a7b3d7b5006465254d410e503108e10138d7dd4cb3f1a4035d7f8d58c4d0684
 DIST dbus-python-1.2.8.tar.gz 787426 BLAKE2B 186cb8b1b25b2d2d12ab24ed304819ef18f953232d321bd425e7fda632c79a5a94f7b4118cc09f1bb13a0621980af67b4b55599fbbbcaf0e95f7912f4afd0a2e SHA512 6e486fd560944fc1461a27e6798e2c348c7fdf351602c082a0614c0a6822ff147875212bdcb1f818c0ab12470cffc613c0ffbd292cd9d445d3429bee65765905
 EBUILD dbus-python-1.2.0-r1.ebuild 2205 BLAKE2B c8ae4fccaebb5f744e7de0b6e7d9f0e3fa33b831e87ee86570e5e5b1e35c734285f90f4b6e86672d2eeb396e457909f655dbc4ffb92d560be95e911371085102 SHA512 c9eb2fcc1ad24cf85190fdd6e54bf8297738292002703446e976c5aed31c977ab4cdcfa04c7630173748c8aceb173302bc07c24d0e6b56179bb4556bba5a5c47
-EBUILD dbus-python-1.2.4.ebuild 2223 BLAKE2B f7305f685746abfc8cdde8e60ed5392de201dadbff314ef68be3397660ab5b233a1be4e56f03caf05b0ff6caf52eb11848d4dd3ff2425bf80e9149cf38dc4d10 SHA512 215ac4212764aea64ea9e46ab71a84b37974cc3fc746f762273f3ed844d6b42fa7ad88be6e4b7d4d384a88835b80816aaf861a770cd19d135c9080b8e0ecb0bf
+EBUILD dbus-python-1.2.4.ebuild 2222 BLAKE2B 0ca1d717637d10a0b67680fade35943174a7d8e21ab86a31b9071dc684da9cfa468a5c416bf4b5be0152992176a7715009549c4d7a58ba1b7f303425ef24e51c SHA512 0cb41410eef57da1bcfbe22a5a9c8c501639bdba1889a536e611e74befbc3b17bc613ae42f438d5edebbcffabae301d99414cd5d903013ae0f6c9e2ea4810ab7
 EBUILD dbus-python-1.2.6-r1.ebuild 2349 BLAKE2B f577bc044bc06a0e2d3ea8dd6e938521788142204ad9737b8590638033c0fc5e576871fed3b92c82993da9f0ca3c0f125e375c24126842a973be76f7b71c6b77 SHA512 e331d2330a4646e5fee159eb2fbeebdf4bc768af462e1534dfa572dc491a7a7fb7ff7bc628f4028acf3c0053f63878e339cf337ffc8f6cc7e0d39422eaa854a3
 EBUILD dbus-python-1.2.6-r2.ebuild 1890 BLAKE2B 8a097ba7667768f84768548d493b25b7fda6c1cbf408749b82b20f97d5b1e4f8c56aa69f3dce58d787dcedfdb41f11ab33841be94b5e64cf26bc072dd48fbf07 SHA512 46d81d1c9cc7ab4b10d99a99718d90780a1e6404e0b4c65bf10aa870b138fadc6475519652d3b53c4d8b6a89b38d941355ae13f5696e4ee35f54d32c6164d25a
 EBUILD dbus-python-1.2.8.ebuild 1694 BLAKE2B a4b320db8dd1d7237dde5907d309b630823558edd9d6570ca9837e51785fbbec16b95db5ec7d0ac6b739417d067fc472082cef6579ff18bb2a2ca2533baba934 SHA512 7d7cc62469edb5508c1eed729b2022f8fb5cd9b15f0ba5265cd5484a9dd59bd96a8c05dce1aca18dbf1508b0f44fae08889817ec0d07d53dd6c0cd161d0fc488
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
index c44352f50c3d..57a27fadf0e7 100644
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="doc examples test"
 # API docs generated with epydoc, which is python2-only
 REQUIRED_USE="
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 1ecbdab836b2..c235b3c57ca1 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -4,5 +4,5 @@ AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea53
 DIST dbusmock-0.16.9.tar.gz 71014 BLAKE2B d1c0853cfd06848f1d10afdd8de764814054a44080b44e1ac2ef3a1658a538f1e4c7f5936d65658c16da33ccbc2e94f35d2746f200fc6791f645e1eccc55f6fd SHA512 3aa91f6ede054ed3d3a69f68f3886094e881d266a8f09c7d08a34d10b080a77facde8aae01e75232472c2e643574fe897dae2c3588f5ad9ecf4ec4e67f404f54
 DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
 EBUILD dbusmock-0.16.9.ebuild 1066 BLAKE2B 9df8f24c4231843c9738982b1836135f8852774bbe5de4b102987594973d5b9d8d23694aa36447cd0246d415e2aa9d4c17db0c423ad2255f2dda55445baad209 SHA512 63c6f73a03800b347c54dd6fb1f060d942e260a9230fec805344ad486d2443d39fb8983427dd8e41cf59048599d95e5ec7d0c65f6766f8bdeace873e2bfc328b
-EBUILD dbusmock-0.18.2.ebuild 1051 BLAKE2B 5c2c5ce9ad9ade4dac4adb1605ee3d18ff1de354c2343202bbffc1ca5243beeacc1b3d329fd866c48043cf9ef4ee09ad5d4e1bc5fe50231d4381e6ef6a55c192 SHA512 16ed9805f2e02864fa0064ba40c5f8976ce23130b7450c992b4775c28dacf3b2d64adea2dff340d55ca07155ac7c63b21248843b9bf0110368c1e37636009b0f
+EBUILD dbusmock-0.18.2.ebuild 1049 BLAKE2B cde48334778f85cf75d6889c690c424f19c31c18a001f01f4d3da40187c7f8b0e6861686be9362c6d1e24df3bbefa814e4068cd9b0d9bd6629b25c3d5748559f SHA512 2c2563e7a538b8e833609960ba73addd28259b3f098538969cfbef30b083a9e1ba108cd06a8c70056562b65210f75b18d04217d1dd9ec06f7e3d705df951f10e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.18.2.ebuild b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
index 3cd2af8c38db..d6f08eb0071e 100644
--- a/dev-python/dbusmock/dbusmock-0.18.2.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 01737d8dfa9d..6dfb4d76ffd6 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -5,5 +5,5 @@ DIST debtcollector-1.21.0.tar.gz 28472 BLAKE2B a7c4a2d41ff6df1df1bfc2b775d888c1f
 EBUILD debtcollector-1.11.0.ebuild 1852 BLAKE2B 1553b7761a4869d42a2486d63ae660e1670c4d6d5717f039ad0c48883b4aa5ffc34539315e9bf5a7e60a403cc1f53dbb810c3701d343043ee387529cfa0b6bd2 SHA512 c3ddb9c2c72a692ca7dd5338dd14c0eb513c0e31cfa6cfd5a916fbcad6f1866af03599a89f910e1b5e3bfdb3ea3a203ee213d3fc300b34832813919cf52a193b
 EBUILD debtcollector-1.17.1.ebuild 1994 BLAKE2B b29f473ffb14e47606dcf5362d34c3f121a6daabd37e40ebf4302c894be8329e567a572bb9548006c12beb3d35e5a23d25083220591b23fbba391597d82b1f95 SHA512 533805910ea7d689a5002ebd9b0cd10e352427e3fe0a7480dd62e95b4bd3cb077170aabddd79e7623a1569b848675a9994f31eeac4e5131f7537f3e35ca2469f
 EBUILD debtcollector-1.19.0.ebuild 1866 BLAKE2B bca91816830a28179b0d58a09a004f0d5cba1cd56a68b3b41900d596fe8cb874d69f497895a70f6da3be52a17d21cb9df87d0a544cead07f8ebf100e762f89a4 SHA512 849aa668ce6d42e765db5866e71d737a1067696808c7010b756017454756d6d55622e0aa9585a265b9fcaeb7ecab9843f68122a592b6425817c415072bf9a87e
-EBUILD debtcollector-1.21.0.ebuild 1950 BLAKE2B 6e788b695be0e14aeeda07abff7c9ed5ddcd29db230e0812344adce36bb12ed5d32fc23507472a782bf40cec7934aaa9d3d125e94d819d6212df4a912411ecfd SHA512 e92addc9cf2a42ef837ce5b8486a5cd837d7428b576d8f1e874f45b507d9895ea1715249f04f6ef485f9a1505c37b8785c5531d5e63b757d9ffc7157c09788c8
+EBUILD debtcollector-1.21.0.ebuild 1948 BLAKE2B 3882494f922f50664763cd4870104309e1b9d7155317edeeaa353cb3092e309db8a0004cddd6fbd54566255c944ce555b1f58193c5dbcc846f8fe2ed9dfcc564 SHA512 5006f673386a3eed7c440bfcb78309fe9114105d5260e0ee33cdc16e1e7a8c79e1ceb227c0659f81a8827523a7770e77eaefe17649caf947c09d6709a6d1c8e9
 MISC metadata.xml 330 BLAKE2B f67815c96ec5d1c50e57e80edcf471c38482eab644d201f4f1d4afa9a44941aa26cf5151d74ab2be666514454a3cb041cb1cf31ab22b4c4efe01a4a57ab5aa75 SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268
diff --git a/dev-python/debtcollector/debtcollector-1.21.0.ebuild b/dev-python/debtcollector/debtcollector-1.21.0.ebuild
index d14fd9b35287..1cdfbb6e143d 100644
--- a/dev-python/debtcollector/debtcollector-1.21.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 4b37bc28c7ab..0db9bbc58ee0 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -6,6 +6,6 @@ DIST decorator-4.4.0.tar.gz 34559 BLAKE2B ed8cad0081ca47cef15f30d10afda1d19dd496
 EBUILD decorator-4.1.2.ebuild 782 BLAKE2B 477646acd03c6c5a6384704b589cb2ce6b669820b731017871108da4180cfaa56328c8caca203769c49a7a149082f8d205ed17647d9ad5d7fd8cc6b1c1e9f677 SHA512 3aba4077375414d56e1b18a900d840d5317b9389cb37cb301abcc62676ba52208fd5a4a6640189c6ffbfc6d99bb690da4ed001efd23ea14947031e2cc2a1f99c
 EBUILD decorator-4.2.1.ebuild 782 BLAKE2B 477646acd03c6c5a6384704b589cb2ce6b669820b731017871108da4180cfaa56328c8caca203769c49a7a149082f8d205ed17647d9ad5d7fd8cc6b1c1e9f677 SHA512 3aba4077375414d56e1b18a900d840d5317b9389cb37cb301abcc62676ba52208fd5a4a6640189c6ffbfc6d99bb690da4ed001efd23ea14947031e2cc2a1f99c
 EBUILD decorator-4.3.0.ebuild 731 BLAKE2B 6619ef97522672b13b33303fa055be62b4393dfe2776f9ce1fb065bcbe42d7cb27e6dacfff1d68600572bb0045929d8fa8d6f514e213ea129b91596a3f1005d8 SHA512 d30691e6374b2aec3027022d0ae8f5ea73935b9073323dcbea8215dbf3394abef89b8fa2c46e9b16d3fdf77d50c8eeecc10533db66301241b3234a4ca7913a51
-EBUILD decorator-4.3.2.ebuild 725 BLAKE2B 3f57dc154b9b368e2e6108363731aa7d5df2cf459ce5d6a3e52e0c96cae850eb6439cdb5d4dfcb963575a587e2136a3173da85866f3662c70c92916c0f177567 SHA512 32494f9228249ee54363156eef624bd06360064f966a8a43ec1aa426de2745dbdb5828770d64a508595d7939c0af461c1cf46c17afcfaa821ffe1802f3e39633
+EBUILD decorator-4.3.2.ebuild 713 BLAKE2B 796d7f268e73e361193671759bbbea054782a61c121c40fb5f871a81a91b91db290f98954e2867b3a2c6cb1b614a838b7e6c764ea748c583c74414a88fac7ffc SHA512 6bc9158b9407de2d006bd19d7e6cf6b5850bb1c7982b3f803253cae01ecd23b47fd8df2c92df38367edcee618df56f1934427db3388946e87d5adc68093dd557
 EBUILD decorator-4.4.0.ebuild 674 BLAKE2B c42ad83422951c593ff1fcdf27e8c84340c74d1c26a09315db19712a52815dcf5d76d10fe8b62bda1cfe310c33005f5e11fc0ce2e7725d9c3d8629a0e84a8c48 SHA512 35158d280f742612e80df979607f83e49f43b3712a24a5e18a243669e7a33474a14587288ab3476546f7b790906693ab9989c3aba1baad1667820080dddd8c18
 MISC metadata.xml 731 BLAKE2B 9dcc846096fd68b11b1af0259b9707ca288b962a871c50b1701dba0e00011db27d3bc17970310b57b70301a51f083d41a3f6659ced9a7c34e48caaa60333af25 SHA512 6df81157bc757c8a8218fd75a28165cb8349d5a17a320db78582311d614a4fd586cf928e4d1c2158d8fa96cbc6537e26d85524839b688e82b29e5d7997819219
diff --git a/dev-python/decorator/decorator-4.3.2.ebuild b/dev-python/decorator/decorator-4.3.2.ebuild
index 71607129b028..41d1fe420423 100644
--- a/dev-python/decorator/decorator-4.3.2.ebuild
+++ b/dev-python/decorator/decorator-4.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/distributed/Manifest b/dev-python/distributed/Manifest
index 78778ced6c36..cdad6671f567 100644
--- a/dev-python/distributed/Manifest
+++ b/dev-python/distributed/Manifest
@@ -1,4 +1,4 @@
 DIST distributed-1.18.0.tar.gz 395888 BLAKE2B a1f84f93130b4e878d2b6a2059e71330fd10ac7be2c8e1d3fa06984e34dda4984180f496b9513f531ae21f3cc978f71f8e9492fcd5d644613a7d9ececcb5ecb6 SHA512 3603b22a454c7010c64fceb79b4aa024476bd038f4c27585c8f2dd51a2e4ace1c900dfc7c3bf096d4274be985003b72e9bd16af7b351ec9a65c6712a1f5e39d4
-EBUILD distributed-1.18.0-r1.ebuild 1306 BLAKE2B 3d915acf64d25470035720416189c43218947428c0632c374bd38bcb002641d92f622a8bad4e64fb62bfc36ee43f7ea2d7077951a9d2f602996e94a784d88ec3 SHA512 a92cdb2f203f350ef57769e5c6396601503fd5c4405e11dbde8421cd9c1d22bbf9694fb945854da7e693f732993734a4449aa164438bc0171dd41c5e6aba28b3
+EBUILD distributed-1.18.0-r1.ebuild 1304 BLAKE2B 0dbfd61ae8e4a287703bc544a9bd65311d5e7ff5b53fb154a15037c1977356f0a31c5cb4d779a7dce85fa8084b0e09bc40a5825bf9ee03f630a439fdec21fc01 SHA512 86529387c35148dba0f2806d69e53c0c643dc24d9b5c5b66c1027dec463704f0f6d217b326afc225cc910fd65a812e2a58ab95eec803993404770afcab2683ac
 EBUILD distributed-1.18.0.ebuild 1322 BLAKE2B 2b607c58a02adebf8160d16dea34bb790b9734a2c65867b048fb784b2b119c6dd347bd684397d8b8c6f8c951b9ec1d7a9392409c65202bce943a0f8df47b98ca SHA512 f43d9b5c6de4def3cfa90c6ff1811600dce66daa4753230fa23e87e05bd0825c6d6b0f146564b53702abc902886134b0ff2cef80a1744fbcab24d35ec6b298de
 MISC metadata.xml 511 BLAKE2B cd7c1cbc44915c6a922c188703d69260c85f0f1d4a97606fccec97b2d11deba4ef25f91dffe7fbd407a93dffa4f69f50f9289d948ebf4764da2980acdebe5ffe SHA512 b512481cca22a1dffd5620312825bdec9348b1a469be61874211dd25befb2111fab1ea79596087f5226b053a2ab660174508828d5300de9ff24119880995a296
diff --git a/dev-python/distributed/distributed-1.18.0-r1.ebuild b/dev-python/distributed/distributed-1.18.0-r1.ebuild
index 081787d638eb..9fa13dad1476 100644
--- a/dev-python/distributed/distributed-1.18.0-r1.ebuild
+++ b/dev-python/distributed/distributed-1.18.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index ea75bd94d302..7428b39e87e3 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,5 +1,7 @@
 DIST dnspython-1.15.0.zip 252157 BLAKE2B 6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9 SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
+DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
 DIST dnspython-1.16.0_pre20180731.tar.gz 182538 BLAKE2B 3a472091fccc4f37d65681727643677472837fd6be0c4fd6aaa13afd1fd4362eb27a5ba4ff6babca46fe15c2f5318ddbba22ce058b522f763baa797e1e2d1ab9 SHA512 67d17ab7cb48c370c3c2dd5cb935eec5ab7e3ac0c912e179931f395899ad186ba869edd8b870c043ba9fb3545bace18549d2a377f2ae2c278660fc488e68a20d
 EBUILD dnspython-1.15.0-r1.ebuild 1030 BLAKE2B e295a0d3dd2d9a3a9119b973d0dfeba069474ec810c14dd8769f2736524386de3980c4eaed66702b4ac5ccb5f550f1a6c8e01391f6a27e1106ef64a9b8b3d0f8 SHA512 b9096e129cc0fd5c2fb93a1b9b4ed4415cbf091a9033de170cacf9bb770e7912d7449def6561a570473f9ceeea2f83563373e43a6339a29b475295f4724f6233
+EBUILD dnspython-1.16.0.ebuild 1162 BLAKE2B 5c861148155ba2b2aae7acb098fdf58868ceb19357e5e717624ae21ca3a2d329b65e50e324e3fd096c25e2fe46155b467461d548439e28d0d835cb273cfddbf4 SHA512 3fd3ce2a9a9ca7c97c3704bdc6f49eee63c9ef084b802326a31b750c1d042dfc5a7303fb4e17ab3fb67b371eef2102420be513898a0b8c69cf3d0a8b3dcba980
 EBUILD dnspython-1.16.0_pre20180731.ebuild 1224 BLAKE2B bd50703c79abc827e745ba915aa103b02bda0550cc7901780be1f428145e6f3df0932b1c5a2c645f5a827525ef95c8000280c7a879d847c547566b43435e1006 SHA512 0ea74618e8e37584056f1e83def3e7ce86920b67bbfdd1b7387acb7f629fdb27c0cfd0b39694dea41aa02b5690da2039e766bcdaa3b7cbfbd70cc270b2778dbe
 MISC metadata.xml 1458 BLAKE2B 9a04546a3cb62f7ed6a72a8416e7f38aca15733a444970e84fe0134d0097eca4ae8fab9433f66196539de66a4b6b92103a4531f9248cf508a2e0f4d16c85c172 SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d
diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild b/dev-python/dnspython/dnspython-1.16.0.ebuild
new file mode 100644
index 000000000000..99bce355fb93
--- /dev/null
+++ b/dev-python/dnspython/dnspython-1.16.0.ebuild
@@ -0,0 +1,41 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/"
+SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples test"
+
+RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	!dev-python/dnspython:py2
+	!dev-python/dnspython:py3"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# For testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+	einfo "Testsuite passed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 54ea6218e4a1..c335a811033f 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,15 +1,11 @@
 DIST docker-py-2.4.2.tar.gz 180890 BLAKE2B 57518a0c8481fde0198100354225cd8a2908af6d3ca2690d98ad80b386ca4c688c7ccd6a34634ce04fb5ab1553b6c0dfbc75d28333a10f28de7188fe2ee7ffde SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2
 DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
-DIST docker-py-3.4.1.tar.gz 207885 BLAKE2B 472f5dde4761b02a2b55c64762a0529dbaecc8aa9f0e24c67770f533341a5ca9c7322bfacba81f99f9305f09d4e5f7d7ccf37201f5e987777c33c6f81552a807 SHA512 447dccb9129d549886882e6cf0a8ac56d91f7ed57b6aa1dca1942c62d70dc78b92184cbdd9ac5f3445be04cfaadf0b4fba191fb70e223e93c6d1cfbfd334a397
-DIST docker-py-3.5.0.tar.gz 209142 BLAKE2B 56e4400e1f67c870274eb2fdaf84edeac966a1486366355f2697f0fc4e5f37c5e4f3f8163e9187219a4fa27cd43be2bc19370a99755fa880c9e089d6af9bcc9e SHA512 c5ebc99df66d49f53c39ff897bd95afcbb92ced3ec6fd61148b6775cddf9e830454b1da5ac79ea0bba76f143f35f29dec66e7db5c6df33ca5157d3fe40cd4e93
 DIST docker-py-3.5.1.tar.gz 209381 BLAKE2B de0992aff9af240eeb79b66f0f7ca11aca4132cbef0ca9796cfa778b0f44e2ebf83858d0e4df2b9dd813caa83e1c301829152362a6983e5ee96dd5806815ee6f SHA512 8e927794cd308e17fc75f3c6569026c9b9c9f44eb2aa1c191dcfc6d1aabc36bdd341795ba9a2243ae2a27c428868c9f45e8bfabd7c1c798f3f4c85b7855eda6d
 DIST docker-py-3.6.0.tar.gz 213435 BLAKE2B 28301a508ef346373f8ac4033b697a71092c4162ba1be81bc69c513d1de700326a4e8ffcb1c015e20516aa1a09d31162d54182985eea3dc1dc23d6e79ef28fea SHA512 b32acb2585995c3c5bdef95ea4bbb6bcadba3b9fca81a3e637dc294b5dbd3823ee6c98236c4bb197373a96feafcaae665b9c64b805abd52e1ae27aa42079278d
 DIST docker-py-3.7.0.tar.gz 220407 BLAKE2B 3ba217957ff8746fb399ba23e4513810ffd96a758bfc5eba908ab3c66eb0a9711d94e5d9f517c301602961a21490659628d0a3deec3a4286155a4f5469304a3b SHA512 444634a26d0ce7af4850f346286cdac7f2c597aa6ce349c6371dbaa670aa0bcc2fa192221783b2059750d682580e34fcc5e115aeda0884838bf966decf9d0070
 DIST docker-py-3.7.1.tar.gz 220882 BLAKE2B a7547d2989b3fc2dfc38dfffb909508b7a5b3f8ee6b0fc874a73d0cdfaa17fe28c971f5a226893a41d893e75b1b2e4c74da806996e85b097b3a85b2d8dadcfcb SHA512 0a89c5fc05423d913b1029390318d9cd4ca54a3b4df1e9a9f459e27fa114fd7b03047ff95f3ea2ef6bb2cb48c5f6fe712da11c940249d3b253aa3fe74b8b1c98
 EBUILD docker-py-2.4.2.ebuild 1559 BLAKE2B 3bb505f2e65f2d12cf839bc666d3286fd4e7f7d92bd2ad7ea295680361f31759df6b8ff37ab5bfba18b0fb93e60cc5c0dd6119d048422532c5616560555198ba SHA512 bf7c5a7bcd7e1e5160bb831ec466f7e1904e765432f021d9fed8e894e776f3bc015b4a670e4383ad2e493d53d68f4fa5a0bf789b48a31dd9d8f21e1dedc5956a
 EBUILD docker-py-2.7.0.ebuild 1512 BLAKE2B 3816813d7a0259d7a4342ca575590ea4fd395f010e74f0b2ada6c1b0f34b22332784d88a9fe7a2777ef00199e78e785a96dc3ad46f182cee9719b6b97e850fa2 SHA512 2e9bd5037ccf6a133859d54c0f6f5859ec0f36222de0517f13ed2785ec6ba03ba36a9559b41633cf03a1b73c2fd8ecd6ead3e8e22c8f88947e732bd219aa8052
-EBUILD docker-py-3.4.1.ebuild 1382 BLAKE2B 1a72c74b83392be048bd4d0ac7198ebf206ead9ec2effe04cc4bac4e5191be6c4e1d69a474b19468ab172f438b12968ea1265ab18847a4b382d26b7c6b26fb85 SHA512 b9db4951ed806bd410d025a3e848a9250d30486ce16d5ad87af3e554fad0eaf802613c979f5973d975601d804501cdf2fdaaec511325fa014d5a8589dc0b881f
-EBUILD docker-py-3.5.0.ebuild 1382 BLAKE2B 1a72c74b83392be048bd4d0ac7198ebf206ead9ec2effe04cc4bac4e5191be6c4e1d69a474b19468ab172f438b12968ea1265ab18847a4b382d26b7c6b26fb85 SHA512 b9db4951ed806bd410d025a3e848a9250d30486ce16d5ad87af3e554fad0eaf802613c979f5973d975601d804501cdf2fdaaec511325fa014d5a8589dc0b881f
 EBUILD docker-py-3.5.1.ebuild 1382 BLAKE2B 1a72c74b83392be048bd4d0ac7198ebf206ead9ec2effe04cc4bac4e5191be6c4e1d69a474b19468ab172f438b12968ea1265ab18847a4b382d26b7c6b26fb85 SHA512 b9db4951ed806bd410d025a3e848a9250d30486ce16d5ad87af3e554fad0eaf802613c979f5973d975601d804501cdf2fdaaec511325fa014d5a8589dc0b881f
 EBUILD docker-py-3.6.0.ebuild 1424 BLAKE2B 0aa4a503cdf0dfaf3a317a4499b9505fe4479c0ed76aa7c018d39d05a8f20ed3cb40b2a2edbf7d5f1654073739e03302c89a398174cfa872d01625cabfa99356 SHA512 86c16d4bd30b7eaecd727c240154f5d529478251a75fc40d9a1caee1c69958c8e6b6a7fdc3ea2e3156ebae95b03e62939e3607f520900b43f9b4be645198b182
 EBUILD docker-py-3.7.0.ebuild 1426 BLAKE2B 54e7659153510592ea0a600a66e2dd961fb04596727d74b61bc679c89d4d1949ad444748ce24ffcb7cd7c916c26ec55a64547551e375911192f85a311abc82c9 SHA512 368e67f47da94ecbb9d522599d2e53a39340a1e34bfc48604e728b5c51c5864882b0dc9b7986329810a38c614d13f5fafa3e36bfe294a97e4015c20419a39ad6
diff --git a/dev-python/docker-py/docker-py-3.4.1.ebuild b/dev-python/docker-py/docker-py-3.4.1.ebuild
deleted file mode 100644
index 8e16af3feb1c..000000000000
--- a/dev-python/docker-py/docker-py-3.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.3.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.5.0.ebuild b/dev-python/docker-py/docker-py-3.5.0.ebuild
deleted file mode 100644
index 8e16af3feb1c..000000000000
--- a/dev-python/docker-py/docker-py-3.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.3.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 0536e09cb9e2..95417cfba33c 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r2.ebuild 797 BLAKE2B 3c06b23a319bab5f3479a27eb3b272d32b5bef12fbaa1e37b92a2efa79b17376ee6312f21afb8836909af45dae17dcc11859a0d877209653d0a6a1ea092c5524 SHA512 b688b0cbcfb43dd74d65af3bbf91a28adacf64e17ddc1aa2e383007014e39b1e56ef6baf36cec91ce48123a0533d7e7b5216a8d9d2c51717c2d1eee3c66b8842
+EBUILD docopt-0.6.2-r2.ebuild 804 BLAKE2B 342cd0185cd3fed889afb2fe4567b8b4bb14df5352514aa6dda60ae021cfc9a20286257b2594a5b942e2d5d02740e122e0c71a4bc611c4d533061711cea60e55 SHA512 e31b49f88feedcf12601d18c5491e80ac16b6cddd465b561cc47be85d65cde3a452cfcb0b27bba26e795d81cc2c9f2ac7ead8a3891d24de82a271196eca950a7
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index ab08333f4553..f4af2c7ace04 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
index df7aa6f87c36..b2fdcf2948ae 100644
--- a/dev-python/doctest-ignore-unicode/Manifest
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 BLAKE2B a114a1724445ed2c5c41f46098d5930da8b255e82256ef686fa8567dc305608363895655ede36f70b87896f0ed22f1c8e1047632cff5719ef7417159b0a691e6 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3
-EBUILD doctest-ignore-unicode-0.1.2.ebuild 634 BLAKE2B 0b25bd66c7a7b3c1c7a1a08d7cb937ea27b10694a14bd9330e8e14e340a66578a1d04acb0b98b69b4d8c207261495004f8dfac6fdaa0d954d120e0694515af9e SHA512 8f5ee5c2a8dc89a1151e3bb4b0a0ed02927cd9ec0df30fc861d04aea98f9b3d3036779d60ab557a7e207176c72ffc473da1835d38384fe4f3e676afc0cd4e346
+EBUILD doctest-ignore-unicode-0.1.2.ebuild 633 BLAKE2B 25046ac3fcb02b7da0744b67be24ae6b46f969d69f551c61bcadcddff39cc9093e59c7522320117868d278ea22088a9ecd543856e75476235d1105f3bba046a5 SHA512 c534e5c5644539b9cdb977694c94d095a4e1d8f9a6447a3112932d0b0d857bc03707d4a89a5a3cb36db1b604b2f9a1a64fe00123abf5250bcffb2d883eb1b800
 MISC metadata.xml 396 BLAKE2B 9d6ed08e6f963cb03406050e1ec934e9fd0484633e7989b52d5277e6668ebdc919d60f8b0898b0ccec076e9839ed07c6cf5273e14a289049f815cb119e4c13d9 SHA512 da8a39b0f46893a69b4e53ef6b62845f70b1ebdb0ff1c339f52b61b69c6a6e730ecc26d3f99db16a259c73ff454685faf546babc7afc9e804170a0e738cd7d1d
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index e394d32587bf..d4ec5f6196f9 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index b04a0d49d388..01ea8d4dba96 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,5 @@
 DIST dogpile.cache-0.6.4.tar.gz 315533 BLAKE2B 92848b82d923c6d19bc3aa7f0f1c399f8d7131bc308a79686269e904520e6b690c8d78a3c715e3e9153f81f1478bbb6e82ed6caad60a791e2488b023f1fe3d8c SHA512 0e86ed6aacbfbbbefdc3622ac956679c4986c77989daa3c3e845d4b8dbbf7945b4d0764789f03540b2ff59712e2ee86c8283cc3ee8d9e950f9ef1772db7ea137
 DIST dogpile.cache-0.7.1.tar.gz 326127 BLAKE2B 358391033d1d22b2711052f1aa3003c0c5f2da42b33b3f4fbb2d582418b0b42695db5df638dabcb9ba81ba414d142ac7f52a6c80ea645f5fcba12ca21122a495 SHA512 39c0a1d3d5027bc61cc69eda46c846c72d09892b2de0ea2e9545b1f710911dce8726b4ee4a0daef0d3c409a16733920d437f6e833a5b3f55ccc80267bb0da39c
 EBUILD dogpile-cache-0.6.4.ebuild 892 BLAKE2B 90730b1c4257490b239fbc88ad21e38bf8fb741d197efb5827aa5ed791c3778f70046737436dbb52be536cb9b12c9e615646e25cd005c4403f507ab42e7dc571 SHA512 979ab4b89187cb1f62e41412efaac18cbeb55f40168a202e84dbd4bfb68c215b6ffe8e804fffed02eb8e3a0233418b1c976d4ba7284b915dc4f4bf60cd963456
-EBUILD dogpile-cache-0.7.1.ebuild 898 BLAKE2B 5f04ae4cb2b558b3dc29c13256a31c7e363247ef76f356f448f60773c46a3854e834772342749f44e1c5d28cdbff061c8cfc39cc371ff3f58f43525eba864be9 SHA512 5d25ad47bad4a16838c921cfc66209fe577e990be473dabc4b4c9ab25a324861e898053f3d4c42dc9f8af1f0dad8620f48c7b8a8b2710381e0e663e9824a2f49
+EBUILD dogpile-cache-0.7.1.ebuild 896 BLAKE2B 82efaf378e993e994ba4609b1fe3d4a01d83ef1fbf58002e4a1d0675f5518ba94a4697d964a979d8f3c19975e5d6bf095f08a5bb8cd5b5a240490edb9e629aa9 SHA512 1f62efcd6c6529438825762e30e63551a4421ce033cb9e8b5b0a9dc020b5181423102a74f3778c47b3392ed94a41fdccabf53fb3ac7d36e3c3ed2ab75ba00ba7
 MISC metadata.xml 716 BLAKE2B 790b3d6205c7f01a122bdc92250cb507408742e973a33dcadf4be9180d4bc4d6c77a9a9283057b88406d852a461dbc46d834b6a95309b7641b2ad78430b0f553 SHA512 7d260f1511dd2507f67149e1dda7a5ef5e5fee21bdd45832d141cfda5794b32b5b99a31e0f351da5f076fe481f14c7b420cf11f5b14587a1858b61325f4ff59b
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
index fef2f29fd345..3513c0da1f54 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.7.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/epydoc/Manifest b/dev-python/epydoc/Manifest
index 149c28eada3c..2c36c2932352 100644
--- a/dev-python/epydoc/Manifest
+++ b/dev-python/epydoc/Manifest
@@ -1,5 +1,5 @@
 AUX epydoc-docutils-0.6.patch 1190 BLAKE2B ad424efe439798076d99e3eb5c516277eaf05fbc73a24bb07ac32d4199d537d1a93af15660543ba8a038edb2b8539ce2392c7f8d008a13d5ff8abbbae870c901 SHA512 d1366440fb3942d307508e2a629453dee1ba53dc01dccb6a424bc5486a34dd714cc5d502262ee4fa9d8191faabae61176592a950d0d7cfc0d037ca0fbd5abfac
 AUX epydoc-python-2.6.patch 2425 BLAKE2B 9eb7426637243073fc0ed93975e2ad77631f11243c5d22b5fe8bb79c7379ed0771ab3af244b10d88333394e4f9690fe117e60e2777646eed9e40d436af49ee48 SHA512 b1dbc9053125c770acb75a236a32475e98be41d77dc9c1816cc194297cbbb6334e3e4cdfb1b50e37ec37a18285be6675be50f8a029ffac96705c776c0768d173
 DIST epydoc-3.0.1.tar.gz 1785792 BLAKE2B 405e58132f4d0f9c40bfe58ada11618865e29c3b7a1eb41954f4769287ff780b4f17e57b50214fdc0f38a269093e35d11c83629e22c8ba854ed78ce299825826 SHA512 5c4011f0018ab956c0e1fe5fe0c1608fa2416439a60b5836a9d2d95e359428086ba403bcb5ed53e64d9d4979441ca6d537d9e5b8d6224d2202e7df3332d9ea83
-EBUILD epydoc-3.0.1-r2.ebuild 1129 BLAKE2B c3364a90b101419b4d207d61e0716494196349737385a49b68f2aeaf7d4b0199e37ec5ce532d07c2366b550d82ca71b8d20e6048b1b5efb80110ade58e49099d SHA512 7d2b1dc5a3bbe28a82594cd63e43643f46e010df26071a8d154f91a1ec20e8b1727bf67e3ec037f0b8867c2f87fb2efae26bae42d2ab9d026342f318da4da3ca
+EBUILD epydoc-3.0.1-r2.ebuild 1125 BLAKE2B 90231c23c1eb4086042fa40d4779ecc38c48f960d7766f6817d01759c2067722fcf1337f4da46133dde5d3504521d40f8290e1b00dafbb36f5f501ac55aa4601 SHA512 848d38e7586d0a668c1073534fed0c92c1b5528a85cb3f7d67d1e50c74a4fc49ffd54a04606713db9dc70503ddbcb709cdc664f26db5cde4d41940cf0ced4ca5
 MISC metadata.xml 1217 BLAKE2B 89ec592e9bf635d08b60cede28d77fc2efc5674eb409120a51f107676c3f87dffb7ce57269ef936b723a55e32cff2287affeca88faedd7fb90264f52ada262b8 SHA512 3a8b0a2194a7899b9e7fedf2136a587e38947d395fda15d17b9ce6aabc65adae91783f8e4ab37acdc5b2ded8281615dd9831f5dafaf7e6c0d22ef771ce253c39
diff --git a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
index 1cacbff4e908..4ae96d72a863 100644
--- a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
+++ b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc latex tk"
 
 DEPEND=""
diff --git a/dev-python/errorhandler/Manifest b/dev-python/errorhandler/Manifest
index f5dcf691372a..a9825888eae1 100644
--- a/dev-python/errorhandler/Manifest
+++ b/dev-python/errorhandler/Manifest
@@ -1,5 +1,8 @@
 AUX docs.patch 358 BLAKE2B 14a004cd902c0c0acdf0d8e2bd595729beed4a395c249e8b204d97acdc7ddbb11e2653265b11c9229775f37857a227a89517abd7b91d7dfd8935d3d9bda1f836 SHA512 fad104f167d633644ec8f21d8888e8bfe5ab7eaa8c82b30ae2d209d64746ac4912ece042ea942bc7578c51423d1472820a58eafedfd34b644899362b94d84469
 AUX errorhandler-1.1.1-test.patch 386 BLAKE2B 13699a957b74822e9e1cb6ddce1b42fad2dd9c6b92cd82e44d27520b514d6e3def9fe487a95dfe91340dd8db02748a8430dccb433134c32c7bb6715c8364c3d7 SHA512 c6ce048411e70f8f2cb5bdbba5ee2799b09dc036f5620f03b87c0185bd12759cce03d7dc9379602546693daa05d3fb9b15c4aed8e18c265bee73272bb4a16f52
+AUX errorhandler-2.0.1-no-intersphinx.patch 342 BLAKE2B b2165e4dcc5acb49c7f456c9eb2fc918e9c764cc3c83a920cbde99ece65827cb3f44d3943783d484de75bed6214f3878d22848a6ed52b51a4577e2e9352c1ec0 SHA512 dacd25028b2afdafe7507e466914b37cade57f8678849946052b60fda817bd6065232dc83673f9377b0abf0015716547ddc3a03177eba081f1f01a63741559a6
 DIST errorhandler-1.1.1.tar.gz 8321 BLAKE2B f2b0cc9dcf9bf86c1b89356f66fca2d64d49acb919ae6bfc18b1dcb013cb67a358f2f81d47cd1c3bca601c85fc3bb5f870e1cc2452d25b187309a844efed15b3 SHA512 a2f875537103086be956becfdac25a43a646a89b404b6a7a2a243c6d2ddbc29d55948b781529d0a0fa82b163187747f3396b62ed0be98d39834de038cc4a1fd2
+DIST errorhandler-2.0.1.tar.gz 8534 BLAKE2B 2a1db016acef81b5e625800614b2b5084cb6e8175d623e42726a728018871d200709ec66db16847ae0cf604551925a18fd2207c861388844f324a6eaae4bbe90 SHA512 b2fe44f400551e2af8aa589aefce042ee761893678b211a0e3ec7eb4527803001ac930d0941425f6e1487d36493d0c8f439e0bf672536ec27f041309fd69420e
 EBUILD errorhandler-1.1.1-r2.ebuild 1129 BLAKE2B b04eb174321a2f870f1b8e0006f095dae3e6058f25db1c62a0672421437878844a5388640dcdb35e34eefda845b443068cf51e12d76ffeceb22995c38d42d098 SHA512 ed41fdced7f976173391192c0768f6da7e417147a981b6b2ac2ffa9fc2621e6b4ac1c2c563402cb76de9b14d6c7dbba1122e7609dff33dd4beafe599af96ed9d
+EBUILD errorhandler-2.0.1.ebuild 880 BLAKE2B 918c2254adb737adf27d33d06c1974b9f52a9dc19940ae2267e51b5cf31d2bb96a505bbe25d9a0b4180db1d475ffab79eda791b9028a7ac4576b5bd9f75175ce SHA512 cca4f944521ba2d7eb12391fa071869501cb319499b18322037256ada2584cf3d6398dccf16fb702ca388ff00bde9648994a1fb06e805f6642e74dfe0d82a549
 MISC metadata.xml 325 BLAKE2B b9d3bdc299f206991f900f0fefbf436445eedfd32b0c005919d37417003fb115d435924e424943554333fb65d6811d82e27436f6cd40b0818e204804da74ce6f SHA512 d7a0591bd66d48cab6821c9ac4131839a8b60f026ffbb677263f1af1a0f6f9b9dea2cfe3be003c40e2da7f16914ff2078ed591de0c6833406595010ed88479ff
diff --git a/dev-python/errorhandler/errorhandler-2.0.1.ebuild b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
new file mode 100644
index 000000000000..042a4d7cb20f
--- /dev/null
+++ b/dev-python/errorhandler/errorhandler-2.0.1.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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Logging framework handler"
+HOMEPAGE="https://pypi.org/project/errorhandler/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="
+	dev-python/pkginfo[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.1-no-intersphinx.patch
+)
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/errorhandler/files/errorhandler-2.0.1-no-intersphinx.patch b/dev-python/errorhandler/files/errorhandler-2.0.1-no-intersphinx.patch
new file mode 100644
index 000000000000..d37e190fb6ed
--- /dev/null
+++ b/dev-python/errorhandler/files/errorhandler-2.0.1-no-intersphinx.patch
@@ -0,0 +1,12 @@
+diff --git a/docs/conf.py b/docs/conf.py
+index 2c71c44..0e6f0ae 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -5,7 +5,6 @@ pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__),'..'))
+ 
+ extensions = [
+     'sphinx.ext.autodoc',
+-    'sphinx.ext.intersphinx'
+     ]
+ 
+ intersphinx_mapping = {'http://docs.python.org/dev': None}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 4bf855a4a2d6..32be42fe13cc 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 2295 BLAKE2B ce74fe92cde572a26a6322651544295db4cb1e530fdc93479796ba7ac33648219a8b4cfe4e62982fe0280689b3115629ec5bf7f2c81e9630d26a3a7fd5501788 SHA512 a944dc7dc8e271191146f7c78f5261577d64b74723483b6b920f8d45240c0a81f76a0d6ae21b83133ccba0e98219fe662828da80602352e997f5b881ceca797d
+EBUILD eventlet-0.24.1-r1.ebuild 2293 BLAKE2B 36311de03443d82c23ef7c6efa593e1f03a92d7475e007ac0a43d526bb08552efa912340385e240ded4f97be46f9d8a8b8c2d3ecb691d3eb9cf0cc89ea3b0b25 SHA512 3226aa8326d476cdc85cf05a67cacceeed71e021ce3f44430df54467d75d4bdf605c50236aa75c3c23dc4dfa0a2a10ad2e0789ae77ae6fd158c1a1be95837316
 EBUILD eventlet-0.24.1.ebuild 2294 BLAKE2B c6073bb0f2e6a3ffdfff5690aab9c05baf831cee5a1974b48f8f4f2c4e3b11383a9693a33143f4a3490a939f97cc05460c2cc245df7762da682984a20ca8d73b SHA512 970bab17a538b9b0e4fa2468519b0ee916829c12ebf1b30f35f93f29fc0cb374e83150f674bc4bf49d04f12f00c12d9fad6e3efb95edb3dc34d05aa6e6efa11e
 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 9d347f679fde..baa91fcbdcdf 100644
--- a/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
index 840727d22377..92c8c7388cad 100644
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@@ -3,5 +3,5 @@ DIST fabric-1.14.0-completion.bash 4266 BLAKE2B b691b34d3a62ab8a70d184fe89150d50
 DIST fabric-2.3.1.tar.gz 148829 BLAKE2B 65df8856d7d7ae61ad045ee7710c1aa0517b3be63751380d349c27c4ca4667a9179ae4e7f14612d7fec71cf90de5c98d7c7867508e56717235703c688c54a4e2 SHA512 8341869004b9ec2ac4459245af30b06f8f693f696339ec08aa83a9d56069379390a89f6e04f66ea3f064436d9184de0435a8fb283db8ec5a815471684889dad9
 EBUILD fabric-1.14.0-r1.ebuild 2164 BLAKE2B ec127746fc664b2b2c2912d24d6d00c05726b767c75842c4232fefc8bc305c4e03add32b4fe02aa9b5991d416df3ba0e4596a30540e952377fa4d51389e88618 SHA512 61b3db0b304068865b19ec7d947c31f026fdb8acf12beb53e9ada569e66170a3331867cf2826dc23523a8f86c140618fafde26c3d0bab11dda783d0648fa29b1
 EBUILD fabric-1.14.0.ebuild 2165 BLAKE2B d46bb79f45d25acab384cda763452c6f966bd8bef3a1a6bb4d8fdef45e6eda79a7d34dcf2b6333ed57125f5c23b600a67ed53fdd5c603acecfeef2c93a711fdd SHA512 caf771a5a4ae4f3af317dc62dc7062db24958e92b801d0fe7ae4426098c261cc3c5d2aede6ae5e6f12e5775d17a437fa019b429cf96f132ecf2409da98bebc65
-EBUILD fabric-2.3.1.ebuild 1455 BLAKE2B 30c0d7a2d07ebf0983a552035b097520b431def590b5f2b874fa21b507cbafcba34691b5902a23d9a344c43b39336fc3972ca016c99b8c0ecb81c12e51d56455 SHA512 adbee47f3df1255817d67bea4eb07491e9f398f25e5492fd69fadfba557623e4b37d4b70226ad92de464de7d539d0e3cc6afceb9fd817b5d96b6b90121d9602e
-MISC metadata.xml 524 BLAKE2B 9df10f0b4cbe8197f27e7b5fc67fee9d46d881ab29cd29f2255aca693b3439c49edd1145ec2442cc6d49fcb173998aef3bbd2a3f2017e1cb83fcc79f1c50c59e SHA512 1a7a207ebf6d760a6f8e150806addbc9ca6c207b0f93c13bf5525ab2868d95a2b33acee846dee25eb70af0163cb2e05323de1ac2b74155046de962a44c470413
+EBUILD fabric-2.3.1.ebuild 1229 BLAKE2B 471b6e7540809947b27c083b6f00c56678e79304bf36cafc0522b835f3022d33b0a47324e7ca9c3c2d77e9fe62a4593ff7306845b6483974c4022b142e11bbbe SHA512 05f2a18349b14e57ffa436fd3029fa7b09b1dd048c47f5799c18ca4416fb219b6fbfcbe06ab9853af9b7f6980e51e47f5cd7fe79430f4f824a538dd90dfcf2ca
+MISC metadata.xml 416 BLAKE2B dad0309bc188c5d36edbb6694bb06e9080249a419b0b6140a2e1a8dc35c63a5720a91ce1b70f40e8f8a923671bde7c01f5da20d9ddd003ee9d319246422a001b SHA512 6b5fd491f212f7e18955920dd1e70703cbef4e8821f04ab4d44b0a794c3c9820250f9f36749e52479c5655579d83af2507b614131bbc3929eb67466e538de97d
diff --git a/dev-python/fabric/fabric-2.3.1.ebuild b/dev-python/fabric/fabric-2.3.1.ebuild
index c6273f4e440a..8265a2381332 100644
--- a/dev-python/fabric/fabric-2.3.1.ebuild
+++ b/dev-python/fabric/fabric-2.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc fab2 test"
+IUSE="doc fab2"
 
 RDEPEND="
 	!fab2? ( !dev-python/fabric:0 )
@@ -28,13 +28,11 @@ BDEPEND="
 		dev-python/alabaster[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.4[${PYTHON_USEDEP}]
 		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pytest-relaxed-1.1.4[${PYTHON_USEDEP}]
 	)"
 
+# Depends on pytest-relaxed which is broken
+RESTRICT="test"
+
 python_compile() {
 	if use fab2; then
 		export PACKAGE_AS_FABRIC2=1
@@ -49,11 +47,6 @@ python_compile_all() {
 	fi
 }
 
-python_test() {
-	# -p pytest_relaxed: this plugin has to be loaded explicitly
-	pytest -s -v -p pytest_relaxed.plugin || die "Tests failed"
-}
-
 python_install_all() {
 	use doc && local HTML_DOCS=( sites/docs/html/. )
 	distutils-r1_python_install_all
diff --git a/dev-python/fabric/metadata.xml b/dev-python/fabric/metadata.xml
index 38953b499500..275fb515bd8b 100644
--- a/dev-python/fabric/metadata.xml
+++ b/dev-python/fabric/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 5ddac64a7b2c..23dae41e4b19 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 951 BLAKE2B 40aa15a951c74bf16f778aab516008a8ba4540e6f9029aa1e0fb44762b6f86e58ac6ba0a811f4788223fee1b1c5a7ca0be8173596e6dcd83fb9c7d6ed3ad84b6 SHA512 9189d789586dfd72f864a9ec905e2b8f036610590f92ceb84bba8cb35e987ba46f63ddcf1e83457411d6ca652977d3fc28833eb7bf87ec538eacd722055e379d
+EBUILD filelock-3.0.10.ebuild 963 BLAKE2B 3480875709b658d449c5b357841851142a58de8851356f93cd561d85bae83ece5d7066307d19738f54f0acf44c681cef4f693ccbef048fa7995386e0a8fa7210 SHA512 d72324fdc0c4e514936732a976d5c144d47983a0c3967ac07859a99bd00117a6bf71d002660c2fc024b2526f44244ccab3c1155d38053804d25dc1e4889dcf58
 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 0a62a896563a..bc016f84b54c 100644
--- a/dev-python/filelock/filelock-3.0.10.ebuild
+++ b/dev-python/filelock/filelock-3.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/v${PV}.tar.gz ->
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index b238b1e70089..679fb7824301 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -3,5 +3,5 @@ DIST flask-restful-0.3.6.tar.gz 114512 BLAKE2B f03f7ed0fd521a265b8a2293d15262736
 DIST flask-restful-0.3.7.tar.gz 114238 BLAKE2B ec960f060b3a1a36e538606d710a57e9d9fb3b1c2c1ee1874c5f7592e9ad8a9a2af4716f820f27ec1a9e55fcb0505ca711c6e045e6cb0ef8c9c64de339871710 SHA512 1d1d066dec5f39af3197b680f791d83df686602b703efe874ea0e81d7f3b65f605dbdb63f84fdd07e469c6824d52571e195ae70f58e1543b53f13a81e1cd8543
 EBUILD flask-restful-0.3.5-r1.ebuild 1281 BLAKE2B e830a36ff2b11cf52db025ca0fc17f56da68b63049c469759e9bd5792f5b3a0568fa44e6a3d235fea0c37af17b4ae349ea5e595fe3e43302910eb1b63260eda8 SHA512 9c4e8fe56d4cddfa40dd820bbb26110994e5517b7b5ccbcc844864876b9d3372f397bec0db9327e78d266dd3b20dad46d97a083e42842aceddb82cf30ade7f94
 EBUILD flask-restful-0.3.6.ebuild 1290 BLAKE2B 2550866bcbbfec2ef5b7350d9734141adc82f39181123b57979d6dcf683f47afb19bddf4864464fec113ed11feeb66fc727ca07e86970fdf22099eb7158fbc99 SHA512 9b3ba0ba3d32daa126bf4a6b8ae7d40d67d38971d3e96c51beca6f4d70adf72075e5c08e85430efe7c95be8761a7409ed7343a04c25bc1027a37777c92668c17
-EBUILD flask-restful-0.3.7.ebuild 1292 BLAKE2B 2470f2ebcae13e95b4c21eef22512c734823c3c7a4e9886337345e5519de7782e66b630468c3609beaa031ca6c0ec8c84c2efc084ce7839650b410d66b1063a8 SHA512 923ebe180bcb280be9edba4596fbc515f24e79716cf0c15d808f4f416b8de09ea6de14fc3b2ab27ec7b66a0f6dba814082c88da81e64bf440325c308ce8196e9
+EBUILD flask-restful-0.3.7.ebuild 1290 BLAKE2B f75ac94d5e30068d4cd1e9727175ddcc20cba00d2a55e48aa92aebaffc2ca817b700586b02a79658beac9c96eb69d6be25e43414a251d4d36326756eba9c11e7 SHA512 8615521f2d5aee80a28ef638095a88582710e6df778dfb7f9675e40ac34a148ac238bf074270f3334fa67669376a78ddc2aa3b17c1d5d7a2cdb91be9f8a0b9c5
 MISC metadata.xml 400 BLAKE2B 73ff908518d52fcfb2aaf73571c5c1a36cf0cc749b0d1f5e2c28780323b096aed34644c8bf373e241112892e08dc184d0310bcce52aa583ad6301473cd7a4248 SHA512 be62c37c4d0fd8a051cc14fb2a9dec6885a1e83420bbe95282a0fdc7803d700372b345d83c3d648037c45080246d71b91086b3e4841d9e41fb3003d7c114e0c0
diff --git a/dev-python/flask-restful/flask-restful-0.3.7.ebuild b/dev-python/flask-restful/flask-restful-0.3.7.ebuild
index 8b537f269cd1..cc20eed8e066 100644
--- a/dev-python/flask-restful/flask-restful-0.3.7.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples paging test"
 
 RDEPEND="
diff --git a/dev-python/futurist/Manifest b/dev-python/futurist/Manifest
index 952b97edb203..5ad4fdaca221 100644
--- a/dev-python/futurist/Manifest
+++ b/dev-python/futurist/Manifest
@@ -3,5 +3,5 @@ DIST futurist-1.6.0.tar.gz 40372 BLAKE2B 295a2a274de8a613025c6c46f6abd048cc6d988
 DIST futurist-1.8.1.tar.gz 42430 BLAKE2B 4584d37dd2a5de41be576b1233a50202c9c134b0a7e6c231e028224413f2a0c6e2ab22e1685e5fc974cded3e70c4fee6cbb9ae1262f167455a40a39eeec8c904 SHA512 4ec292284a1a6a7675bd9970f391bfcc47841c42beedac8348b23755481c4f87a2467dbb0f8c963c4b9fc8148a8aaca43e3c166878d07c9e48720481b0f73d9b
 EBUILD futurist-1.3.1.ebuild 895 BLAKE2B 4c2984fd7c1414adc8144e7d0b486126806b2e4f4c8a2954c973d5d97633b41ea641e3f49a1d2046df908c56943ef8a7c6028b5eb368099bd844309aa8e0c490 SHA512 26c5dbc85b05f7d748233f7df0a89113096ca34c9bb9e14cfe181d49eb1e1c33ea68188158f1e1dcc55f119a62eef8ac4845e39c2550e87cee64b6ea05c3df42
 EBUILD futurist-1.6.0.ebuild 849 BLAKE2B 26cc3bd8af4202f4d430a96d892af4bd1399c1a4ff917936cf528b39fa6acfeb217aa53604198c5068f2f5b36de947859613eaa28e27b31a910a0a8e1888f13f SHA512 4558ec056f81c09b5e317898e32f4c28c77b04c47047cb19cd5a72bf71fa8f0e409ab9d794b4be88b871adb41312fe5c6fa4a4bfdfc0d97b812279899809d2b1
-EBUILD futurist-1.8.1.ebuild 860 BLAKE2B 9aa7043db8927181f4a8806d80ea7e6a02683571a3345571840a2dabcfe1b63a2dca7c89d185f28ba4a44d60c4653664e97f8045b77e733046d4d5ed67276ec4 SHA512 5ae3b8d2fff3c60b905c090626d74b3e0920b3b68f030b31f8ea55bbf30e5941560087350191199fcd644770157d1f2892b29b53b926282295b6d14cc892a554
+EBUILD futurist-1.8.1.ebuild 858 BLAKE2B a1e8047f4a902a026837531dfcf6bfeda2c1a94da2be579f050758f91b5f633e583b64cc587a20d7243c0b3ffbc626f4ff36a6fc0520f37b0c72cfdc6999ba77 SHA512 ef3089ee40ad6aa75d5fc0cd78082696d4eb9c10a1858caaf7e4cc7b704e76df4328b92a69b001474b38f51604c8237dd123a4ce77a1eab9d787f6121926e715
 MISC metadata.xml 325 BLAKE2B fd30488beae3d9648ca9812b6b719c85c4b8aa98bd1209400fcfbc729955ffd8d3690a145b26fe5404737d2b2df346a73547abf3b519e0f8d6200686a4bcb62f SHA512 4d4d42c2821349f1a2144c297cf80c572482eff31cd1fb4f43f43c503d1533a1ea53627528cfac417ab0d1c174f7924f951f823c9577ebea86ce7cdd88195bed
diff --git a/dev-python/futurist/futurist-1.8.1.ebuild b/dev-python/futurist/futurist-1.8.1.ebuild
index 7996e2168a67..7a758b38892e 100644
--- a/dev-python/futurist/futurist-1.8.1.ebuild
+++ b/dev-python/futurist/futurist-1.8.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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
index e9c15fd4fa80..f20ec28048cf 100644
--- a/dev-python/gevent-websocket/Manifest
+++ b/dev-python/gevent-websocket/Manifest
@@ -1,5 +1,5 @@
 DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93
 DIST gevent-websocket-0.9.3.tar.gz 16463 BLAKE2B b5def54cb76c377e04210e3490e69d7daf73fd38c3f0d4e632272cbe863c50af50cde121bb493121ee24ac96d3ae9da63ee52a12d40718c1736931e0f2adf7bd SHA512 71d6a81f04bae36e7122890b37082df188c28f5901bffcd8c774b2bf1cbcc603ff7ff9f854ab17ef00564d36b19787e3a9267e6e299f9837c1d682e63acadb73
-EBUILD gevent-websocket-0.10.1.ebuild 535 BLAKE2B 07852eb6939694b11face95e4c1131b753fd9d539f6a377c15256f163003eb128cdb6be5112f517191f391607fdc865f9a691618368b35d0fd906f28bdf0e800 SHA512 d0a99d512d4efc810cd4383c5c5c34ddaade80da060086917fb9fde0ca00d96637876e3ba5fd9b546c235a14736024e97cf46692feaef117c6fa56a1bb56ac99
+EBUILD gevent-websocket-0.10.1.ebuild 533 BLAKE2B 08e313f9164a802d37d14730f9d99fee9a474879d03ec19e6c21d4972c019e0afaf24aa7b7e5427757ab611528667405edbaeb4d7d1d3d5a3e140029e00a35b0 SHA512 a56b16dc7a7b9518e5bc5839838c324f39081fae12d819dac0d57fe05fa03f6923eb3da6db6fba71ebd1ef25104655de40ea284abed605a8ac1ddb59de0de570
 EBUILD gevent-websocket-0.9.3.ebuild 514 BLAKE2B 3040755b6a7ad1342339486a5167bafa96b2473424baf178b950b9fdfc1db0e2553f086f277ae6664e2b87ae86eb8b6ba19c7fa2fea8e60555c6829dd77f98c6 SHA512 4a86af2f7f20118fa8689676bf9c38afa738de2aaaf9d9dc6ac476e4feaaa45e81ab13dec119cf4848406b8d5e571f45ac9d8790c7b11b55456d92c8de71c649
 MISC metadata.xml 503 BLAKE2B bd191adc93cb5d0b5a604fbd2fba07ef21297adf7f5e20f0c2b3af579db55251c6ef9167fdb8f3a9167a8b3d67bfc4ee08706d84483f66bb326f851838f6f688 SHA512 5e0df66113a0665e2e35d10389b05acb19caee9f0a2e38aa9d605e50f2d695e4f0a6dd938946fff548aae99c3e2b98620fd740e15d351c52c83387c18a34fb3a
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
index 19dca5f6a14e..46ebdfeadad5 100644
--- a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
+++ b/dev-python/gevent-websocket/gevent-websocket-0.10.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=""
 
 RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index b54e7022ae95..efd874ce9174 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -5,5 +5,5 @@ DIST glance_store-0.28.0.tar.gz 183622 BLAKE2B 327bbb498d9cc1e446361d026f2dac4d4
 EBUILD glance_store-0.22.0.ebuild 1618 BLAKE2B 1573062d8450a4aec612fc839660357b99f9528a0e44a2127ef23e69b2cc708862360769a00e2b4eb3078f69e665971cf8c3007bdd97d84c749d05147ef120eb SHA512 1e90ca29e7c8f0d99e6abc29cc8c564c8a3ead65aaa0fe25d6ae093dc8da68c450294eb1f2854074e7e67b2d7fbcb2ffa32aca79989b5ed779d858f6e5dfb139
 EBUILD glance_store-0.23.0.ebuild 1807 BLAKE2B fda5339c1a16479872e3724ebc9f6fefaa15cd2dec11fd7a03b6f0838efa0532686f04100a859d31cff4fa50b37a0776b538cb4a8ad5c23d16f7d65bc8920206 SHA512 a7396c28ff233d7b431c56238e4969c6de550fd1b610120b66b5adc8f3a8793a3f52c08335b812536612a32911e169d354b1c7e871200208b716048adbb10cdc
 EBUILD glance_store-0.26.1.ebuild 1803 BLAKE2B aa894e49506071cb4695f37c028de3da45388b9e17582bbedb5a03aa3795f25c028c91745d9825e46a7a69e76abd594551a90f591996ab6b227b4555b3b085c6 SHA512 99f4ca34af7be2a1ab1f3407c597c85d90883c3d9277a84162e69bbb586dbb593688c6671ffaa197ead038c423d022be44aa5d56070b6d9280bafb16c4ebbdfa
-EBUILD glance_store-0.28.0.ebuild 1764 BLAKE2B 4253dabdf2617b7aab678984dc9132ae4238b6da72d41664ca13b2bae128d64debe6d7b012dde324b6dca7be4aefcb0797ae9e1b62375a6133f001e2c7a09c73 SHA512 6030e988a08f12d080962be3fd08fc1f3b897415431b14c04b70dfab03a3558ddb2d4d4450f70c1ff2ca4b9f54c7f28d2156bf35184c7114fb442ed61f0f85e5
+EBUILD glance_store-0.28.0.ebuild 1762 BLAKE2B cd31a90bccdcc88157121d1e71cb015443b43ec35dd6c15fa3c90ce5042fabf96a615c2e8431e002cf91c38a35ab548016885adc8f7c94352f0f5771aa11ff48 SHA512 ee074a10071db60ea21898175944a01473388aa764454039592f04aa043432c9d601907456b392aceb4bb7c26ce822cebebfa1c38276b0b2a71ccc091224ab11
 MISC metadata.xml 807 BLAKE2B c5195ef9669d04dc0f81f47b07e802984114b15bf4dedaf99b7214187befb556765a4b14c7d55c9bbbf1dcc2acb4f22e7c5a12a65912cb9f2bbcb73d1cafa4a5 SHA512 3479866f525828fbd21f7d0953088720d0045bf2e00d8dd4cb5bba25f7d5ba939c4bc9bac89d1f9bbf5c3a815f0d5199045f6ad0585c6712843dc1f26135705d
diff --git a/dev-python/glance_store/glance_store-0.28.0.ebuild b/dev-python/glance_store/glance_store-0.28.0.ebuild
index 1aa4b806b914..6180cb8ec0d1 100644
--- a/dev-python/glance_store/glance_store-0.28.0.ebuild
+++ b/dev-python/glance_store/glance_store-0.28.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="cinder swift vmware"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/greenstalk/Manifest b/dev-python/greenstalk/Manifest
new file mode 100644
index 000000000000..bbe9dc75f2a5
--- /dev/null
+++ b/dev-python/greenstalk/Manifest
@@ -0,0 +1,3 @@
+DIST greenstalk-0.5.2.tar.gz 5317 BLAKE2B 1dd461f0a3a97210cad1c2a1957483477334c015e97184db22c3048c5152b4b7a2a0a5768cf79190c4f8c3115fc61557d3cb453fb56194db9906c5d29e7734e9 SHA512 a270e0c6aaab1ce93e695413c8c12a2546cffb5d3cd11b20679c1f4f8238a68b8e9ed59c0b1c5ec3ed3319d3cd32e8bfef68533e092645d2832546024dfa68db
+EBUILD greenstalk-0.5.2.ebuild 468 BLAKE2B e7255d89a1de96ce313ec2d22adeba6b9ce3cba61b189682d0b6451e97ac00fdbe58b1076cd3cccce4a550dfe60931b27ccfac2e9243e7e7db0d29c24c0148dc SHA512 d947c6cbec0eec880fd8139153f82923c9707fe4bccf7100b09bc88d95331fd1c6772cbc52ad82507aadb94fd18de50ef83d91cc2a8c0a39f99dd8ef9b870537
+MISC metadata.xml 468 BLAKE2B be86df42ba2a9a693ef6d6ff7dc2840a5a8ad749978f4ce6a77e43fa7ad1f0f14c0a3ef7fed355ce17cdfdf94bd40d1650851aa3910c6a7f85af36753f329505 SHA512 e484b320e2e44edc72cf5cdacb7355cfea180a3193738f233667cbc28384933d4defa8fd3415032cb863acd4d2cbbfa3992e116ec6b14f29a34078a56fab9264
diff --git a/dev-python/greenstalk/greenstalk-0.5.2.ebuild b/dev-python/greenstalk/greenstalk-0.5.2.ebuild
new file mode 100644
index 000000000000..1aa08feab7da
--- /dev/null
+++ b/dev-python/greenstalk/greenstalk-0.5.2.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="A Python 3 client for the beanstalkd work queue"
+HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/mayhewj/greenstalk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/greenstalk/metadata.xml b/dev-python/greenstalk/metadata.xml
new file mode 100644
index 000000000000..ca34494621e1
--- /dev/null
+++ b/dev-python/greenstalk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>linder.gabriel@gmail.com</email>
+    <name>Gabriel Linder</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">mayhewj/greenstalk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index fe39712d99ab..b20414f26b61 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -7,5 +7,5 @@ EBUILD grpcio-testing-1.16.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd
 EBUILD grpcio-testing-1.17.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.18.0.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.19.0.ebuild 522 BLAKE2B df149020fd4d3b66348cd08db83e3669cbfadb8c62110efb0e643af2737be7eb2576ed04217722936cff8eb6f11fac521edcdf22aebd46245f845ba0ffce6410 SHA512 90ad1fbbd670eb50c52d02a51963aec60287d8b803d99df335c84436fe7476a376c312ec1e1d68f285838ef7bcbf4719516879ca806283e1dc8d49a833ef4a7d
-EBUILD grpcio-testing-1.20.1.ebuild 522 BLAKE2B df149020fd4d3b66348cd08db83e3669cbfadb8c62110efb0e643af2737be7eb2576ed04217722936cff8eb6f11fac521edcdf22aebd46245f845ba0ffce6410 SHA512 90ad1fbbd670eb50c52d02a51963aec60287d8b803d99df335c84436fe7476a376c312ec1e1d68f285838ef7bcbf4719516879ca806283e1dc8d49a833ef4a7d
+EBUILD grpcio-testing-1.20.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
index ad6217a42d40..0f6ea5237441 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 01d3ce655818..a1c82d540408 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -4,8 +4,8 @@ DIST grpcio-tools-1.18.0.tar.gz 1925482 BLAKE2B a8a97e3a6204593bcc0e96d392652d31
 DIST grpcio-tools-1.19.0.tar.gz 1920614 BLAKE2B 00d3a702071d33a51fe47aea6ef47d58e2901df6b55cee8fba1c382e45695fce32e2fc20e438d48b5024b7a80373bea76466f2981f58b106192016078f2df214 SHA512 f9832237a0ec3e1dc8550dce5c0b06bfe43d1bd164b251c1bf9b8075ee647f23c8da31f90c84cd7f047682832876616ec5c73b495cb4a1fa2d83982cf368eee2
 DIST grpcio-tools-1.20.1.tar.gz 2018570 BLAKE2B 9c2ba04b06df9883ac79726aafec6eb129c338be93c61d49cafea29d4849bd497bd45da106431b7e17ece281037cfb0a53ed33ca7078306b727812fbce9df9b4 SHA512 2888e5c3ec92733b43b6bd115bbbfc2bace99ffeeff513a8c1c98fb670853a4407de41a5449613f88d8586fc21809d5a0c6de953dc211f3108b32198964db2ee
 EBUILD grpcio-tools-1.16.1.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
-EBUILD grpcio-tools-1.17.1.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
-EBUILD grpcio-tools-1.18.0.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
-EBUILD grpcio-tools-1.19.0.ebuild 680 BLAKE2B ca230dad6f755802398deb9f463251c45694709fec8395ff44a569080b854bb7694feee7bc135e109c46f60f68c9e187357b7c844e8ae968d4df75b0ef72c67c SHA512 83b5a43614a9b3a50eb8721a83155f0793ad30fde88311da0757c0ae19c1b49a63bb297d3b86f01d58ab17f52569bb3e74f176ee354c3ff05bbd80d27a289704
-EBUILD grpcio-tools-1.20.1.ebuild 736 BLAKE2B d9c8fdb3ab2ec9eb1a3b67f975a3e282d55b1d8c0418c84dfa2bb0f8c2c6d8a158e00e5936c1a69dbd6cc21d89adb0a068c14d66301576a1c3d5d6641ce9303f SHA512 586cf63aa06b18f9645c67d393f41dd384d60f65ab768aa996126de79fb2c3af721afb65cd0915fd057e3e57b6df04fee02cab6cca91b6625f7b07b4dd0aa9e5
+EBUILD grpcio-tools-1.17.1.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
+EBUILD grpcio-tools-1.18.0.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
+EBUILD grpcio-tools-1.19.0.ebuild 759 BLAKE2B f6e127ee9d8d8a98a5f810ca27ac3bf15041a58d95abc247e6c79fc1d7045c71919a29a92a8e54f08707ca16d9cd069bb2c114ea900aaa1f042682ca6f9c261a SHA512 124ebbaa082a3acfb3a033d1ac8210c6f7d22a79b99494bbe6da518c22650d65fa5866b514c9b420640a23e3e1d6b2a065f0a97d956e76dd07f27bf3d240b6e7
+EBUILD grpcio-tools-1.20.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
index 5ea474da86e3..55d28e451d57 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
 HOMEPAGE="https://grpc.io"
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 "
 
 python_compile() {
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
 	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
 	distutils-r1_python_compile
 }
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
index 5ea474da86e3..55d28e451d57 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
 HOMEPAGE="https://grpc.io"
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 "
 
 python_compile() {
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
 	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
 	distutils-r1_python_compile
 }
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
index 04f4b78e49f1..54eb74fc6325 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
 HOMEPAGE="https://grpc.io"
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 "
 
 python_compile() {
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
 	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
 	distutils-r1_python_compile
 }
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
index 8e0ddeaf6a5c..c9f032bd7710 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
 	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 7b2b515b3f06..95109b3a65bd 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -4,8 +4,8 @@ DIST grpcio-1.18.0.tar.gz 14601124 BLAKE2B 4dc57243759c573b960e841def6af335f490f
 DIST grpcio-1.19.0.tar.gz 14621509 BLAKE2B b756ba60d317baa089b8ee57c458bc68fb72e61a87150f1ef3366fea23456ca8d5bd443ba1579d1bef5d0049f249fc8c2c6e7c7cc0967eb58c102fb03d783103 SHA512 620459dd1a22cf60cb6bccb1b7dd64175f1efdfc098152cfa1889ad0a727b7a92b72f9de28b57e9a45cc8d2c22e2fc36307af8ab52ced454a91aedeaf7158273
 DIST grpcio-1.20.1.tar.gz 13882426 BLAKE2B 4211d9dedc7ba858a5124798f17b3b158f255d055f32f5947191fcb5fd45cca9c97aa3f8c4966e7195add5289ba3747a77b2f0c01a35762ffbeba6938c76046d SHA512 0ac126d8b2c25204bb03daccfc9b17016bc18dd31f89f6e208f2ae39d7e6fd17ae04a8178367a5334421d959b14fd3d31ac71a692b48a060d98f983553fcc3e2
 EBUILD grpcio-1.16.1.ebuild 921 BLAKE2B b6299a97f90c14a8fd60c148cbe6449a8025b391c69a7f3a9fa1201e06317a687982c873437b270ddceaa5470d5077cc840cc931c65a6e7cb442ad7342f75c8d SHA512 70b3fd83bc2bbbbd2e1cfd93624a5f6a18e2a126165ec5d2d1d946e5f77a672ecf2a2ddcc3f21e29d14e0d3e65e97edb89f98034b0b81644adf516ff3ae48259
-EBUILD grpcio-1.17.1.ebuild 970 BLAKE2B 7719d8051dabfccb56e3f2e05b61428cc05580660b7d59da877fbcb52e9de9f5e221f94d47c6a5afef49f845a748e8846d333651ecca9aa68165fcecfff888a5 SHA512 3f0fc368010d7b48496fd6bb7391694415faf2c1584a9dede25e1b1e47ff42b2041d8061e0c3ebbf2583a5a73fb0f1e57780ddab66598a9849611ae39c6b92ff
-EBUILD grpcio-1.18.0.ebuild 970 BLAKE2B 7719d8051dabfccb56e3f2e05b61428cc05580660b7d59da877fbcb52e9de9f5e221f94d47c6a5afef49f845a748e8846d333651ecca9aa68165fcecfff888a5 SHA512 3f0fc368010d7b48496fd6bb7391694415faf2c1584a9dede25e1b1e47ff42b2041d8061e0c3ebbf2583a5a73fb0f1e57780ddab66598a9849611ae39c6b92ff
-EBUILD grpcio-1.19.0.ebuild 1018 BLAKE2B 206bc81ee8340345f1e3fb592450245f34d09bdd6260b8483e4634b8b2bfe8308df19d70e518015d10c21a47b38d7cd4cb91e09c53b66be5d61bd92b4285c3b5 SHA512 0d039d3ca984b7dd321bdec6bc56d87633fd307d0b0f5c63c36a65d973a6bd3a71807cfcb1f40d8ac689135880896b8cba5d9ab3958af4fa9613d1f7597f13c4
-EBUILD grpcio-1.20.1.ebuild 1083 BLAKE2B e9b8fdc3dc7dfb6572c54ab859ad032f9f88883d7d2f5bd2d1804811680e3e49c08b0d9de4693bb4c468863b2a2611475813e511585361d42c4a468ea879253d SHA512 b205223e829d4b446c17a00e2c2db6b63b2a294ace95a3db3361543b467f9df2ef4b6a3f35f27b9bd56882c125f382d01e0abf059abd207e100798c8ffa2cfd7
+EBUILD grpcio-1.17.1.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
+EBUILD grpcio-1.18.0.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
+EBUILD grpcio-1.19.0.ebuild 1097 BLAKE2B d9eec593595d99eecc5ca5e127f1ab24b015715bfd76b19013788c793aea428732daddcd6458889142a1ec542cc82bbdcf1f74d6b0f158faf4a4722efedf5d36 SHA512 353cad322f66ea4dd434f8c26b29220b5911a66e53228b6f87b34fbb6fa143e9f13dd78be15b9e1aa60b912837e73c7e0554a015c6c788cd8421b416962a9b7f
+EBUILD grpcio-1.20.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.17.1.ebuild b/dev-python/grpcio/grpcio-1.17.1.ebuild
index c2e61e26d6d3..77cc606e199b 100644
--- a/dev-python/grpcio/grpcio-1.17.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.17.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
 HOMEPAGE="https://grpc.io"
@@ -33,5 +33,6 @@ python_compile() {
 	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
 	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
 	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
 	distutils-r1_python_compile
 }
diff --git a/dev-python/grpcio/grpcio-1.18.0.ebuild b/dev-python/grpcio/grpcio-1.18.0.ebuild
index c2e61e26d6d3..77cc606e199b 100644
--- a/dev-python/grpcio/grpcio-1.18.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.18.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
 HOMEPAGE="https://grpc.io"
@@ -33,5 +33,6 @@ python_compile() {
 	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
 	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
 	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
 	distutils-r1_python_compile
 }
diff --git a/dev-python/grpcio/grpcio-1.19.0.ebuild b/dev-python/grpcio/grpcio-1.19.0.ebuild
index ca93c41d1113..8ab781b2bb66 100644
--- a/dev-python/grpcio/grpcio-1.19.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.19.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
 HOMEPAGE="https://grpc.io"
@@ -34,5 +34,6 @@ python_compile() {
 	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
 	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
 	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
 	distutils-r1_python_compile
 }
diff --git a/dev-python/grpcio/grpcio-1.20.1.ebuild b/dev-python/grpcio/grpcio-1.20.1.ebuild
index 044f0b277cd3..095bde11b67c 100644
--- a/dev-python/grpcio/grpcio-1.20.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.20.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
 	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index d3f5e0fb13c3..5155832409d7 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -6,5 +6,5 @@ DIST httplib2-0.11.3.tar.gz 215815 BLAKE2B 912d7cf56b941cc5ecaac23e16e20c17a31dc
 DIST httplib2-0.12.1.tar.gz 218582 BLAKE2B 98c41a96b4e78897e803dbac3d6fedb25ad78f48d0b14ea29340f18da66be4622c7f0ae49acb2f4abca9542a174295d91aa21a6313b15501c4c1e590720a40bb SHA512 b083f0f5e22b384fd61eac428c1c60209702cf595762eadf6734afcf3cef6c3df8c7f2bedc5d782a4a6120a1dec51f910298f678c634c6b5e5d31348d9e10d25
 EBUILD httplib2-0.10.3-r1.ebuild 935 BLAKE2B e2257cc6984e94b06cc07a6179501a9aa83b947a05f9a30efd93f8771e733e516c588361e62355ed89e27200c6ccbd505c3edf14d7ef5427875c64ab8b1c6b46 SHA512 3842aca942c11e96386e9d8aad2939816ada9cc6b97089d226044bec978be8b2d6799a7628ba45fda20596745e46d4934aea8b6f270e5e100dccc702de83241c
 EBUILD httplib2-0.11.3.ebuild 961 BLAKE2B 63cce5b170da61a1f6992e7e6a3a416cab109771062cda3abf73c69a9fe6ec7d7b41a18efb6354f5472534108976f6e91458ce22a9f54f0a214ddb3a85761717 SHA512 56807467df22c7e8f34378033c74e9b87850a0a1b64a0d9ee1f3454607eae9da2878c21d90cedaf120b76fc9c986a1c98c989ef5d00e9729d76ed53d99f8db48
-EBUILD httplib2-0.12.1.ebuild 960 BLAKE2B 735c5a52871671f58708e9f87be95c628e622f3c2ac7495e4c8a2a7cdd2ecbb70c4c11c0c184ca88fc05bd5bdf2d69df51eb24086e211caa91b98e46342ba4f0 SHA512 433c94511fde80b7c7b676f0f9c25ba27c3defdcfb4225bc431a3b35caba1d3e1c6344b18bab6decf6156c3b16d3689c619c6a7aff747fda4b647d088c46dfdf
+EBUILD httplib2-0.12.1.ebuild 952 BLAKE2B 9cdc1c7e6d3f1640058cab2570f36d4540fb4e8d2ba5f65e26f2edd814d8d1af7df7665c958dacb5009a1db74f49ceca3ec67e56e7d9a739efbe1f1f07dc4ff0 SHA512 c55a1e98b1e6b71a4399004b099280fe3140ba8f2c49f472f4a5db7073be65fe712f66a445b88ae15b06dabec0e46649beba2812dc78e7748ae14d1b73122363
 MISC metadata.xml 437 BLAKE2B a688f70bc4de310ac3b250f2832c0803e25ea04fcc6a2b5569fc18f90b46f01ef0978bbccae980faaf74f385bed83b3da8179434614851da491ec62c0cfe92ef SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9
diff --git a/dev-python/httplib2/httplib2-0.12.1.ebuild b/dev-python/httplib2/httplib2-0.12.1.ebuild
index ea68c21b0a1a..fe9666fe0263 100644
--- a/dev-python/httplib2/httplib2-0.12.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.12.1.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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/invoke/Manifest b/dev-python/invoke/Manifest
index c08958ba4649..5c15d870ef22 100644
--- a/dev-python/invoke/Manifest
+++ b/dev-python/invoke/Manifest
@@ -1,4 +1,4 @@
 AUX invoke-1.1.0-skip-pty-tests.patch 959 BLAKE2B 4e23e88f3cdee0a3e7408b3fa217dafe28f36967516a7231543e8303b22c901a5c63a45dcf1332ae7a6e5d031fd535f8674388474429deec15535ad378cd02a7 SHA512 3ee402afa6f658639b56049e114b9e243be91e0a8016f0fda18d3f34c3a3e8d1be9a452d4828f072fc220b185790c820c43bb5d9a7b9060265c181fe2f63c58e
 DIST invoke-1.1.1.tar.gz 311831 BLAKE2B 2918c1a03cccbd90be6aa495206a2714f45c9690d8ce1b063adc0cacfa4c7accd36dd94863a83e9cc0c05aaf889bd746c3f528fad5af0db9f64725438866f81a SHA512 2dabf88428a53f244cab45cbc073b3a91fea5dd97a7590a58701a32bfaa14a4afe5d6a2e4ff4ed03ae38e1dfecc5a7c0f811bb18313e0af1f4e116f56c5e9ba7
-EBUILD invoke-1.1.1.ebuild 811 BLAKE2B 5b330f5eea7d44238f2d45145e5d2e59ec2e4b2924d52f38a22c810e02ba8469eb834b0ec8982abeeac95a46130d95d5265924da1edb40f4cce8f440b2a5ab5b SHA512 d8209ccb5983a96ebf4a61c4059ceaa3a570fa13b2b217f4e0e987163872102badf919f323f2ca7cec0124cd3bf66f12d21a0c4d75e99b3ede965b079e4a5e02
+EBUILD invoke-1.1.1.ebuild 494 BLAKE2B 4e65c7b7ac0f52258728fca4dbdd951aed8dfd4024cf85310e5bc6647a31965db3216847d99ab931c6d908d7ec6133389461673dde11b5270103dd76fe49d3b6 SHA512 2f300bd21e36773d907dfff067d5f9e9a65b63e6ae3ea4285e2c4289a23f7cf7f5700a8c77baaf6215a619bc28d55b4624cd3ea7b774b082b4038d1fdd6b2421
 MISC metadata.xml 438 BLAKE2B fd7de2d82839646be57042d5db8b2d4a27f9e3f16bad202dc068d2eaf590e04952003d67614c98554c631668c0c31927a7e3a4f73ec15761a66631d01cf6aef3 SHA512 eb37fe7d88bec1255f2579bd9e60054b887c466984017501327a48a6a8ae6e3a3b3b473c850db94b0dda7bdeeb63b8c60e0cdae041fa034854fb68ee416fc9bd
diff --git a/dev-python/invoke/invoke-1.1.1.ebuild b/dev-python/invoke/invoke-1.1.1.ebuild
index 8317fccae189..3f4449f2ebcf 100644
--- a/dev-python/invoke/invoke-1.1.1.ebuild
+++ b/dev-python/invoke/invoke-1.1.1.ebuild
@@ -12,23 +12,10 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
+IUSE=""
 
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock
-		>=dev-python/pytest-3.0
-		>=dev-python/pytest-relaxed-1.1.4
-	)"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-skip-pty-tests.patch"
-)
-
-python_test() {
-	# -s flag is important: tests fail when pytest isn't in "no capture" mode
-	# -p pytest_relaxed: this plugin has to be loaded explicitly
-	pytest -s -v -p pytest_relaxed.plugin || die "Tests failed"
-}
+# Depends on broken pytest-relaxed plugin
+RESTRICT="test"
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index f0e4abb605bb..5957643afa4b 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,7 +1,7 @@
 DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
 DIST jinja-2.10.tar.gz 267508 BLAKE2B 3872a073bd3954a079aee74fb2f23815f75559a88a8ab6d849cc9855e158d096a1ac62c219ae7f48a54d082c3073e83749c8536439248c80494e882f6a18995f SHA512 bdfd3c4d01b39827c128cbd7f6ebc0ad1434748be41c5037ba1b23156eea1d28f805ffe2a051b4e9b5b38938615c35c8876095b0bf0bed2c139cf5ea49ae2420
 DIST jinja-2.9.5.tar.gz 486763 BLAKE2B 680b8d58056b180295b52998a573da2fe86ac8b117a942e647626aef16d42c7af89a0ba7f5ab098fcdb29bd18940e316144fea1882e15d71f67bda945b4a6ab8 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121
-EBUILD jinja-2.10.1.ebuild 1655 BLAKE2B b37838d7f39dbb77540dc20866d91e72c0efcb6623a9f569e1a5c145ffc95eeddb5b74f468ce2b67408dfa426fb4c9725c99c69a184ccd44c6cf1c98013b9d42 SHA512 384342f53188aa7d2a9fd4fae4658a0357fd4862a4fbdcbe6accc9c0e9c7b3b8c9107a8279fc08baa37e9c06c8bd8684da2d42069ce68da19c8c300aa36a9e7f
+EBUILD jinja-2.10.1.ebuild 1651 BLAKE2B c76d9e3bf03394949f2711cbe09d56474c4bc9355f8a46e4e6e34d2555df526ab04c51d98bcd91a31cb52fd6068906cec73bf9f157fe1b680e9a3564722fa6b3 SHA512 62618c1ec2161811ada2997044abd257aee2201b1841990a48227be00e4075d279abbf4bee020bb8228b5e9bd1d023f2b7616fb45b76b2da1757ae92dc2dae1a
 EBUILD jinja-2.10.ebuild 1644 BLAKE2B 5337458f20455b9fb20d96a207ff87aa29fb8b418de76e4f9d953cf61b79137ff780dcf41fbec99a15b19350142653cfe9f61fd3dcb0ff46fcb92deade13f140 SHA512 508948d814e81917f8575a1b5d83c78f0636fb2350acc2f5909d07bb09eb544c3952d994cd82f6788d20184454e69bb1cab18b63c8ebc0839486af2dba63ce55
 EBUILD jinja-2.9.5.ebuild 1735 BLAKE2B 25d70d81701a93dd526eb0797c7b30bf737692e23182e03305e2adcbdb96ff980a6665aa00eeb1fea856ec3415becc7781e00c38ca6026553e5238bd3ca8a05d SHA512 8ad076186716fc63577f992000629cb546e0bed4bb378f51cc881059be529b4764e66f62c19c66d8a046c4386a63df50ff628f07d2d0697b1795af9572d6e17b
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.1.ebuild b/dev-python/jinja/jinja-2.10.1.ebuild
index edd801ef69c9..a5a156d90816 100644
--- a/dev-python/jinja/jinja-2.10.1.ebuild
+++ b/dev-python/jinja/jinja-2.10.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 60bad677243f..f46256e16c0b 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -3,5 +3,5 @@ DIST joblib-0.11.tar.gz 213136 BLAKE2B f23260ff16fab1ec775fe6e31c824f33cd6c465bc
 DIST joblib-0.12.2.tar.gz 289249 BLAKE2B 247a8bce753ece235877540b829bdc9546b3a6d7610b09592217bf9d47fd038a5e75f649224b76832825e77d76ae46443984de3d83558cdbd4d816d8f610e8b0 SHA512 9bf93c89681f59d17e735c228d3379df5dff67b4365b59ddea1a062f9547c376e5870e4ece83af8e7cda1ae30e2a2893a4a009e03b7fec798d3574e8ab060267
 EBUILD joblib-0.10.0.ebuild 1204 BLAKE2B f7b5e4afacb50384f72c3540b24e173726d2b3fae64a0357f44beb0125c0bede3ea07961d7fc4e85c208fb7a7a6ac7072d38fea86a07384f56c83068bb3467e6 SHA512 121433b59306e351950168833775f844efdca9866423214f58a6367e4ddea5472a92e0afca0bdc68d24d793831263bf9ef5125e269161effb45b60389657001d
 EBUILD joblib-0.11.ebuild 1131 BLAKE2B 9cf895831b64169645041f38f553b53d143848c8feb3dc347623681383d242c0af0d558c36582baf74d3d8abe0a69ea9725b92b5ef9fc0bbc04966bd3321525c SHA512 6ebc7e729925c5edb50ded71b750160bccd1e701751d81ef55b410ad2321f309f682d3121a6eda00928195deec613afc88d51e0b275e142c390f4a4e2c31f4f2
-EBUILD joblib-0.12.2.ebuild 1136 BLAKE2B 69ff55683dde3ffab8d11d0352c8208cae7da824734cdd640556a349bba378104714ebbfc2adea8facd2d680857cf9fd95a5a2c8c2293333c7ca503f80bc818b SHA512 e8cc663458e152d9bf7cea245ac9207e2291a2e70396796c724ac3d3eb9334f587b30a6524e9d9833a6a1b4f5a95a7cac4208016840845a1cc65178bcde0bc08
+EBUILD joblib-0.12.2.ebuild 1134 BLAKE2B 8700b7099b58075dab7965bd5c480df89a6b5cb1702ed0d7ca00d480058a719133c9021f23ef03fc2931d3e8ad807f064e2c230d6832159cf5fa9412899138a5 SHA512 8b5707b2911ca9908bdce34a858ff7e3a71ae951a25f75772bf97b5472024d42ec278184c1ba6a62f06c1063a7f841d86537ea9a61a2f8abd40e81d62a9f2b03
 MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
diff --git a/dev-python/joblib/joblib-0.12.2.ebuild b/dev-python/joblib/joblib-0.12.2.ebuild
index 76a598ba30a5..5132649ba2ae 100644
--- a/dev-python/joblib/joblib-0.12.2.ebuild
+++ b/dev-python/joblib/joblib-0.12.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 2140851f56b6..e5309f8764b9 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,5 @@
 DIST josepy-1.0.1.tar.gz 50251 BLAKE2B eb75e05dec890c92043357740829edf96f49f0c77b85211b9a9077ef39bfe59df2ee5952c1569559a07b6505870d796b3aa9e2b0fdba6943860b035f09a004b2 SHA512 51f0e1286a05ebc42f388d13e47e7bd2d1eb11ba1cf06f4d52d627d4a3c2d01f73f1ce9c9ff23ed7dd78ba18142af23e3de4277a63dc69b433bbc3e7aedfd6eb
 DIST josepy-1.1.0.tar.gz 51286 BLAKE2B 57da7c74308b7698e84e19307283f9c09e61ee4f99ffcc98f02f50c24a96efd485540b878d5d52248a51f81356ab406654c6016614e32a1810cc1ff46b49ba39 SHA512 eee886565b1cb92e6d7a42f1e3666a158c162fb891f90de844118ac32b24f6deccf2eee5990ba100827109203f7da99c2b55735fb7bda05fd7a447dca39d6362
 EBUILD josepy-1.0.1.ebuild 647 BLAKE2B 4bc9fdf0ad4903835760de27e4f3f0333a666539d849f64fdd924447c71f0725f5048b927fd8eb7bd1936cce2b3f5d9115050d93d965ad5957d405d007a05710 SHA512 5bd5868597481178a1c6681b76a789a5f2fa8acc8f591c8d9916778aedb9f88cdd188ce20e41d73787193b50f9ae2ba88c14e6848d8d3f00d1f2a32a6b0ac89e
-EBUILD josepy-1.1.0.ebuild 654 BLAKE2B 1a29b28352223e5c2e1da1f690359737ae2a97e7325496bf6fd758615b835794b2854753b1cce358a153f25703fc4c3ed8a8a116c51fbe8faa6eb215971e6e77 SHA512 01d786875e368a1efad4a4434af97d1ce8e6a6b100d6abeb32b183f7e5e353bc2bf56075d0e42142e8e29704f43622bb663215732b31ac085922f7d47bdc68ef
+EBUILD josepy-1.1.0.ebuild 664 BLAKE2B eba819fe93372091eb15d7f823a6c1358510bf3b63a9a3f0eed1820f268439819d80e4ef1fdbc500d9354a676f2f3c602fcafc19c1ea9b5fdafc5bed052af125 SHA512 d9249729b1802dd9c536e191cce9d07e68cf1bfcce978a1379e3a29d85fdafd7949f390036e424deed14fb863595330cbfc0178c8f23ff3a3c97f41ee05dab85
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.1.0.ebuild b/dev-python/josepy/josepy-1.1.0.ebuild
index 3afdb81c8e98..a345fc6f3611 100644
--- a/dev-python/josepy/josepy-1.1.0.ebuild
+++ b/dev-python/josepy/josepy-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="JOSE protocol implementation in Python"
diff --git a/dev-python/jsonext/Manifest b/dev-python/jsonext/Manifest
index 8c24e13387fb..de7a81e7826b 100644
--- a/dev-python/jsonext/Manifest
+++ b/dev-python/jsonext/Manifest
@@ -1,3 +1,3 @@
 DIST jsonext-0.4.2.tar.gz 9574 BLAKE2B cba417bc116e572f383a6d396d33fab0f6b63534ae89c402b6cfc0297a0c2fce336bf63464252fe9c87a9617f7f00ed82fe9de9d4e95356b60ae555963d4951b SHA512 2b47b48b529ad8f3b9662ce19f6ea9250648e17cb94e4a59a52ab6a9aabf64abb74f3c76a1edf274fe1e52863352456c0f95c5cd7406c44ca917b6addd09a2a7
-EBUILD jsonext-0.4.2.ebuild 590 BLAKE2B ca40238bcf41cb9cc1cfeb0cc18716bb1d244e8d49e6951a70c969c814562c513a9b3f08ae1e561a03f4130460c02cc570f39324be6f1afe8a7786ae27e74ea9 SHA512 252f7f740f8c2e1a3dfdb0b118cc79d03867df3e917e78464c9475db225d01536723f37da0b745e48d36be866defcb3448be295d6d683fea944b6814059e5bf4
+EBUILD jsonext-0.4.2.ebuild 588 BLAKE2B aacaffa3d88776f11f2bf6a3603733af21471b47e2f4fa4bf3ed70dda2a2eb5de2a3bed7ad1343519b134193d2bc14e7d7ff5bb3b7354866a54f513cc4825bba SHA512 0da76230df7a16d9993ee5354153cec819f90ad371c4b060c82451bb31b45511f8faec700c98d897a8b9d8c544ea37c25406c46d40ffcb04258bc448857a31fa
 MISC metadata.xml 478 BLAKE2B 917cd38f6d39c8fb63724e545d5a0d76a173b83dd43543dcc0400799c2cfec8966496e8656696947fff61f7fb25cdc4fe64ee73ca787d9072acbbaf376817a9f SHA512 819a01efba7324a2b5dc6829a882b1d8ec22588a0b615abf44a83b1e1ea517b463f1d01fae40c6fa3309ebe15f2797065575e9b34dc53944d7b44f860b36a6ed
diff --git a/dev-python/jsonext/jsonext-0.4.2.ebuild b/dev-python/jsonext/jsonext-0.4.2.ebuild
index 51fa8ba1fa13..c3df7420ddea 100644
--- a/dev-python/jsonext/jsonext-0.4.2.ebuild
+++ b/dev-python/jsonext/jsonext-0.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 82d1827000d7..d3afbf95055f 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,7 +1,5 @@
-DIST jsonmerge-1.1.0.tar.gz 12556 BLAKE2B 52039cb1ca349ad9e74cb0bd835796b4e211a2f4cb1eda063e9b3a06efc2dfa8ac1fdab34a3d75bb069dd527c777c086b72b987e4e4149a45eb4593eff6b79ca SHA512 52ca9d17098533ada09365caddaaa92b0e0ac696c99b92db6aabc8942183a6d9e06ebf002213d8cebbd25d4905a6a7bfa17ad9d296c838b0019b9f30e403ce94
-DIST jsonmerge-1.3.0.tar.gz 16569 BLAKE2B 19ec00c06379ac74e18c9a0e0542532e7c9691ca187f189b97252d3265dd80f0584c5495021dff790c44e7fd95571a368f8db008ec30252322a927306e8749fa SHA512 2d44b52441651c090b7439880a1fcda7acbf958fa60bf64b91297b0267500a992e80b3fc51f45c7c97d94af327b02984b110a0e157e62b33f39e1c83a3fdcc32
 DIST jsonmerge-1.4.0.tar.gz 17953 BLAKE2B 625c38fc83bec73f1bca3a8950ec2ee2294ab7da665f4c3b7d78329e5df8a0ed6ceef723eeb5757463b1d702ecfae4a2fa7580915917a7c621c762b90c257504 SHA512 ad28e01692189863f38f363d22b6bb3cef0b0074e5f6092eabf7c58fb242085fa2ac26506e5d816daebd85049cf6fdbb62f9885d66e545c49e2ffeaf589cf122
-EBUILD jsonmerge-1.1.0.ebuild 680 BLAKE2B 8e2d73935ce32c0d9de4a105f432bef747c29bb17d70f2abd4f1f3aa694c18e5967c666bc2855248a0d00282ae53330ce86e51118ff5539ced5110010a1d19bf SHA512 ac15da24d7fa8badde4466a2a5c68a4dedce1cd84d8c04b9dc9b545c5f5ddfeb909f3f3e729186c848e422ddd8e127e7a5c0bd1d2a98c6843930423cf4b6300e
-EBUILD jsonmerge-1.3.0.ebuild 735 BLAKE2B e0e7900931513e86f209f94c9344c6cdba1b46173b476a25d9590ebf66ee66b086ab30206118f08a11dc3c04b5fbe2beb00008ee10472c6af0124ed8d57073fc SHA512 97ca2af60fe9e6d13c63d4646492c321de1c3612a4839de22405d1336884f6eba0ce468387cdfc7304626b43bbcd1fe0b311e9719acfd1013f1af9d321de918d
+DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db
 EBUILD jsonmerge-1.4.0.ebuild 675 BLAKE2B 1efef2b2c522ad0b803b34f9f8c5a5adfb31684d3831b3ec6e44ba81843c3d32a364d976ee9d76f0ff1b0efdc946a018d92b2468477d04123d11feabbe899ca2 SHA512 f9a8c6ebeaf101f01e7fd06c0d4772a3e1cdfb9915e49be8d6b70459bdfb4ff0d9b1b1f370e9604fadcb4c743c783274dc070a9f7725a8726662281f7b357389
+EBUILD jsonmerge-1.6.0.ebuild 678 BLAKE2B 4172542544204328205cc3d267c9e63d6a169a449e05793010e1410cb2f82d9c8ed8570b4b6cfbf469703fa055a2d769c9ce081b00a3120d2b04450fd0812185 SHA512 a7b625fc40c42e469aa8f6d3d48a303de6175d8b9e5baf6442079cad9041dbac8efb35df1145eead49074821ae3b8f7c5f2d5f2242e948555c128afb08648809
 MISC metadata.xml 372 BLAKE2B 1490ad4a4f5950599628f9bbd3f7cabb2ab2cd52e0cea7fdb814674d3f50804675bac91180392a013294c72e3b7b4d551b0ade20331927ad9773ae4eaf2cdb3f SHA512 ecf2f464f37f4f00ccad0d697216fdb669ab31f26a571023597f8d7bffe2e9101bc618c437ce381879c64701f13d3b81c03dba57bf1a67df5b13c81a137865ea
diff --git a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
deleted file mode 100644
index b082e6dc7195..000000000000
--- a/dev-python/jsonmerge/jsonmerge-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents."
-HOMEPAGE="https://github.com/omergertel/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-DEPEND="${REPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH="${PWD}" python -m unittest \
-		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
-}
diff --git a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
index dc713b9ca070..fa454e60a611 100644
--- a/dev-python/jsonmerge/jsonmerge-1.3.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.6.0.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
 
@@ -15,9 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# See https://github.com/avian2/jsonmerge/issues/20
-REPEND="<=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]"
-DEPEND="${REPEND}
+REPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+BDEPEND="${REPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index 2cf6edc4d4b1..ee1438d4470f 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -5,5 +5,5 @@ DIST jsonpatch-1.23.tar.gz 18162 BLAKE2B 86322a4de88d37eb674d28425d3aee4ad3b589c
 EBUILD jsonpatch-1.13.ebuild 796 BLAKE2B cfaff54a94f30369ac5a4f4cc97d2c87ebbf858545ea19a274117ff49da48f205a7792abfcf49177625c261b17ee60d6b1c498898ed755c728bc50979c33ad3d SHA512 6faff114933b84902d03eba04b0c0aa93949b4d31c361c2619b058c1dcc7f9445339cfec28a780a90e124fe3a5c96434487bb315d89b87f29299ea84643e2d32
 EBUILD jsonpatch-1.15.ebuild 804 BLAKE2B 1b45338496ac7865249646b51242571b1ae8c37e335c29e365edfa7938474fd5c8b0886127c58df54d73f3a1ad88b0bc523dd1883a376bc760ad6cf2a85d166f SHA512 5e256adb1fd419dd77418c1b56d5eebc8e1cc190bc28c5d559997a6556abc198f0b624f90b0df99f11bf79837faa2cad7855996f94caa8a7156c6683bdc68713
 EBUILD jsonpatch-1.21.ebuild 793 BLAKE2B 518fc1940720b5af590a4e77339588d1189473abf88e4795be32cb4ccf8587026372c6a81443a4404df50e0539b5f5de047ae35c4a3ffe3ce482db36e204a72c SHA512 3a977ae207c84ecf1dfbfce97e788963b48840c32e2d16bd5bd14f5346b0e086efc1437453c9f17ed2ce8c7405d80c48d0df8c9730292295bf34aad8fbaf4bbf
-EBUILD jsonpatch-1.23.ebuild 798 BLAKE2B e021b3e754438cbf70bc259a654be1a9a36ed9ea0c7d97c65560f95ab2dd1100db8d49225121583d363db0f9aee1db9b9f8efe5deb0ed2b71cb7f67982d49e48 SHA512 cf606ba3cab3228623ff222313e1759e2d59b07120f42f71111d04eb1aa04fe08cc44fb7d173121949d080cde9269434eafc58035c6766de65e23ccc0e7f283f
+EBUILD jsonpatch-1.23.ebuild 795 BLAKE2B 2bedb5d8da320ca4d5bc6639f7baa6c992bd4e99ea992e19f414df9cded5b2f7863ceea74534ca70bd20ae054c2818657b154587d4c9ad1a12a800efa6b7a57a SHA512 c7e18332f52a06383cb381863a44b885d4946e2ddc8bc33e34ca58a997a28c391927fe83131ca0ef5b578d7596ad24c422d9acdbcf7949dd9d7bf33ea99fd240
 MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
diff --git a/dev-python/jsonpatch/jsonpatch-1.23.ebuild b/dev-python/jsonpatch/jsonpatch-1.23.ebuild
index 3c50463d480d..2f161cd1bf93 100644
--- a/dev-python/jsonpatch/jsonpatch-1.23.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.23.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 79f54e7d647c..67a27b009e4c 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,5 +1,5 @@
 DIST jsonpointer-1.10.tar.gz 7577 BLAKE2B b4472cd9ead51fe75f2e53690d4c0378cb6b5dccae240bc1bf264bff9df15bdfab379b1043221e66074e08c3393ecf729e4f95721fcb324fe8b710cd49d7f064 SHA512 b2df5f19b14b670825b18f7da4ca50b089beb2ccbb1c69acfc904eed82b5315ad19940b4aaa8f8504c2fc7d477778d65e31f492dd30ee8b5ba95ccfd0eaeb9b1
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
 EBUILD jsonpointer-1.10.ebuild 638 BLAKE2B 2ebcf0644b5d6cd7baba9c1fb7276b4fa1b3ea22dd545f5cdbf1d56ca51ad4ba60c90aaf48a8f42df44ae456da5bd891b24d3cc1703c22a1c4e0a288c9228388 SHA512 a09d13d511454edb9fca25a01e64e4b47bb8e976d4cf4c063f7b3d85f33407ae5c1ade3342c79df5180c0185cf2394fe4ac9378b0b538e9905aa6942b55aca66
-EBUILD jsonpointer-2.0.ebuild 635 BLAKE2B f20caecfce6226da3220c0fba30c70c8075bd4e22ad84a7451245c1cd3fe7a091240d4201b342280928d4810bb575bd9b57dd38eb8b3bfe2973e5b5cbc7417f6 SHA512 c5b90624752ce110a61c0d4a719cb26214b1d92263ccea3b6849c1f7bb8d96e4cbd0116cfaad490a102a10743e369167400e27b97bf9e14b33f1b248726486a5
+EBUILD jsonpointer-2.0.ebuild 632 BLAKE2B 155809e8ca9ec27526b9642fa878c2aece07dbfcbb2a08c1a82a23f52d1cc4076684d04db0f188193b92d1d548d28a51da939c260175812a0709f36962ec4d9e SHA512 5bbfeacf0d847f965ad2be8470b1cd940c9ae3e3cd4fd9b16d9e00f6abdea5430ae625bc427cf4a6414003b3ad0b7201773379ba9836ae70603a6d9a6b91c474
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-2.0.ebuild b/dev-python/jsonpointer/jsonpointer-2.0.ebuild
index cff789dae5d2..ca6ccf6a6273 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/kaptan/Manifest b/dev-python/kaptan/Manifest
new file mode 100644
index 000000000000..03da99d6fea1
--- /dev/null
+++ b/dev-python/kaptan/Manifest
@@ -0,0 +1,3 @@
+DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
+EBUILD kaptan-0.5.12.ebuild 611 BLAKE2B 5604efad0ad42d9ec82f70809e6d4fe054bdbf365be79de19aab265d7d4beb4d4e5481e8db12328be4cf658fea6326f83b3ec8289f61b25652118b0988acaf4a SHA512 c526b6f52815b1f9533914f363122cc12cb24d70c89e401f7e0c75e8a500851f791d28b4c0416990e17a94b7f3f06341252a6f0716ec631af7d589e5d24fb8af
+MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/kaptan/kaptan-0.5.12.ebuild b/dev-python/kaptan/kaptan-0.5.12.ebuild
new file mode 100644
index 000000000000..8d941ca3bff6
--- /dev/null
+++ b/dev-python/kaptan/kaptan-0.5.12.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Configuration manager in your pocket"
+HOMEPAGE="https://github.com/emre/kaptan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="kaptan"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${BDEPEND}
+	test? (	>=dev-python/pytest-4.4.1[${PYTHON_USEDEP}] )"
+RDEPEND="${BDEPEND}
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/kaptan/metadata.xml b/dev-python/kaptan/metadata.xml
new file mode 100644
index 000000000000..56cae167d372
--- /dev/null
+++ b/dev-python/kaptan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 57bea81c5f9d..a70253ea9abc 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -4,6 +4,6 @@ DIST keystoneauth1-3.13.1.tar.gz 246906 BLAKE2B 92877ef5a0ded692372521244c006f0a
 DIST keystoneauth1-3.4.0.tar.gz 227170 BLAKE2B 57f28ce5a36362f34fcfb2f456a19332df6851a4d372fe890286b4d48469ff69a3ad7281b55d4aa338f61d437f5e07908fc55210e2085a6d9a974cf0bf451c81 SHA512 aeaefb0e5b369e36e06adc1bada104dab2c2aed22bf96cc3e20a5dd4ce8ae10869eb73ce4802faef70f191c3bbd38e3b5c3dff3606c46956fb350c0875cb7a7d
 EBUILD keystoneauth-3.1.0.ebuild 875 BLAKE2B 2d0066fa9da7ddc896e8cb8e86493607bab6f9d2dbf573555994f995722504415a69e72ebb7a5a9e9b672a328009b2c5ba5a14dca5611e8293492c26e08775dc SHA512 ba5f5dec402f66ecfbe89e8c55d3285ec716d4507018e931ff215a7ed3e89a390a047d9c4deae2218a8b37fcdeec7366e76dc9cc5547223561d9a18fc93c981c
 EBUILD keystoneauth-3.10.0.ebuild 892 BLAKE2B 66e95ad85087f263e6ff8362732d0206803d8cf153f0d94546daa9d3e56c0e98da68c9bf4d8a08da5c8f5161c7dfaf782f850b34bdffd1983c29cf91fd31cfe0 SHA512 d8d45252acc920486810aed22e2427b350a94920d0d2a7219ca6f3e90ce7b5aeb97b17ee0605328a53bf832746a3182c012398232a793c07281bf2ccb68edd18
-EBUILD keystoneauth-3.13.1.ebuild 894 BLAKE2B ecadcb6bbb258ed870260af880109dcd2f1afd39927c72456618204d4280864995ea8b82a3733c0795e2d20472d52284f7e550e83ef9dbb7205ead584b0b96f6 SHA512 d84ff38fc1e374585aa629de921f3b09607ca99647b92b2bff8a0862af7a4dc357b1d5bca78e11de1664c9a0b33398b59a5db97941584936eb904ce67d3fae5c
+EBUILD keystoneauth-3.13.1.ebuild 892 BLAKE2B 6d542a76f6ade7ad39fb445c5bb33730e60e83ce9c3a639102ffed3c8088f06a60677e2cb0a3bb61386bbf8f33f948e82d83a7f2c4e683538a3295b57477944d SHA512 e125524332bec12b2d606369745db71c1d9c7ba02e77b4e75b7abc910f4718c2f58cd04ac05ef26d6939932c4aba4ff3f77bb5825edbb2e9a5dc0264d43c726e
 EBUILD keystoneauth-3.4.0.ebuild 827 BLAKE2B 231931b5564237bc5f801b0b635646d36df95620a6caa7e40cf4e02e41b01d7d7622a24769aebba73e772f9136062331ba93ffea7efa14b1374c70c076c0044c SHA512 27ec3076051d78f5a93d0b9548020ea8eb34bbfe1a95b5ce2231788cdcb346bce4acfdf984a35df657970da5445658f7f036e1bc8148068f9314fdd2749a9098
 MISC metadata.xml 519 BLAKE2B 22f32029ae01c1067c8ce7c4ea3adca3e462ef4f274b278dcdbc45f74325c719df3ed89b77a6f5f40a3fdf2219b7ed1b1272a944b1e30ea2d50f4ab2b206e000 SHA512 8a00d549ee4cf755cb819cab370b9e66cea6d3396d7c15c3b644731991ad292b0a2c862b2be42e045584e1a429ff5b8950bfe55d58a904cbefaeda8d117ac117
diff --git a/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild b/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild
index 8e79f6d1abd3..5b750dd57a1f 100644
--- a/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 7f312c8dca0b..1d0c3c5b6b1a 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -3,5 +3,5 @@ DIST keystonemiddleware-4.21.0.tar.gz 207164 BLAKE2B da9e55170c4af189661b518c596
 DIST keystonemiddleware-6.0.0.tar.gz 208974 BLAKE2B f8a92ed31ef5d8385ae28bbc909d4c3c3d157c9b879d3beb0b3b87665381ac138c0f0a114e0c095b663f51cf4c1973f8cbb06eff3ca21feb998809bcb73d83cd SHA512 e2fe230da87de7f4ee768ba93dcbaf5382e44972a84914d6c0fbe0f13eda14ff74642594cfbbed1d6ec359eae4158bf9b798b48d362becdd6bad84ec3015db3b
 EBUILD keystonemiddleware-4.17.0.ebuild 2850 BLAKE2B 6b6c6af19cc88c251d6cf3ede4d8549bc9a27e2062b95a7c759d6d1bc21017963b902a6c9ee497c67f88d62a18bbad461f20b1ae8dbbc92c38d791ea42e4228d SHA512 9e97b903325501b1533aff49309a6132d9c290207e96b14840c603ff6d89f729fe7e493e8b54e5f3dde80b5558a5c56ca55d2018eebf7173b2b0e4ec692d3190
 EBUILD keystonemiddleware-4.21.0.ebuild 2657 BLAKE2B cdb4b2080eeea83d6e4835266a2fd87cae3a21693b509fe2c8de2a29483fdfb33af56f8cf9cc2b1e7b6b189efecf8340984d3e0eb0ae0653480c0a6e73b8e251 SHA512 0a33c73ffc651fc60337b796daa0512b0d45a94a8449a843bf38368eff622a9fdbf4f4987a117700b38b64f947bd7583c6ca219d2d25462634716278be9129c3
-EBUILD keystonemiddleware-6.0.0.ebuild 2444 BLAKE2B 2630dc5ef9066749b87ba0fc129bd22034ee1824db987ef86dccff2deba245fe2e0ceb0df4d3e626b07279917ea31c3078e80a49b973758aa323864085158e9b SHA512 c5ee3ca26240f039f27a0a09644bb26dc603affceeb440266817885e2a4f53b049ac9a553c7a4c223be7a65a821c3da800b165f5bcdb67d73377bb94e453682b
+EBUILD keystonemiddleware-6.0.0.ebuild 2442 BLAKE2B e317ae34bb6583809ba9887bf8e459f33e1e64f9fbb4a327a99857c7a0b64814ca481be590d8adf1898c127f3f71b3855f24188c20cac57ec5f387cce766ee40 SHA512 626e73827fb68c3179ad50bce2b41f1c3aeab037335807cf9e1e88a5541f95380adde131ecc4a2127328236deb290caf1525d9442f635d31268f0d8e21bf8ede
 MISC metadata.xml 624 BLAKE2B 9431121807a163b4dac75bfe53e40ee4b86412db23d46c8fa6318ec6e0d2af338eb6423076879bbb863e7a2aa173d484d2f1a3c98211021e5357e07f9cae481b SHA512 5ca1f6ea10053be2f9f74c797cd1143f6b3ab267d0decb66f3609973c20637b55769bcb305ab70693d99d3ab09da6aa6ac7d2acc66431a4a52f6dc9aef79aa6c
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild
index 3a356d9c7612..32a97395aed0 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index ee109e90cbd9..9f034aad4231 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -3,5 +3,5 @@ DIST kombu-4.2.1.tar.gz 423926 BLAKE2B 8566e3d81bd77c93982f54300e837e2aaac1d1fbf
 DIST kombu-4.4.0.tar.gz 435287 BLAKE2B c87154f5f8862af9e0381f1f4eda6016e5ed69605a39b682c9e648003adf4aa4ed8ebbe7f6dc38b293ab013d8f5e31bb732cf47cc4aab7738be7edaaa25ca750 SHA512 2f7bd71f848c7bba0643e47c43af79ae09373597bed86786e3a90f2acd69414583021e7f5544e47bf01f760b1fd9788e89e88a32cd22a3d74a34845b7917e10b
 EBUILD kombu-4.1.0-r1.ebuild 2329 BLAKE2B 8824ed84a6185b64eacaa6322eadedf4a899418db15cd1ac6f718e4c32ad6185ea31facc833572f0ff654639d645b48ae340a9145e0c16d51db118346686f30f SHA512 0f88f9c70e0a93a57d5992f4592cdef1e405770a1a39aefdcd9e449a07c8df53876121c79238b906785d34122df852293e796a903ff05d0b3e4e7b0c2eb9ac48
 EBUILD kombu-4.2.1.ebuild 2329 BLAKE2B 80aabc0220c5224e974997de09f7e07fd5f8831fadbdf54e7832900e10452bba101928a5b57dec0a5ad50aa60bff879d557a6159278f2ba0703085233515304a SHA512 e28a667406c2b3ac86862488967230d5379c73ddfac0c2e027596f93a78bedfcccb0092c5b1573fb31b992502427406100e7c7040d98f2258bf4da34d302a73b
-EBUILD kombu-4.4.0.ebuild 2331 BLAKE2B 740f3b72f8ab8605bc47b74dea732322bf315cdea673df36652bad1dfa91cb3859cad3cf589e96829664ae211ead9ac46d26d603bfc45374f74d2a9c6e9be4e2 SHA512 4d826be0498e86cc49f726b35ec8f7edf837379244b77be4eb92dba8c05619f20ea39a1b451e6f41da17e7d7af5d84df048d7e1fc03da70f228040227b70eebc
+EBUILD kombu-4.4.0.ebuild 2329 BLAKE2B c7eeddcd6c514bebd232533e75dd01cc398ceb44a1d7f26cd527533c42132df84bea0c1476892b856de038c04c7a87b1f0495e9cebb865296b26abe304f79bb1 SHA512 3a07a480a0e14148b778bd2c0b44728e8f0e3531cda2cab7b8996ae404de9b0d9f996b803dc4fa04269688bef258333d29bfd3e13caf7156eb843f311fbecb39
 MISC metadata.xml 675 BLAKE2B 6bab5465ca22ad8ab27ff08418abb6c6616972605b2b9bec7ec559f887962c80df01e6c9aa8eed5b1ffcbc392a8476f86ea477fa3c4084ba37e1ba350786f8d5 SHA512 37288783570daecc3bd70a8f5e9b96e652cd2271f1a36f9ecd644b6fb98f4dadbb2f2cbe36457c46d4b99d67fc5cfa6fea78f37bfd96b3b639cd26de4e948541
diff --git a/dev-python/kombu/kombu-4.4.0.ebuild b/dev-python/kombu/kombu-4.4.0.ebuild
index 579e37738969..389767e4316f 100644
--- a/dev-python/kombu/kombu-4.4.0.ebuild
+++ b/dev-python/kombu/kombu-4.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc examples mongodb msgpack redis sqs test yaml"
 
 # couchdb backend support possible via dev-python/couchdb-python
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
new file mode 100644
index 000000000000..228a5ed8659f
--- /dev/null
+++ b/dev-python/libtmux/Manifest
@@ -0,0 +1,3 @@
+DIST libtmux-0.8.1.tar.gz 37696 BLAKE2B 48f780ed2c1243c752d35d58f1a7eee4d59297047abcfb0c02c8c9206ad2f8c7df9c2968935e30457dd14be8a9110b9cb1e3b7daf4d5df43e3533e400cd8b21c SHA512 c45e8c761fb9a6b827feff96d4bb263fb0419509a1bd450ac4038d7ad0b96b3047f0d6f3c7bbaa16686918ecfe3c8d189b99982574e4056abf5a491b20e0e7f1
+EBUILD libtmux-0.8.1.ebuild 676 BLAKE2B 3f7f42fa2305111aa785cdef6ef2690122369ef09d58efe57b797e271b5a9cf0390a6d276b69f25ae214355d94f12a6d96a7fdeb2370522d383c8e156980a265 SHA512 080858d629bd06dec3703d65b6e07f36ce9a379ab9d2263883c1794a858ff4a3c2e891e021a52cdb559961c01400743f571b4120c8afc6b6d5e0c3bc50dc7952
+MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/libtmux/libtmux-0.8.1.ebuild b/dev-python/libtmux/libtmux-0.8.1.ebuild
new file mode 100644
index 000000000000..517f2c71e586
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.8.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="python api for tmux"
+HOMEPAGE="https://libtmux.git-pull.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${BDEPEND}
+	test? (
+		>=dev-python/pytest-4.3.1[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+RDEPEND="app-misc/tmux"
+
+# tests aren't included in the dist tarball
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/libtmux/metadata.xml b/dev-python/libtmux/metadata.xml
new file mode 100644
index 000000000000..56cae167d372
--- /dev/null
+++ b/dev-python/libtmux/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index c1d413445759..02aff1977c16 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,14 +1,12 @@
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
-DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
 EBUILD lit-5.0.2.ebuild 899 BLAKE2B 688966a355571c6ee01e56dc980df5ef49f966ccde9edd85143d7d306ccea6e2217dd4870ae3210fbf4c615ce8f57950a3aa34d44b98bcacd4a18d617bce79d8 SHA512 f5f36aef2a795c4b7d5c241810bf4e441b5271c3edaaaffe2a3250fed2f08bc1bc4907cab20303747d1c970d74fed16b55fd48e919b741f3cddf6fb1b27e12d3
 EBUILD lit-6.0.1.ebuild 1009 BLAKE2B 6e468d6a7274031b8e81eaa7c0827ae991e8e11f7daeb20d86fbaa56d26b2462a58e58f3afc75369bcd04c229d3c7644c06f97c08e0eb0fb5b04441bf190ea3a SHA512 63870e81d534e9995d2476934962055c6193522dfff741d2a99155ac83d15ff7e7ea81bb89af14e8d3b09e9dea9f6f593f520f062e4af80738bc1afb3183f58c
-EBUILD lit-7.0.1.ebuild 1015 BLAKE2B 70ebba5849fe2d5d464d2fb2ddf1a903e992dbab59ced42048c16276bcbc71af3e1c72f8d726bd80d5469080b5c00e0e38aac03f1704c23303092848721e424a SHA512 5af4e2d207b7bb5bafb4ecd21577569f77bb2127bd980dd0d31aed256253a9019de316ae4a9c33ddcd4d1135c67ce5052393d4f827554f0fbb65e9e22f0eefbd
-EBUILD lit-7.1.0.ebuild 1015 BLAKE2B 70ebba5849fe2d5d464d2fb2ddf1a903e992dbab59ced42048c16276bcbc71af3e1c72f8d726bd80d5469080b5c00e0e38aac03f1704c23303092848721e424a SHA512 5af4e2d207b7bb5bafb4ecd21577569f77bb2127bd980dd0d31aed256253a9019de316ae4a9c33ddcd4d1135c67ce5052393d4f827554f0fbb65e9e22f0eefbd
+EBUILD lit-7.1.0.ebuild 1012 BLAKE2B d1cf0e9cc017dbc69a9bf3af33072d5aa100fb6e3b331086d297dcef9eebc865d443fcd2e0c5905669a09172965a5ad99b2c3b1a44e9e169f766a50f6f621076 SHA512 e8aebe61958a11aacd8c30df491cdcbbf4fd0fe762ceb7e25b80c1276f8ec9d41e76d480a0f86a546787bf9f8b4b1401f50265d4c59cf805e17c72720b76bc53
 EBUILD lit-8.0.0.ebuild 1015 BLAKE2B 70ebba5849fe2d5d464d2fb2ddf1a903e992dbab59ced42048c16276bcbc71af3e1c72f8d726bd80d5469080b5c00e0e38aac03f1704c23303092848721e424a SHA512 5af4e2d207b7bb5bafb4ecd21577569f77bb2127bd980dd0d31aed256253a9019de316ae4a9c33ddcd4d1135c67ce5052393d4f827554f0fbb65e9e22f0eefbd
 EBUILD lit-8.0.9999.ebuild 958 BLAKE2B 18ad819d0b277e210a71ce5f7f93be2d37e83b343d8f65576b7f4e158830654367ac8347e551f0a42dbbbf4174caa7aa74ef869f69d04eee8d26fd3f6bf0750a SHA512 662980691abfc4ea922db2bfbee369f6c9645f69e9b8062d2da85fb853b732d174e00e148d65ffa6b9347885ae16372bc223070d08c63edaada3c7bbc183bdbe
 EBUILD lit-9999.ebuild 933 BLAKE2B 926665f411fc4abba8d6d3d2ef314c487fdf548919a790cbcc9ab7ff033756aa17b4b155ee8dc925ad0e99fade0dab02494e1433ea2ffee2bd24415ea609a016 SHA512 5f091d06f9db9b2916618435b1d9807b22c1abbb1d92e286cba3c5f18755b4f73cdb8b7e945e123d0eb1b8e396da6ac410063ba1e179ddb276f06bebf29af7d9
diff --git a/dev-python/lit/lit-7.0.1.ebuild b/dev-python/lit/lit-7.0.1.ebuild
deleted file mode 100644
index 7a58346362ad..000000000000
--- a/dev-python/lit/lit-7.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit distutils-r1 multiprocessing
-
-MY_P=llvm-${PV/_/}.src
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}/utils/lit
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
-}
-
-python_test() {
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
-}
diff --git a/dev-python/lit/lit-7.1.0.ebuild b/dev-python/lit/lit-7.1.0.ebuild
index 7a58346362ad..0a4917031147 100644
--- a/dev-python/lit/lit-7.1.0.ebuild
+++ b/dev-python/lit/lit-7.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 0274684227b5..b844c5f2b2c9 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -11,5 +11,5 @@ EBUILD llvmlite-0.22.0.ebuild 1353 BLAKE2B df1cbe7e93bead771f9abc130fc053caf9eb2
 EBUILD llvmlite-0.26.0.ebuild 1501 BLAKE2B 93d3c40675120ca291a8d4fa90d84f484982a110f06707e1f93ec281d7dc2769a34427db467f976d82b9740ddd469b3550488fb00f210db570242cf74a12a033 SHA512 6ddc17275c10c8690e8bcd686dffbb86a6f60dd45e9ac73fe70d574ce1226e3292d9886fbaf9b96b916af9cd7437522a071a7506692285ba9c48017a3090a2f8
 EBUILD llvmlite-0.27.0.ebuild 1492 BLAKE2B 9dd18224c52fa5c67c6938a1bd91d21027594c86fd0b8350f59331b95947faedfa34f1bd22c50af83eba176aae2918ad9ea8a3a7b5bf9a1c196fbd310efb0c56 SHA512 d87c9739206de53f080b9b566fd32749b61ca72f7b1edb8d4cef5cb1c892cdeeda9a85cafc114935e3da60819b381ddcc7b86eae0e5d83a32ccba996af3e69c2
 EBUILD llvmlite-0.27.1.ebuild 1492 BLAKE2B 9dd18224c52fa5c67c6938a1bd91d21027594c86fd0b8350f59331b95947faedfa34f1bd22c50af83eba176aae2918ad9ea8a3a7b5bf9a1c196fbd310efb0c56 SHA512 d87c9739206de53f080b9b566fd32749b61ca72f7b1edb8d4cef5cb1c892cdeeda9a85cafc114935e3da60819b381ddcc7b86eae0e5d83a32ccba996af3e69c2
-EBUILD llvmlite-0.28.0.ebuild 1537 BLAKE2B 602866235d8cef56741ceff7f39a6e9ead3d9313dcc6764006fdd0622920402536642f8652e6722954034c544e29c62dc34eb919912f5a9d6b909e3ea9d7a543 SHA512 58f8fb6ce0e6d8daf19092ab6a5241f37a7ad94cb61481de333b27db3257d56de5528e59654b7fce4e716a771614a4371b894288a50f82a56c236fd18e9d0532
+EBUILD llvmlite-0.28.0.ebuild 1541 BLAKE2B 2d6575051c5c5fab37a40a4a9164ad2b739d1f18164836f4b68d7e4a2dc03a4fa1999b41afc1d3beb39d20e71356d76d68dee157690082cc3c74e63c6bb089cb SHA512 2337eac3c683cb2c7deba8a24556c5f5830b54e156ba589b8896aba3a2676841bc79e7c143a8e998ea53e8a0b871bfd40154a2586d1c15ccce1d6bcade47410b
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.28.0.ebuild b/dev-python/llvmlite/llvmlite-0.28.0.ebuild
index 0d1f8da500ba..846f75a697f4 100644
--- a/dev-python/llvmlite/llvmlite-0.28.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.28.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LLVM_MAX_SLOT=7
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 2e6063b5674d..b7478289a00f 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -2,5 +2,5 @@ AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7
 DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9 SHA512 4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe
 DIST lxml-4.3.3.tar.gz 4378439 BLAKE2B 30c2a29e58951164fbff1c9d23362d46987c86b671e0cfa6cf15cbbb3db23ead856786babe57ce553f7b8a66d8ac333410ea1bb3b8b521aac43a038b90daf488 SHA512 cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0
 EBUILD lxml-4.2.5.ebuild 2348 BLAKE2B a226eeaa080552fbde23fe44dcdda766c4d463b1103440cec93ebb84e79ddaae62dc328e5825639368ee21fd4ad2ddd32f2c08f3c0b7ef81f48c8e92a284312a SHA512 9e16806fb9e602b5f60be9e5b24b1ce7bed7a643a632d37e12dbdb79defeb312bbf4628c9f2842b12ee3f7d36ca11922aa9edffeb3898ff8465b34210f29f653
-EBUILD lxml-4.3.3.ebuild 2449 BLAKE2B 77d23aa3eebd636103112a20740821bfaa5087642bfad207232eb4fcf1290f5fc18d372b9ae41215284441a17604e049f6978d3ee1b58fba230b2964d2af1841 SHA512 d0256c53ba71116ad254b0a681e01a01a49545a358e706dec491f4878c4ecfe14d67d8e409f454d6db7c6659ab14c6cb8c1c03ed25990bc37f52f45a16cb351e
+EBUILD lxml-4.3.3.ebuild 2438 BLAKE2B bdd51ec36c142e2f2f0562e989e3fa9577e164848f0a7c67f9335f6211d3507bf08bfce14316a66a9673cce701602e952f6f489f243e8ad9a3bb66e05149025c SHA512 7e4c36f1dd8bd95d695ca75b68d4bae3ffd8bc81681115d4c91f68eeff19d601bc8cd42669b05e6b2ee52bf895093854208d05db5c0786a0c4b1eef121ddd420
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.3.3.ebuild b/dev-python/lxml/lxml-4.3.3.ebuild
index 126cb2185c32..5c08170d5e9b 100644
--- a/dev-python/lxml/lxml-4.3.3.ebuild
+++ b/dev-python/lxml/lxml-4.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 287aeb8e86b0..a0f8eaf0244d 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -2,5 +2,5 @@ AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e
 DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
 EBUILD miniupnpc-2.1.20190210.ebuild 748 BLAKE2B 67ab0e95d689347412b7c08b9949a059adedd4c62b0705c8cebba7347bdae1727fdaab0138200457289ac1a7eaf425163894b850e69268e9bae55cc660784b1c SHA512 bc8300b2f4df692141a7a46307858677ae37c57b64655f21daad9ded09d51c7d9bd28e861482d08b7681fd4758a3f65ac169a150a0bfbd29be464b567a176ba8
-EBUILD miniupnpc-2.1.20190408.ebuild 752 BLAKE2B 5577d70133e96f101b73f764e3b79427cd4712540104e4cd52f9c00888359a3343fb73b1e02ed0eaa7422347e67bf5546bef21dc29d8ca09e037f4015e21900c SHA512 f198919736f4ee9464a46d5c57b95cd4f261d6932249df5183da26156f0689bfa7aee46a97cb602c6a89b5ad0f8978898be1373b8b6559debff27661d6b26c55
+EBUILD miniupnpc-2.1.20190408.ebuild 749 BLAKE2B 704eac6b06753dff7735585710904a4343fe6f3c3f7a12d746d3c0e39e20037aa42813719809f417bfed400718919750e0ee31af662dc5adc9e5f9898752c927 SHA512 d56f65cf675609ac6bf13b12505ff4c5e790c5ec9425344e140432dcf057d489a31ec767db73d1c103c0d6804a64e044744797f6ed63f2a887458ddaa6cc6e90
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild
index 839293766791..bed9cd2a744b 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 40385fbf46c6..4dd4f17f3d85 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,5 +1,5 @@
 DIST moto-0.4.30.tar.gz 614008 BLAKE2B 2868ab25414e488299cb521ce814239698466d69e806245fd86ceb9d5835d08fa530f2da0a5a16f595a88b3c0e421cc264f361bc68d31841726896826240fbab SHA512 ece27979911f46adbb0aec9aa3755b13c09ced00b24ea136ab9c8a8a992550e9c38dac15d8b0c71822953f070761083253ee5fb5cbe44a4b108d140ab4407699
 DIST moto-1.0.1.tar.gz 731617 BLAKE2B 6f20c07c0635a8c10f8f70530aeaac5ed7c2136d4fc87ff57774a95f4d2e1ea8cf1100b9f0871b29138cec9059de5746a9c01104d856f8248edbb648cc4a78e0 SHA512 3171ea3e8f9d267960a7b82caf7e42b86fceba5a80e96d35b849e4e72b7fc6aed94090161219a520f9c1b4050f7de12e0f6c0d560ab1f90ca43fc0387b62d377
 EBUILD moto-0.4.30.ebuild 857 BLAKE2B 444ceb952a989c9464811cfb42f042ec7782fb5492410c5653a9b3772da113f4025f3e983e0565badc061cadfe97f56c11b5b7f224e8aa550eaefa329cc82f20 SHA512 179362a90cc09caea49019df697039b009ee86ea03079f8c148ed226c83397614c6fd5ba1362be252374fa0cc2e028238f0d23a5e96cb37993e638f70a679b41
-EBUILD moto-1.0.1-r1.ebuild 1287 BLAKE2B 223980c580a306b0138d657f15f4625b5f9d3ed0a763f1127370930a64ed00ce5853e846a16c01dd596841367180757a048b3e1d2d6502d0cac4f1929ff8575a SHA512 e4ea67082079e95c31301efd6e025e91ffbb7096f8f597c8dc703d1d311eed20f785100f0f85da1bc3a41afe25ac8f3f77a765b7c32717eb16fcff04a71c0727
+EBUILD moto-1.0.1-r1.ebuild 1286 BLAKE2B 12e25889b037ebae406b65f3cc482e6a545c5a670ffbcdf4d2810d855f7d4cd474dae4ac6765cc74e5e468eb35c5797b8976ca82583271251e703424dc2b5091 SHA512 dee6ca369ffc4d1703d8c06c849d823550685a540a9de1e540609ae3732994da21f5e92992d1cfc2d48f937bb0c702bd626b00703dafaa0e6d842a3abbd5b461
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-1.0.1-r1.ebuild b/dev-python/moto/moto-1.0.1-r1.ebuild
index 2dbd4ec641d9..4afbbcfea982 100644
--- a/dev-python/moto/moto-1.0.1-r1.ebuild
+++ b/dev-python/moto/moto-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 
diff --git a/dev-python/mox3/Manifest b/dev-python/mox3/Manifest
index 156e46ea88ea..85ddbacbe47a 100644
--- a/dev-python/mox3/Manifest
+++ b/dev-python/mox3/Manifest
@@ -1,4 +1,4 @@
 AUX mox3-0.12.0-RegexTest-python3.6.patch 652 BLAKE2B c7a53ec43accd137c100c6cab6e208a5e88ff784a59b01b2c71316654f9fe7f39273eae7be8a8810548b25636864b32176997a19020c878ba7861b3e86d74c77 SHA512 bdb5b27c151a2b2fc0351575fb7f8413a7667b738624991255882c1908df3677f2d8bbc984f8c4179325450f0a5837a750adeef3afc1738090879b70a2b135b6
 DIST mox3-0.24.0.tar.gz 44846 BLAKE2B dd1a27b20fc821de79f1e1f209872c3fb66f39b2330d1dda04c5b17045e337c84920e4538d7971f025d1377f9e91abd2fca8167508c5614fee06d9fca92aaa75 SHA512 6c081cf2b1e529f3213f7f48d22ed5d2980420b2de8f49607b624d5861f8b784f2f36d8a32fae3e81fe8186c1a9c36e6c4ec7d9de172c41c0530523590ef97b6
-EBUILD mox3-0.24.0.ebuild 1437 BLAKE2B bde030e6753160260b9d48c4855b74cd14430ac01b9adb4ca0885e846094f9255245c4a05ec8c75d79b7bdbc75a1889276c89233d1e81a0396998ff885f871f5 SHA512 7d09d44736a0ec3217293e6e0821ae7bec9853bc0eb0968498286120b1ac694e0d320c5dbf11855ebd3de80134a0eb6049511e81c3253e235157ddb63f514784
+EBUILD mox3-0.24.0.ebuild 1438 BLAKE2B d8f557a604f1d795bfdec01514607610cc0ba29beb1722866131b725d4e55c2ad1dd1dff8529f2574b9e7924f8a93898bcc6c876a49abc277d3d6bd1c177937b SHA512 de5f78b71df38f29377348b99b83d5f59c928079cb4138c7585826dd234f29c1b0703db389b781bd1f76ea7aec6b96181cd6bab2a651970a81ff0eea8692d6b5
 MISC metadata.xml 323 BLAKE2B 880203c04d889c65278f42730f465e61463109e5e8e71ffacf21d3ad98eb804d36ff66886349eec536aef71a7741a1df9496f1c8073ce1421aed9863593a9ebd SHA512 cb4be23a6eabcd2f0c9761234006bdba088200a94c23087fd3e09ac054c785bfcbe2c35ac060843cc0de2d4774298ac4c94ba8bd3e16eac9a8a4d08fa342e4f3
diff --git a/dev-python/mox3/mox3-0.24.0.ebuild b/dev-python/mox3/mox3-0.24.0.ebuild
index bdabb4a93df2..734833d0a009 100644
--- a/dev-python/mox3/mox3-0.24.0.ebuild
+++ b/dev-python/mox3/mox3-0.24.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Mock object framework for Python"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 2ee9e94f44b8..db535d883272 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -5,5 +5,5 @@ DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc
 EBUILD msgpack-0.4.8.ebuild 764 BLAKE2B 9a5e5880ef71e89506c316880316f56518eed8a3e4abf21c4553235d39801d9506cfbc5cd55a5eaccbaee2d0ed904ab5897aaea4515b7e2679d8d7fe23cc0471 SHA512 c9b4bf69484031066719ed6c2c9db56826c8ec560fe3525332cb20b76c9110fac26d100f5069705ec2f2b5f29999737cde4d8bfc7df2cd12f2bf82a38f48559c
 EBUILD msgpack-0.5.1.ebuild 763 BLAKE2B efa206b2e0c07a00a3e42c03d5d82b3812c7f5273916863bc3e22a14445df5ad0ee8be023d44b323dbf8a29150c7ee2da9eeb0dfb5613602e80e5971f7a979ee SHA512 57a1785ca05eec1a783638552b463a87c102bed67cfe7cfdab37a9b0a95a2d5e5f60665e8c0df44ff932d43e1b5a07276076e1d6a93e6b41ee4fa43dfebc92fe
 EBUILD msgpack-0.5.6.ebuild 1053 BLAKE2B ef21e6f1cdd6ea6be2fbeafd26bc9244457f1fad0ff890b598269e46c823b39e2be5050aea67f42dea84e7dfbabe3c81cc4d29a99eb2f50288e692b8e815cdfa SHA512 930ad02507b145d18cc0a02869e2623da54382a23b77a4bdf5f8b37c1e2a3c030247419c269f2d29f666fa193d8194300da1d1328e9713ee29a62618cdfad476
-EBUILD msgpack-0.6.1.ebuild 1063 BLAKE2B 03fe37a970e6a42de8c799d1897dc743447659648a6f553599f8556a8a55a5ed25d6c825bce1ed9176c9272bca7ff5dfa08f329ae431f38ee6d19695ec3a0a2e SHA512 6e07497e1f58b30d315ddbfbc005fef06ed4e4366f532c909779facc49f634ab74a42616d0660c5bede5589e5dc8cbdf575799d2557007d23c4c08146612d812
+EBUILD msgpack-0.6.1.ebuild 1059 BLAKE2B c491ff8283bcbfa389db530623971a6f89c7f0ac7354ca9c65acb2a0fc537c41ce6f45036e7b8af9eb96825da453650b6bd38779b9b68f4816cb07e8b85eecf3 SHA512 6b83b84ce6aa1fa56a7cceb86ae287075905bc30a7d0b33637e75ccfd851a2645a32df4ee3ec03bb95a388166a2c9c4fcb9656c5b09789fb1f43124b99b9dfca
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-0.6.1.ebuild b/dev-python/msgpack/msgpack-0.6.1.ebuild
index 3cb8137c6450..327fccd2a27b 100644
--- a/dev-python/msgpack/msgpack-0.6.1.ebuild
+++ b/dev-python/msgpack/msgpack-0.6.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 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="+native-extensions test"
 
 DEPEND="
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index f46c2a5f6cb1..4a363fd34ecc 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -3,5 +3,5 @@ DIST munch-2.2.0.tar.gz 7108 BLAKE2B c01635adbcc1083dd539317f6619ad15bb654d1f511
 DIST munch-2.3.2.tar.gz 7598 BLAKE2B 0ff607c4821b675bb0710e185c82135ba031e2ad0e18aae07f8736e102ee73c53a6977155f250ff20e26e87671f8a20ed7bac625bb96625017be047704f63bc6 SHA512 7cbcd79b9506940f88a2090649e5ab6678164b468ed04feebeab8f85c9af861a1a8012aaafc869755c3c7957feefb231bc15426c382c014e82e9b806a879b8e7
 EBUILD munch-2.1.1.ebuild 473 BLAKE2B 55af2c595124d3a792be541e87a028b31e08605f82b7291e778105ac6acdff7d7f96a8fd123e8d791c3e8c4cc84c2d2388b6f3ebffd81b7e0e0789c299062ec5 SHA512 3868b705e6cbf7d4522225f11176275bd19be5a0d803f909a88ae0a3886dc7e47986ab8a718dfe263a8838355d01b70befeccacd0579ebbc06a8fe70f6b882e9
 EBUILD munch-2.2.0.ebuild 478 BLAKE2B 0ca8fdc985de70b87df668065bbdaa512c6a7759039020ff4e192bbd7e8a77f5585edbe9a93690b660c60aed69a9db1406408b32e03ad24a8920fea1c727fd65 SHA512 8ae5404498fd465fff1bfdef711668cf3412502f0360bc5053c0fc682039e638d34737113d86b772b0f70c690b89ef2ba1a87eaedc47d8b18f4b1c6a33225c68
-EBUILD munch-2.3.2.ebuild 513 BLAKE2B be0541df34c72b4f35c8e11b5b8a2d816987d6a3e58c734a7fb1c491d644542e69e68ae7fecba0460b7811ec55aa4bf480e7c0a0e85d2ce5131f79033b09898e SHA512 93445e9578107ca7c983c8e75c08f7ccd475b0847555d24c70bbdef59a67c9f3b46170bdc83fd93eab99db83c8f30e6acd04d23f2bf9476bb2b88c9a0ed8d5fd
+EBUILD munch-2.3.2.ebuild 511 BLAKE2B 2dd6b884510184b469b2c3f261861c668b3d2abed653cd90964bce741c41073c87820a5dd29136453c611af3e489fe01fda820ade4c1066a80030d224b96d874 SHA512 e27213d809610f235faa95d51d87be90108bfeda55fd442622dc3e3db25a4ef500b0430641590bd4aa4a8f241f8a10af9784da6bf88acf8b9ca78d2599bb101d
 MISC metadata.xml 348 BLAKE2B b02f6b0b5a5acc47ab4d719f9b70dd7e6a8c5d1694d374fe5eeedbede01105160c91226db47d08cbb5e290b9d57e1741b954f8c36a52d69016b8013eedd470ef SHA512 1787b144611cf1dd895b7a822ec2c5ef81e523f277c3394c4e23de466d11f1a4e22bbff019f92383de6b116ca911eff0293b4945c18d0287de07bf020303bf08
diff --git a/dev-python/munch/munch-2.3.2.ebuild b/dev-python/munch/munch-2.3.2.ebuild
index b3800a6f6eea..a55f4795317a 100644
--- a/dev-python/munch/munch-2.3.2.ebuild
+++ b/dev-python/munch/munch-2.3.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index bd08f03700cd..53729adfcdb8 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -5,6 +5,7 @@ DIST mypy-0.630.tar.gz 1172089 BLAKE2B 672f05f5fa45b922ddebb5ea802358f8a63eecf26
 DIST mypy-0.660.tar.gz 1274856 BLAKE2B da59dbae31df1c2c8530fddf44f02d608cc9019c9294919e015ef7e62ac8680162a044a98d109e5aa7cdb1f1a611b09659f828c2366ce5a850c23d5f68a11047 SHA512 4d18fb8e04ba2e4d290582ecc2af660ca26c4ef3ccf5ee5455f4be9fe9dabddafe644ce6463a8079dbfb04c463b759283af23014065f290edfa0255879bd0076
 DIST mypy-0.670.tar.gz 1376917 BLAKE2B 1c7de26e48d91a1dd8b007607e6e8989e6b622eb62ad98b3c575faef1373ba510acba546977d26984689c5cd245ea341022ae68209d498d8bac78b01760daa24 SHA512 1fb994410acb3ae3ef6c4380f1b76d2f65790fa7822067dfd75eb34d0336547f85810e475563c797dca268de35b1594217cb3edfe32033eb012d121a3a2e6406
 DIST mypy-0.700.tar.gz 1413962 BLAKE2B 6739960bdb5984115b4bd84ec3ca63e6b7a4c4494c48fcde8bab4b3679814e3ffdbe1319a4c0e221e3cab6521d95568839ded58c29dc6f2528d15d684e3c870d SHA512 934adaaf8ef48a843c8cce159502a2d4ca9697cf44bfd9a1c0f77e05da9bfb75ec099819e5543a4bc2492c670ee1f1f843df82746aaf7573776006d7dc6b57b0
+DIST mypy-0.701.tar.gz 1413988 BLAKE2B e705a1da6af8c68b9226d67acaf7976951ff5ddfe926f52cf51f70be59e75cd12cf303aad98e136ee342487c07e1273d0ca8ea582621552924c40ee725e6c01d SHA512 6dde048c211d1dd8f3c02af9500d5151588810d9989528ec4bee0ccbb5a8636fc4e03a373b80d177ca0937c0c92e0ffad1faf82b23db22248b782ec6812e3c1a
 DIST mypy-typeshed-0.570.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.590.tar.gz 413076 BLAKE2B 774a6d07308228c379a5deec2ee36a498863a1386181b47ceb8783537afdb75bc0fb4893b07cf8cf7bf5bfe977babbdc44a6420784e2cba6ce94346175858573 SHA512 e9afb2fe841fa82ed264a73a1ce6c1c0fede42008042a34cf21f1e39aabaa8f1cd945861aa9e80a86f61f1dd6a362892b25a1c5469915fbca95406e72740ba6d
 DIST mypy-typeshed-0.600-2dc7d39.tar.gz 425045 BLAKE2B e2ef63f2ed988f77f52e2a01c158ff8e3fbdec118c1f613ffe6c57d025da8d5bcf6dc0e6bcbc1bb8655fbf340a0f358535d7e1ed214a5a1af8e3188f2dde5459 SHA512 9c960c2dcb2cd5ed36d77efa47a5632698e841b685386f8d5a31200c61235b68d627fc450d070955ab14962d6a70a2d538929e2dc845512e83161c0299d91807
@@ -12,6 +13,7 @@ DIST mypy-typeshed-0.630-8ed0159.tar.gz 451750 BLAKE2B 8d59204bf71fadc36788d93e8
 DIST mypy-typeshed-0.660-f343150.tar.gz 456324 BLAKE2B b7a0f7e3da84b4be8c4cfdb43a62887ab433c22395af2ecee558440b15b9ffadf824c1eb3e8084d8c74ec61301a14f73a7e1ed4802522481e3545872be3f1010 SHA512 c64dd1aa2eb1bb6a0bebe819f7f9ee1b81fb6f6f1da5a2246f5b60aea97a16d86051dcef176b673afe9788bf16f5378d03c5b071f72b9aea727737ddb5adbaca
 DIST mypy-typeshed-0.670-3eb66ba.tar.gz 462981 BLAKE2B 9e321e71637edf6b7b08bdad3ffe76798aec2ad9ff7be0d1649e29ae7543536a6a6d413d9bd9bc4b15e164500e95ee3ba2ad58abc8f984499493c4753dd39337 SHA512 2b3d59451caaf4779c6543cee70461afd9a95b809ba5db7b0fc43e02711d8c4b28c98f680d9ddb9f0c01dcfb5011b6626fe746187c47e737d87689245da9344a
 DIST mypy-typeshed-0.700-f7c00b8.tar.gz 467098 BLAKE2B f10c9c6b3cfe9bc8518950839c2bb00d22521b6696a155cf721d34aac46205a8415f569d566f20ce865a44c23e5935748e5e488aff22950fbdd12bad4e679a42 SHA512 88e1ca3bc88f349a26cbd97303398de270eaf9332432b0402d7b44794cadbca86612df98ff1abed2a146450df760278946cb8eecc660f3dd5e00439c60807362
+DIST mypy-typeshed-0.701-36b28e5.tar.gz 466822 BLAKE2B 6a1e2ae84250d6e51649aab9b1c65f4258533bc54ba470162ad4c4e894d6c73f32a9087fea3501f5b833069c717e6037dd848a514c5ea2880eca081337962806 SHA512 27fe5dda347903ac8fc925c7bc7d91ff0bac6421315a49fc8227f5ef8f476e6bcacafd07b87f80ee8dddc73009dc2f52fe6a57fd542283fcf2c52440ca09256e
 EBUILD mypy-0.570.ebuild 1558 BLAKE2B 1ad1aaeade920ca6881464e62a446bc17faff14e41eab767977f3cc181892d9349b73169639e3234215edc80b02916c900e001917a60e64fef5e03d204ee32d8 SHA512 e2c0bd5ed2f77d1b9b3cffadb1522e9ebf78953ec9c172bc71f831cdc7b125974a3b051cd08339c5d5397635f3ab169e49c2703a18e6702c57c1e144d02f918d
 EBUILD mypy-0.590.ebuild 1558 BLAKE2B 1ad1aaeade920ca6881464e62a446bc17faff14e41eab767977f3cc181892d9349b73169639e3234215edc80b02916c900e001917a60e64fef5e03d204ee32d8 SHA512 e2c0bd5ed2f77d1b9b3cffadb1522e9ebf78953ec9c172bc71f831cdc7b125974a3b051cd08339c5d5397635f3ab169e49c2703a18e6702c57c1e144d02f918d
 EBUILD mypy-0.600.ebuild 1577 BLAKE2B fff5f2f4efac6e2c6cab22a9539a4117d67090b85d5f3b72f96721aeb90068b3398049a7c83ba736c446985753f80d4aa88de2403633b689ee7ad15ee3116211 SHA512 b3b471cd70711d43e90548bf8c17fd3d8ede706bd39ad896f4b50b14d6890d8c64f6fd7159992edeeb59c85b4326140ba8c7deeb4122c244f54e312f91f05abb
@@ -19,4 +21,5 @@ EBUILD mypy-0.630.ebuild 1586 BLAKE2B d264665fef5e963e18b9f73d963ff7dac776ffa292
 EBUILD mypy-0.660.ebuild 1823 BLAKE2B 3f82e348c8f6179a40cc49468d9a1c59e2c98a6526d081674d1e0463e7f6045ee9c926630d8df24b34c366742f4772d4eb8498b0f122417dc934de9bed86c797 SHA512 a4364d89c52536f6542b39bfd45417ce0f7328432a5c468a14a41ed0c8a5fdb8bf2f8cab2d239005548e630ffe9e3adc3ec2340c279be2415056cf9ded07a2cb
 EBUILD mypy-0.670.ebuild 1823 BLAKE2B 037ba694acb544fff2f5f6c602e302d2e4348fad705acc19ebd0b8ca1dd6c326c686a86a403182afb3e8ab19f0d2eeca64244fb2ee2d69e194bd8ca87abccc5c SHA512 7f44a70ec9e0b4a4a97bd8a657aa7fa9a2e5d15c71bca119c09f129adb04ef02173697a12efa38da7442eed9a222c84621610d96dc2691d505f84a5948419bce
 EBUILD mypy-0.700.ebuild 1823 BLAKE2B 7f0efc2bd69373bc10872089728dbe2606d9754f43a54542f944dc1188a65293e9ed67a321def99340ba7d3bcb8aa79aacdfe578c87e19416f9405041b48f685 SHA512 74f225f3cf4f3b8ccfdade61706582571bb1b35eafb11d5fb86c1a723a535047d662cbff30da76efabbc1321ed5a1881a782d735c285002f076803daa98ddecf
+EBUILD mypy-0.701.ebuild 1695 BLAKE2B 5ec584dae0b7450b897a03abe200d733e386a9882d4b5e1c5bf977621a8a8dbc8bfd1453eca610d782215e28badaf70539b3a53e146313e9e11377b933df62d0 SHA512 25abd179cea08fbe49f7b8369d98b9212e876da04ca753dac98766ed907837bb1f97edbc63d71f856ebd3a09aaa4ffa4bf79e634201b25727961d516a1062c11
 MISC metadata.xml 318 BLAKE2B 26aeab57c568a3ebc431f846d61405428034bf9cf8333e5f52f43ec68d51fbbc2cb71deef622c07291312f63f46f29007ba4b02c21e90b4af3db039a43fda4ed SHA512 9e3c8432730d94d7ad9c65ccd1a48d7afc1b43662097f0844048ad107e81ba30e03bea99f64ee8a4171ff0504f1ff04d8d9a84407f414ff228cecadcb80c7c43
diff --git a/dev-python/mypy/mypy-0.701.ebuild b/dev-python/mypy/mypy-0.701.ebuild
new file mode 100644
index 000000000000..6d104eec990e
--- /dev/null
+++ b/dev-python/mypy/mypy-0.701.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [ "${PV}" == "9999" ]; then
+	inherit distutils-r1 git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	SRC_URI=""
+else
+	inherit distutils-r1
+	TYPESHED_COMMIT="36b28e5"
+	SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${PV}-${TYPESHED_COMMIT}.tar.gz"
+fi
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+CDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/psutil-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.3.1[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	"
+
+RDEPEND="${CDEPEND}"
+
+src_unpack() {
+	if [ "${PV}" == "9999" ]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		rmdir "${S}/mypy/typeshed"
+		mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed"
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	local PYTHONPATH="$(pwd)"
+
+	"${PYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index 27bbbdaf4754..db85b0a543d5 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1,6 +1,6 @@
 DIST MySQL-python-1.2.3.tar.gz 70305 BLAKE2B 8a365732556646c535bd9cfac69c759e561f1e15f4b25ef863ed60b64f8953af0e3633dfe00085d9a69025cdbc755afab62fc3af5d785d1dc0f67795d5748f75 SHA512 8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5
 DIST MySQL-python-1.2.5.zip 108935 BLAKE2B c4d5d4bc814c05604c4acf673ba4f4040dac2653e65173f672a42de4f2877583c79553533040c5502f99b57b71868031daeea7b637a4bea189fb20eea6a6ecc2 SHA512 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0
 EBUILD mysql-python-1.2.3-r1.ebuild 847 BLAKE2B 7d3813a9bce6da048889a9a781a009c7156faae8b78de54b0f820341700f927f7507d48733de499fa0bf09aadc5e4ad51001caab76a56766966b6eb9b882e929 SHA512 2593fdc227841b7d35b76fd7418a7e71cccaf113a0a458f9313be0ffbc8020d1e5cd3f0cf47ee27ad1210f4493d8d777cb2181977bbf7d757b1b20d5b1a51fbd
-EBUILD mysql-python-1.2.5-r1.ebuild 1120 BLAKE2B cf6f49c6f3384dd8c6788bb71869a360b57cfadfe3ba9479cff9c83a73b02adbca643750b2c92ddb1f83d0422fef5e5853bb27c203d3425ab366abd8bc30983c SHA512 e23b2c5a7202ce3edde36ff5c07fb872a8f85820de10b914ef94be53c80058e3c3e8584d07292f9b933f82f96a798910e0ec79dda2741547e158f299ee2fc53b
+EBUILD mysql-python-1.2.5-r1.ebuild 1119 BLAKE2B 682b9a7855eb434298f824b9231bb30718fc44b2e470e5c39bcf79c68f5e338820e3ab8a5284fefbe5644b588487cbcee0a77b03fe41b724d815d9673815205a SHA512 d080256be4fcc15e65a54e1e8427cd112e664e4aaa9c8f0a04bfdc37536f0e1d6a186cc1f602c5c316e7435615c697752d16fc96b4784c148fd4638abe23ac2b
 EBUILD mysql-python-1.2.5-r2.ebuild 1165 BLAKE2B 3f8e0274ffe1300e72a3acc880817d29ac30bd8a524244f2c530ae441e4d4426b7c1365decc6e244a3ffeb23667c35b27ab214296f24bc3da0ea10400190b0de SHA512 d6be08aee4082b904a4f3aee82846016481c82bc298baa5b3c4bb485561e195fdaf0e07421a849127b49bb98f40573755fb85f89ba4e70bafa41aa3e5fbf4f08
 MISC metadata.xml 384 BLAKE2B 3cfa19a657e3c9f4ffe875d44e01b6ddb72913d6d189a40cb9b3fb7ae6e076deb7f667ba24911ff4627125059dbec21b4fdc6deac20b71dd72de0b500689804a SHA512 df7d59db502cd6ed66cd936708f82efc5e22633508ee367c331d1f66298f806eb3d9a17dc8919c450afe3bebe30fa38e356d3feea2e87c82eea03db54c6e7ee9
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
index 4ff23902dfcd..71e128390e91 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="virtual/mysql"
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index 31427cdbf6c8..a83c1917e6bd 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 741 BLAKE2B 02f69703609bebd034f7b7ffa9bbc3f8e662392b72978140ff8a5d17c80def23bd7b4d20d7f45d9f1d38357c5ddad5c9c6a4b1e66225845d119f0363b3cfd1be SHA512 a07edf6bfdd1b03167fe5d3a20796217aff8c1f4f92dd5bccd257fd47d6d502fd03e7e352bf3aeab9c8a0106a7ca2e69c3f14034d2afe08dd91e8cad2309943c
+EBUILD namespace-repoze-1.ebuild 739 BLAKE2B 642fac4453c5be55c9444137f60cdacec7349064b68a98c7e9037bcd7973e4cf38be40cea461d3da802dc59d867a29153924779f4affe01441d330d5983a4185 SHA512 a9f06f586a4868bc0eb31caa9a637ffb967d7d96f599be8e19266736124b930bb6023a8ab3d699bb325f9be6d5af91c1e319de8a3bc4902700826de9a4f380a6
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-repoze/namespace-repoze-1.ebuild b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
index 184ecb67ae46..36aade0a1de5 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 327d04a44a42..47653257beb3 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,5 +1,5 @@
 DIST nautilus-python-1.1.tar.xz 239392 BLAKE2B a2baef3cb4d96d97b4b3e9b7644388c8778e1579ee0b32ff2a60baae45baa2d60dbcc61108fc3fe9e8a7193cf4c6ad82f8ffc2f175419e0937bacecc98551c51 SHA512 e721f46414a3efa4b5f5ec3f56cc00a308ec010a7a0612cef975d6f436494701f8bdbed39bdb5186c8013a582c7e63288a1c60adc4b8967c9ec69d6301a50fef
 DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc
 EBUILD nautilus-python-1.1-r2.ebuild 1256 BLAKE2B 85b87fecbbed7bf55cf7c8d53e2a8d5267037495698ef45646d43edf6658d2f71a1ae1c71c66860c0d36f49ba47a39248c6f6a9f8a272e048414d5a1ac08b642 SHA512 40b29c0099b7d5d5d6730918ef263e522cd503ea7e77111a80361cb496b74a65a1bdbb5fb879beb85c3806a0e8ec4a1aeb77ea3fc3bbd2344ce5292eb4fa8448
-EBUILD nautilus-python-1.2.2.ebuild 912 BLAKE2B 7dac3951975adb80f95ec62d4fa086f1fc3067d2409aaae25ffea5f2627d7b2324b2e90d80ae4b54fedd6b567308d508f22d739076467d12377cef2e1c85add0 SHA512 9f7e4c4cad425ee3c67f5c467994b63744739b4275cfd285367826854895b90111236db10a36f30050e60ebc03e207876f470af6b301f31ceb8d354bb722f4f5
+EBUILD nautilus-python-1.2.2.ebuild 910 BLAKE2B b17ea06c06d56c343da53d021940f2cb60f792a8eda93c942a3435085fb8e65c059e5973d4da1a8da7c25e5c785dace4a433ced3c2b5f16ef5d602a04f1f39a9 SHA512 5deb162c8a04a6f114e6e1e20669e2e4caaca7e0df82f8ff9b3ccf4c291c922113c1ad2f346ae8dedcb3d9b7fd94712b2d6c8e1b5ad8c1f88ad4c3b102e118e9
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
index 291a0ebb6d43..7d376a7f527e 100644
--- a/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://projects.gnome.org/nautilus-python/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 981f7606bde1..43f43a85f592 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,5 @@
 DIST nbconvert-5.2.1.tar.gz 510937 BLAKE2B aade38372775b032287f420ea4d335ad949a80afc0df63859db5a4f520bbaa22fcd17bf4318b05fa042fe94c2f65890aa2ed2365206abe8cdfb357817b056ac7 SHA512 c71c95d6c7bda4b55afad792d108d48c27857e060531dc8ec262673971c258ff9480821bd78ee5cbdbb19f107d5f8d19a49eac88819f20a09b450c26681335fa
 DIST nbconvert-5.5.0.tar.gz 583216 BLAKE2B fce42d68fcfb5439607fcb0fa8475462e929a5ddb9d160985956a85e09c7561e1a966be633b4d59e6afe873fb7f1300997c97bdbf4690290401d14bbe351c47a SHA512 4d10cbd6d6854d7672537cfb2e0a79854be1ed4adf96f805b1a0ec0dde0e149ed465a26ceec8d7c325f7011c30ff646054585b65d1e83540622e25a96cc207bf
 EBUILD nbconvert-5.2.1.ebuild 2131 BLAKE2B 605349fed8fcfd3f69ee336a0a723267182995e574fb38d3a054fb29dd0ca06354f86af415db49294e4ca65191033093cd74b6ec3fd2b2862d774b3288be4f97 SHA512 bb4620d8418a9c3a254caa3a45a5309181db5d163544b3527cb1d271f99be6e2efaa74ed87b9127d0df16330c0fa80642496538bdfe15df4843b58aa2f269ced
-EBUILD nbconvert-5.5.0.ebuild 2064 BLAKE2B ed5891572a9296fa00c2d7c7d598b672f8054c97c8051edca3d868175c615bd0828a32a86a0ce97c86ecb5dd3e951affab49c7ac5dac3c58b60d4e793cb00928 SHA512 196f20d32128b7268c161961a29b9536fe58640f0eecdba1189ebce65e6b92908ac4f214cb852bcd34b9c93236c210be16a1209a01dcf2f5ba66acda369191b6
+EBUILD nbconvert-5.5.0.ebuild 2105 BLAKE2B 5c9fc42b42010fa1136729997065ab686ffa3a17c1fb3ec3c609a43f020d9cc1b29d2851d15faf8ee798178d89757f1bc665d9e9e76fc7790549668cc9dd5b6e SHA512 c49a69d7e72c52876469939b373517293a66c28185eb7301c7b2459ee3afb04e779ba77c18418f1f6eb837238c061c7a66b58940e2d25a4d52bb2da84b5150af
 MISC metadata.xml 534 BLAKE2B 011d472737f4929968f44c9ab3beaaff8938a4550096b8abc2bc7dc72acfbde4eb745527a6f9ce3d1188bdc09f11607db2d9515a89b53793a88259513cf0056c SHA512 8a00c8bf80e0e9477a531b70d9f2fbba1fc8c8bc09246a6a2263d94170d294e65e6a20f8ab84974e97b346c96b22e2ca648ef5021fc9316a023532ca34bd07d8
diff --git a/dev-python/nbconvert/nbconvert-5.5.0.ebuild b/dev-python/nbconvert/nbconvert-5.5.0.ebuild
index 542772f0ca2f..913466aa9ad4 100644
--- a/dev-python/nbconvert/nbconvert-5.5.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-5.5.0.ebuild
@@ -18,6 +18,7 @@ IUSE="doc test"
 
 RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
 	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 92bde4b139c0..03578497ecfb 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -4,5 +4,5 @@ DIST netifaces-0.10.7.tar.gz 29330 BLAKE2B b93b48242781e6fc0006dc653c180daabda46
 DIST netifaces-0.10.9.tar.gz 28844 BLAKE2B abbe36ef82c5fa70bac60abe4c7bda671f8bc009567dfd38fcf2084bac5b09cbd42cc16c5c8023f3219129892f8def296e3cad8f9241d8c904a9c362c8077aa6 SHA512 8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87
 EBUILD netifaces-0.10.6.ebuild 640 BLAKE2B 6f911c18818a5bc920d7eaf0f6232d38a344630418b50de8793a92334edbeef21d4401ce7b44fed2e241a61df11faec24f0d4d75ced63f87bbdc1ba6b442541c SHA512 98dc16546efdaf0199aa8e2bef8aac7548630ecc7e02ae32b73708e07ef54876d774df724ece5ae34e5fb03e61e0e6e3874c3c87c199cc8decb73fdd0d54144b
 EBUILD netifaces-0.10.7.ebuild 622 BLAKE2B 8233519f496ab810fa34e38e72b451ea7303f83af0ac5959e41cafeb7512a85be07f0f748dafea056d809a57582d55fa74691328d9879df3c6c01517a29ef470 SHA512 ae7c942ceacc55d03d0ee67e4df431528b88835003d6bb28c11b41f9f3704fd9ca9b68d1e791f12a1903897c580ba3ca489fd93f2eea9c347505261bacb11a21
-EBUILD netifaces-0.10.9.ebuild 621 BLAKE2B c5aa41961109d11fc45f8b8dd4f0a3a5d22bb51ea56586cef3ef75267391fb8ced16fd65e07839298dbb10e30337d7362ab2104611389278a222189ca309952f SHA512 c97ae664ee7e5fdde9b241cf8602575977b5a41fa97f171bf6271a0441c774eb1d9ca1dfa30d73861723e34724c8aaf59b7083cd00271e9d84fe0431805ce7a1
+EBUILD netifaces-0.10.9.ebuild 618 BLAKE2B 12292d202045b0ab98c47847c894cb746ec673df98546b0b9d937846621ab8e6c07cf01ec4d15d6da3afb01256e23a473500ce706a30684109b7c989aa8677d8 SHA512 e97059b1b63f6dd928b686dc0d385289022d8f46cc16f25aa26d23007e85dc7ffaf804965d2369dcec5a7ed806da201f85e326458de09cc571f257a65b11a51c
 MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
index fdecb1885237..9c716b123694 100644
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index dcb62dd44a3a..65bd5d042b78 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -5,5 +5,5 @@ DIST networkx-2.2.zip 1700336 BLAKE2B 8cd4bda4100d5da10864f3b08d5a7faa11399176cf
 EBUILD networkx-1.11-r1.ebuild 1906 BLAKE2B bf1c3c207390a3d28945bb25d164028e1727cd34c53d9f2af0dcb8550ad0703a59e4f768f0239bc754c4a959039929f44f3cacbeaee7230900fcd2a8014d68f9 SHA512 063419d28e04cd51256206a2522013dcb707ab9d97ecc038ae70ac4f19b316f097867508e520c1d2584044833547489c237b97aff010c7e51f0539e608795fd9
 EBUILD networkx-1.11.ebuild 1882 BLAKE2B 29280c963dc0d1fc49700ca7c7bebea6c31651f3ccfce867ed4020d7f9d26cc3d06ab3e7d16803b101f3f8181e33e49f6d34f5b235ec6fbdf6c354f5ff49c82b SHA512 d4e8689c98171dbc13cf307b2343f33ba56b0b73b53d314c6a66063eff1e03b32c78b8f4cc4e4b976660dd131dddf14fa9e7b3ac6b0c4c167dba595f57e3b331
 EBUILD networkx-2.1.ebuild 1493 BLAKE2B 1fc5b26fa405d5a48ae84b67897c1a88e21f0ab5c8e4dd1a667534c84dee876e6a62e5c56c7d5b6427898741850d5ad3582b01b4865f8962278791b99858dfa6 SHA512 56683a5cb53de30b85d8501aa55f5a2aef176baf8aed0ee797fbcea75d0e5b4dd64031b9aef546722aa41309485491d6de46cf79105ea2b35abdf17ed946318c
-EBUILD networkx-2.2.ebuild 1492 BLAKE2B 02b0b2f2c6c9f0866d40bd2b2df3ce14e28eb75d7065803641c73cc14448d4c39a3aaae0c2f548d3b9e0c103ce2f42a55c6fcfb5e5a4908001e5b548d9dfa7bb SHA512 1c1e8be8251105accf6f021fa1fe072c497ec5a8842913bb64128cf213e68ff7695b64430f0ff2b5b961e85ab304de316defb4a2518144a8ea17761d0b2b815f
+EBUILD networkx-2.2.ebuild 1490 BLAKE2B a2b1d9438f2529d6765839d128e6f6e7fccf76c8fcffc9601b5005f3d3f54b901f7b70a56799793a316e2c6f24fafafb3bc066885d77e371c6dcefb9a0372bfc SHA512 72af6766bc5eebb1864d548ea70fe6a93fa72b4d173a9b76e767bbb329a09941c2928bf9a30e3bcffe5580da7427efc161b1c74cc2c733fdbd4d268dfa80fb1f
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/networkx-2.2.ebuild b/dev-python/networkx/networkx-2.2.ebuild
index 8a0ae3aafc81..a33edf2829d5 100644
--- a/dev-python/networkx/networkx-2.2.ebuild
+++ b/dev-python/networkx/networkx-2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples extras pandas scipy test xml yaml"
 
 REQUIRED_USE="
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index b22f71194bfc..651e7d792433 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,9 +1,5 @@
-DIST neutron-lib-1.13.0.tar.gz 322076 BLAKE2B 389f0abd2c114e486df1306b58a6e6714e3106c1e175295f0a2250424553fad17303eee29d96aa7b05b48b1bf2c8ac3f4714031ae9716a351d3f4e58d16778dd SHA512 36eaa6c6c848d46389d615c1b4372f0e762aad5f5f28681523826e1b8b31284cb1278d387caf62234553db0eaa8d90e838c4145392e9d8439750ad3fd56571ca
 DIST neutron-lib-1.18.0.tar.gz 395616 BLAKE2B 4970a7254eb3d94e06f332a9ac75d371db370fe1348497d86a535e3a12fb9f56652b319d23e9d6e5b83aa0fef30ff9c903704e00747e1176097572a7a0ec2a19 SHA512 8b20fab0f2b0a7c4ffedc0012fe80a0b1a972233fd4a4f1b5c68c77f4dcafb67df3074573453961a087481a821c2df4696a1e186adbffc09f55172cecdc1c132
 DIST neutron-lib-1.25.0.tar.gz 434978 BLAKE2B 5e7687862a8e02b1b7cb1e10135f7940c5e42c96f652ed3e694d8ffd12a55528637928ce31c6511367b80251feb609fcc6b1c92ea73c3ecc27902798d68f63bd SHA512 79614d391e6b812875312970b1cd020bcd3fb6c9135935b8f3e7a2c611d1948a9ddfa33a5f625cd6badc80c1a2fc37549add85a09dfeaad0422353b7e641e9e9
-DIST neutron-lib-1.9.1.tar.gz 269151 BLAKE2B 82bf212f59659ad3f4774ee4bdc0dbc1ada6cde84761f1397eb506a7803d5c5d649c9ff59efaa359d4fe751a1b8864669b57b3d0afb26adefa5e9dfb329324cd SHA512 1bfe986a5174f19ebcea34220535b20b4afcebb8215d105b911badccf606f02dcda8def6f3abd49c44352f3fcc509da977646f65a371a4d94d448e7f9436302c
-EBUILD neutron-lib-1.13.0.ebuild 1679 BLAKE2B 15f3b1e4a2ba3932ae24715e7ca6c68963bd126d75cf55939401425d5ee8ac7f794d9bf019e4cfe1acbeae48ea4a8a877802da8bf61127770ae9a62c1c8b755c SHA512 326f8d65415620296ab8047770b1e995867b877e53186c1d7892edaf917188f493918c7e91b4e42abed8a200862c555389cd0b40236cbdc5a165bbff064371ad
 EBUILD neutron-lib-1.18.0.ebuild 2069 BLAKE2B 7f4a3e4ca80d7e6137cf1fa2643c868d51753abfbeb795c2c2f718ddc0b4d561b06f324172a1e456958372d3a3e8ebb19863ecc9d4a6d32c10c95e448d72baa8 SHA512 640f01ac20fc5be52fd846660868db2c82be065383bf5247096cbee1677262b6ddcb2a7e8808a87b7f98f05ce747990080d9a469c66ea68a3d8524ff0063e3d5
-EBUILD neutron-lib-1.25.0.ebuild 1975 BLAKE2B a68b49d526a52188d26ea175da27657b7d07253902588e4458c7d81a8f3a20f34e240e0b19e7036d2af1f1293178c5f8519bc83983dafd05077b67c9904535b4 SHA512 b8efaa1b3788c93da677e8e74c6c502e2a27c6301758d58740d0776debebfbcbf7b1d2a9a5209cdb8e1b29aab172043245e6ed2c4967aa84a13c930764f22ef4
-EBUILD neutron-lib-1.9.1.ebuild 1613 BLAKE2B 45847e120ccd28c12973ba5a9e9799e079e3a233b8ec32697798d8d208c77e8fce801a03832e5826b61d86f84773266a2e67a8378f288014e89b4419fec0f699 SHA512 3932cb45da8401644e65d1ab5ddec503add19e98d3865cbecf350fb67324af8a23aeb64853186ab9fec1ccd842682b58b7b2e62f597e886c60bcd571c977d488
+EBUILD neutron-lib-1.25.0.ebuild 1973 BLAKE2B 77a522b5a6a28cf5929b9234a927f9bb83c6b788e1cf54f259505863c8869568f74c019306b2258d86f05aac7f07460d4e755be79a3ba3c8ac0a6c6da8fbddc1 SHA512 acb2ac65355cb7351f7e4b37c5ea345f5216c0e42c8a49d5c5359999c9ac1347ecd601a098d785526533c5f241e45991667a8d55289068ecc5efd8b5104e66cc
 MISC metadata.xml 478 BLAKE2B 479b1ffc2e6b3de332fbdd2612c50a3471bd26615beed90810463b56122faf219cb602818de421a16c1e3227d13f5553d9db330dbbcfd6e67a725a3479566f3c SHA512 c642bad9f710c347629fca6952be3efe57e247dee81fac187d4a6458b4cb8280dc0d3d4a66e4d329bfd293b9e27edbb7a38247311fbb817088eeb70c441737bc
diff --git a/dev-python/neutron-lib/neutron-lib-1.13.0.ebuild b/dev-python/neutron-lib/neutron-lib-1.13.0.ebuild
deleted file mode 100644
index 1bbce9023910..000000000000
--- a/dev-python/neutron-lib/neutron-lib-1.13.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Neutron shared routines and utilities."
-HOMEPAGE="https://github.com/openstack/neutron-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild b/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild
index e2b3f9bb6e12..b3ca2a893a40 100644
--- a/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/neutron-lib/neutron-lib-1.9.1.ebuild b/dev-python/neutron-lib/neutron-lib-1.9.1.ebuild
deleted file mode 100644
index bd5227ca6f22..000000000000
--- a/dev-python/neutron-lib/neutron-lib-1.9.1.ebuild
+++ /dev/null
@@ -1,43 +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="Neutron shared routines and utilities."
-HOMEPAGE="https://github.com/openstack/neutron-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index ed38403af3f8..720d077abe69 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -5,5 +5,5 @@ DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac8
 EBUILD oauth2client-2.0.1.ebuild 1116 BLAKE2B 6f44662774bbcc87956a139350f7f80e603f786a78ef752104bd4a636a2f1ed0569e0f930ecb9b887ad48caf6b98d96d9fbe5fd35fa180fd5090d3b36643d9e7 SHA512 8fe080acfdbc270f5c367982c1686531591d0bbeb4d150ce8726931f5c502f7e46feb9b8fbfc9bb1dd80acb0adb8ce89fd6cd3078b2f00d80290c66c9b256975
 EBUILD oauth2client-2.2.0.ebuild 1119 BLAKE2B e35cf70076bd57d2dc5c32b1cded13a6a72dcf223cd4823b60f78fa54cb8a1a0313cf9960c41468c9abe3509a0dc4cd62ea12852fd1cbabda38454c0956e04c1 SHA512 e560828a0ce512a6de838d61a945053f8a5b5f0c54ed82edfa1ae00bdbd20d3d49e7be3d2fb4838f7fae9341025f8512bee6e20330260edf93931cf40000b610
 EBUILD oauth2client-4.1.2.ebuild 1698 BLAKE2B b4a550bd1250da40d38c81f45c83c1bdf52099538d5f0390e82d0a9bd9e495b8ba4cf921a5d6a5558dde4c8bd0618a5540227abbc137b80bed43a98318f586fd SHA512 ca329b4b337f78132ce1a78e99848f404ff9ece552cd08c89d2c4b99e4b77e5964d1669421416f6a057f1c0a4d1cc322cf7ac36ab80198528e00de9f91f7d34e
-EBUILD oauth2client-4.1.3.ebuild 1702 BLAKE2B 291f21628e989f079e669f240cdde32179ce9b4e10667ea80e64a7c1e99748c6282236af39a50c5f78b06c2b85b53598e604ab67a4ea4cdabe2b9b33bfa755d4 SHA512 ea30a8f4e47c435fcbfba46a02d5baf6f4de4cdc2dfa436ab4ef0beeebef377443a3fa77d8a17459922e00234c34a9e1f82b1885aafcf14f15381c43f20deeac
+EBUILD oauth2client-4.1.3.ebuild 1700 BLAKE2B a42fa6c8989d7ceb7f5d2dfbb03543814a8aeb988e9df5e602d0071c58bf959c6d41b252eb24c0de6b586e4ec9791328760732bfff5a83c70d80cd4fda7eb7d4 SHA512 5e4e4288a8c6818111a7475bab8e1120ce1de0005079db146b352cc17d39be49c48c79047baf684b08fed64151fd44381fe2f4127255fb937dfa57d420162f8f
 MISC metadata.xml 334 BLAKE2B 474087a66809e8ad113f10c3f674b5684858d0eb67d58f54d19557f9a32295f96c587aa945eb6b4fbe338690a096fb59109f907902cd4e08f40c4d62f5dc7e54 SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c
diff --git a/dev-python/oauth2client/oauth2client-4.1.3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
index db39ef718787..daff95917d61 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
 
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 4883aa252180..e79b68d89136 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -7,5 +7,5 @@ EBUILD oauthlib-1.0.3.ebuild 1030 BLAKE2B fcba19fac1736f0826fddb2850ab1697bd5b2d
 EBUILD oauthlib-2.0.2.ebuild 989 BLAKE2B 558c37bced7d65404c54b46051bf1540d21829564dd631ca662d749ac019ae8105697933e860c3064ab4ab19515d6d7c981e3408b4edb0f7c889060aef928838 SHA512 a0aa987465cf01f9ee3d8955a49739b4578b031cf709d60f8dee09c9a9ce7f134e57159cbfe05625685aefa2e7127cbc70ff1e1cc5568ec5a1af3f819157b544
 EBUILD oauthlib-2.0.3.ebuild 994 BLAKE2B 8a1f2d34491fe329346920c3340bdc71388233a74d65e4de95c7c86abc8d86d4aa0f162b5181644b47c66a47ac9993c63ac4276ce0d79d907698e644b0ec5760 SHA512 02e2a5e3e8c5df5113d9f361b117683d411621fcee9490d0c20f39589b363722111e77dc857798dc124fd26fa07956eaa59449e4b3106121021dc78b4db235bd
 EBUILD oauthlib-2.0.6.ebuild 992 BLAKE2B 8ad5b3ef3791af835e1032d71db8f82b3dc2c1b8eb823e5dd636a4a6aa444272f095b5c5631a9505b7dc9a07060ae1b0e1781c48482ff02e4e74175824e10e26 SHA512 34652ea0db2a27aff0aa016b0f9747b1713e20e1b10f8dcdaa20f08e57c3e77b97f46e5fc14417fc9f6e91dc9430f951d7232b6dc7b350b8a73e0e79f34d2c9c
-EBUILD oauthlib-3.0.1.ebuild 996 BLAKE2B 6e920c648cb85c86054a629a1af295bb0a25bb0caae54ba2b7873a6522ad1dbab4a77aaa5125e0e3b6f7fbbaa87ad1bedf0f7e1831c3707bda8705d85faf13d8 SHA512 912ef5f7fe6ed5edf21b23d9da5d7ead14e36fa7a1139f227a6eb7858a11652fcc5442a036ab22abfe04d09c76a6e1cf5903ab2d32522c82c5d8632667a8c305
+EBUILD oauthlib-3.0.1.ebuild 994 BLAKE2B c1cb7a7c881cff90d25a4de6c5e34ab98f2cfd463e233b7da34b3676a99fd7f5d6766a8b93acbb3bbd78143f4d66d36fe2510a55d6e1ec3c0a3f855d14d485bc SHA512 81689aa2c593d5b62561133a5557202b51b0fa402c43e301f00833938e4197819ba79de876e53680d813046db863c84f73e93a17e8eda77a716d062df5f0132b
 MISC metadata.xml 376 BLAKE2B cc62cffdc76d014f0c43c3cd9495942d08f592f6a3d241d8147dc907e233d7b3ed394c52e8b7767570768a50bc4b76fcfd64fb90f2860b4f7ed65f016eb69a68 SHA512 ec1f35a21ea68091f6fe901d7c05c711f891f7edcf48496dbf57312cf331e7df9465309ca90789b795efa024e3ba3ede3d0416c7d9362823cffab8fbb23fd3fe
diff --git a/dev-python/oauthlib/oauthlib-3.0.1.ebuild b/dev-python/oauthlib/oauthlib-3.0.1.ebuild
index 3a313d3f4516..932e50a80b7a 100644
--- a/dev-python/oauthlib/oauthlib-3.0.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 # optional extras hard set as RDEPs. See setup.py
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 78f170d8485a..9d0b16f51ead 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -4,6 +4,6 @@ DIST openstacksdk-0.27.0.tar.gz 818981 BLAKE2B 6ad4bdd75e9b6af8da256afaff4003b23
 DIST openstacksdk-0.9.17.tar.gz 335611 BLAKE2B 2f1ac157c957cc90d53d97dad1930a2cab7dc40c15cb76f22394762eefffa402480a8fa4b9fd30358690b401e2d362b4f7e29b8a17d0e7ef87885256d1d62bcf SHA512 4699e80ad68896cea709c861b013404234b1d6acf2fcd8bc4e8b21b8841f8c204e693c4e631a85906b5b415404cf50f35f395df6206e471920c68d2f26726696
 EBUILD openstacksdk-0.11.3.ebuild 1416 BLAKE2B 0a6df1e568f8c929ead2181faa1c29e8ce0ac10f9acceb7f06b4ae6f5830e54944e1be0d23f00833e7d2024e16e19c7a25e9040aabc6399045545542b5a609db SHA512 e4c086d55ed54ae4f9eabc94d18294a861bd2f1c2cceefb72dbeb3dcbb2458e0478a3ad82f065561752c9c55aef8659d23bd4a73029581e708a467a83ba8a451
 EBUILD openstacksdk-0.17.2.ebuild 1467 BLAKE2B 32954b0ae2af309e4c072c643f684e314de2d4a9c5a763209f99575d78cc9e17fb5f430d4f26ae68a30f1a119a1df300522bc320382301aca9ba126e6abfcbf0 SHA512 fb79da86eee7882f14e99d3b01b9083e25807c5e0b84dedace7a55cd36cc9b677e8d829c47ad2d999c827abb8c8f128edbd2f1622b6f570113f27e29a6aff5c5
-EBUILD openstacksdk-0.27.0.ebuild 1424 BLAKE2B 126cc8633961a76f98fa4abe5de987aa594e3ddecf2ff619c067585069f18cea061ef404172a31ebff36fc835536e28dba31bd67130914b7725a3f6704aef9b6 SHA512 e2c1931405be4534d8962bbbd3dd1a3bf84e456a211849dd889f469ebab54815ee788376d7a48ed56498cfe1c0ed2262ef56a7bb1519518294e9d32b6be97843
+EBUILD openstacksdk-0.27.0.ebuild 1422 BLAKE2B 7360a31da811667945a8bdacdb4ddf97e05d0b4c6486c8af93e2878480745080868b9b261a2b9ea5a26578b0ce88f37becfbf151464f071c4b04b7443642da94 SHA512 627ea6ec00cc817817feacab1fe1f0248ba26ef250cb960f7a69bef0894c01322a82c51026e43584eeb250c2475c80e6956ed7cf5dc6f942b6fa4bc222c83692
 EBUILD openstacksdk-0.9.17.ebuild 894 BLAKE2B cd7b3970dee48d25ea293af523eaca58fd2f4ffc0677b43b7c68b59376d80e77f9f330d3eee504b94accf553bd90c3d884f2f6bbfdfc27ce4ac149b1d490f50b SHA512 1787197a9923bf0763a7a4c6b7b7ff520fa63b7f6885afc352af129c168e507576426a6d08919d42e1e91eea5d800fc1f01f2b63779f19785fb8af3f50eef27d
 MISC metadata.xml 532 BLAKE2B 6432003077d4f17d035396d83fdd85037468296b4e58c7e93a773bfd99e1d65144d88ef93709e41fa5618a300fc1c9f2e85bdb3f8520d5ca2bdbb4a9520003a9 SHA512 1dd04969556dfc8648aefe2358c81dcbb2e6c36fe487d153f0b488d3a066130f99d31edabafd15933892a0b6b1979f0edba37ca88e1d62be9898380890d0977c
diff --git a/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
index 72b406bdf214..dad854f5652a 100644
--- a/dev-python/openstacksdk/openstacksdk-0.27.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 11deeff38da9..f731a8f4b737 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,5 +1,5 @@
 DIST os-brick-2.5.5.tar.gz 174931 BLAKE2B 0efa117c756728062ef0ae3bdff4ce8127bd0d800cac906960c9f2d5fcd79820e2b72753744f8acfbc52a8dce8a357583283e2adacb692cbb391c5b198b4a919 SHA512 a343cb9194ca1b497bdec55853258b8d51b109abbb3ea406aab672e87c5c68d00511928d8690bca88c37e65bb4d8bfb4cab2cd3ba6fbff2794edbdcb681e0cc0
 DIST os-brick-2.8.1.tar.gz 178634 BLAKE2B f73006272af801f2d84990c90187ce979b7fab0993ab203efad5b05159af9b861afc73a277b9bd52765448f1ee4daf7e974802846ea2784a346ffdc2a0de23f0 SHA512 9dfe399688ced12d6c7d8e552bd7dc0e01938ee5e138cad690c72cc541714ae0216cb8c0a5007635f3815c2d89187576af7febd3311e9d201082a6fd66a2f7eb
 EBUILD os-brick-2.5.5.ebuild 1468 BLAKE2B 46eb46eaf474b181407156a5843c7e75dc03df3ad166e14fd7e6b25de6752cea46dc007f91bdd342fb0414517e1f410a75bcce15817aa1ed91f3297adcf13325 SHA512 ee1e0803cf8e705f9a721706d358165e3aa6027a0acaecd8f85da64374ed6aa1e129c75fa3ae9243efb1c0a22858f1a1de896cc8af9e0af58dbad44beb0b6ac7
-EBUILD os-brick-2.8.1.ebuild 1472 BLAKE2B 61558b800dedc2671608259909f1b36ae6aa321322577635e8805fd90754b2b8fae0ad6da0beb741f31728d7be4fe202a01d9a470ff8a8277e2c33f9ab63c88d SHA512 e1a825bcd59491bcecf685745fca1c9d5854fb95d01c40cfbbe1eda1f7c6cad01ac0bee54a983f78ba1ddefe52704dbc7220e579a504f7ca2b2d81eafaf28db0
+EBUILD os-brick-2.8.1.ebuild 1470 BLAKE2B 2edce4ad636d375d50ebb740fa37fa461b637b4887ab7f3e546c61bd83cdbd75dca6918c8fb922b3efab4bd232ca2459b60719cfea80a93b5be118d30885eff3 SHA512 d81fcd8c8c7a5ae52a2626f1edbea67a2f75dad8fed04082d86136bdd7cc12cd3aaa21a3bc4ad026f125a099739cec57d3983c3af9993441901b373872e547e6
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-2.8.1.ebuild b/dev-python/os-brick/os-brick-2.8.1.ebuild
index f9c5853de38e..1c44322da69a 100644
--- a/dev-python/os-brick/os-brick-2.8.1.ebuild
+++ b/dev-python/os-brick/os-brick-2.8.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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 3eb78ecc6e4d..4aa21650d4c3 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,6 +1,6 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-1.29.0.tar.gz 65974 BLAKE2B f8632f4f4ae95941e81b039ea928bb1013d4208b93a3cf67abcb689aeb8f2f128ad309b4c86ead98ede98c2a9c44a5e0db49a32bd6e73490ce50a357f1f37bba SHA512 1b50777fb1476a58ff0b6ca9fe3015d4002eee312bc970d23284f2a05c5b27a96204c3e892b8262c8d830b1681fb7376387cc4a032736e31a3c353a0a348e752
 DIST os-client-config-1.32.0.tar.gz 48162 BLAKE2B 95f70717da5ad85b4a691bd89ca38989713f2d3654eac18c7b0001ccda8eccb266bd7ac3a25591d649af0814f8c97b718c88d856498e5042a07ca9920b6fe52d SHA512 2cca903347df75e18a0aab4244dc325f79fa7cb5a25a382ec7081a30d7e2c6ecbd5025d58c20873ea851396169e2b2c8253b0b77f6189a311016e57f8e065329
-EBUILD os-client-config-1.29.0.ebuild 891 BLAKE2B c6e1329931442c864ee2c9fab84617215d4462170baf4992344674a4aaafb4f99a2787bd09f49b28d4d56a6b1b9df368e85ce17d29256ddc22ae178efc78f555 SHA512 1db444895edb6859dd0338b40cc4af32ac10e9c084a02f447a9b4f4d01724a596627559f1b8d1359724199c24304480d4f873c4d3e127e36f369ca3bc56c8587
-EBUILD os-client-config-1.32.0.ebuild 745 BLAKE2B f397f32fde74e4a4b8c22302c9696918a69671c09a91a856c4057b2846c1ea724aee47e4bfc1855142dbc85e97d6b289eb64f4d1600d56efe1e49e6c7da5599f SHA512 fca6fc8e78da7598a3272257f57d2fef598265a0d7eb2fff620590e9e2e82c5b9a321ff1f56ede39126b71f51797d175c520d8dedeba6fc23b31d2d96a04c7e1
+EBUILD os-client-config-1.29.0.ebuild 892 BLAKE2B cdaa51fcc30282c73586faa34402696dd43a9548ce1a71a7fd6ea51b94057528c82de30743dcaf7ec36f59b37d0dabccdce6f5811c1ab0e103b2a3f70f11226a SHA512 da9f6c8d19e04d563f685926ec27bd88b0e2410e8f6067f2006189cc0b35d5dbede1b2cf83d261184c01aad8a017dd2cdf0eec24e7bfa62b50fa2cf4befcfafc
+EBUILD os-client-config-1.32.0.ebuild 744 BLAKE2B 205b8849fc8a9ae18a68239ba288cb71ebbaf4fb04e0614fc2d4c3403aac46293a92b2505d954477ee1e605a890787ef2e34939c49c5eda723c0f66c1fe4ae27 SHA512 555f33648f426b5d5523d4edd15b7c13e80db817ef3c93f95ae5a0005b6905c183d549488f782dfe7869e8e7d075591368406b3c8f81e86d0b5884b23bd732aa
 MISC metadata.xml 450 BLAKE2B 107120c3a7de0bdacbcc1d06d9daa9dd5379da49a46cdd8d7578809654eeece85ffd309e12b5044553ebfb8b46176f614aca67d141db99e4a615f98eb140f8b5 SHA512 776aca3159f9e170b02e6d6ef52fd088fc77315fef951f24d6a4477b7a95f109dc790daf814a373df04e263c68ff4f9acf0b50c221e1ea4b932804c4355ec4ef
diff --git a/dev-python/os-client-config/os-client-config-1.29.0.ebuild b/dev-python/os-client-config/os-client-config-1.29.0.ebuild
index 4bb8292b5952..bd6169ea8f10 100644
--- a/dev-python/os-client-config/os-client-config-1.29.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.29.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack Client Configuation Library"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/os-client-config/os-client-config-1.32.0.ebuild b/dev-python/os-client-config/os-client-config-1.32.0.ebuild
index 28c2e17937c3..a0bd9eb91b33 100644
--- a/dev-python/os-client-config/os-client-config-1.32.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.32.0.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack Client Configuation Library"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-ken/Manifest b/dev-python/os-ken/Manifest
index cc317297cb23..237d3440f286 100644
--- a/dev-python/os-ken/Manifest
+++ b/dev-python/os-ken/Manifest
@@ -1,3 +1,3 @@
 DIST os-ken-0.3.1.tar.gz 1440173 BLAKE2B 1b861e79e3aa324ac24b0a120b1edc06ce3b9916f2863538a95ecd96d618cbf416c2633af6a89e923d346d6092dcf72f25bf486b5e46d2d7a18774c58f839efc SHA512 ddf3309165614a9d25046623cefbb0e961452eefd43a9260ad3e1bdeb9999200624848d14bf5ef318b53dee786374131bcaf14d9798d7b7a8cd581bc47aaf9ed
-EBUILD os-ken-0.3.1.ebuild 1387 BLAKE2B 07b1b61dbfa07b3287605bdd504834d4dbce30140d67adc3eeae6020028b5a8bff1e561e7d5a9a4416cec84f2fd31613659494a901423b764d02395096f27116 SHA512 4f6445c6bb835b9eab81b7c594f594650c79896e2ae55374f3d793976a7328c66fe3bb462d18f49d3a1a3392d4c78bc729516ee7c7d5d424bc113a955748aee1
+EBUILD os-ken-0.3.1.ebuild 1385 BLAKE2B 8ef21a692393974a484d693584b939e86befcbf9a6398122e0854038839c8d9287f48e387eaf8ff76f4c848de86d294f000f95d12431b07d8a46121ea3951b7d SHA512 387a03fe136b57ce1bfb78a2f244a13e93879b5520fff5794c2c1dae70bf677bdaeed668e3df81978c98cf00f4180018742906d7d4914dda4e8ccae0c452f4ec
 MISC metadata.xml 379 BLAKE2B 32a2ec39c671d7239814a17aece1b1c676bb60efc379ec5b27aa534eb9436f327e801b1d54167144c27654e9161b3edb147c2fa7593ecc57b156b7462b73d806 SHA512 d93efff2f59945fad29d284866339ed2d8d0a6e53eb96a728909635d268c47798bf4f50c1dc3a62e9ac2861230b178af85798ce68a223ed8bc3d318f64ce78ec
diff --git a/dev-python/os-ken/os-ken-0.3.1.ebuild b/dev-python/os-ken/os-ken-0.3.1.ebuild
index 7d1ec7347f96..689c3bc54bc9 100644
--- a/dev-python/os-ken/os-ken-0.3.1.ebuild
+++ b/dev-python/os-ken/os-ken-0.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os-ken-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-resource-classes/Manifest b/dev-python/os-resource-classes/Manifest
index b78d702a7a1d..c4590b8321a6 100644
--- a/dev-python/os-resource-classes/Manifest
+++ b/dev-python/os-resource-classes/Manifest
@@ -1,3 +1,3 @@
 DIST os-resource-classes-0.3.0.tar.gz 15371 BLAKE2B 93d9f97cc3ea546e56384684da086e284c6d4c575e8232ddb2655a98fc1cc37e6cf454f50890bffccc625342cb7bbc020df8f2a2a262a2888b854425ae2ac6f3 SHA512 6b347fde11dd0d11784a6e80ff148385b33e3f31545d6379693af611cd1d65d5cb54721c7fa599fc49b1f8e6a07ecf85ee33c30d09dc647da07fd4f67f6c5813
-EBUILD os-resource-classes-0.3.0.ebuild 742 BLAKE2B 03c8b1d37ac02f35eb0e305b99d940e07ec8efd02974a88afd5c3b84f1ab76c72e6ccf1397818e045493616c594e5ead7cb17f353e318e548bd95bc7f3f23805 SHA512 b12dc707dfdc8c9c1eb9fc6cd9ac784812bc2e3fe428c4e85ed4122fca760dc90b3ed80f66b62fb7f332569d004f53df142d06c7b09d2d30bbd66eac38dafd7a
+EBUILD os-resource-classes-0.3.0.ebuild 740 BLAKE2B fc0b32f0db11f4127e0166e26b0d0c6162c81bb8d8388aa1055fbd71b5c91d9c627cdf54ddfdd29f6c3882a6e518bf547ecfdac9b89cb50f0329f1dfafa17761 SHA512 a1d7922b81185bcdf63a2f6b199ec324c78c563c868475bf7c5c5acf0b44d6efbdd990ae6a1e879441ca23e7cebfa0004c028a2f26620bffef77744e22d8ade4
 MISC metadata.xml 405 BLAKE2B 63a7bd1834b0367846138475cdc9024abafca54967b74f09d2bc248663c3e0481417d735298f6076af2db4b7dd8c111b59f8f0fe615f8d09edc18b07fc484626 SHA512 256a3131b22660dadbb0522ae467e715b0a7e326f68308bfa76f8e3aabfcc25c44b64b483a4af6e0b6772c89425e9798dee0dcf3b5b1b775efcb2d836b63061b
diff --git a/dev-python/os-resource-classes/os-resource-classes-0.3.0.ebuild b/dev-python/os-resource-classes/os-resource-classes-0.3.0.ebuild
index ab121613543a..ca97d93b46cb 100644
--- a/dev-python/os-resource-classes/os-resource-classes-0.3.0.ebuild
+++ b/dev-python/os-resource-classes/os-resource-classes-0.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index c835b9ac81d2..eaee740dd01f 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,5 +1,5 @@
 DIST os-service-types-1.3.0.tar.gz 22961 BLAKE2B 6ad32594c7fd86f61b0e9018901da740c6ce7d30ba10610cb3fac1900cb8188084ed754a36b608dc076582f438a8cdff0f655cef2ee406de4186c12b5b454f1c SHA512 6a90cd4744902dc314ae2af09411947270a06db548016a0d8e424e6dd44520b20a24e061425e7dcebe4c62fad4c0bab4636e9537644d87f66e652ae02025afe1
 DIST os-service-types-1.6.0.tar.gz 23412 BLAKE2B 9e475b3905c81b2c480c98b17fb804766312d32573c8d84d27aec66cca60b0b4b6065a12b73c6546f60a266e1cdd3f9499c409c031580a323ee7bd87472cbcd1 SHA512 5269f54568304e038510542c5c29aefedb00449807a424426a03d450db6822b3c7d850da50b6804a9ee435298c0e56da31a031cdd09fc758780655f92de28662
 EBUILD os-service-types-1.3.0.ebuild 561 BLAKE2B bc2d466af236e659f8a81f398d626d99bc098adb188479906a694746ac7e8c1fe1aa6c9b0f17659291074703db1e6086faf3853477d92c6a0960320e01f9c359 SHA512 b97f7b8aeedc55cbab26d85a56ac99607a3f4620ae4bf02f5552ebf7869f3e94e641a08a0980680953c91d7825b5af5995549726ee76e28aaf3caa6215b687ab
-EBUILD os-service-types-1.6.0.ebuild 563 BLAKE2B 0c45a9fbacbf3c31e19893e9bf6558d4c7f252068b397c0586cc62fe6cfb95e04c68e229a68b46b72406f6c086ed2cfd825f3216cde70bcaad4bffad96dea7fe SHA512 99674e55fe28318578a79c64fc5ce09b0b09893354c8b384c3e04cb5c0c65bab43adc987c3d3972673844968af8d33614ccddb7619eafa653188fd165518b5c0
+EBUILD os-service-types-1.6.0.ebuild 561 BLAKE2B 9fd2bcdba7308674a8716ee4b13ca31811a5f6461b34cd7d52a6be9b1b25f57a325836812449abf1ff93b31595503cbf92af3951577a7efde3b0a318308ead50 SHA512 76f48af17fee8a5dc8e60f35cc79d4a60f90dc87961f0f5a6d97912c40866f344f2f24eac55463e672ddee9aad25bbc3b8ef20f5a7ace9bbe23025ee911c98dc
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
diff --git a/dev-python/os-service-types/os-service-types-1.6.0.ebuild b/dev-python/os-service-types/os-service-types-1.6.0.ebuild
index 48917eb701ad..f7ff9202a49f 100644
--- a/dev-python/os-service-types/os-service-types-1.6.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
index 4ee8f7640650..4150fa0368e6 100644
--- a/dev-python/os-traits/Manifest
+++ b/dev-python/os-traits/Manifest
@@ -1,5 +1,5 @@
 DIST os-traits-0.11.0.tar.gz 20362 BLAKE2B 843c1a874dc5e7ee5066263a7dfd9491157c692a5489e53f9467d85589ce25570995cb25715409a49d81400a39bbf4c5ba0e616706e7462c4497f3613dd95599 SHA512 570fdc23ab3ae1920cbe0520bf2c007bd10c8372d83bb129993324a9a6de4462a9b5a86b816295dde9039f55cb8f125cb38653b4bfdb29630577327ec47c7d0c
 DIST os-traits-0.5.0.tar.gz 15775 BLAKE2B 288db72d500a3187a8520b9674982f3233f8644a537ec04971453ece394344b7310cbf133785dfee7122e1aeadebee7fd91d18f57a6ccecf0f176fd569b2bfae SHA512 2dd9019b13fc3394bf97fa9ff6c82d02d26dc6ca8ba8b32e619e9f88a9fdee0d3082e3818ca6a51eea9eb45997dfb48eee6976190b27dff6ab5b892747ce2a54
-EBUILD os-traits-0.11.0.ebuild 739 BLAKE2B 24b04d0044e8ae9daa4e87040c6a2ccd757e0a0ae644cb6578d1011744d62eb6cbd2a4f55a0790d1ffc0a09d834ce5a15d6724f1abe3fbbd74a836aadf1457a4 SHA512 f5539868cf12391e8951ee01be9e8825f566623b65ee172d911b782225f11c12e0e36d84d0c9c77cab565e1dcdbdaec0067d3229494a327e679c0dd295646b7c
+EBUILD os-traits-0.11.0.ebuild 737 BLAKE2B 9f3387917df2c1a26d2f9f40432b6605f791066821aadcac56f7d0c48dbcd2bd1d095fd027b1e1fa628d31bb3e9f50043154a7b77ddae4d9e24ee361be662910 SHA512 832a25bea6a8dc888da6b0280169aaf7eaa76db026a31e244cffe0937da18c22ae8327f1e62cc7d28892008b2ae61416d8831e77672676ea96f8d90a65b8a13e
 EBUILD os-traits-0.5.0.ebuild 735 BLAKE2B b808414f5f8a7a92060aa785d347d5180e0b0c52dcb0bd01c85dabf15eeaaf64b78233420608233cd434f9c3299b52a95e121228c822abcadd0ede4cf7ee378f SHA512 f6bda726549e1a5fd4fa344c09c21612f0aefb920c5786018eddf78473c51fbbcdb6855f90417abc651c12c91bd71d559c9f0d81452d56ad41731cbc05c6e00e
 MISC metadata.xml 385 BLAKE2B 2ba965a78d301c8f0b65378ff482552eba70236b457b96461367e0ffa5cbab79ddac2296cab4184803f7970e4162faa0ace82762ff356eef2e739625bfc99878 SHA512 9dc66a1191f15d9a8569e229a59164a7527c2ad27c06f67d89a9a25910bdaafe70f6c9269a2482d5770105ce58a64705dde15db56b34f2568add1800df0cc42d
diff --git a/dev-python/os-traits/os-traits-0.11.0.ebuild b/dev-python/os-traits/os-traits-0.11.0.ebuild
index 3ba218ddd663..0ab91e9fe7ef 100644
--- a/dev-python/os-traits/os-traits-0.11.0.ebuild
+++ b/dev-python/os-traits/os-traits-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
index 0cf2d724cfbb..95b341938d89 100644
--- a/dev-python/os-vif/Manifest
+++ b/dev-python/os-vif/Manifest
@@ -1,5 +1,5 @@
 DIST os_vif-1.15.1.tar.gz 85731 BLAKE2B c0855be5204513fcb18c39341cae0a51ab6ad961d6a5f6d96988b14e43beddc4fa7f8c3e8a590eb5f657af8590603cc516a194af1c73234566047b8059cacfc1 SHA512 5fe7ba1bccba81e8b03884e951012f181c4b0cff433ff9211ce750868811ad4a3e5b1188396c466a286df6a9db824fd07a7abc62fda2c0c302d6d07108f419a8
 DIST os_vif-1.9.1.tar.gz 63535 BLAKE2B b4c017b129c2540794f85292341a165761d00439d24727fe2f421c96a7e5d6e79e8572a217064e01e62bb137f136fcfd1d51ff089c48026de82d91a8b9a22386 SHA512 d7aeec1bd277a91a1f4fbda69e5408f5648ad49ffac17d1ca54148ec30c31bd64639151988355395166747df91cd89cbed1863a2668a5bce89a10d2aea55c288
-EBUILD os-vif-1.15.1.ebuild 1420 BLAKE2B 1d5eeadc98a27de20639ca046536de8622fa082d6c10e3916ffbf160ba0bf2c4f602e04fe5e43cc6b26ee48ae7cb1edc7ebb64dee00df638553f3a677e43ea40 SHA512 a3922882f31418a324d7c0ab4aa682012e978c3aea1dbff3b2104012e7f1a2421f3c89c72779ea4c7529cd787f8c96064377304b10c2918d78b96a88a7096e35
+EBUILD os-vif-1.15.1.ebuild 1418 BLAKE2B 575f1b3fe4398f8d15819439ba8dacd256211378d12428d05dcafedc6887da47e1d5e2c60aa7e80c5dc6ee1d2887866b689d621bce7ef42c9cff245d0410cb22 SHA512 9b53d5b13bdbee6bd2015c828c747dba4f2ec47c7c9355017085505e1db3bb6fafd183e063d54e16711fd941319816ca6ec5f29b0af1a26b7ec293bc491c66c4
 EBUILD os-vif-1.9.1.ebuild 1316 BLAKE2B fed08c77cb8740ab83da994b04d7f218cb8848c0e8e7d5635826b7cf56adf540823f96364685cd396649ca57b3ca9086fe1ee5bab466b448cd6617787415fb9f SHA512 50ebdb3012fb584797346da906f212011dc09a9d9cb11ea91df25daa60a446af246a9e5a6c7c4d3c4cc7b59cbe7c980a072c0e111f2c5ebf6fa9fcbe46bc7140
 MISC metadata.xml 379 BLAKE2B 9c4bc302bcb12ea964647546867a2f00cc84eda6f1193a700cd248248c6c992f6183c735ac55f021a8b89974ca336d4d840578444f02d1ac85cfdfcb8d48bc0c SHA512 3667aff7bf331a2383c2e4a854ceb0b1fa214bc605e98bcc9829dae0eb5e870ad123e9a2989a345134db916541005f54dce777c680e32ec6196785727a89831f
diff --git a/dev-python/os-vif/os-vif-1.15.1.ebuild b/dev-python/os-vif/os-vif-1.15.1.ebuild
index 4a5e87d488cf..f40aad0c51cd 100644
--- a/dev-python/os-vif/os-vif-1.15.1.ebuild
+++ b/dev-python/os-vif/os-vif-1.15.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/os_vif-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
index ca7845f2e2ba..430131ecb746 100644
--- a/dev-python/os-win/Manifest
+++ b/dev-python/os-win/Manifest
@@ -1,5 +1,5 @@
 DIST os-win-3.0.1.tar.gz 202691 BLAKE2B 934f90970ccdb7890379ca6f3545936db65f104414c4de51dd8956345b4e5330a3d6db286b6fc2cbc9f218528751fea56b7836d81cb9da1f271737817b220101 SHA512 619b893f4595fda57c2d339b10bf4a7de48c711829f1e2407f981c943b76999d1ee84c15a5b91b03fcd946f16754501cede2081c5ce0ae3ffea0e6f4faaaf23e
 DIST os-win-4.2.0.tar.gz 214676 BLAKE2B 689417494acd7ddf219b7b29d670ed888dc0649fddb5e0a94b5160b2bec66167c14a315e0daa2f0fa794de96cecb15a054cbc6f4df0c4c8d26abb2367eb06862 SHA512 5f828e5b0b0a178a65959bb69f88c7bf30282b71f458ac36c11ef197dac3e821a2cbfb8be43acbc90d845e247be990ce6618b6dbe60205af8e890c2f7b7d245e
 EBUILD os-win-3.0.1.ebuild 1204 BLAKE2B d62380f5245b0b4cc508f455199200ebb6b44f55469f23e7ba11f2311081d3e54a3e1333bc1149dc33f70eae923a0e186bf7eb4cd0cd55278ff004525b6474ee SHA512 c11ce871a108be63fc6da28777c6e6a64ba023b7ac059385f43dc3b8a42087bada470c85b8337ae7b8c149d95d15f478caf21608262b7a98e7bab983099edc9b
-EBUILD os-win-4.2.0.ebuild 1161 BLAKE2B 8e02bd05fc4c243b0b1ea633d71667d01846afa545795feae19724d9e2283530e91a8ee41436c6316c3090e3939fe758db90b4b63977d92ba06e34cd847fdeea SHA512 17fdb53e8df2882e691838321076b33c20c1ff2191d970557ae8bd52aa46631fbe1e3812118098249daab186ea05b9f8ebfbdda55917ed14851677d9805af6fe
+EBUILD os-win-4.2.0.ebuild 1159 BLAKE2B b0d310385f3fc2948f7da3f6828273b6005db1bacea2f04cb5c75da15cd1defaca2b0064e5984453047376ce092cdd5a035af79b479830eaa39814a51b9aadb6 SHA512 e2ec9e65a2bb28198a361d3bf1d8bcb8c30e1c82f7888b122fbe023f27b31c62d16fdab5f410a9dca7c041b4699ccacf11323e9d1437615b9e5645db0f7d1943
 MISC metadata.xml 480 BLAKE2B b17e3983e5660147a3a55a76948e00dd9e0fc800e442cdf92e4e17a70737740b749a86063f3f644b092df6e0d00d4e9c36d11f6a8ba697f214c08fd79c560008 SHA512 6454d56af0f829cf94cd211f78651a6d611eabebd8a3aaf5cf2cb92aef29107ed6efa5e974b5f9e5f6f53ed29565c1c6ac0448de72a3f21efbf73ecbcad2dd3e
diff --git a/dev-python/os-win/os-win-4.2.0.ebuild b/dev-python/os-win/os-win-4.2.0.ebuild
index 90abee3d0f5c..da1e21ac8924 100644
--- a/dev-python/os-win/os-win-4.2.0.ebuild
+++ b/dev-python/os-win/os-win-4.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-xenapi/Manifest b/dev-python/os-xenapi/Manifest
index 54a816a1e1b7..bb6e481a6014 100644
--- a/dev-python/os-xenapi/Manifest
+++ b/dev-python/os-xenapi/Manifest
@@ -1,5 +1,5 @@
 DIST os-xenapi-0.3.3.tar.gz 135902 BLAKE2B 7ba2a7a386d3bbc0a0e20aeeae7b34c22540ed66a97ab48819eeb5995b6a5c8de09f59f0ab31ecee543147c75b33a5b590e6cb228f2f2f7aed861e3fe03654b4 SHA512 ec7b89299cfb4a76d0184bbac933e30857e45082cadf43c6b3f74d0c241cbb1013959e6338f85cb2af71c815a6ec6166d8e173898539c9f68eca128e2e908ad1
 DIST os-xenapi-0.3.4.tar.gz 139843 BLAKE2B 333b7af4bc5475584922264ea47a61e6c7a0fd813cd5ed99db1338c74fc86474d190df84ab8732d090668cfa5dc7ec43cfc75283f42a7298aad7d470deec5eb5 SHA512 4e5afbce07d38f93e93ac839eb26927a2436b33a39e14a57ed1e99cbd3501c7d2dec8db7f65617c8d6308e8227e60f5653102ac3a04d9322c0791040fa3f22a9
 EBUILD os-xenapi-0.3.3.ebuild 1078 BLAKE2B 7941d0c863157f35f00e72a978bf99426154541547e7772b0c9d97ff7e9428d0dfbd4d1f4bf76c3612c136b3d320c7d8505afe9b8c9352c608e7c0ba3b31c299 SHA512 f960228d7006714568381337401ecb5a53fc8b0ef06621434c16b84362fa4032325c5f3a0390817e5b1253ed805daef7f1e3cbbcfa646c26d9065c8982a6c9b2
-EBUILD os-xenapi-0.3.4.ebuild 1035 BLAKE2B d3e0b8c4d5359db8fe04ae240b57f6bc1db0ea42f3f735215d0758d9206495e34b217eafdc18a8ef7156b3f2f66e405c618f3d9b06f4cd8a88a0b3bbd40af41b SHA512 a5f22733a5361f14a5721cfdea94c6558e35daf166751b8b719e2232f7f0d6eadfa49c948df49d838c8f98c29ac2dafcb6f87e6f18b8c033de019ac91c4a687d
+EBUILD os-xenapi-0.3.4.ebuild 1033 BLAKE2B fa055491759dc1bd23778eb81efccbe07777d7dd314f3956d46cc90d6b0d9c918f7b8f6d3ba69c4a77e1146757f515357ca3c2eb95e5d637144c5dd9790312e0 SHA512 b332bda0f2aa4526cb925fa0101e8da582c70060a69bb29bdf34c101aa8acc47882f21ce8cd95383715d431778c047d5106b129954565fde6d6131f38515550b
 MISC metadata.xml 385 BLAKE2B f9d38f905be85b349d2afbc8c957f4da69f640e1156cf17ea94d64df946e836e7f1d5629f03eff601e625330320e99a1df11dea785bd142e82492beeedbe7a13 SHA512 b8a779ae9c1158dc5d435fdea67f528af82d880b858cacd091d6d9b0e1812cc0c909b46d76396785aeee8f26cb00d5ca53ce38b063c42ae05deb90efd01b586c
diff --git a/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild b/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
index c524522d078f..d10ef612b4fb 100644
--- a/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
+++ b/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index b4d0b4fe8664..9277b899d9a4 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -3,7 +3,7 @@ DIST osc-lib-1.12.1.tar.gz 89641 BLAKE2B 06069dc38e72c2c008c730cb7a30279762c213b
 DIST osc-lib-1.7.0.tar.gz 81917 BLAKE2B 3a87d42fb8baed7096e01e591d863097d5efab63fc36f0245b5311fa52a0f952a3a8a52cfc964e14630009aed7922752e7a0c5d9aeb1da0d31d7caf40c3a9a44 SHA512 a3dd3ceeaf674692fa318809b190df30d1d6be5b59355b8f0b5862f5b220452e3df0185415b35ef596158ce010b47bdfea24e5fcc3d957d38a2a89b8a5905bcf
 DIST osc-lib-1.9.0.tar.gz 86263 BLAKE2B 23105d3e0a327e0c7a9d08be59ff70b510528bbc26bf8b5fad0dbd6bb53e96773427ea4a0a6fe069ffb8270ea001e767d2e58863132938398a0d9c99a427f13d SHA512 26ade2147f5e0f7c02a2ff0ca1e0b2c369f6cbcb7d7843c4df09e5c5ae9e5e6eb7001cc9232723b2941b956fec1c7ae34457fd8ba7c45056a185576cd8abe2a4
 EBUILD osc-lib-1.11.1.ebuild 1180 BLAKE2B 3ec8f05914a1ececcda60be9702df9a814dafa6a83b3f9138120fe10a0ee6896c4eb44ed3c906fe9bbb081dccab33185311574b1e9ce7fc003adb54b20407e8d SHA512 d9a28ee4d91634f73d20c1ff38e4284889ee368877201f2758c1172383c47ba41cf9bce645b7c4e75776e961e58aafa7d9aecc3fc4368658f615f72b838155a9
-EBUILD osc-lib-1.12.1.ebuild 1184 BLAKE2B 0598f1de4486c47ef5f0634f19fc85bcbbc50815bffb35e0288f3a2986e35338e63397cf98d3280a687c35a73f62bbaa144dba61ea28d9bd0c3844648ea59e2a SHA512 929e4eba47c7229627f73acb181458c8df4b2c46424fafc2ee73218f9d0e2bed310b8691c2ce8514515a41eb21339ce8f89b51746b6a8deb5758815242ead07d
+EBUILD osc-lib-1.12.1.ebuild 1182 BLAKE2B d01c9ee2d54b3b77c72a18566ef1f7e62fcc2da585fe4586aebf71a5c5af42f98d2d67fe68ecb15d5941ddae5cc6aa47421d92f3667800be9d35487107044979 SHA512 30cddac2f4a0b0cac837509f706eeeac69c33ade3abb96f12517fb8a8ff9dcc7cb47f10e338f37723f902a26106404abe5a556851d2adf6c415dc7537261444e
 EBUILD osc-lib-1.7.0.ebuild 1128 BLAKE2B 0b014f75b02dcd920bfd013e55ef6943120c31f408aa18e995a18357dbdb9d8efe8561af9f01a2e41e4545d8a6fb0cdc773b517cea8816bad43d935a93ac35c9 SHA512 256a09c40698de237b0b29d5f9b946a65c15a57dbda0e436bad8b5c040c4046ee7ddc2a3bcff373bb16b1de5bbaf24aebb047e4303691df04dda2343ee634871
 EBUILD osc-lib-1.9.0.ebuild 1180 BLAKE2B 61a9e28ffe3ec422e898d48b0ed0ec3e16877cd9d9c617082e6c391ab04a328f8d8d18fa68713b5b58be9b78d97afde9ced4b19d33752e6f884fbd061f1ee1dd SHA512 524e3fde81644222bfe802c9110e4c736488cc02e6d99db51510ad4d6c754f840c68090497e68a345de8af1ca85a5180a818dc23ec7009bb6c0c1fc23c43c260
 MISC metadata.xml 703 BLAKE2B c8c0ecef0cabde0df016a0a65b6f29079fc44b98f23bfa74abd7e9c9305b3469fe103998262027d7f16d4132d0520c530d41cf28d869cf50bdec307dac6ae475 SHA512 78f928551abdf1d6c53aa4f7ab7dc4b3f6a5212157b7c31adb5019a3b88064d06c66c693493ac2bcc6cf62e0f4b3fa2c6b4e329a25ab530df72220f430bd8df4
diff --git a/dev-python/osc-lib/osc-lib-1.12.1.ebuild b/dev-python/osc-lib/osc-lib-1.12.1.ebuild
index 3fd58f0cd205..4adabaab7c7d 100644
--- a/dev-python/osc-lib/osc-lib-1.12.1.ebuild
+++ b/dev-python/osc-lib/osc-lib-1.12.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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 1eb4f9843a80..7ea4b4b5b504 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,6 +1,8 @@
 DIST bug-681012.patch 4751 BLAKE2B 50c95275ec06522292bcbc7833af63bff98dcc112b2c2f742c0807d02bf090cfdd70fdeed433149ca3f27b7b5d356d7bd321c145aa8fb212ffa6e77b42da976f SHA512 f7ebbe5fbdbb570fbadc7d840c11fba49a9bc13e04626df053aae3da5668641f095a48d89229a7fd2b894d86c58f14699822e16923f183c099792dcde0777051
 DIST oslo-cache-1.30.3.tar.gz 53116 BLAKE2B 0b63f828f61dd82b69efe7a6e345974c56b2e980d88f159dd7c3ba5484cd1e8f78a393a7f73a6f2152db1c30178a054e2f20d753a286a0cd8f7d83af7f623bf2 SHA512 3ab9842cd388a846fe9004b97364057245936b9af185ba0f68e6d6bcc750dd957eb873d45e686cddeec94fda6872b72e4549c71ebc9e1de4755504c2a138b85c
 DIST oslo-cache-1.33.2.tar.gz 55778 BLAKE2B e75fea8b669d30efdf72bd565deb560dfe2c1627e4bca74ffbce923341e5663d641ae44b144e070e4af7587c08e911a4b025ffd0ca1bbc39dfc4ed3266cde1c8 SHA512 8111ba9f62724ff6ee64750a88807e40a38252273669c96b86dedd0e36f2d1661f54fd55bc462ffa577e95771d08965ad6be208224d442306d869db2d155da91
+DIST oslo-cache-1.33.3.tar.gz 56098 BLAKE2B b3d2ab549a2b2066ffdfc5d9b680da35501818719a8c6f460be1520c2d6342f1c41f0f1aa20ffdcc45958e83e242515a3ec8bf69ce1273ab47a8a26e648069c8 SHA512 7edc1d8ceb00f2989093ec1809120f2aa552de2d5ce6176c9af56278040d652fc0d627e0f7f427b9bacaaa24cec7b0fe24568316d90a4e52054357bc9b9e30e2
 EBUILD oslo-cache-1.30.3-r1.ebuild 1173 BLAKE2B 82fe972fda987f22c495edaaf42c2218224a6e562f3b04ffac9ef1429ee2195e931701ddb48b6bb4f1e08b1c1954cbd6e5845852906e1249bf3d06f5275aca6d SHA512 bf93c8cf44e6724ce1b77972f5603625f0fcb795e037506721a92e492cb919e4fe958d8f9680f6c90d53d360021677e8ff4e2c0cf40585c86ce8025eb90530b9
-EBUILD oslo-cache-1.33.2-r1.ebuild 1194 BLAKE2B 58c47193de3300c6cd7f0042fbd289aba97070019e3ff4547e29500e6f324615478d33eccc5f1c91c786e6d205baa850ecfb3f15c7708a4925a2220dea02fd8f SHA512 2acc8aa6857d332128ce169ccbe4f5379b94a3b91aa00b868ae871aa25c2b3d10976a57e70e8b0848e52c7a2046a9e5ec285e772449933462ae0e65ac7deefe4
+EBUILD oslo-cache-1.33.2-r1.ebuild 1192 BLAKE2B edea95d24eb2756e656cb37790c2693dfa3b25fc3f004cf75fd0da136275c727a75600b1520720921f8a2990c8fb2dea786726801ad8b147b19077930f7cf9d4 SHA512 96bb301424cb4530e75e9f096552d323eb99532d483afa26089cbb17dd092760e8ba76f35c4b7c5c8730e34777eb667e0f3375db6ec78721f751133e7e910ec4
+EBUILD oslo-cache-1.33.3.ebuild 1074 BLAKE2B 1f3f19873b43d48447699aee44a55d03aa4bd61dbc8ff3cd13d090912abdf4d0258c25e2fceeb217c2a4c10988908137b5e72c37ba1ee56be9124bb508c2bab5 SHA512 76621ca251812cbf8b1daad7731af1824b267533d34dd46c2085deb69db0490059e75ba2e23ef8f47b4ae187b8b9deb9a9dcba3e7730921540d5a10570a783b0
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.33.2-r1.ebuild b/dev-python/oslo-cache/oslo-cache-1.33.2-r1.ebuild
index 1507ee6fb2e6..663262ea3fa6 100644
--- a/dev-python/oslo-cache/oslo-cache-1.33.2-r1.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.33.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild b/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
new file mode 100644
index 000000000000..9ceba426c4e4
--- /dev/null
+++ b/dev-python/oslo-cache/oslo-cache-1.33.3.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=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Caching around dogpile.cache"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index ad1218387000..be07136123f5 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.concurrency-3.27.0.tar.gz 49604 BLAKE2B 04a7ed66c6d7cf37014080113bd3782cf186f57f486d6834fd28f3d518141f8dcac6f5e67ffb5ef894bc6f5085a90aa41a041e35b72325c645f7567dd743a912 SHA512 fb2e1377a8bbad451ef0a2713dfbcd58ec06d455e97fc4d8acf8bfde8eb27d59826d68dd3411bd60b6d6b5e68ff629f0e6e4781b17dd4349bc5b87f17c8b9d52
 DIST oslo.concurrency-3.29.1.tar.gz 51785 BLAKE2B 4035981fcff3cb4384209f3b640b928dfacd13e324c9df1dfebb0c5230727736ff803b478e506b08ac4bd7bd405763b93bdb951b01751a5e293daa33df860c8e SHA512 f820b07dbb26be9170c7ded08ce96bebc8c8cbfa72a3be56e0cb0fd7a025160fe630ad256c8c5b1adc9059cd1608c3625513b3da311e5a611866280d2b65424e
 EBUILD oslo-concurrency-3.27.0.ebuild 1836 BLAKE2B 9d5bc689e9fc8b1260fe531801c60873e90569bbcd7e9a551017682c73a80777bc757888f3b6134d6a6df0d555099081b14d951ff5c4af0ff49f835872138170 SHA512 1eb6cae58b41285cce68ac1c0afdea9149d374c7e44d16fa3160ec0505b1f64f3bfb5e611deb9f443a27c8f7fde14c21698bae5a35fec1b54474c9ad951cd889
-EBUILD oslo-concurrency-3.29.1.ebuild 1894 BLAKE2B 98fafa2d764be23be1dbc0cf6682de0b0e0b36aaa5e81946385b83c15dda51208d877ff4dc59b18ecd35f07a198f99ed424544ffe8ac5e120de45e618725a36c SHA512 eebebab640e2d23b9d1c94e73caf81c648c072efbda5e1cd59822cde61d2758e7c47202f125bc1f325ceef635fa6c59628afda931727b836d2b2b7eb488869e2
+EBUILD oslo-concurrency-3.29.1.ebuild 1892 BLAKE2B 2fb75f4d590b023f5684e369b6c9c2f20fba9e49c7c62efd68d4baf4d29a9bd90dfdd96ef39712c7e8f94de73dc23548d1fb94a103ff4daa367c1b23ad4d94ec SHA512 3fb5700a78da5f110fba1e6610e06000482ffd5b29c1aeada712378a07d6ac4f1aeff28a2a80547df7dbe232affca0f0841d39a00f88c4f713f63dfb809dca8b
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
index dcd6de4f40da..d833184d6127 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index e1af5b82f051..b9f8c4887721 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-config-6.4.1.tar.gz 144762 BLAKE2B 467e139767b6afd82e1c0d39841765c93e4c23b208e676bfd4c64512a71f6c432a1431d5bf902d268152fa3011e864173f6a766bca560efaadce7a713fa919b7 SHA512 97a47931fe98c6a19ecfe38fa8aae50e91e955db879b96988560db16c0ec775ce294cf0c9b45e62aa7dea67ec43cbfebf4a77e168f0c348bb03066c832dc40a3
 DIST oslo-config-6.8.1.tar.gz 149525 BLAKE2B 0676ac364410c5d2eb6c4d75b85c18d0cbb50cff33954a2afc96f4f779606912d46c0627b0d77fd63795f43e26baab113cfba409eb86e5a8c8353253542bdecb SHA512 d861120e35332411e7caba1ce1b37a2ad16d986ff2063d731edfa0cd6603000fd7f1abf6ebb611c7efbb6d3c4296c0ffb9ccea2c2cd6ba6bf7b18c53daa09f15
 EBUILD oslo-config-6.4.1.ebuild 2279 BLAKE2B b701305c6a9e46837e4e25b9431fb715fecbc49ae9b86af98e8594fcaef2fbe37aafdb8a8ce787524f50f45f12a656d2128328c4c72bc00a39364d77579d24d1 SHA512 9b7dfec2ccbdca51df7c5ea3fe96edc206f4dd1719e31347781ea4d0b029d847ada1a017852d9a548c649fe5874c8fcdf36c743cb7bd1e84794be6f2805caabf
-EBUILD oslo-config-6.8.1.ebuild 2288 BLAKE2B 859ad9bed3cfde761bd3c62c5ca98cdd60d86e802989598982df3e221208b297e3d74ef3d434b5975a869d0d35fb61ef557f94e984a01c45de0e6b66b432761c SHA512 4804eafce030385539a3b9493ba7afac4ddc2bbde8e5d2ddb74a171b65a611df08cd3189a2b568f998ccc010ba162c05a74f33311ce02256c16d6f4c4c96c386
+EBUILD oslo-config-6.8.1.ebuild 2286 BLAKE2B 0ab2f08acfd3d8fb451ad4d6845c23ac483dd3f168c3cd98658331181066add447f78d5b7f8a7ce9d21e7f1bcdae29d5e56a23e25d027faaf2b80e8c10bb95a2 SHA512 27f009a43c7bd1d67ec53182146abb1d8a9ed60bf5d41790bfec90ebd19cfc7c87ee9c3555700db1ac7d413346ce50fbbea0891ff1d46ec580a7a4a158565b8e
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-6.8.1.ebuild b/dev-python/oslo-config/oslo-config-6.8.1.ebuild
index b38bda89e608..4ecd74de591c 100644
--- a/dev-python/oslo-config/oslo-config-6.8.1.ebuild
+++ b/dev-python/oslo-config/oslo-config-6.8.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index b3f957774ed5..ab40ef4e336f 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.context-2.21.0.tar.gz 27605 BLAKE2B fa2be8819c3b5c46e12eacae12c665e8168c4d8ac88fe7e8b8c3454093ea14d1a5980d1ecc377eb7294d913e117cf5188571be3bf678f270712e09c5230f2f7e SHA512 af25aebd306d0a3d60032778e6e3ca10b976e758c10e5d02302ebfef6a6183c8f9a102e9b4c2c8400914d71976dff284654bbcec63c15192dcfd2605928596eb
 DIST oslo.context-2.22.1.tar.gz 29315 BLAKE2B 89c7dacfe42a9c3cd8d7fde8a77e3654f48788909cea725151e833a305c6916534919496393e603084311625cc9242661e72cbf1a2bdb72bedca3127e77ca9d9 SHA512 d0a3b9e41d23e8f642f8aacd998f6d6f4ad1fbf103947fc7403a57c4e3d9ae51b3cf73dfb79139d541875a0e412ed8600c4ce6b19cc207697429f48a7fb72887
 EBUILD oslo-context-2.21.0.ebuild 1207 BLAKE2B f0a71a5eab33b0c4c1e76e81e48405cc0d51a50b75b483aa22273a1d94ba17797db2c97a803ce07a20b888332f88bdf429d1c515953472d7ea3c68a101881991 SHA512 076b0d81cf7c20f64870c284ee9f49b39597e8d3318a638608bdecf19a935bc9f7ac80f13c1d25f5fb1a2e64873c6c0ff11991422e9ada6b81026280b65f59e5
-EBUILD oslo-context-2.22.1.ebuild 1254 BLAKE2B 43b2c346e89d04c4beb20423778e0f821e304e40641711fec4f86370a30865ef13c9d6f7fea9f156f2af91e11ba41ea202ab78456d63d6ed4273da0d8b309c53 SHA512 feac0242bc612605d08ae20e9590f6e03069c837971349b709e85f84a153d0e031ad230708802e65fcb06e9fb3fc2e72443fa0c262c663b1a1c1ad99a8b101a7
+EBUILD oslo-context-2.22.1.ebuild 1252 BLAKE2B e74cc2cc6c9e5dd793547fcec9cb77aa35024b9beccc7ed65c332faa41c3615ced49ed29fff6e7ea851811c4d8d253729c087a83502a0c15035ea5b4ed040340 SHA512 13b77b6a951a611d2f4f04cd73903da8aea978370ddde435b20e3de9cd5144285f7fb31d555ab1317112d47b04170a07ad528afe03d73407c2343b244b713413
 MISC metadata.xml 700 BLAKE2B d0e048afd7e2d85b6cbadc1927d2cf83469e0c8bf31d6aa6516e8d9f6af5d07e387c975c54c2bd877a22f2a964ab6b99d7f2c70130efcb80af68368d2f4c769c SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb
diff --git a/dev-python/oslo-context/oslo-context-2.22.1.ebuild b/dev-python/oslo-context/oslo-context-2.22.1.ebuild
index eb4017192d80..7b3f8acc8134 100644
--- a/dev-python/oslo-context/oslo-context-2.22.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.22.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 39e30ae820d6..1f68b89d24a7 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.db-4.40.0.tar.gz 171545 BLAKE2B 34172325f99938595b36cbbabea421f8e51f8c5916a908ade56a2cd072ea532ec08b884c2ee74481f3651855f9c1432be145df3689569b06a6597e9eb9bdd6d2 SHA512 b1a0db1d3624ffc86eb41b49f76a4afe3737d943b6465a1b66a2aed18524c463e52130f1d6fe27cd382f04633df327bba07254b6d4bfb300cdaeb51b608745f0
 DIST oslo.db-4.45.0.tar.gz 172505 BLAKE2B b280daf94dcdcaa21051bb1c8d611199725b7ad9017225f16ef2ae7342941a6b2bd474b1598cdb54e301f5143c985f250ec1b1f64cddf2ac3cb71a03d9acf589 SHA512 f976ff2aab1e39ce253618ed5669ee0b824ada03073028a990899784d96378eb7c5a2476e1a60ab9afa5a30fd8e34c84b0545d63a7f3c522cad9c7423208b1ba
 EBUILD oslo-db-4.40.0.ebuild 2205 BLAKE2B 2ca6c5f9c1e772415ff43834eae834b845ca1b3bfd1b5c21c5a091273eaabbd8359b6c5a8e10df99a6ed67e05a6c476431efc6207f103c5313721decf8795781 SHA512 5c626911b5b32aa5b893d67d2b5260d322ec143cfcc69884dd1599ace84c9382d7983279377417b5c2fcbdedf210a85e6d55542aff1deb59f746805159064b94
-EBUILD oslo-db-4.45.0.ebuild 2213 BLAKE2B b48ee2f3c01a26bffd7bfa0487139a20167da26571e17c5fab0b986d5320bb18ec1b8197be9330217a8aa123cd22d339df6cbc73fbe5fb7dceef4137f5b545a8 SHA512 317bac6f7e234d1a7567d3094c6a6d88a62babe4ff1d38f2ce183e12885cab4022c390310581051e39b319e796503bc702a9465e11a121d018e083e70170dc16
+EBUILD oslo-db-4.45.0.ebuild 2211 BLAKE2B 241199749d24abbbc13a70eaf013dfe3953602157e8fcdc153c52285b53c5729a81fa7a39352ceeefc938490e5a3db9f5c8806c573bee6962f2982c571b5bb39 SHA512 01e523b3af6ee597a5da40a3ae6e86e87a6fff6eef896079936483f091bfae5edd150e8de516da369da12c18ee790ca962e5ea28dece88ced36c9e6a35d5cd11
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.45.0.ebuild b/dev-python/oslo-db/oslo-db-4.45.0.ebuild
index 22d5fef20835..e748cb2e91f7 100644
--- a/dev-python/oslo-db/oslo-db-4.45.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.45.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.db-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite mysql postgres"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 4840a9a81d7c..9a5f78b5a20c 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-i18n-3.19.0.tar.gz 41888 BLAKE2B 651b6e1ee2d2d6c11bd1b86b78eadf70b33338f5495fb93d58747635961df20fbf74fb2a949ef81b82efce582410f05c88806e678f688bb686b500378c77ff6e SHA512 2c12fc5ec24fbebd2624b3bf9d3043a62da84304e73a995c49b395e792bd9bd7d38a13f5e3086abe59bbb9ef43729a47eaee78ea0701ed05c15f5070af232a69
 DIST oslo-i18n-3.23.1.tar.gz 44731 BLAKE2B 2205d5f27640fe15c7143df2e18d27b01a3f90c30b04b838643d33cc490cc4257cde77925d76fefd0add0d3159ee4976281608b6e43288f0c0cd4fc4c7959b47 SHA512 82ebcf54d7edbd7c3e7c1d7e13b223ca9cf88aae717ee6fa0c2fb9b423ef88403b42b3360cfd7b8dd3b6d973a077a1458fc9c879efbb6006a1cedc6ade35397b
 EBUILD oslo-i18n-3.19.0.ebuild 1752 BLAKE2B 06318a1101e69cf38d6d90df5baf1ce74ba6870d3659b80e96797e7fa9d1c255f9e60a66fd941ebeb9442332d45da9a0e2e31dbddc6e340cb1c6964a5964395e SHA512 4e10a94048288b9e7fa39fc240c41a99bc994759d9eab0bceba47d609e40b758447ca363629cb2e9a7f3685a1de8931b97ef7da8e0850a2901b0a0a1a6050ee1
-EBUILD oslo-i18n-3.23.1.ebuild 1890 BLAKE2B b12c3d4c70bc291b094f88cc649114fbc508f60effe6f10209a630bca133bf861e63e5001dea9888d68859f9edaa1cbd1eeec6da7f07630680755efabae65908 SHA512 dcdaf60a2f526b5f82ca41fb89ca55945a4b65d6f3ef6dbbf5dc0f07cfff471618664c9befc17a0c2690611314297f66a0c604e64fe6644894cb62535ad498a6
+EBUILD oslo-i18n-3.23.1.ebuild 1888 BLAKE2B b7cd1014f45d9d4dca078149e16b57d4883e7a4fca23119f1b032a4133a2571c78bb214a5b3b538804269358a7428fc269473c1ca3763c298d8a3b9b2f59873a SHA512 c997f8c19feb6dee9f77d8df24c99036474b5923f03d5dda1e5127363ba58858ad4af4b55ae2aae2af8f13d1b5bb49050445edc5fcdd66ecaeb8f659021f373b
 MISC metadata.xml 365 BLAKE2B de17547743fb15cc3453fbff770a48a4f7d7222e6a5f437064eef2269ecbc0a8ba3723893d653074364afd320894fda16f4e2f70da3dc6f60bf5e2ac763d61d5 SHA512 c3f2d54fd641ba2c5f423e2d358ccd8001354a7a3dc405af89b781ed167340b8a1dc23b3c15e70d60b72ed2d35ced17f9d4e6c1442ba8b3f919ab1788b33db37
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
index 23787714b286..dac1a9ed49e4 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.23.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index d67a65f644c9..1640f65e94c1 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.log-3.39.2.tar.gz 85121 BLAKE2B 782323490b619d28b1ff5df0d72e752431b01156e4c6fc8c1ff6191e22960398560dfc3c871edf65d33b92a75a3af61c85a5b1b66bf56ed8237a638355ccae35 SHA512 6b5fad426387d65559be2cd014054c123b9db57158969229ce184919f36ea355b181e3c0c06c78d8e1567108bd05af38ec2695354070826933888332699261ed
 DIST oslo.log-3.42.3.tar.gz 87865 BLAKE2B cd4bd304a122093ec99eace122dac4cc6b859afa7b2c8a2257b34f6af0c3eae7aae8603e48ece8cfd37b561f4d2387ad6f4eb58210b6a477b0f3c86d2f938687 SHA512 ac9425725c86b73cd87c2e61d2254a7c4267bafdff1fd27ad88a177d5fc4f6c8a9a10d6fb38425a0b40d9095e5139de028a4c775f02de226a85a91d46dc195f4
 EBUILD oslo-log-3.39.2.ebuild 1960 BLAKE2B 06f9c2f46329df6d2c328465c8038d41ad0b997850a39f1ebfee6429d97ccbe545c8161cd32bb01af6e1b5eec7d00f08c4216a53fca1d476820e87eb16ed423a SHA512 7fe8a0a7debdef366dd75de0ded98b9bc473800f312f6ad41491b46f03b7aaf9b5593aa132b9085a510cb0545048c6c891d1f60c5f1779cde5dc76ffd06717d4
-EBUILD oslo-log-3.42.3.ebuild 1849 BLAKE2B 32b8529d4d570e4fbf6f6cd9f957c28a6131b70a168c3e2254ea05fc24300baea8db3678ef84ceba78267d9526d88c0068bd49a7a6c56be8528e8e2f08e5210b SHA512 54c2ef2f721bd69b47ba1415a8d9087eddb5768fbc3aadfd18c6133c58206b922f09ac1e25dfc33fb8f2caca4a22f86ae8bb4746876d51ae41ebffbb0387d679
+EBUILD oslo-log-3.42.3.ebuild 1847 BLAKE2B 672ca4c53d95546a415bc7ac440220588d6ce706b0f6d1ec36eeba1a2812205f6ef89c8fd9a6107c3b236c66116610fae844d1ea6ff94e7a701001e7b53ec25f SHA512 915f76017c90e8f56a4a56f193a7ac7f97042f832ea5e75e538e41744851be733354e8562d91f70bd49898e993e0107bfecf995b0ce42472445c7d2b5e64b83b
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.42.3.ebuild b/dev-python/oslo-log/oslo-log-3.42.3.ebuild
index 52b355135d70..d26f92ef9c3f 100644
--- a/dev-python/oslo-log/oslo-log-3.42.3.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.42.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 3497daa0e09b..b43ee2e03df3 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.messaging-8.1.2.tar.gz 296052 BLAKE2B c24d8bc22f1e7bb8fd4f58bf15c349a5fa5e41b98031611a0820b66ab7cabb2742d49995e5c730d1bba2c04a36ef4a055de0aced5f1100a7930052a4f4efd5fb SHA512 f7bebc525019f19f6d25178f4b2ef811c3073dc2b10600a9a01aa23dfadad4b428baeb929963df31ee7c775bb94c47493699e8031d5dd9cea5d865c28432d3ba
 DIST oslo.messaging-9.5.0.tar.gz 251799 BLAKE2B 72edeea222af199ace54ef6ea672177713c15c8556b7b1d1691c5d217bd57e377f871879c3429d46ef1339f4a4b5c610bae82c2aa6ddc74dc069d08b86c15537 SHA512 2479a51c2be7be5752d11fa2d09eb6ffd6cd82ce3531f0a9275eb5bf5fa4451ac16240873a41e2550db5fd7b51003bc9af293704e50d2f3033bd51b502728380
 EBUILD oslo-messaging-8.1.2.ebuild 1943 BLAKE2B 68098cb7a6988819d0a42d38a7e24288c964b3339451ce1919e7acfc683148fac7d1658deecca5f50461fa3c2eb98b5bbc2866750ccbe52bac50fb92fb8b7b08 SHA512 0e940f38b388211d6ca008782787d13e07f78ddd411ed145b6ac04f287a01f5c60e6ea62cf89daef9bac7b00e43619aa8dae66bfac0aac880848b4ac4e39273a
-EBUILD oslo-messaging-9.5.0.ebuild 1766 BLAKE2B c73140970b54574d71c8d38928ada54213ba294d4e534068f99bf1df0867ef89c542c3c611136a3e5fc2e3fd89e8e1146238564d4899d5dfe31363e2c97b8f5a SHA512 7de6b4253af6760bc670d8d53d81b78ea77a60a0b4c7e9060f81ea122f1622d4a7123fb3d0137455b83c787e269f951f2cad06bc32fb77059332554c55638f70
+EBUILD oslo-messaging-9.5.0.ebuild 1764 BLAKE2B 2e8a90aeba377eced243f1bb36e25baa7bf134ea5c0352208f9cc47e7cae17e722cfab9871fb29da356a88bf10561c3212b5ad68fc74bb3675418dada8079b13 SHA512 922f1b37c550db3fae096336e683a05ac2b5f7600ff33de5f4efefbdcd611627cf2d943a6d62e8bb2a4336c0190725eb05bda29e837f7cc472b5e5e6f1b80b0d
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
index 4c0617ac3eb2..a245277a2029 100644
--- a/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index f48aff07d1ea..48eba3ccf499 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.middleware-3.34.0.tar.gz 55582 BLAKE2B 0e1af09d016cd5b81c5e0e719d40665ce24e0caaf28a4aae0043f99eee4e74a36669fdaa39330d0ffa13b588892480ee5081e1ffa41b431687c85964c7f30460 SHA512 ba8b418eb11f25ca929db32eb0451fdba757197e1bdba90dd56665e08daaa6f0a4dc6cc07788db4f14ebf2625312d3db69b73acc5cb425fa9e35299f22b6d451
 DIST oslo.middleware-3.37.1.tar.gz 56354 BLAKE2B e9b119d2163c3949eb98b7580b4d5aa4a4427b9a8b3a841549f282358d8daefe62cc3f0588535c744aab7b77b44d38691316f50b9d60e5c974e3a0714a367699 SHA512 1864b2c25602ac7e27e2b080617f7af5f38083705735893dde744e7535d127d62ab0f29a0ef2575ec53af22969544d83e454bc5913b5719c4eb7d312764fa5c0
 EBUILD oslo-middleware-3.34.0.ebuild 2175 BLAKE2B cf2133467e7afd8188b81fe6a9d61f16c4244d624c75df7558e1752fdf2106bd6bb16581a977daed07090fa6a0237887dc783efd5c301dfe01df7b35a24d11ca SHA512 5be89317ec9a7eed7600a141a63a2bbc4bf0bc19bd157b47d74f3797fe7a87894cbbe19e6d6a77cbe39fcda63af4ffb40662897e34ac5a1148ffb97508879798
-EBUILD oslo-middleware-3.37.1.ebuild 2005 BLAKE2B 640f4adee696ebeb76920c42d054893d388b4e9a6c13203607cf52d872089765f9092fa177a3603395479eb1ea3738426b2a1a22dde9c3a86d99b05777bfea81 SHA512 5f348ca6a95167fc17a758268d2ae88658335ef07e377dfd24dfaf64bda048a63a8401db96149ce0e6bfadebdc89012c16831e578e8e90a33d42277d0a94d898
+EBUILD oslo-middleware-3.37.1.ebuild 2003 BLAKE2B d3bfb08848fa4e73188def23a812c19b62b48373f7f8e90db1ec81951ce26c861860b52f47f3a8b29908a6ffd677624c89b9fe48eac96bd1eccfad81cd587247 SHA512 1ba549609717301d628012fc928df66e508373db618d70fda7111df73b889ddbf1b27710ddc04c2d77f1b7710833ed524cd06df89300ab1c96ad849b9ccee903
 MISC metadata.xml 766 BLAKE2B 09e791c996ee3e46083287243f3180ad073f53611981ef527b166c7c251401b2a3c34b8c0db8142ad77b4d4a82b92e43696b36f5fe80f7077e92928d5a825930 SHA512 38381c4dd993470e01cb5d469f345880a730b9afb3536b467a6e86243174192db346dfad58282e17d1bc0bcfb33e08b0f1797577e938c982e633cec8719d468e
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
index c5cc5e122eb9..3e6a4410c51a 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.middleware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index f366ba5a68bb..07167c790b62 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.policy-1.38.1.tar.gz 82871 BLAKE2B e47e96230874d1c287a1d4e930c9a5dd4ab35ccfee62b1c93c9d046adaf877c7e0cb65f9c34ef378c2a212d6986b0c1abf86af0ca6671c17f7dc8e85e1f1e706 SHA512 6b80a45ef550f5562d0c5cd3a0a466163d741bba7f9fb430c4e9d5273e0811d468d9c0c19c1e6168b38b4436279b81a1aec379d6513cf12d59f1a50fd7a4eb91
 DIST oslo.policy-2.1.1.tar.gz 90438 BLAKE2B fa99f36c688705fbaacefbb01bbc74bb5efd6f6c6ab0e1c0a8e21a299f9a45e162988e26a8da98d0edc2318b8f0b16d2e3c75962043da8aeb365b1a35307dcb4 SHA512 e5925156a42978eada310ef1fd695ff7759e22a4124aaf0bbf5803071484ea83dfbce335c45bdfa73564050b853661d848a1b92e457de8fa3f4c1f27abcbc089
 EBUILD oslo-policy-1.38.1.ebuild 1219 BLAKE2B 3e5e5eeebf9acbeb29ba131e0322825261322cd212c5b95c06e95938b80787931f261a9b30d5a538b8dc44ed1fda844f82854faebbe92dc152c5f57e2ef971a5 SHA512 2d1572122c3efc725ede91766b48ef3ab2192d7d728f6b129a2b2aa51168eb049190fc6561e1c317ab77ba89c58314447dce65f60c8dced32b15f3ff1181dfb1
-EBUILD oslo-policy-2.1.1.ebuild 1222 BLAKE2B a7d4e85837fbfad1608c19f495ef55ec9834eaf0dbe9f9f5c68276a0c6fa62444db3134b5b88bd7917cbcdaf152a98fc036f5344802d66ba5aafe35e45a0bafc SHA512 31e338b308c3a0f8a048f40b90d5170e1ac34d06549eab9449259b3e02b6422feb63e465a1fdca71235554a3ccad507e2463c3d9b1e5668e5452f10a84869c1b
+EBUILD oslo-policy-2.1.1.ebuild 1220 BLAKE2B 345909d3df0d89e87beab94df7c0c2cde1874bcaea117a0a4708463ce4c8c7da25202ae82000a43d0a7cb213451e94441dee56fa5ef66aec92f93ecc3b01cb2a SHA512 7dfc88ce801b95a3175f57579d239df6d6b20f8723fb8b85bfe55e9b07206f5ac96cfaf3d468c8e5d02d7a5a727cd7e91f707289de76fa6462dfa9f2a202cf8f
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild b/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
index e0ab35670b44..a6c6091fa12e 100644
--- a/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index 97f86ad1069e..173e7a488784 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.privsep-1.29.2.tar.gz 34376 BLAKE2B aab2807ec44cb984f7b304f46ffae39d2965dbfb876f08e3a6fbf24e9e70d5f0ae7a2aed9d47b126c48641c56004195bcc4ff015865e97b966e7f6b172f9f5a3 SHA512 8130700578cc1b54530011da259c795b6eb24ceba959f927934cf21e439d1412d393dee9f7bcb804ac52a4ae716284df8950677d5386905ac68bd6c37adfabbc
 DIST oslo.privsep-1.32.1.tar.gz 35671 BLAKE2B 06a793386b39a1899daf87ec7a9668821baf66d04cd785298d15b3ab1a1ed5fce2366b529e6d0eef0eaa64f35a4f41000a3b779648909737d6fe5a651aada631 SHA512 250c80a9654fb3ed503742cf867b36b09721c97b428684ba42542bcc8cccdf5c821156177360973594697135a7181c37ccb05f873746c241e0d78a14a15f7b05
 EBUILD oslo-privsep-1.29.2.ebuild 1770 BLAKE2B d3e3b81b321c03f485b82a05b2d2e3133c230682d6b96aed3f05ce417e582dceb52beb54d22928be9f6fec755df8b4c2f88297ccbd4c53684fa9ce159409dc9e SHA512 9a2998a515b0a873936d7a218b169351379bc17ac195075b7adf9d2790aa07525ce64eef36a81a075cb5940739b87559fa47b6570f28adadbc9806c89fb2854e
-EBUILD oslo-privsep-1.32.1.ebuild 1862 BLAKE2B 652a2c4c841273ec67a4a39aa07b6f890591f1175b96f10a01a6377a50048446abe403f44124c03c31435c7f72c7d83f9b48a4de6d5fbf2ae38ff3afd7dcbedc SHA512 f7d5aa24a19453d578d5c8304a2a31389665a52500f08a9abd160a93bb29c8f266c3be5b034e089577ca1df97b0dd7621874986dabf5680436eba6e261e37de5
+EBUILD oslo-privsep-1.32.1.ebuild 1860 BLAKE2B 2a61ad5023dc6084bef82656bddfd26be128ed5155aa41d71ce8aa95f18efb6b21162d1e386d20e06a417bc21f85340a6e3c269450f0e8bf98e0795df2652358 SHA512 03bece5d5bf5be43674947b79494a2c1360b45bc8ae28bcb3a928a69f2ff7e9ddb822766dc2167f3197275e1cdfde07ea46f4310e8551595a69aa57e1240281a
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.32.1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.32.1.ebuild
index 03b1fd49c8fb..a7374a83d6f9 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.32.1.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.32.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.privsep-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index b96526e1ea95..398daa2f9bf2 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.reports-1.26.0.tar.gz 48691 BLAKE2B 670c3c7205dd2ceba1559d296cbb697045aa088f7343614e82c9c5983166f34e90af33de43c55b1d865715c840ea3a12fcff697a798a5eb0b2a120a39c4895c8 SHA512 e4a8bb5cdfaf1cb82f53fc56060f2e6bfde85ad6933326faab2ce8f8181231510700712d191c1429cb264f70a79695a069fe9dae93aa4a70aafa3efe37898603
 DIST oslo.reports-1.29.2.tar.gz 49597 BLAKE2B 4c5f76fce7075fa1b9dece5a617d2a198d04386ba03513070b700a5794baeab18e9266012b8f10d232d5063eadf8467f0169e670fbd6dbe7e2838e34cbed4bb0 SHA512 92ba14a445ae0a12454c8861f43bcb2aed9f07373008b0246dd10a6a650ac22be8e239365441e6b192d11d09506dd51a4c2e4a6fb54560fa46175b0f085c4fb3
 EBUILD oslo-reports-1.26.0.ebuild 1293 BLAKE2B edef108a7240b7e9f370c710580d1a934793133b4a1ab9eb35992677e5d7b085e67f44461d8d2fb83917eeda834fed5638efbdb95e8effcac3e2b3bc3be8c046 SHA512 50e7b1f4a8652935eed67a6d2acd26b405a44f65b5b704d960d7f89ca5a3f268ce45ff597eb80da470fe770847d56ad0e5f471f90be4c2ad0b22642b6056bd35
-EBUILD oslo-reports-1.29.2.ebuild 1078 BLAKE2B 188fc130fb3484f495e1ef7f458435d1c6f50892bb1a6d055974ac805f3f801a7661c8bb9fc64aa3ee92cd770bda760a70b5439575fdaa6d5ecba7e1e05fe332 SHA512 9922018a27d293a030a68ee12cfee74c26232a4211d7b3bda67b32b520d3c212d29226f6c04eabe22c1a1c62175be4c29cb0d49fbbd042d083191756e38389d1
+EBUILD oslo-reports-1.29.2.ebuild 1076 BLAKE2B 1937d3cd8356baf743792c4f5558502abda57540912f4c51b70c143a1b504340b832e7f813963d292ede2c13d7baf1a1ac55ed0ada0c7e1bb7b601a3aa54240e SHA512 7e1d53a0e166fae6e4f9af44e57c8af7ed6ca886c9a50f2e3cf4bc9ace972cde267c14c9508c869d1f12acb01fd986f483dec3059583a04d11ec042618c91cfe
 MISC metadata.xml 329 BLAKE2B 431c4b925c3e743ab9f24b399affb6c0debc3c81f2dff9fc3e30c04af99b1984b8b8ee56d143c5f130a2c77f3bcecc0ff905d07fad2e3301ce5ca1b7920715d9 SHA512 61b44fd1704b8cee9c664efea764a36fc32e5019e5b9c7fca107b8a3a3272a7f97c525827b6ea918d0f91e9098f19fa164df62c83cf617b8125886aee633c1ec
diff --git a/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild b/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
index 84832d73d9d7..9c1b91075216 100644
--- a/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.reports-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index 14dbf83f6671..faee01ee0bdf 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.rootwrap-5.13.0.tar.gz 43433 BLAKE2B 8d53587f63022255683d18b8ce22dca07a160d7692e9d2fcd5e6c466bb6969da11a9a1af4646809921724b9f1b63b2532728bd3ade82312354793b6b4d15f0d4 SHA512 ff716e1e5900f754617578eb8bf60c1d2794474706f22a0c619c94177602ed3c3acde42ad499a7a613f310d6dffe526339b5cd1c96ecc727dcc43e1a9afd606c
 DIST oslo.rootwrap-5.15.2.tar.gz 45566 BLAKE2B 1755a52d1e380a512c50f5314f7a4f249da9e62030abfef531bf973277a98f1f42f1c27a69a4e6e5cf64441e6a7263a3780355da4860461cfafed172ea087946 SHA512 9fc4c4678a25ebecb08026e71ef8da44bf1214f177d5330de8d68cfce8c3d85f4085a9e19f282bc8b498a36d8a7e384cde354a95619a800e3a68aba088df5aad
 EBUILD oslo-rootwrap-5.13.0.ebuild 1611 BLAKE2B 28edc79ae8377b85508ac41e65064aa428639f004f0e520bab2ff4aee377f95bfd32013c9b2904aa8d295ed2187f880adbf60a69adfb29732e314605b80b4234 SHA512 950fe54920dc7430b75f50146841486a6d88e5bb0a8b458977886a2d33fc193c1d5fc88fdc21ace475cd0c34c03ab4cd01fb15de6300163eb6e6e480da42b4d7
-EBUILD oslo-rootwrap-5.15.2.ebuild 1649 BLAKE2B af72c9448c077222e3c0a42aa9e420f59261eac03d638f96d69a79ba9abeda0b50001bb919290c2207990ba6a39aaf05c6b3158ba87c3eef5977630c71338c05 SHA512 32a78a330f40e24b374ff20db5dd7d2a853cde858fbd9fbc41eee5eb30e2623d16592837cbf5098ded6391aff6473cb3eb8ff2b573f34e760b9bec1f09aa7f8f
+EBUILD oslo-rootwrap-5.15.2.ebuild 1647 BLAKE2B 478a1548b3af09ced9ffb350d06c84649bee94dba2fcf379797f4156e6eaa0cc605ea7e14e6aac14e9c8e24b5ddcdb62f026d667a935073a716b98344d0b5fac SHA512 412b9489c56fa5567e0aad4aed84906e38f83fb6e37b6c5bbc73328535d9eefc1bcca4a7e9aeeeb9055fb5eb666418c0fd5649c9601ebf2488b38caaa5c11fcb
 MISC metadata.xml 600 BLAKE2B 93dce16794b8495f34be98af703ca0ba06ff4a2e378805f7f3b08d4805f01ad015a1144124e1ad32eb63e6b5c9a9378aea30a4b82eeab54b1cb9dc95280fc6fd SHA512 ad1012d9f43875065679837f787f6a8087876d4ef1e56d24fcd2aa379c85e628848dcf5fa03e84e5929cdfabc4c1b6e2f7167ac0a508f7f26b6b533405932e10
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild
index 8a42d3739fae..3d9b6e604702 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.15.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.rootwrap-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 606e9276968d..17e1651e4a2b 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-serialization-2.24.0.tar.gz 28948 BLAKE2B 8e57d14b21deefd8058f4dd677493072b0bfdc08bfb18faae2f6a09c4ab4e29ce544e479427a6c6557e0ca78fd7b525aa6a8ab3443a01c3d856ee3556f5f3f5e SHA512 8c2103409d9ec2ebfd45eefb56ed42b1ca52c0f8eaf5deff1020a67f813c8524d1bffd81d97a1ad28c80b4a5afeaebca829c4580e635f514900fd0835782990c
 DIST oslo-serialization-2.28.2.tar.gz 30807 BLAKE2B ff0ee4d4215943d0fa419d0d0989c093812d354da6727f5e87a27ff0562baf5e3a22c781c686ce5156fcff065e03c7481bcf3e16041a2296366a1f297060eff5 SHA512 78305f20392348b73eca244464cd4167177cd82ea74597641ee9de60b51182e5e3d75e5d748fe2c39ddb322a08f2ee5044c846bc969022b738a0b89874451337
 EBUILD oslo-serialization-2.24.0-r1.ebuild 2024 BLAKE2B 747fff9ee91e652cbfe1dbdafac61cd7834faeecb7270499e9578fffb217441a6d80733a2352476d4c1f70c0f6560148ea095970a33ccbb64618d8d048400811 SHA512 0b62f26a70b885ca31c1e781dcccf530887451787de10757f788cf98935c92ce7fc5ee50e202c2bf455e005d2350703942a0439d57ba9640b8b87f31f38be139
-EBUILD oslo-serialization-2.28.2.ebuild 2135 BLAKE2B dac0937be669f70273fdfdd5514c3b9515e3505db39bbc90de76b05ff6f01885d9910490c632b975c341e09c51566fba11003818e42c5a69e4200960ae2c829b SHA512 736019a4c1b3de5b7169256c0d3a349d0ffc38b63ede293159c399b59d73e26ddd24329e2b1f2e97a28e00776b82e780154019835b670a6e33b879c85b233c28
+EBUILD oslo-serialization-2.28.2.ebuild 2133 BLAKE2B 0f141f77840cc18f206f05dd5303c7d89bbf6d5a6adb3ee53a69be5d070dfc5a8bc1c69f13f3976fbc89bc635bf3e1057a31fca42db326d0719db4a0d472b278 SHA512 37bff5318b724bac3fe0518d9255a3b55ddb3ebc68869a366ff597532b01bdbb3c670d8b2fcb56d09b5269e7555aab89e0d2ec190609d86fccc2acfd0383644a
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
index 769a6e4a857f..80c2a180dbb3 100644
--- a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index b133cdbaddca..7f52dfaee87d 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.service-1.31.8.tar.gz 72731 BLAKE2B d0460fa76df75b691dd85bed07b2bff5f8574feb84f324736769156fb1d9c74f181d8267ed69b6f8a371bd9eae3db17d5fc8588bd706da30f3cd065e8d35f80b SHA512 af4f1fc011dce56935d8ce09902172fe3c93f4907023d04c3aacb3e06631b5d5fc891ec55ee3c42acb8e29754a7519d12a38d1264935636284aee9134ce6f84f
 DIST oslo.service-1.38.0.tar.gz 78671 BLAKE2B 3291b20a60d57a251045701f890a1dc4077bec070330c4fc86e2bfaa82612e4795d0bc8b1cd8c5d8b70c7be0f45fe6db25c98b263e0a5a7bc4335bd4ae0995d9 SHA512 c2bce20abe535b12f98eea808cc95a687b226c16507ed2a4cc5f7143439f7f1a9137489ae82dc09e175165784046f6103bede3350bd6419ba5d4c134cf6aa361
 EBUILD oslo-service-1.31.8.ebuild 2115 BLAKE2B 35356b6f20a63898f9d77c8696a01b3211318f2cd1f8dd2dbf69b8a5e4d3f362067421773c026b237e68e73f7a9604b2c22a7e2301e38cd447eb4f191349e0ec SHA512 314d5c7e452a5b810485fa1673871534c1159543ba2db07ec6b1eb87370cefefd522c338e30112605ff878475bd834ffa5fa5d961992b46812d42e7b0e344c35
-EBUILD oslo-service-1.38.0.ebuild 2260 BLAKE2B 77734e09f1252ec7fddbd70bfcedd48525e707d8f4f2bc60217cb35814185767dd810c7486568ee63e5a2e059b6da9cea05ab089ad14a40c29ec94bb85e66ca5 SHA512 7c3d78de6d6af081b48a30c995f49bf2e26dde09231774642ab68d941296f789ebc9d8613c45b0d123bd9477322f3534ed4d9ffcd528834668ab6a6e5b36566b
+EBUILD oslo-service-1.38.0.ebuild 2258 BLAKE2B 45d4f7e21bdac6fc2392ff5837c25718c8560c02870b7dda2f7b2de25a6962a67b61f1e5024cf35c09e1f21b8a09e919a1cb72ac050e1017b753493e717e2a1b SHA512 19d10df401a9ab827808ba988ba4e1d4001ae61318cb4a4724974a33528db30d3266b03ebd0522f84c73f1225e625a8d42146fbc4a9a9bd3be7acfcf8182c153
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.38.0.ebuild b/dev-python/oslo-service/oslo-service-1.38.0.ebuild
index bef35b80b07e..cd410c8755f7 100644
--- a/dev-python/oslo-service/oslo-service-1.38.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.38.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
index 80d084cd64db..84d0eb4da7d4 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,3 +1,3 @@
 DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
-EBUILD oslo-sphinx-4.18.0.ebuild 1042 BLAKE2B 14e872642ed675202a2d6aae8218ec398113040be98b3f4bfcdd5dc898bca6533405c9d28896ad8f356d081ed4d17812fdea7c3f4fc5d654dd5f94a14d5c08f3 SHA512 9c2b02d2bc6c06f488dfabd960984586a020b4a976040568cd9d791af3da7992bcaf1769a698d16036ba3337c5d16ea3cc2a220b39828fae59d54da4318a0598
+EBUILD oslo-sphinx-4.18.0.ebuild 1043 BLAKE2B 882a80e87775a4eac7eb7856155508ee8286a08d33b457273b43a4b2f40d5e59243f94226056d1a6345ac490f695002b34c01267d80a5a0c4662bd2ed76aad8c SHA512 3025376006afd71057c7ecd9b0ed55a33fe2366f5d4b149de6eec17d7d5206fa3e39c150d3ffb0b9a655c0c070d30e7b888455f5a18bc11358fc0804a17a7a7a
 MISC metadata.xml 586 BLAKE2B b78b49fc66eaa7ca4a79da676895e28b397359cc8579a3e9b91dca1d933779d3ec7f9153d0789b7f44dd75c8fa8f9d866cd916911a4dfe3bd6d89435a0330960 SHA512 ebd5d188edde4955081fa7cb073daeace8c9580dab828d4fd12f10f27bb562ca7736ec77f816e243a02e808b83dc712ab53f40f70e1865cec014413514ffa000
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
index 787d64927c67..1e6a98810f1e 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN="${PN//-/}"
 
 DESCRIPTION="OpenStack Sphinx Extensions and Theme"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index 184f55367fb0..e3fa66260eb3 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-upgradecheck-0.2.1.tar.gz 14624 BLAKE2B 0b6e397c67df12f3162f4f05334b775e05ec253f642d707a262901b90120eedeef7aaaa3764c04620426e62031f953096cba975dc3e8dc7da3e091c7ac8f2d57 SHA512 26c771b3bc07b9d13fea6638330c785ef82781e794084088bbf46ec811a615e58123d5a42d17a9e31685308a4c1d2ccb7b839c32d9f454e3934d5fb625b73816
-EBUILD oslo-upgradecheck-0.2.1.ebuild 1004 BLAKE2B 72c5445e313adaa691072b6987525db0c5cdbcc3218fced5be3a823ddeb419b687e0241094864b4f4c294b39dd9262e46caed81da3ae5f50fa0ac0d8abf897eb SHA512 87a379f29845796730c3af5cb4174587027339d6ddc3c8196ce88dca6f4f97b3a2f293feb714bd2a769ec5a696da1e8ac204e78de2a7ab8ac17c0ab38860ff72
+EBUILD oslo-upgradecheck-0.2.1.ebuild 1002 BLAKE2B d8fcb2dcd64c01534ff04e43ba001c913c575c988a744312306e670b2f8e132765e5816a15af54657006e82142f0b2accbe0281bbfe5563f160198275572823f SHA512 bfc2a2ca1fd5472af27bb7e2e00a435e5f10b646c98433c16e98dec3f33d00af8259dfac57df2257b885a27c16b39b2529903a863968a65435aab8886a5a0053
 MISC metadata.xml 373 BLAKE2B faf870e41a823c9dc8e6829fffc6cdc1852889bf17de0ef5b93f12321d86d7cc538368cb93edc56807aca7f25e0d75255045acbc6cfa60329aaea35e78721346 SHA512 c82e432bee2d34b39fca929ba2b602d65d13167c555eb0a3b07d39c5ae864bb4d6ac459449200bd767f040307ebf854e0a99d72d5ba1f965053190eed68c401c
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
index d55046ec433e..aa83219a0356 100644
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 633c43bec02d..7eccc60a3df1 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,5 @@
 DIST oslo-utils-3.36.4.tar.gz 87872 BLAKE2B 15f4fe90e5335cdf146ec582a506f2ab2bcae9989feca24caec7c12a4136767e93acb117345ce62013cde64938994eeb0c0809665cd155d5e0aaae7dc6aad879 SHA512 d5a81b68cc00c25eeb2e6d39b8fd4a47cb958c32e50471845b14a06cb5f420ac58986106893a27364adba968adc19f864624d69bae316202bdaf2c156458eac1
 DIST oslo-utils-3.40.3.tar.gz 90561 BLAKE2B 72c3361a291819e8d08f0c2087ad87a50848c73e9e349b330ad81225612446523a13bbe726fcbd27151baace0316f704878db9438930ee212a77757d67ca551e SHA512 893164fcb10d7912053666beb9caaad11c37c187b9d5182a3ffaf3282b9c97d9a9eeeb0cc9a4fdb68d3d3a82b14c7c9cef3c7a27d1395f20fc16de486ecaa49b
 EBUILD oslo-utils-3.36.4.ebuild 2729 BLAKE2B 2ef6e4e00c7047f8f3848b44e875b352d9e65b8916f0eba647f8207192ab62c2375066e5f0114b796ad05e8f7ae9d8ea4f4d30c8b674b8a22090ed185101b4d4 SHA512 e4cd655c9d906cdd0abc783038f7494e234acbf0a717a602e2e6dfc01b3497014ce8933b2a173168e21538c846c660e6e78a0716b5fd082e727178628222ae8f
-EBUILD oslo-utils-3.40.3.ebuild 2992 BLAKE2B c652258ebfa7acca495f9c088adbcfdabbbb216641c7b6aa6649418d4e599b8bb232f18dea5fa7f7c7cbab5d493625e728397c36aee9f01666640b6bb601dda9 SHA512 4c32c2183d67ebab1a461f2aa74b39f25bb6ede5b19383a16e690920b5d6ea1d28d5ced906fb094b0604820b9a57e20d22b0079fbd6614d56fce64b4a2588f91
+EBUILD oslo-utils-3.40.3.ebuild 2990 BLAKE2B 25f443c10fec153bd7b5172e62e9a8b915108439df81c150ab49dbfbfeec90791b51fdd8408ca0557a8a1e8acbf7fa1b77462b90e877e2f3e0279b939e838280 SHA512 d29183b0574ee769b61426f23f3fe6322580d88ab616309db443c10eefa10647e671bdf180dbf4d06ef0e7e94450c7f01114daa8932287215f21d4d94c2e85e5
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.40.3.ebuild b/dev-python/oslo-utils/oslo-utils-3.40.3.ebuild
index 69297aee86f3..c9aa019a6c73 100644
--- a/dev-python/oslo-utils/oslo-utils-3.40.3.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.40.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 6ea4fa1b148c..eeb6fd39b808 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.versionedobjects-1.33.3.tar.gz 150086 BLAKE2B 7248c5cc114962ed33c70a3c6e9698ed784a2a995d949830f5e8f3f97953caf793a37c60074e848e8c4518aed2de29ed54ae637166f247bb7e6f95af0d9c6e87 SHA512 0d1d8654b1f971bc922d57771c159608d30fd7474448d425beb7c5a98b9810c6796c7e0b21436f75a266f54913fb01ce6b8e8ad4402e09453b797854f9fc4575
 DIST oslo.versionedobjects-1.35.1.tar.gz 150347 BLAKE2B 2b19ff4056eaa4106adb255b4ca0c3c2c4e07ee6a3839a079f6ac9891383c02b1a913833853e4c8e8c6d67f2880b9f2966b1e5d9d20e9093a8f37a1063cdccdf SHA512 f115ef300d4274cca00fac938a5f62c920a8a44901fe40d7c016498718c1e0357cf8eb745213986a89455b33e9dfbfe10b0fcb76551ad815859e7204e5532307
 EBUILD oslo-versionedobjects-1.33.3.ebuild 1355 BLAKE2B 26aedceb505595664bd7a0e0711f5436c43274dec175b0846c7f0d5687de1072e879cd34a2dec969a07ddc4803906ae4a8d3dc75c8fe61cd9e05fa95034b9860 SHA512 0fb308a7d9c509b923fdd3dc5f5c655ae0f1994b1296290b940877577f85694823a577069e7e7df63421e036000d097a07dc450ca4f543876426b86b44f87a03
-EBUILD oslo-versionedobjects-1.35.1.ebuild 1359 BLAKE2B 4b6cd75cc79da9d2868d7cd6d2772ffedfb7750eb681b66e06b864d6a561c32bbc65a7d41e12463a65a34ecef3970009b086ee1f06a30bfee81ca87000b8bcb9 SHA512 5e06addb8ab24f947b19cebd6ae64ef47f7b69fa0b6744de9fe3ef0cdbcb8b82d649d275389680bedd2e4bfa7bd962fd68a164724853b6f944259aea03e9a61d
+EBUILD oslo-versionedobjects-1.35.1.ebuild 1357 BLAKE2B e8aafa8f156c6f17a9219d37452bdbf8c388887643122860baf689d69f5035e6e891f8a57311d5f744342394b02261967c683cb01ef15a2a1f25b4910e17c6fe SHA512 139cb1792fc4ed14fa5bcf64292280c9d04f284df83d913c5432d1b1ae4bf71103b26f5797b2614ba06d2d789b24f6bc2c8522dd504a2d0c08dad199c72138bc
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
index c111a376802d..f6b21fdba583 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.35.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.versionedobjects-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 4970c4b45e59..85f193dbb548 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.vmware-2.26.0.tar.gz 208576 BLAKE2B 2e9df2002565d286631dd846c31551735f204771156b2c5cddc7ace1170381d10eaf647e13f1634f84fb21be674b65c29ab51076b49fdfd6787072b78c06171d SHA512 7ddb675ec252e91984cdc23b6adee7e1b13a0dddd1967f9a882935da0bc12d3c0b271f0cfa42b569802e0521d65285d80c7a3e1ef280cf405827a4e2fa2f6437
 DIST oslo.vmware-2.32.2.tar.gz 334130 BLAKE2B ba1fcec92812613fc202afd8d5eab3c4de65f2451bf17dbae383dd6176a0fda73d1661c1d066e3c9fa24686562c46b0b8927f359632d8f2f94c9d3d185ef802d SHA512 2f18f38590221a14e876607ccb9b8d1b5f25cca1e714c3256980b1f818ac1a1d2f9d3f1418bee7289b1efe01bfff1ae17f76663eb4a96a90e4d17a05dc39e91f
 EBUILD oslo-vmware-2.26.0.ebuild 2145 BLAKE2B 5fa2e3e342b27a9657379a2075eabd80f62fe968f727010eb73df1f732536ec50f9d6d97b24e87e0779fd0d1667b8e04654035487d003d7de892fe10c5afbf1a SHA512 e0dd65245e42ecd18e7e938b01a251595024dae17b0c11f0669f8107a6a64f9e8ccf6516e12371ff1c572046b6a10811e7932a84101823ebf1434f1f85ce6c64
-EBUILD oslo-vmware-2.32.2.ebuild 2290 BLAKE2B cd3c83bad8e6b25751ac2fb7bdbb14452c63bd6fdf381e80c125291a9da9cbaf8d077bd7a6685aa6da969472ed240ed166cc6f80c4053b52ce7546e2f0661f09 SHA512 b0f62ba30486ab44443a8246563ed2de8e7d897494a9fad6238512c578ce53278d5f99ee436903e4be40e23e9c5f1930551cf5b2a7e67bafbf9f307558f26e19
+EBUILD oslo-vmware-2.32.2.ebuild 2288 BLAKE2B f7f5da47c80f23dfc4a64cc66479392094905788d82e829375fd1494cf7c31450c1b5f9a9a9e00a5ebdc292050d403d43045857b51ebc21b9f3299279f379d47 SHA512 6c115c4cbbda1821dd93496a8ab36893fa73d6516019e3f4c28fb8e33c487e4b3413f1f4639ff2e62ff2c83f1ad35d7e9a98476f52e92033f42d0c068ff7d5bd
 MISC metadata.xml 568 BLAKE2B e5ba6d5e5d14ace6be413a2bc6d97d8dd5f6befd0cfe683fdb6bb870cef7b673cc779ab143362b48181f62fa4f15eb827174f17da64c4d7ed539eef74e050136 SHA512 879bcc0237b70f9ab61a3d659e948e5d1289128b3b4f11f6797b0f20809c3cc90efa104a582dd6cb407fd9a7dd4f0e2330d68227dda145c9456875d44db913dc
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild
index 9cdf60bce0c2..7b8d8c98ad12 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.32.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.vmware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index f02b3a8954e4..e37a7eaf4890 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,5 +1,5 @@
 DIST oslotest-3.2.0.tar.gz 35445 BLAKE2B d33c70e760fc595586c2d7b0ce6ed1f63b73c89ba078f85b70d3b6b1af1c4d115e6eb7b431f9ef52abf50290eb47a1d3adb2d014c2ba5cf7b93ecf0e46401a26 SHA512 4513291e2bec939f9734255cb0fe3f85b9eb8a8cadce58873ad4e85365a0ec27bc2084085f5b95b681b5e811b62458e18fe63aff1e022b2d8ace0ca48bd6a527
 DIST oslotest-3.7.1.tar.gz 38176 BLAKE2B 94924dca8384dcc8ba9e4f62220eb6d29b27b38966ffce7dddbd23d5c5e66493141ce4170565325a0516648db186a0171cd33de6d536bb8ed5cdef76161d4f94 SHA512 dfc55bc91ebd8ef448d4c69b2af51b8f2a9f2068b2ef2ec1cfbcfffc27eff7ccafb00dc2a3059730427aecbcd815f9dee2f00b8c74df154c8dbb95793aff7e78
 EBUILD oslotest-3.2.0.ebuild 1542 BLAKE2B 34e8fdddfeeb6f8248719777381dee59f1557602673a819f73c35b8b483e9e683f3bab23c032fd3aa32d13317cea38812ca10a75fadb2ff689917b9823e6a5ad SHA512 157dcbd13479262ebd041e9ce7d0e7c76e7f6c0011f12620ff89c7f41cca658642e860f6d12bd7a4fff82e80c05e9a3026c03e6cca6bc784db0e8041f5522d4b
-EBUILD oslotest-3.7.1.ebuild 1724 BLAKE2B cd40bfac47ce0d910c29436dfb09e0a83d9df594e69146f41a3891228db189fcc777f7e8080e14cf634b582c91426249d74735e4f314b48aca7f4f113d95025e SHA512 08cec364b2e1a303c1df4b12b4dbc85b43f21e53861f3e5bcbd7e5ba2f14676facfbc841e62de570688c045fa99256cf1d7d62d406321d38785169e660ea8cfa
+EBUILD oslotest-3.7.1.ebuild 1722 BLAKE2B 58097cea45a5d0ddc2e2ec5ba7e9196c33ee05496545b2349d221b55e7538737362169fc6c65a57eb48d537830d8863f45a896d733357c32cd8c280bad90bec0 SHA512 1f9f988d553d19a4da9bbaca0eacdbaf1f32897af9ee0b9e9d5d04e5f65fc376eb12588c1176dff9dbc8685ae54c51eff74217f913241d9cb5e96da9733ea462
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-3.7.1.ebuild b/dev-python/oslotest/oslotest-3.7.1.ebuild
index ad830deef86d..08f6ab376419 100644
--- a/dev-python/oslotest/oslotest-3.7.1.ebuild
+++ b/dev-python/oslotest/oslotest-3.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/osprofiler/Manifest b/dev-python/osprofiler/Manifest
index 6a9e3cf4b555..af2eb5207296 100644
--- a/dev-python/osprofiler/Manifest
+++ b/dev-python/osprofiler/Manifest
@@ -3,5 +3,5 @@ DIST osprofiler-1.15.2.tar.gz 80503 BLAKE2B 280f96ece13ba0973692c6ab29b0ee783465
 DIST osprofiler-2.6.0.tar.gz 80518 BLAKE2B bc45f9bf3378b75a8c702ab1bf9ba40e9f6d77bba808882c7c504adb4f1c295449ab2cc19d128cdec7ebb3120a3d0c49eb77e1769625bafa216e32b3304c6f1e SHA512 3c911961b3107f28bc7b625738d6afb0098d87b891603d1a41be5cfea2b21eb0a3358f3f2fc5cfa0f9b32287f59d732c4ade8ae3436fe46095fa220b5bfb7a15
 EBUILD osprofiler-1.11.0.ebuild 912 BLAKE2B caa728180601770d8c38c068d5a949790928d9d89385738cba6a33abd08d5365d4fe31362c1a0a2d97877f6212aac60a9c7f0dae40fccb4c6efa4797064ad354 SHA512 815a5394a118e2fc56f4d40d8f581428db91d8961b9bdacae4ca1103608d738517c61c1ee38dd4d691f6c2104d443c06cf49e30625614ebc7f382c4a93cecf4d
 EBUILD osprofiler-1.15.2.ebuild 821 BLAKE2B b6da8ee99fc3b335edc7ba9716c1df48bbadc1544586cd6585db7b6634340bc7249f253497cd4509de671ccef052047d0ffbba9c27297f928d2504a8ab37a032 SHA512 9893e3e6a82463dcf400260b1aa460963ea7d0e79d7f417e90bce789a7958589204d8e7e675be28d243d1a0cb862f91dfbdec2c2579c0f69b7e12f4070375dda
-EBUILD osprofiler-2.6.0.ebuild 935 BLAKE2B 877ca6fd3918582ec46bb0853a2fa4f465ccb4beb9ac8cb0be468c03ac4d84d52125d5b2064dc2bdbf96ec6028b322baba23e1b366ecdadc61f6741434b619e9 SHA512 a2de1636654b5b04cdd537a2752e0634fd4cfdb00b5fe2942dae3cb05e795094e4db7bf00685dc00861eb50116914ead2e2fbc4e814df6f4869665690d67b9ca
+EBUILD osprofiler-2.6.0.ebuild 933 BLAKE2B 5161308676067b499e759a6270e0b1f2108e350729373c7962d8a95e07b8198d44ef0d0e8b7e214631cd52eccdd2c1c0dbb143d749575a81a90884b7e48b837e SHA512 5f69f41312d834247804bc58b4a422e8cfa221dfcece6c6975923717ccdac13adc2e5e938d1bd85d00ab3bd0efe476953fe54d31c84f0f6f07b98daefaf88937
 MISC metadata.xml 564 BLAKE2B 7af0039638bc73eb560dfaee133f1990851111a2f3ab51e270cc5418bce6c044fa0b15355823fd37b54f73b84d2187096a1e29918b1e0fa073138d901654232c SHA512 2a8070a290ebecb271dec1bb576fd361c937191f69390e1477bac368eb6c9b91ddb3c9eb78af9aa4e4f6e3982a8a83f3ad2c8d5675b1278d6e7191aa3bd36589
diff --git a/dev-python/osprofiler/osprofiler-2.6.0.ebuild b/dev-python/osprofiler/osprofiler-2.6.0.ebuild
index 7a59e0efb055..4c103c01991d 100644
--- a/dev-python/osprofiler/osprofiler-2.6.0.ebuild
+++ b/dev-python/osprofiler/osprofiler-2.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index ca8297977bfa..2013c1d9b98f 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -3,7 +3,7 @@ DIST ovs-2.7.0.tar.gz 73714 BLAKE2B 3edb76be6ddb20243b6d85c7bc67024c274f625c2f18
 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 496 BLAKE2B b121159166e0868f641dbb81f1728bc8143dfc69ccaf61460ae8dba92e49c13f3e8b0e4ff8acf9be6a3e055dc2dc95c9ac72afa161923abf99ab0f2a52d80df8 SHA512 d8c479c79c5c823c842a1e9ac3c7db71a745c17622465fb143f056a352a1794942f169ae3722f208e9f7346c70d0f1adfa5e4ae7f82763c47c7774607da6a8b5
+EBUILD ovs-2.10.0-r1.ebuild 494 BLAKE2B 8b928ab15e48826ba8ba27964cf19760f9672f47be1d48a32da06dd3e833644bc280638359a8e4675a2694dbe3400f742f7effeba28b4df4ac1f33d79a526577 SHA512 578128668432bcb6943b4f3020e9c280bec7ad581a1429ec04c4cea7b0523e6f127b03f0238a90fb85edf667cedbed165c6f37785dab0e45c23752dba502376f
 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.10.0-r1.ebuild b/dev-python/ovs/ovs-2.10.0-r1.ebuild
index 446dd3058554..2006c9e99595 100644
--- a/dev-python/ovs/ovs-2.10.0-r1.ebuild
+++ b/dev-python/ovs/ovs-2.10.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index 7a5e49961914..facf55617da2 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,5 +1,5 @@
 DIST ovsdbapp-0.12.2.tar.gz 78135 BLAKE2B bd0e0b209352af0bc2939a98d2ef52aa4d610471669d9eb3e9050dccdaa093ea9c922a588e6709defc0182cc991cd38883a9a9780f03cf7350a08eee5b99d424 SHA512 ef2b4080e600c585e23e5e9fa80fd684b42a1f2209db7ff00ec59a751e47c887d296339958d2805be0d359bb30dfab35271cea1b750039170c7bbf719ccc9d6e
 DIST ovsdbapp-0.15.0.tar.gz 79493 BLAKE2B a035a8571033e210db253dc4a301c602f9b213bbeb6fc73e9317d2a29f3b3520f43c0f6c8fa7f3d549f3fd76484993f5b905d3916c93c1daef228e9c15fa4a0f SHA512 db8179c32bb58b04019b215083bbf7490418305631a826a44965d52ebbfa9d75e08bff840659982a93c3941cecc0ef1e81299e83408731582907e24d2e2764f0
 EBUILD ovsdbapp-0.12.2.ebuild 736 BLAKE2B 42c711075ff666a36c7936e7f70bcd4ecc644e5fd5eb6ed5298b41da2c37a176c24c9aedd2e5f794d545d0f575d9fb6a1d5fc413aa3a21df8bd5c1210ea3222b SHA512 d493b6636241673760512edb8443e65f9795b417afb46cfd5cc49c84f1668497941d7ee5a6291435b53dd2ef636870abfce4d3577a8f476b0819c8e919a4dd1d
-EBUILD ovsdbapp-0.15.0.ebuild 740 BLAKE2B 1d4c2ef040a34a2fe83225cbfd76fadee297a40c0205a8c7f83927c4967b6ec193b085658b2a472dea06c564e662d71572821e0f8d7d69dfe9f394512d0afa61 SHA512 cbaf3e959be34b113f51c3136c77bf72b07b01c15e9fb5cffbcb41501456e7f16126a8887bd02a8d18c41ee3777ebb90e3f90899a0540732a41e8bcc90303ac6
+EBUILD ovsdbapp-0.15.0.ebuild 738 BLAKE2B 765a048db2b20cc423410d8d6149364b2c5f3da35a395dbde8e71d3cc9d4448b4183798cb2effb5a0275c4b3aaa06e698bb521e7990f876424f3318df41e7825 SHA512 00f42900b3dcb49f26d9acfac37d40c5fd62651ebf33865a79be1cddd6ee0264b881d1b6581aa2c2c06e57f0f42a006533ce844c009ede6cd2932d38b3d66691
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
index ee85b80d617f..cfd92151e1a1 100644
--- a/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index e4d1caba3ac3..964de6bbd457 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -7,6 +7,6 @@ DIST pandas-0.23.4.tar.gz 10490077 BLAKE2B 28a78860e0aa5de8def7bb529fc98b9121a51
 DIST pandas-0.24.2.tar.gz 11837693 BLAKE2B 3762e94554a3ae3c803c9a412c5c551c15a9fbf15cb05633f7d1b0ccbfddc646f68f0306666e688a83a4495b0537cea2fec671157f5a63aaa5f9cad6b791261e SHA512 0795c6bb8a47a511853558ea59d371b4540ec175f213cfba4ad2361d6481fea5d3f7074bb4961c32f2f0080a72d7436a9b3706f5cc692074f98d83bfc587fd15
 EBUILD pandas-0.19.1.ebuild 5784 BLAKE2B 8bd07ab04a4bb2ebb7f54bdb5eb13440b5bbeb6e2199584b1169739cef479d1e9a3da9e569066e4d1e3414edfa1ab37ed1238ff562783d09caefb23d7030010a SHA512 50ffc34a62f5a56927cb80213255d8d3eebbff4c9f6cf86d01b4bb04e3fbb95ffa2a124d179a814e2de4b43927614e2b94e100867f999b4aa37eeec9d08dcce0
 EBUILD pandas-0.23.4.ebuild 5778 BLAKE2B 1fd378e985e5794f331e45741b5f2fe7380b4f0f993ff727a34d4a0879cc7dfb3ffe6c0bfb119a59ddc73fee2ef5554e31790a638673d5ee652dd1e55c0e55a6 SHA512 999dde9816f75a305e223dfcbeac0a37bd5ec084a0af24547297cb8553a57d1ed33e10279fb6a1ed43e4295c6b9b7ab805cfb413e3833d540a7090e8fe25f071
-EBUILD pandas-0.24.2.ebuild 5421 BLAKE2B 999cb1cbe7eb0a951870002bbd83c595433c520c55fd226149afa81d38382cc058ce0a964b259ef856d6f3ef3faa39c8c0485ea4e86fa48df19391975e0c863e SHA512 53804c4698d64b48bb816aeda8601c81ae98844cb5cdd700585c4bd47d6c674fab7ee0372342c867386f7356244aa07c83a3d2d25e6a5ab01c41e383d185e930
+EBUILD pandas-0.24.2.ebuild 5419 BLAKE2B 32e1ac18924d0856cb1e7d68586cde1ea8d988633f65c1ad3cd3c3e9a9caeebddf5f73c7e92cdbaec80bcf3c6dc0ce454149646e4c2f2b25510ea50a03ed4db5 SHA512 94719f739f36eaba8e6fb916e656edc6c4f4f75460f8188fc01026c27a63aade29a27d07954bf385cb8b329238f1f909a46683a33637d364876be2e0a25543b8
 EBUILD pandas-9999.ebuild 5864 BLAKE2B 23df5dc740f518ce7c82cda5d351b248f8d8e0983b937be43200f2a2f5bc6d48ea71234203fc6776f94a9460dc6e6340dbfa0248b64205eb2792a7b633ee58a3 SHA512 80c4d885b9dc3872b3da9a9daa9f18e2e1b226d249b23eb2d8b3b3161458648ebd77a2c3b17d25e58d2f278d9a9fc2372a62b946acf24bdc441da882067fee67
 MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/pandas-0.24.2.ebuild b/dev-python/pandas/pandas-0.24.2.ebuild
index 98cf5b1e2c5d..f3ac80a8d3a4 100644
--- a/dev-python/pandas/pandas-0.24.2.ebuild
+++ b/dev-python/pandas/pandas-0.24.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc full-support minimal test X"
 
 RECOMMENDED_DEPEND="
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index e1f8a3c1026b..688cb319c50f 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,4 +1,4 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
-EBUILD paramiko-2.4.2.ebuild 1663 BLAKE2B 1e45ef638f558df3f552ebe4c8db4a57ab656b5d3941a4d77d7615c0884311fa605fa89579e03719ee585fe3e174cf4f21d435adccaed4a9f57c845030e5ada9 SHA512 3547c3b0b2354c3118395f7566f4348b2c492c86245181b7b2b0ce3ae52f1827fc5fcebec052aa1fc57aa8fcb10015ee8a1dbf3c81ec32420e00bf36c3c5058b
+EBUILD paramiko-2.4.2.ebuild 1526 BLAKE2B 7ab3ec8d7d0ba9a8ee7391c1d9c410ace9be2a3717e7d91c39076518e9152395ddfe9c290afd27a68471cd209fb3934548c3043a53107057a392655dfbe530b0 SHA512 d2abb05897eaac0334a1a3ebee68521f76c666fbd5a807e79d86f5bf3eb331d4d58a1f14e13dce12ced9fe4fd03b8eaa71a4a7125a9820925e6643a9d4f42ec1
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index d52e14914dae..559b9089c457 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.ebuild
@@ -28,13 +28,11 @@ RDEPEND="
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-relaxed[${PYTHON_USEDEP}]
-	)
 "
 
+# Depends on pytest-relaxed which is broken.
+RESTRICT="test"
+
 src_prepare() {
 	if ! use server; then
 		eapply "${FILESDIR}/${PN}-2.4.2-disable-server.patch"
@@ -42,10 +40,6 @@ src_prepare() {
 	eapply_user
 }
 
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
-
 python_compile_all() {
 	use doc && esetup.py build_sphinx -s sites/docs
 }
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 81ff1b576bf1..bf6a6d70f1e5 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -2,5 +2,5 @@ AUX paste-2.0.3-unbundle-tempita.patch 1260 BLAKE2B eee8a9ede07730cc6af7de910a02
 DIST Paste-2.0.3.tar.gz 643935 BLAKE2B 140f88cbab40728713a052e5aca0c7f14336d526a2c7bcd6a279fcdd13b14ed83938f69997182b43d2a83a76f51586c3b9132428f0f9c9e9ba08b6ff820827b9 SHA512 174b06d77bc6e1d4079e8de7df40412ffda098364efd4e3f915f858be1188c8a6fb546fe4ab981ccc067ec77b7171083b2469e7db6fc3b777d5a24151c928362
 DIST Paste-3.0.7.tar.gz 628999 BLAKE2B c91bb228fc2c36da1e7d487d521b9f57df19f4cb76731ec8ac17786aae087fe820760d19798a8da0ab6ce50f24b8a1fcb9d5189e6c48cffbda75ddfc9cf9f617 SHA512 adf823d208065b00a4bf1473e7550a1e0907d1da88000e87ea3a5dfb36f22c2bb33dda21ccf096da1512a0f2db2ad540a66efe751bbab8bfb49cd4ad456d5460
 EBUILD paste-2.0.3-r1.ebuild 1842 BLAKE2B 84b7beb82b4ee1e824e3c7da99592e94130a9d4333cc09831d4e091008cedb9540738cfb870c2c852a337ba02220c088f923cef78b32009ced81d80877094510 SHA512 77dba81daafaafa73079884c82de4bb9a948c496327346a397d9ed1bb700dd1bd237191f982dbe0f43ff26e7df4fb292e6c26388ef797c822ceb65dddf697b62
-EBUILD paste-3.0.7.ebuild 1903 BLAKE2B 1361a9476fef7809ac8fca00df8ba7273c77e31ac49a3231c99f1594ed778f2ed129454d5bf9f91112f39a7453a6f136c9012e9454c1d31b344a21dd19922ce3 SHA512 df0efdab94c12f91db8da0b4153a7441296b56cae9ba8103701b59b8a38f6dd8f38cba6a4882bd5407744d37bb5a4d83d0c478a91cf38a5d1bff41de80ae514f
+EBUILD paste-3.0.7.ebuild 1901 BLAKE2B be5890f92d4feb948d51056320c7052a1ddc530b836115ddb6aebd16148b2f0c98ab64f9018799ccaefdde5ec625c3709c08d7e42b37e410953bbef6a3434988 SHA512 58c8620b6fde31ae28bcf7cb8aafbd45c173abf4573d90d2858e6e63240ebbbcd25153c335ca3d29bbe83f744bbdabaaf0a02a125ef4932662285f61b5206d51
 MISC metadata.xml 778 BLAKE2B 74d5474ab918861e65f330eff278a319f8b197c6f95e65c862e55bd19d84534c447e348df82ddc68558dd089f8ac81785c16de38e3fdc70f706d4e5b870243fc SHA512 86b244a3dd365e74dfc12dfc283809840352cbe210b34c34ffda1929db29362d1e02b246920d8461cde70b087020d15cecd3ec5cfe0f168fb69fa45cdb66015a
diff --git a/dev-python/paste/paste-3.0.7.ebuild b/dev-python/paste/paste-3.0.7.ebuild
index 9f189ffcc3c4..8effea9ce8f7 100644
--- a/dev-python/paste/paste-3.0.7.ebuild
+++ b/dev-python/paste/paste-3.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc flup openid"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 31cf0e5b0c58..96694ec77ed1 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -5,5 +5,5 @@ DIST pastedeploy-2.0.1.tar.gz 32215 BLAKE2B a398c54813fa990e3f12ba7c66615e3e84e8
 EBUILD pastedeploy-1.5.2-r1.ebuild 1018 BLAKE2B e637c7c72e72e96574dc3dabe0745be737a7dda28079b9df289656f95ea16473fc0cd6a76531d6a216db5dd6eab6518745c53fc5a271aaebc110c9be78c063b7 SHA512 2f6d8fa1f5d69960ceee232d75b101488561ae6a95d32dee07f6c9b11ec5ccd9ff16d5b37c75e721f70ad36638157f3db3c4f56e3ad45573c2700be271122505
 EBUILD pastedeploy-1.5.2-r2.ebuild 1035 BLAKE2B 4575691497a743509a5552afc30b216fc6d70bbaf584e8ca9c3a98ed83a24c1825190bf04cd55f932578f2152de2dc51712456e8e28f911fef9d5f98e80d8033 SHA512 cbfc465f2bd82b2974aab5a4c687bc2e5e2c399781356e2ea3d46aa4bcb0639df65b5eb550c81f36086fe977f5585c95951e03d4bb89ca60d28571276a9154ef
 EBUILD pastedeploy-1.5.2.ebuild 715 BLAKE2B e909b282cebdf298b5e7392261dfaf043c100c5ed201986fd10bbeba6a016f1c99d7001a3e54198526eb15224a420dea4f172273b85ea0bb9c86beeb8e610fb2 SHA512 f794b9a53d97e5a279bb1a8c6f61d8280e89659bcb33f44e950a47df14dde715edb6478edb0f98e2924722885d5e5d70dec2affbbd0e99983de1b2c0bae879d0
-EBUILD pastedeploy-2.0.1.ebuild 989 BLAKE2B 725b5c8185023a10033e44c21f0772e56b9410004c2f6eda27ce917db27e2fb3309deaf59e2f625f6b1550f49e33036dbf39d875bb654b5b9454303167dd4caf SHA512 84c0b088fcc41a9264bb071e54732ac510d74f524d1fd2f345afe7ed5216d4924eb7b3d57af6944d940fea472f56aa0509c2a5a2de56b6db890d936ee487f806
+EBUILD pastedeploy-2.0.1.ebuild 979 BLAKE2B 29ab6acb323ead519a5226f91f3349e64ee8ef49053b11527c02b7e8ecef5d773e188dab2a07780b07c9948f6e318c72bd48c5b4a064cf8df0b722aa1d2775e7 SHA512 5c9bd419b0386ff17ef82910b15d47a5d5bb6998648da72fe9cfd45d96441a474904a13974f79693819127d1e1d1f682857dc3efd938ebec0a0e53742c31fbbe
 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
index a16a05d80e42..3f7b6802faa4 100644
--- a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index 56c87342db4e..59614495e536 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,5 +1,5 @@
 DIST patsy-0.4.1.zip 425390 BLAKE2B b8d5696abcf35fcd5e49a7d3efdfb201976efdbe7e845f136dd0cdbfb0972d8372e54b8f4141139cff9ad4df3525c67a10a3c71bc1471991a810e834e0dd0ad9 SHA512 24cf2e6f9a33e6dd795a839eb2b2ac9e0d45cd9c3d5250de17722914ac29436d0518388d0696b75d73236eda3c7819dc4fa24d6d9bc37d5ae035dde2af4510c3
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
 EBUILD patsy-0.4.1.ebuild 1103 BLAKE2B 02f8a4545db11364ead06400fd18aab6d6bf908b1cc2afb2bcae84c6ecfb5e73d23c2f3aec5d5743f854a2416ac61b9796824ac7d117505876ab86f0254c1e6e SHA512 ea389f722ca19b450c198688046dfc32a4111267c1355058d965e5e86b5e42388a35f6acd9e4b91c5db1774ef35ba4cff10afd6598dfe035e9db41f323a797eb
-EBUILD patsy-0.5.1.ebuild 1193 BLAKE2B cfec9d38b17f65d72399b52c796ed3703a713b0b345f57ec0f279eabb342fcbd7cbb49e48a9af82545efda3c660b5d4091d1cffeaac1ec9cb5b545227dafd351 SHA512 36a6003705fb9e13ec61dff3192ba303ff9ba89f01d4467a11a8fdf1eb3f38ee3d8f5dddc29deb69ec99a809d3c159a845e8c72effb29cb6ad625f43752f2cff
+EBUILD patsy-0.5.1.ebuild 1191 BLAKE2B 83d07602c167e00a33d0a3a865231bd6b98390f0744217e8f784b9bcb0effd0bd8630aecee60e182e49b1d0db50cd5439044b8805ce09e44868fe659363110c4 SHA512 47a76e34c507f4e7ffeedfdc8a84d0603029040084bbac0c090ae90c5d10aedccf1126933aaccf59717fc7a19c31a2afa321b5914ee66aba2a520690a0592f9a
 MISC metadata.xml 568 BLAKE2B 198b70af00599da8c516753e5ec88fb4353a966a279e4e40db5b57a7bab57f0ec360ac70ebe4dc14b194b147520b0a8d6d35d2e73003c9c70bbbcc3c830b91aa SHA512 57957dc18e93d9bc8d53d72bf8c9e601856ffb1511943034ff30aa7d93761f8b986e67daadf8dbcd57ef7714ebf3dda13ccd345df294809954c942cb9bdd1310
diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
index c51e67cc441d..d13c17f7f027 100644
--- a/dev-python/patsy/patsy-0.5.1.ebuild
+++ b/dev-python/patsy/patsy-0.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://files.pythonhosted.org/packages/49/c7/b971d8685c52512dbaa45bf8d
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index be2a6e43a4dc..3fc9b78fe5d9 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -6,5 +6,5 @@ EBUILD pecan-1.0.4.ebuild 840 BLAKE2B e8e278e5b0505d02671cd90c92a236c027a7ca5ed3
 EBUILD pecan-1.1.2.ebuild 848 BLAKE2B 2423f4fb53310f0433f196b4b426b161f4e158d40aabedb7682842fbe9d40a896edf55202402066fe3e8e7d031dc897bb78ce238f7100aff8da2d6fa220fe6c5 SHA512 9ea55af4fc69e54bf1bd916e2016d2c033af39e26e802f1dfd544f4a555dea0ec807686a870e1e9f3ea4827942d8fad2835a0c8978161b564e56d1bf07b37a9c
 EBUILD pecan-1.2.1-r1.ebuild 857 BLAKE2B 0fc4cbbd54aa9ed32ac4cf11f31a172f1e1304190a30ca86727a3dcabd8152ec7a27fc79e5220215fe8d5ac55ecb1c3a38ab785eb1873051f8e47d4a4efab485 SHA512 93de7068eed04d839d1168ae722e744b1ce1e352e127f5053a4cf0ca02cacd1a632646cdc6ffaa2bb5b70944ffdb189e1dd13ce2a20de921d8ac113b7aaca0a5
 EBUILD pecan-1.2.1.ebuild 858 BLAKE2B 386b6264b7d70dff6dc944f157e51c735e932cc9d5bf47d8f302c6065539bb8817bc4cfecce323e908c69046257738bf8be7bb40572e7b94cc070d2c23e98899 SHA512 e6165cd6a4cbb3838730bcb651b4444f31e79e8c061f7c05288b2ad9337e2427af8d0f72d2d1e08633d5607a58ebbf061781b0545280d762b542a2e772449a94
-EBUILD pecan-1.3.3.ebuild 807 BLAKE2B 06dfd391d32593e895dc7562250a7b929d19d95da917a113523941f11042b5fa519a679456e203f25090786b42b7f3949296a1b354183d1f3f1bb8c51fc3a090 SHA512 52e9114121c311c82f2eaf055a6ffb22600f82b01958317ee94d310784b8950ad6c4042144529fb9947ab372f86ca8e747404e5a4bb8666098c573c7a4120d6f
+EBUILD pecan-1.3.3.ebuild 805 BLAKE2B c32b9f52a96d3f87783211976ad3f120742605d63d46e2aa4d0f29f7f3511d5f063251763997ddd0131f3ce8e46f4b27c4e5db0de25d413a02e4068296519dcc SHA512 1e45fd1cd0c196c41306d770ce3cf4c24f5f6bc04d9cb7daf83cdda9ac8786c35d75f90676d5479b816b98796da3097e1d8baed2a6c17bbb417d9c11bf5774d4
 MISC metadata.xml 322 BLAKE2B 4be3ea8f134925d142020ac8fcfb0adbba264d7576f30c012a70c5ac175ef79cf9293d6035c9c0eeb52c01ab1a6288a42c926dcd40ee48951ba10122e640017c SHA512 506ed5b74b1e2383261f2ce34595e4fce40864db017ac9a8b2497de0802949a5d2163956a860d037898cb0885a4990531f200767781615056dac07a4af3a4e7d
diff --git a/dev-python/pecan/pecan-1.3.3.ebuild b/dev-python/pecan/pecan-1.3.3.ebuild
index 6abcc6f2fe08..27af9ad66d85 100644
--- a/dev-python/pecan/pecan-1.3.3.ebuild
+++ b/dev-python/pecan/pecan-1.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
index 5c147c4b90b4..2e98b1f205a3 100644
--- a/dev-python/pika/Manifest
+++ b/dev-python/pika/Manifest
@@ -1,5 +1,5 @@
 DIST pika-0.10.0.tar.gz 82642 BLAKE2B cc0cafd6d58c1b6511bb244731f4c18698370e77baaa0b876061d80c9748fb81b92dfdac0250c4db7a6ca816791ab8eb8f4f785d9223b45082918a304545a4bd SHA512 8a6e8b870aa36f141a24d4886cd8e4d4fb5cb735d87857a16ad963d7a14e0c40e81a3c7e193d879046a7e76fa87ab0b16bfd4a000e169e2452815fcd04db93eb
 DIST pika-0.13.0.tar.gz 103730 BLAKE2B c78139ac7a60bd324619792b177c96793c8c645d58bd6962f7061d5dfca2f621b6199ebb4b2d3fbc7367324f18d3e766266b43db9afafdd8e64c2eec6069f175 SHA512 f555142c8f466ebdbc46a24278794754186176832841723cb0d5d6ff69ee9a946dca8a7ae3280a96b5da8cb2d3066e11a58771583edecf7990749c8857a7ed42
 EBUILD pika-0.10.0.ebuild 482 BLAKE2B 32894aaf55332fa734d1175074a05eb28ce2c740a1464627b55e308248fd654055b79fcf1f6d50a6d45ca566c1dc8d67c3ad36ffc1e6c8c7990a892a7654d0a7 SHA512 b86f8c40b1cea790caad0482938f9acf0e6ab380168507e58b12d4a5c2bbf2e5a3e1b21cbb5e91468a84380213efeb511b25dfc8231cb50fcbc2d40983cefa92
-EBUILD pika-0.13.0.ebuild 486 BLAKE2B 6a0fd4bdb481f6a8dc20f6c8d4f418b4813227ecad0056336d360d96461c570e11fa171b2ed89d93e65fc4fb2f03087baaecaf0dbf780175d46fe43c7a604053 SHA512 ecaf8cb7ee73ee918c2b262ad4b0ba95b02eb3be230c062f6002cfc2fe1e0c8f8da119f3462076c87ea29cd00834e93ac3044ce80525099c0964d58bde93059f
+EBUILD pika-0.13.0.ebuild 484 BLAKE2B 4c0e426eadd598fffdeddbc7515dce366bc5c180ad152932285b2e47adcd85a9a6e4ce719f31e93de9f7f35fed12846bd1a074dd8b4e85152a9392a20bfb981b SHA512 34ab28a59802664188144b0f41dd26d575ae378fc745cec716b426fa58988a2a0857c580be25a9e6f59d3dce13edd6536daffd4c49ea607ae0ef9267d81d91ef
 MISC metadata.xml 654 BLAKE2B d2ca07b7ddae1316c11f0fc7efe6a075f3b6118ddf6063e72de5cfaf90eb46cbb6f1c94292e82df12b2c7282f7518f79ed7fb5bac446841d388d797242bfac98 SHA512 dfaf85260ba3acb2c471870c6674d5ac647111168a77f09bde9419831f2a18acb297ef1590b7c944a242bce3deb29aa5dc149e691424d85eafd6f4b678aa2289
diff --git a/dev-python/pika/pika-0.13.0.ebuild b/dev-python/pika/pika-0.13.0.ebuild
index 062a032dbedb..318ade7ac886 100644
--- a/dev-python/pika/pika-0.13.0.ebuild
+++ b/dev-python/pika/pika-0.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index c79337e5fd26..5753b49b9532 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -9,5 +9,5 @@ DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69
 EBUILD pillow-3.4.2-r1.ebuild 2493 BLAKE2B 01326658c00545bcd6162167e735c4805b3b4ceb159a24f2b76c993edba56bfee27ea51b5bcd3db401f07f3ec794286042f603bc03e9a4c41934fd0073ddcd43 SHA512 88c6758dbd10f8c9e5ad8637c3bd14cabf8c66d9ea8fafa5e7d824d460c1eb4e2ca209832018acfc654c17550199df6fddbc14fc3b44c725dfe0690a70ed520f
 EBUILD pillow-5.2.0.ebuild 2730 BLAKE2B 66971c9af9b80aec5c5ae0350ff662f5713d0c710d157e002e717c9a40241c41480549f81c2a73490601003d95f9106e4131d940acfdf847dae6fc7066ddb4ab SHA512 7a7eb96105c19d993fc94c4f7fcbd1b514322ed5f360438c78a668483625bbbc0ebeabfbff74a44ba10646302f889807958075fb2d215a81b230fa4ecea5508f
 EBUILD pillow-5.4.1.ebuild 2772 BLAKE2B 1d30c0e4ce03b07c85809a92ed4e38660269dc2bf3b0948fc90a1e914575c2e03deacdee8dc4f409e6afa5c91268184a1bf1f63a0c1b7066f9e99f4562fd7fde SHA512 82944ed9e754a04b8507e606b7bb7933d045f9f59eedf7129fadbdf9aa2933920105f9f733f28132a45d29aa751ac6c27d27b606fecd2ed7f463e64a9428b72f
-EBUILD pillow-6.0.0.ebuild 2774 BLAKE2B b8d9dbde95457718d05fa1ad8de4b4a73a076ae602730fa18f906f6cf63aa314ff350a8c7ad82e989ebfdd50fa1743a8b080907a460ea35cb901f4e7ce844f43 SHA512 c8b0b69c867fcb95b78abe510b257747805b0edae6f78c28858bc92d87c3b3496c9af8b1de9b81fa8055fe76816879530d47b8f189f07333533477b7bf357089
+EBUILD pillow-6.0.0.ebuild 2773 BLAKE2B 9332930703d43e2600618b3ecf24471a52288348ea1067c2508948cdb2addbc22ee37ca077e2c5773e8335949ed0331dea1ecd57b43e9152abb70c9ab48af3a0 SHA512 89cb0af57b9fd3347a88418b65943d5c2569598bd4a2fa822c3fef9a2a538150506581342124080fb5a64f52f331aac65662947c0d514de6840e3c48cf4ce8a6
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/pillow-6.0.0.ebuild b/dev-python/pillow/pillow-6.0.0.ebuild
index 92baaf9582e9..d2c78a8bf301 100644
--- a/dev-python/pillow/pillow-6.0.0.ebuild
+++ b/dev-python/pillow/pillow-6.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 079201697a35..e6e42f4ff88f 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 3466 BLAKE2B bacb2d202d0243ec857bdb08ed34463b909c52317e01a85054df5503c4cb455eeff480b54d081ae42801a07534f1aa130c1d311da1ffa9b383fd22c6a5c769ae SHA512 1da575a34e7dd620f31853fcc9af4eea7c32626f5a3bd6b2fcb8cd421a6bb0168fe1df6b1f16f34dc39c9cec5a61a9eeddfe3dd0ea18dc661215d5c37d929550
+EBUILD pip-19.1.ebuild 3467 BLAKE2B e57d949ae5510e7389cd8a12ca7d8ddf8051e8296e3ae8343e967d7f777fabaae2fa32ce283b7880858804630c8fc7e69d4dc4b7f762758b9fdf1a5bd6b71bdf SHA512 890c6da6d3bcb8a569a843d32a76a057b803c556d00f01cbc8e14708d3b2427adc04b033be34b25dff89e294d5d87425ba8c177f2d90f3ee85b17e11738bba48
 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 643cf0978c13..1d2a8c7a3721 100644
--- a/dev-python/pip/pip-19.1.ebuild
+++ b/dev-python/pip/pip-19.1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
 "
 DEPEND="
-	${DEPEND}
+	${RDEPEND}
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index f6da47ca0cd8..15538f3a3961 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,10 +1,10 @@
 AUX pluggy-0.7.1-disable-broken-tests.patch 506 BLAKE2B 9f01f31d9b78254c662e15e2580ca78636ebfb7d902828054ada96857863917938f78f8af292549bdfa0ff1bd71cea9ff6e5309bcbb99a00c65ad52290fc23a8 SHA512 bb959e084e388599b468727afd0ed94e445ba65a5e6dd8840470ab7f0c56aed57bde3ab389a48c49dbc5f4bdeb6a60a77cd70c28c778a952bdb1910c362d456a
+DIST pluggy-0.11.0.tar.gz 56897 BLAKE2B 2d40ca953fa0ead7516dd81007ef6f1f88b0ebe45512b031fda9ed69c953bca08109f157676ba2ed545ffb1f8f7bb18fa1b8532635d6fc929c62bf0b5de45128 SHA512 8808f5015fa6f33fcb07047c644706bf3acceed1e107dd617395e61aa9765a45e3a641e49c610ab817ebaa2c4f3b32a15bf347579206e979fe6b844ba2f684b5
 DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
 DIST pluggy-0.6.0.tar.gz 19678 BLAKE2B 79db59c5f0ce0dd157630d039ec50643f615789b6b993d84e9ab1bdc9ce04b32df336d88df13f13a16a1f0bd4acb7b900208e98c84f007bdc3654f9a1d5f19a2 SHA512 dd58dabe2e65eee64d62c8748c2bbd99457288e99b819eb12312f2acdb0740ac46fd08f83522bc992297b9f14eec14c216c2c9688580f68393bf6fc609e65812
 DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff756a59f080e79e70465d48dbbc6e6100305e8b32031cefb0ba06bb10494f29bc8ddd38d4296016ecebaafccc1 SHA512 e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697
-DIST pluggy-0.9.0.tar.gz 54035 BLAKE2B 8977072d264d50b2d47df88066aa8b0eeb79c02ccb8706c7bc1eaf91f0ed29f1534582fdaed8b446b92239ee6f87f676574df3a9d5dd0fc4eebe2ce2f2f83b5c SHA512 377d201393b11afbbe7dcce6053a4200782e4d2017252a4dee3859a5cf3eb21534ebd6ac7c9fd518b5eff441009b1b5791c8fc86e59385b7eddfc9dbc103eb33
+EBUILD pluggy-0.11.0.ebuild 850 BLAKE2B 5abdc6916469456d8cd1e27d44795eebdc88a6ceb9e0fdfdad17c1cf7ef0dfff89277aa8a9a6668deca2e0f447f9135e1c8e770d7f0a1db5cea10761fc8697e4 SHA512 713b90e21e5e2efd96d07d8c5ffe2b7adcf9598c0da1d05d9f56af669cab3b7a058579826fe98748bbf848eb445f54df09b466eb602be338e8595d2567e7a451
 EBUILD pluggy-0.5.2.ebuild 740 BLAKE2B adad43db340232fa1c41831a7b0660e3d2f57edd21df2fe249a3d259d3e01df1cf037b409a519deeaf29d322cab7523d9a798394d13b4fb1e1dde67e5f1a9b29 SHA512 64515e52df6d90ac1254306ab9bd8f7f9ca15d6d91bda3820e8e98ede7e3d25e48e5f63dd3361eb92ae48e8cc97611fe46b7fc0d99cdb2cbeb3d21b6c4c8fef4
 EBUILD pluggy-0.6.0.ebuild 759 BLAKE2B b8977998df79aa3ada2b5b486833320cfa1cfb29b2b9208684b1800f50bfa248db5a7cc58f7c6e82eff02c1031d5bab22468ee7c05d87ababf72462534f67fc9 SHA512 7b37be0d2f4a6b8062bf2ed36f2699980588b8798e71921faa5a705e2ad65688d5f60b7d344b25c29662edcfff43e189d29c64c97f757b1d5e2a6ef369ebbfba
 EBUILD pluggy-0.7.1.ebuild 906 BLAKE2B 9c200bd8157e62413551374ff7ec3539fafcb5e5fffd65c4cd7c158770eb0b7d9bd6367ef5c841f96d5f5e5450f523f04938c6dd7d3c52e78bed9f67b36217d1 SHA512 c82d7afca314e0429e1dd3c434b28a197c92a97b6eea9f286cd7af61b2fdc12ad1b944ad93376a1f40c25b5482a4cc65dd3caddcefe198f997d23d6a8fb03fab
-EBUILD pluggy-0.9.0.ebuild 850 BLAKE2B 5abdc6916469456d8cd1e27d44795eebdc88a6ceb9e0fdfdad17c1cf7ef0dfff89277aa8a9a6668deca2e0f447f9135e1c8e770d7f0a1db5cea10761fc8697e4 SHA512 713b90e21e5e2efd96d07d8c5ffe2b7adcf9598c0da1d05d9f56af669cab3b7a058579826fe98748bbf848eb445f54df09b466eb602be338e8595d2567e7a451
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.9.0.ebuild b/dev-python/pluggy/pluggy-0.11.0.ebuild
index 7952bbc447b2..7952bbc447b2 100644
--- a/dev-python/pluggy/pluggy-0.9.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.11.0.ebuild
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index b762ea678ca6..db227a32f531 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -10,6 +10,6 @@ EBUILD psutil-5.4.3.ebuild 808 BLAKE2B 57449207dda0dee16d1adfe47de968ac0fa0ea950
 EBUILD psutil-5.4.7.ebuild 916 BLAKE2B 1222075bf9ddbcfcf2974d16febbeba61796fc5e328c684690484b8953f70b3605426f6981380561189fc63fef8f1a160eddaa544ab02f3535f4b5375773b9b9 SHA512 e1d7de9fd50a3f3e007eff5c8409b05024800f0bc27e1a40cb19d29b5df6b2bb06a8af638fb7c791975536cd204897f0739289ba18706527c693322945038e2e
 EBUILD psutil-5.4.8.ebuild 930 BLAKE2B 2f48bb0f662f1b7536b5ffd242d4c4d2e4ea9878d76aba0008125bd820e0c9dea28b01c4056c44afcf74a51a4d999b971d7a74d64d60d1ac36cd29ba28075fb4 SHA512 0fc2d19616f39b9aaf71a07b9a0ec203c33433bf74b7336bc48f2925715921a2ae4b3a84a3760c9e37fe5e3bf3f44551f1615d74e67c45098e66f662d9ce8792
 EBUILD psutil-5.5.0.ebuild 921 BLAKE2B c5e9b2a67249d73c467bbb8bb61cccc18c6c06964082d6cce5996e0655031cba8481e382eb4d5eb312d5d73c6615f15c3d11f6ec364fc3e5f4e08150db85bb09 SHA512 6fe1ec7e79f32cc7f926dcffbc5229b54fb3eeeea9680367c180db2e785b4154626235f9aaffab55d06c34df6f1fbf16dda7f34f31258dd0913f4e750f6acb86
-EBUILD psutil-5.6.0.ebuild 929 BLAKE2B 6b560a26f0d6728e21ac5e24e9505dc7fac2adddfde1d7bcbd1f476d9da582dafdaecc935b2adb1b503c246d0ad766c88fab65c120367f231d60a3a4283dec42 SHA512 e07aea82d9e4e8eaa0bab475333df6e048d9faddef3640ba044db0a34f958c75b1f02f00c8168bf545877f92afa7423bf67582544296a2a01df02fadaf72ed8c
+EBUILD psutil-5.6.0.ebuild 923 BLAKE2B 8c43ea83ea387c5b727b2a5a14b1a433aebb772199f0de3c2d6c5e9cb427386017dd56bbfe8c4eb0b2c326a985686d2747a06c1c0d67c5d90673dd9b05c8d51f SHA512 327a51b9325ff6f8bce24d4accc24c5374f4be4e14c9e1e23d29f0faf98afb7166f6eb62c6d03add6b65b7045431fad8a6e3f83af425a3dded192707d7995b25
 EBUILD psutil-5.6.1.ebuild 929 BLAKE2B 6b560a26f0d6728e21ac5e24e9505dc7fac2adddfde1d7bcbd1f476d9da582dafdaecc935b2adb1b503c246d0ad766c88fab65c120367f231d60a3a4283dec42 SHA512 e07aea82d9e4e8eaa0bab475333df6e048d9faddef3640ba044db0a34f958c75b1f02f00c8168bf545877f92afa7423bf67582544296a2a01df02fadaf72ed8c
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.6.0.ebuild b/dev-python/psutil/psutil-5.6.0.ebuild
index f99845b149ea..bee6cc9b647c 100644
--- a/dev-python/psutil/psutil-5.6.0.ebuild
+++ b/dev-python/psutil/psutil-5.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index e9ddcfdc48eb..e352aa90b990 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -4,5 +4,5 @@ DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb001
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 EBUILD psycopg-2.7.4.ebuild 1555 BLAKE2B 84dc8e350573ca5a2dd6d8a19e2d5cfe12de395a8c7a9f7da4aeb675d6cb9dae4898c0f8ffbadde71ec13835fd795df122b5f41434d2a3d8014c11bdc4f6d0c2 SHA512 a148a9135cb0c52498850266bceda6e2c17fa4200be31b8116e7e1bf76108fc92cb771e14b04c66e845eb306d8d7f81e98aab6696550cd5694b552c397ed8f04
 EBUILD psycopg-2.7.5.ebuild 1566 BLAKE2B 3e506ec0eea0272920049c3afad528b65f7ef3107ed0e28163afe3ed619a48b5a5a2ac637fdccde26992f2bb020d98f4a3f27c5dd8a0c7506c92957ec9a5c5c0 SHA512 18382ad0ef2488d73d93173a71bfe20614e478490c814dbec077e9be40a8e9eeb17775331cafad33e37008db47c5ad1a27c4ec7cb92d6d8eb262f5035e837839
-EBUILD psycopg-2.7.7.ebuild 1566 BLAKE2B 3e506ec0eea0272920049c3afad528b65f7ef3107ed0e28163afe3ed619a48b5a5a2ac637fdccde26992f2bb020d98f4a3f27c5dd8a0c7506c92957ec9a5c5c0 SHA512 18382ad0ef2488d73d93173a71bfe20614e478490c814dbec077e9be40a8e9eeb17775331cafad33e37008db47c5ad1a27c4ec7cb92d6d8eb262f5035e837839
+EBUILD psycopg-2.7.7.ebuild 1557 BLAKE2B 0c98bf10fcd08c5a7ec7f4413827a68d12e9e3e0f66ff94bd0a06482779ac3c5d045a904de62435731ef933138f03e5eaa553e487d1601d872f171770792b8d4 SHA512 857d953640a880ea792b38a7b6bebba38d34bf024494c301a1354bb98d49c6337323eedf91a138e2e69b2bbdc9770b309434f971ec8c68f0be8fd9a365a4b239
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7.ebuild
index 4845b3855738..8d6449648a71 100644
--- a/dev-python/psycopg/psycopg-2.7.7.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 1e54b5bd28da..da0f9334e96c 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,5 +1,5 @@
 DIST amqp-2.3.2.tar.gz 105854 BLAKE2B 8bacae52f03118e2d0fb93a6494628f18f7139d655f1c4b3e7cda9fd81eba5d92f56038bc01dd4a28a89168be0fd51013db0060e945e7f7c63e1423892feaee6 SHA512 c9c99a238cf64ab5590eaea5756e9f68d58769b4d74af3405321d5c129171f34e6a5d20f2125ef2828e843b637fbd115d1ee9391726fe6ff09d233f0e6bdd511
 DIST amqp-2.4.2.tar.gz 116265 BLAKE2B 1615563ad4ea86ebd970641ed409d3f90aba86c4f4eb4af3fbd528cdbe68642a83e05bbed8b8bcc5f503c227003f078c2cbd444f56218af5d02961f1008319ec SHA512 dba880c07ee8b503e02f11ea5804f559ac2eb85717118d796558b1890032482babd15930af78f9d11b77530d496fce3ba8c8579eec71ce5a3f76b8d8a181af34
 EBUILD py-amqp-2.3.2.ebuild 1179 BLAKE2B 940543c5320f5b9f04f090145e38a979cd7beaf45615a688736974ff8c3a89e35f3fe6acddb6f8959f966b533485802e237428c5d76e89686e60c684152ffe28 SHA512 7abe6d3e85aca17167978fa6321b311a2221ea1cdbba11eff702a726d3f5cb65e39fa073d151a3d71b6939e335a70008ccd0afcffb7ae04d14a6268e03409c20
-EBUILD py-amqp-2.4.2.ebuild 1182 BLAKE2B 5e52f9dc672841c4e497e3e66fd217394772d1f0819033659c9a74d26fd8dd3a58781f6485b6870e2561ba49aa8a967ee78fbca4d0eae7927bb0fd57aaef61ee SHA512 d01ef470148d62fcc017c503d7c36518a78272eccf7f64202303fd6a20ea97cb2016e6cd07bbcb4b555653818c71e03f8e60b87055e77d25893ac71c44787c7f
+EBUILD py-amqp-2.4.2.ebuild 1180 BLAKE2B 150425bdab6c277acc8b9891297961b9265d0853965bc242c1462047f97407a87fc51a307df116ea7ab7010d48ba131bdec99f8d68f50e5b23c0154c7c460189 SHA512 a7f87217532e032db5192a5916f2c8ce22b7e1401ef20f8b2078533429b40f40770483a7bd69f0a215bc2bc5723d4ff54a81ef1d579ef8c80fa34bb842e71cf5
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.4.2.ebuild b/dev-python/py-amqp/py-amqp-2.4.2.ebuild
index 2c57e5cbc1bd..729b948e4ede 100644
--- a/dev-python/py-amqp/py-amqp-2.4.2.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.4.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc extras test"
 
 RDEPEND=""
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index 89f30041ed82..694c27246db6 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -1,7 +1,9 @@
 DIST pyTenable-0.3.14.tar.gz 101836 BLAKE2B 276c35cddf1f1b7d96f2e5f7d1e16244d4884abbc5b84e3902db2c98edb906a5805354b5c9482ab24598c6ba83ba9e7ec4cb62bed2a76a38c749c229438ad43b SHA512 66c0217730b51733ce691efcb8f6750de810c2a256397cd445f6d1ddff36e3e32c0afd2860d0d2ef38b2c0b181555eac5d2c0eb8c22226b1c61ce3b31177984f
 DIST pyTenable-0.3.18.tar.gz 115304 BLAKE2B 5f25afc4de6a7ee59c0049b7f91a88b9bc6b2a9ae7fa83d64be0d62eab40898c4591fec9924d7425399cea0a36e6332da41567caeb4ac55129dea4fe32991d1f SHA512 7ce4b284a89dbb5d0c98fa2ee12038c2ac5b524b5bf76af4232966db79f3714417a4f1068e9831c16077d692a366fc6a7bd78cc9c47c3420c879ad376cb59015
+DIST pyTenable-0.3.19.tar.gz 117429 BLAKE2B 08d6c1e4a718425221013fbfd981f5893cbc7f6c3f09fa22bec1b7aa39019ac6167a06ba35e0bc449803d0f513b44cb1a7731abc87f9c70ac7082837130d3eac SHA512 d79e37be7b28c4cf8b987c77cc527a0697f0045fb3d07b497ed3a2fd926b7dcfda9f94cf891cdd61c84175757dbfad0f62b179e11cf72935845ea2537687af53
 DIST pyTenable-0.3.7.tar.gz 76638 BLAKE2B 8ff586e4a77bc4005769e6565622756b798398aac9e8e2335653c1ccc5f9c0525ab9e1261b939c848126b1fa71dcca8ea7887d82972f1d881c7b21e5f61de0b5 SHA512 c1f5d7a916cc79a754160fd056b661bad15ec60d64ab08b91345c2646f0e8047ba629d73b39a4d70d87ad7b1c624d55744cbbe0eb78f6e9df32e50a5c85c38b4
 EBUILD pyTenable-0.3.14.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
 EBUILD pyTenable-0.3.18.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
+EBUILD pyTenable-0.3.19.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
 EBUILD pyTenable-0.3.7.ebuild 678 BLAKE2B 63274d27fa3aad1e82c8aca7fea64ae65acfe670c7546965717fbdec694511e96b789d4a5cd4aa06b23b09c960bb8ed87d859916e13e6378cdbfc294c2d448de SHA512 05c6d303474a25f30dd974616fc0e8977977a1ad498a1b6a9b010717864ef6c2def5c5ffeea05df41acaa5e75d476acbed3f1241913b3b63958dff49a3d9ec6a
 MISC metadata.xml 529 BLAKE2B eccd96c558e42e1d453f21c6ce85fdda19c47a9bebd5803cc1f789f311726ff02a41d6da592ad1202a6c970413745a5e272dafa7efb6c2abdbe5361c0d7544b0 SHA512 9c8094a71191ceda8919499eca6c8cebcbb3db0bc668b5d2cc414b1ed0798ad1431fa9e102358deee6eeadd5a11c610d2bd90ade8ace0d4451b4d87ac66a5ae1
diff --git a/dev-python/pyTenable/pyTenable-0.3.19.ebuild b/dev-python/pyTenable/pyTenable-0.3.19.ebuild
new file mode 100644
index 000000000000..6aa15ef4bd9c
--- /dev/null
+++ b/dev-python/pyTenable/pyTenable-0.3.19.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tenable API Library for Tenable.io and SecurityCenter"
+HOMEPAGE="https://github.com/tenable/pyTenable"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.19[${PYTHON_USEDEP}]
+	>=dev-python/requests_pkcs12-1.3[${PYTHON_USEDEP}]
+	>=dev-python/semver-2.8.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# requires networking and API endpoint
+RESTRICT="test"
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index c653fc4738a0..07c5a659d62c 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -2,5 +2,5 @@ AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268b
 DIST pyatspi-2.24.0.tar.xz 298228 BLAKE2B a1c989df5431a9fdf0b35c5fa75a12b9c083c6a979052e3a621685feada611f4322195b30bc1f4f56cd35f305087756cded31a445cca07e74262ecd807926239 SHA512 ea0c3e5a5a417c4d494cfe33ccfcca1996f417e51f5ccd3508372a0df636fb186b9940d7832681af9b353aa50a9aabd64c5477fdabbc5016794a502396b3d67a
 DIST pyatspi-2.30.0.tar.xz 310672 BLAKE2B 76d51e6ce2f39305bcda8f706b5207738d3a2c0fd7480efb77c4dab8baf8ed6eb71263375ff0c16be0087e47f7f6b5eab99c6fc8992b83bdea6e64c92c381043 SHA512 a7af81bb55dff45d1bceced645f6aeb1adc1fa2a2b61fc39d9e97b6659e474636e5ac1af9923588311e651fee57b5e31a62ea5b2977b341eda43a5a736bf27ed
 EBUILD pyatspi-2.24.0.ebuild 1290 BLAKE2B 9cc722c33a681090dcacc79c1b0e7fe834519c5a924b6c159e2d6b2312bc961780280c316d22162d5e3acf5170dbc88caf4cd797247cfbd6cd06ca18d70d8e60 SHA512 6bb8fffa7d5050c3ca605c60414f296c506ebddf4d04ac6f91fe1be205b8f22a4f78b95f99f7f3f8991b2a530ea974912b74c6fff280601e6841c53f9e76ed67
-EBUILD pyatspi-2.30.0.ebuild 1293 BLAKE2B 0a0c52faefb1a0a199c225fe76d70703485fc8099f59f7cbc68f31fa107730eeb8cf171b5418fb25702c46ea48c1f732ac68e927023f0d3381e25a00cafff74d SHA512 79157363166290cccaf448a053287ef24e7c07dc03fafa18edb1ba50a018bc11cdc5a8dd8e1a245ed5eee5373970a0b83f61ad2dc2f377f14580935e871e86b1
+EBUILD pyatspi-2.30.0.ebuild 1291 BLAKE2B cec9a5514ed42cc556897457af1a600472a77bd4443760ec42576f63cd708239e65eadada08abc3e4985c57eeebf4503593042415e09af903c3a60e0bb025955 SHA512 7cee980495072da952f369f1724bd44c9fc102a14af770924c0697c68c72e8306bbff8f7ad23a5dae313b64c2a44f28bdad4017592a0f8f2655177a603d09d02
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.30.0.ebuild b/dev-python/pyatspi/pyatspi-2.30.0.ebuild
index ced2380036a2..a092e8ba0851 100644
--- a/dev-python/pyatspi/pyatspi-2.30.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.30.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="" # test
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index dcd24ff3b275..d3151d151fff 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -3,5 +3,5 @@ DIST pycadf-2.7.0.tar.gz 248233 BLAKE2B b2258e0f2027811c35cfcf7063821bd41cc83291
 DIST pycadf-2.9.0.tar.gz 249992 BLAKE2B d6c1fd12991e24fa747e2f0ba35719faf6b4392334957ead977901f14c8cd98b26f1f93e4b866085e73b7009f66a1ce692e58e478ec501dd4fa988ebf11c2f5b SHA512 da94d778db2fa06b129ae5e85151e301eb68b9ca551fe33f86a9e627cf2c879c71451df140dddbc6d3dfcbac4b6939fce6748711549400713e96165b6673c356
 EBUILD pycadf-2.6.0.ebuild 1821 BLAKE2B e174c75b60a8647d8dc51ef2e3469b4843240939a244afe39c910812f22b392cd937ddf44a6477ee0f681d92cde2f860b7810b71384df5c023a3a1ad91dacf30 SHA512 87a83c5026f4e4c1abfeaf2972e6933bfb62fb6e0e3a63e69dd9b4d2b5386760e93794db527c09aecfce51656d65ba54d7620d023da2494ed685ed9131139ed3
 EBUILD pycadf-2.7.0.ebuild 1847 BLAKE2B 9eca77e7d34a72abcdc13c017a3bb3c33513541d5975c90d5cce5d0fc2bc1eb09bde4ad54914b103cfa72f0ed0832452ae9056f52dd58cdaa3764736704293db SHA512 8582c89f65e349ddd43ba46e8ed896e5562f1bb2bfa32d0650f7bc53bd66bf3253a60fbb842369c9bab8a6be22b01404ddfb09711f88a983be65c9b3882d359e
-EBUILD pycadf-2.9.0.ebuild 1929 BLAKE2B 2251311c99a060025cfa38b478f649eb0d5e8064c827f4a6334384c6b8021db19c4965d8ce66181a997ee9748abf3a2f0a68347fa4c7b7a88a0cc32c79925f4b SHA512 10a90d4563a275e719829a8d2ec63b60546aaecea3ae42587434e25aa6ed078602fb1d5da96e3ecc5a3ee26dc7487406ecd2d77ff88dc0e1dbb602e37ee099d4
+EBUILD pycadf-2.9.0.ebuild 1927 BLAKE2B 11fadd1c21ed0e4d14cf07e830278ba7650d0283505bf0fa99c19c1bfc4d6e35948fa75c4d14350922211b0bb1a8174fbc04e82bc09b1d9c1c8fef832f3969d7 SHA512 423ac7db0ef1776439cfbb0ea617ff05438f9010a5c9cff9b6f5982adc27528a3e95bc18cf0c2ff63d5ccff2208685e6336539280dc523dced4ddb13abe04a1c
 MISC metadata.xml 555 BLAKE2B 87869fe50262ccda3c9f08312ba7d4017e655da6e4e18e31bf8dd99cfb552ea2a1a13cd71793bc00feb6d6d362c19bbc6fcff9779ffa7334db96833548b567dc SHA512 370b97a8a71e49aa553cd6d56b5060074fbfcf366e84672527e8ce49e086c3393198a6afc7d675ce7db71fb8c2abf7bbd4921140da3180f78eee687a2edadf0d
diff --git a/dev-python/pycadf/pycadf-2.9.0.ebuild b/dev-python/pycadf/pycadf-2.9.0.ebuild
index 26c90a63728c..4096e06f15d4 100644
--- a/dev-python/pycadf/pycadf-2.9.0.ebuild
+++ b/dev-python/pycadf/pycadf-2.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 3c5bc8f0daf2..bb996cf9c829 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -3,6 +3,6 @@ DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff611
 DIST pycairo-1.17.0.tar.gz 192182 BLAKE2B b7a4db8258b03b89878fca6b5e27bb9037b74b1792ded23edfe38a0aa5e9ba5003bbac2c8623a6ace8033960c3199b307dcb689650e21ba2df0d81a36a71b6cf SHA512 c073f04d92c9a577f7dcea8d46335751ebd896a65e682e99e4453877d8ba2cadad4437f4ceb1ce8c05eb87d5757a2bd78ac2549e63e38720f4c9276e6f70bdd5
 DIST pycairo-1.18.1.tar.gz 200610 BLAKE2B 47e707f3481d816e9fcd72d169d7ab9210f746396a45a6c9cdac946b4dca9529515ebe1a288d985eed659ff23488bec2cf3e0fb8d11c160349530871ed05881f SHA512 fef6b0d863d45a182a1ba671ddc4f6cb15745447cdaed3e1efeb05fad97f02aa0a56698517648a942bde263d74e06ad7781bcf487757aeb3b124ef64dc525024
 EBUILD pycairo-1.16.3-r1.ebuild 1090 BLAKE2B 65395a13bf91d590925007854d44278a307bb9c96c89a2e79bc9943e6857a2ada7e9724014650e6bba55e2fff2f11549ca973523a4de1d49bf8f99d884ec27d4 SHA512 40ee988b12ff797e2471e0046d01b4a4c36fa662ab66a0a0d8bd3426f3dbc9e17d30d5365e7061f2fa0e933960278284ddd11395ad3697f0bf0ec0dcfc6318ea
-EBUILD pycairo-1.17.0-r1.ebuild 1283 BLAKE2B 5e81f0210d0ece346ec0b11a47b779c9c4a81631c92f4d5a3b77c44bc043d5186822b79118402974e7c3d63601d3e07847ad694ef3ccd5ca57ec0cb5570d6446 SHA512 8e3b6ee6cdc78fa885f4f5bd82abb9cf7b41445b8d06c8943524da6d0a1d81a8cf99b36490e4bacb17d69ad930f6c114a916340ae2b47e0606ded11ce9fbab0b
+EBUILD pycairo-1.17.0-r1.ebuild 1282 BLAKE2B baeb0c6476b0c56ab5a7b7aba75fa5fed8abf3a085607be2c9c404d3252f8e854a7a4d51c204443b2f816d56921cd548aea19c8c62199b54f8d50fe2dd1a99fc SHA512 be5156dcee307239e1553581b5ef84441ebdc263d86229e42fd5ebc7adf6d9e0fb3cb1834ffc156d0801e8e42566771fb4f3b50c87f9425af5d6651d604cb25a
 EBUILD pycairo-1.18.1.ebuild 1274 BLAKE2B 299dda4e49402a977fb00256c8993793efb360379320336ab04ff1e578e7b267cceb4ca7a788496aead0424e510b514a00205b7132232e217637053667077076 SHA512 d6bd89a9cca7bff4ddf5562be1b6faa5eeb8bca7cee2864c5a5e98aff20ad1ddd8cd0cf1b044df7c26a3bcaef50dacd734f08f9c7776fe5e92d08c7e0a9d520b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
index 45c8384be0a0..f8378c96249f 100644
--- a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
+++ b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index b8c7db20a0ca..5d6e6318b4fc 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -5,5 +5,5 @@ DIST pydot-1.2.3.tar.gz 262660 BLAKE2B b5acfc365f7864c2b1fb419e5d4624ebeabef2e96
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
 EBUILD pydot-1.0.28-r2.ebuild 737 BLAKE2B f74b13acedb35d34e8c99f9c26c0544594e054200efe842f43acb35cdeb164c1eb4721c3187ab6a53d10bdafb3d3fb73f9f8b69e70cbcf1d6d268ff23cf7c519 SHA512 9267631c4e58b2a25c3836243d1ef80c7d67df2cf5fccf5c90782dacfe44d8533ad487e0411b2fe5daa28d297335feb54f1b2c48a9c1d769585d2b2a115cb158
 EBUILD pydot-1.2.3.ebuild 916 BLAKE2B 9a8df9e7e12c8f94305d50a71dc6565a65030fb89fa1a2c1dcb34e0eeba84cb921486505428e2ed73d7be0396b7180bba8d059d1d258c4a39d2e07f22a554655 SHA512 604af75aa0708650a6685fd6547708b35abd6b8e256e1fa1051fde47b016c0f3fee4bec34f445835376a5581f4d3f8a52e8d308dcbbbcaf8311dd5c4203dc27d
-EBUILD pydot-1.4.1.ebuild 935 BLAKE2B 53d49f288fad0ab33ed908a07a76b07d432dbd640de86e7b6c8297686436ef592614b65f102cd6a3d823885e9af64829473c0a03ec7e402cbfdf9a7cad0c9914 SHA512 e140d400082fcb1addd6ff381298971754a68542083e228da79737a28d59c669bbdb079f3844e1dd32ab9f21f80af5ddcca4374061d6d46c303f6f718d20bc79
+EBUILD pydot-1.4.1.ebuild 926 BLAKE2B 3709f1fd6a861045cb39261fad731d2ccf9a53b82f022101309193396d919e9cb844a7c5d029913c6950d5e9d7d68898cf046ec582a016185b40f2511d7a1dc8 SHA512 9251d0b2de688cbadd7c9d40b9f1bc2375e8c5d4dc0592a8c3abecef13f48f5a795da7b8928ca10831d9d4801697ea767549e6a498fd2084dfae485c13e04f19
 MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index aac7646b981f..3696fdd6fe13 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 0ab7b101aa87..1d87804c0c25 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,7 +11,7 @@ DIST pygobject-3.28.3.tar.xz 1005368 BLAKE2B 5c24fd25fa20dbdbd3ad18d7e2eafd8f47f
 DIST pygobject-3.32.0.tar.xz 551516 BLAKE2B 4c0b568c900523f4ff6dcf88a85c8780b16004985db6388e29f7d71e7bbac3131779d2652ba760f47cddee8607ca1da7f6144213f29f709069655ec898a125ea SHA512 beb0625e3257cdc2be251624dbf852d2f51bcb95d13bff676b93d46a80d9df94f6fb6ef9850e5c38c56325b72854165fba9ce20ab78f13d99552b3b10ff0fa81
 DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd69b463b3c8aae7634a320cc8ec723e24301c0674b9ffbfdcb6d798fddddb5b772a723afc7ac28c23461e84cf7485a SHA512 5b325d0caf4f34f783fc2c664a795809f048eb1639d2f2e375fc147c852d6e29a8ab119438cac76786fb20220c72d5859cc06d6f70c29f976f6a5914e0169915
 EBUILD pygobject-2.28.6-r55.ebuild 3537 BLAKE2B a5b8ed9f09176314ffd8584203f5688399c9aa4320379765c0867c4605e38d2fdfc51986b58960465506e36b70260afdf48e68d4de385b4ce0d0113a20309d40 SHA512 c605ab80a65d3a8e71669c22675b4cf54cb94fefad28126df05504e84b0d867bb5608952c0b0e161df4c8895c159159035622919b9321d81b1f26b34ea677b0a
-EBUILD pygobject-3.28.3.ebuild 2782 BLAKE2B 798cb0ad8df8bb3a90b1b02e3a710d72c15bf24801d167ff932487aa6e75b19475599bff24f07fabfbe5aee7c0fbbfb4da5d1ee3ce6cf3a181796f1e44eebc38 SHA512 8e030962ef13ab0695ee176c9f0b5e27e970c53f7541979047d2cf79336b1f86611d63aeb3452f910a557aa097cc4ca2f104428056a82c3aab27b1de4fafa845
+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 1807 BLAKE2B 92fdf98eb4d9eb035612c7dce29627f560a31876db0669058874f0080e49a70130aacbb2418ddc382858b75959962c557c6bdd94b5d5e1bd3f563ce57c387b69 SHA512 0924fc7fa5e938064dfbc78868cf834adf1fc3fd396783d8be959d160becb72150c710ad3dd115b327bf4908b46c0766a78c3459f4d4eb9c1dc90c153e9d1733
+EBUILD pygobject-3.32.1.ebuild 1804 BLAKE2B 8da0454c953e0576212e530e471af82a61cbac27c980acf5bbb85acd5c40059de5d70845f35a5b0abcc8b9735f11fd4c90e315baad9df9d880bfaf8bc1285c8e SHA512 ea267d822fd997a0652b0cc5584925be69e35e4997caba63bc17df8f2b8cc55896634a858275b0620256f6c6630b78b8d99ad106789c6e839bb2f64437e60259
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.28.3.ebuild b/dev-python/pygobject/pygobject-3.28.3.ebuild
index fe2c39bf927b..975a33122467 100644
--- a/dev-python/pygobject/pygobject-3.28.3.ebuild
+++ b/dev-python/pygobject/pygobject-3.28.3.ebuild
@@ -12,7 +12,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="
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index 9563a5a4729b..cbfe2c87a06b 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/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index afb5fad4b6ae..411e67bcfc35 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -8,5 +8,5 @@ DIST pygraphviz-1.3.1.tar.gz 103336 BLAKE2B 267c85ca4639a2f0ad8c06d36eaa1f2026c6
 DIST pygraphviz-1.5.zip 117810 BLAKE2B e9139d6b8e01cacb3135b1ccd2fa8624c041b7a04848f66c7668c5acf55cf66380ab9f05193b1bb240133f0c01a21915e2314807fcde23246c287d22efb9450a SHA512 6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2
 EBUILD pygraphviz-1.2.ebuild 981 BLAKE2B ec7393d162ecf32e423ed08b8464e1caf99d91dca43d7ffab048b25f9fe870441d32dd72849e89fd414320e32a9e8286ba44d7136eb8cb3e8e74ce5b4aabac03 SHA512 1e30090835e51b5bf59c8e26d2bf657b248a242b302a7f46ce5df8663fd38253588c2cd0e4850fc2b0e87ccad1090e321921fafa3c98dd6f1ed5ca67a6117c1a
 EBUILD pygraphviz-1.3.1.ebuild 1096 BLAKE2B ca69ff599fb2d195d51136bf8bec12c1136c8529c7eab9111fccc1d3c8d30aaa6977345bf2838c9ddcc4b0209477c4dfc7490a58ef8fa793d63e663122e983f2 SHA512 2641f1791e7e90cf458a2d78b90882f047ed3f7879b5400905feb85881ff57b4abda5b254cac319595bdb3510d30111369e6614d2bf751b0246b71174eccc34f
-EBUILD pygraphviz-1.5.ebuild 1063 BLAKE2B 2986101107629b069c92c08397b52345d327c815ff93d505117f13568d78ed819b97e9591f49216e4ccc6e2d02b23673abfe08637f8e8b9af5d935c32c5f3bb4 SHA512 eb8e4c00252f114917b8d8194f33e8fc82ac53340eef022285f8e9a88b2d346a52274e5293e2ad0e354c18679a02f54ac7d70668450c3eb884e6d488bd7e9498
+EBUILD pygraphviz-1.5.ebuild 1060 BLAKE2B c4e9388c839fbb62d2fa501e7a315a4a05a8cb8eae7b1cabec35fb0d7dee8a52a7ec2fd0b2edbb0d3912246290c2472a0563ba16f31a44524f48dd8223c33356 SHA512 5c91334b3bbe946dd43415e473ec796fc239d70f5508cd592d744cd7239d6a915fec98ed5a1099313572d74fa2863183b618f5d31fc8237b85908bbec68d6776
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.5.ebuild b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
index 9ffd0f25141d..eaba99b3a524 100644
--- a/dev-python/pygraphviz/pygraphviz-1.5.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 1cce9abcd36c..62062fc856bf 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -4,5 +4,5 @@ AUX pyilmbase-2.3.0-link-pyimath.patch 454 BLAKE2B 5e2bc6d09bb7012f8d0087aa0d76b
 DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344
 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
 EBUILD pyilmbase-2.2.0.ebuild 1129 BLAKE2B b3876947d8104e5dca92dc6e02780228b30c5c3b3fcf0975b8a8876b3b48e8f95990d16b1a94101626d439972128e0c4f0d901d847a93468f88592e92f0855bc SHA512 abe726f6a70ee90242eee1a9b70ca8386e09a1c7de32e30372407cf4c49ef653e260f392b15407f7d13d76b737a424699d72d0c35f92793c470bddeedbda3e65
-EBUILD pyilmbase-2.3.0.ebuild 1248 BLAKE2B 41abe6232321ab9a84d0397cd771c9cebf0cfab053a2c1aaca1570f5e2a548b2b5baa616f1f64753442450f8e3742b4250f6ab1a63300350f41e58d81d64124b SHA512 25237d6858103cede2d287d546f119ae546422aac9209091d84f50d4f68ca05a262ca1b9064131e804266ea2843e8e088107e8e67d1b1a3ba11df435c47ad511
+EBUILD pyilmbase-2.3.0.ebuild 1429 BLAKE2B 7910bc31dc4dd04c83ba7a68a20d1f56f35a20a42ae66b85edb88273e861debb3e8889975adb1741e686b78624ab7c02d76c82406f61bb41d396541646d31050 SHA512 9f918d152a48e83c188670b7f88af0c4b3e5b76dad9989d3fb99e278e9ce03639c10c1cfc2786b7bb060e47fca59e47d9bf3aae5d3f061da1065d456c0700fee
 MISC metadata.xml 537 BLAKE2B 88a1d7d89fac2094eefd766ad23b01c12cc49bff080e83f6ad63318294c97b18ecd83c6d908979ae8345a6601898b7a01295d9db886f0de500e460129d9c4a6a SHA512 c685de970979ac4ad5c3392a4b41b23bb523da5d003e3f6757a8d61fbdf0be1ea2bddc1a756176a9887101cc5bd6e19f5ac7e038e9dc9e5976c676a8817b9a87
diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
index fda4c62db801..f0a627779b31 100644
--- a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,10 +38,17 @@ src_prepare() {
 }
 
 src_configure() {
+	local boostpython_ver="${EPYTHON:6}"
+	if has_version ">=dev-libs/boost-1.70.0"; then
+		boostpython_ver="${boostpython_ver/./}"
+	else
+		boostpython_ver="-${boostpython_ver}"
+	fi
+
 	local myeconfargs=(
 		--with-boost-include-dir="${EPREFIX}/usr/include/boost"
 		--with-boost-lib-dir="${EPREFIX}/usr/$(get_libdir)"
-		--with-boost-python-libname="boost_python-${EPYTHON:6}"
+		--with-boost-python-libname="boost_python${boostpython_ver}"
 		$(use_with numpy)
 	)
 
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 3c5cd98437f0..3d2f981f1564 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 1271 BLAKE2B c66596d7d123616e6d0af1562e32344b260ee7de50183590258555af28ac409daa2769d5ed78d2467ef5069d8f6bcde7e3616fb41658faff444d391287ddaaf7 SHA512 e9256af66b8b96a7d56693895906249c46d050526f15ac9ed493d5784e519b1a0723decfe05c551920508c305087dccf735e09413a4272c735f4b7d7502f4daa
+EBUILD pyjwt-1.7.1.ebuild 1269 BLAKE2B 029a126096e4d8e9bce8f2b117cef9b7ea4d90adb87690c3aee3019b9743624e506f5264fb67d1735e58bddb966c64be558d5e8dca07165f51fc7d0e2b2b26d5 SHA512 09963a2355477bc077be04b9e39e8ee8a498fb50ea9eafbf47add766fdd20612a032cf8c7cf7b7c201f369698a01707f4fea87440db6c031ef64195666fd0a00
 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 373bb62196da..f33db9856c96 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"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 39df31acdac0..80d598a47c4d 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -3,5 +3,5 @@ DIST pykerberos-1.1.9.tar.gz 35788 BLAKE2B 19fb084e10bba3b002e7ac919590d7249acb7
 DIST pykerberos-1.2.1.tar.gz 24535 BLAKE2B 5c6253d99857a5061f708e213e24e0ac34a6fa2a39332d5a0f27f30f1ac9eec45654966113c3036cf9bbe27ee9642748afe4cef845d2ceda26286ced1e2277e0 SHA512 048ed0238911b3e9970a5567ddc2b5e3b551e24bd8d08f06e5807f238c566ead9998e0efb0e3207f178ef2a8c9116f4ed4b7c728b9279f7a88f0945a7c4b081f
 EBUILD pykerberos-1.1.7.ebuild 546 BLAKE2B 3b3d14175dd3e613f8a892f27f0229c913c1d3578973c935fd9b2a22e1a5e357dcc83013390c97a9c184122cc4acb6a51ca22930712e2e8dfcf2042cb289d4ca SHA512 88154232e01d41c35aa82e57b8850b199daf53a08f3aee5e8179383e18559727bfe14426ddbe2366b3073eaf9522046079cfd38501cf33c21cedb0d0d32fd746
 EBUILD pykerberos-1.1.9.ebuild 543 BLAKE2B 01884f831fbfcdab65a71f90c0ec97024cbecb8ac17c339b1302b8f2c135fae0fbd6393dc6166cf6e6b9c1b2c56111d25925031fcbc2560a21217fe3a66126a8 SHA512 fdd1de48e0b9aa123629d349e18a920df25bb28a309dfb50d2b6f9cc2f06ba7a34d0aee917a3bfea0809d022303a49fc86ea335d753f47022e034b711b8f6be1
-EBUILD pykerberos-1.2.1.ebuild 546 BLAKE2B 3a6397f38a5b20eef9a9f26d0d9490b7a27706772e2d97d893e1f8a7f874a00bf40cb19ea7ddb118d08c04385cea4c91dfce0bed14024f945e6151b0592f5e84 SHA512 26b599d3590005b7d5eb8bd3b76e0dcee36a7b6c84152a23907416f49d46509bf3e68b5ad937cfb40557ff8d2c7bb1ac50601cd983787602acc0cf932ec5745a
+EBUILD pykerberos-1.2.1.ebuild 544 BLAKE2B e67c85138e2f0a40bf4071936e9683bc8e7c8dd533cb2f5a7a7b4a038aa4dd30277a1a3c063e4abd9d7fd8232c42014ac5f1e1cd1de1cd211fc8c7e9ef8d907a SHA512 7a7967ce34e542dd54c922533f6f0ccaefc8aaf8d89e24f573c2b140c02f173645768e63df48be29fed6f63e3024be7cfd91fefeed25965f6b9ef9f8cfcaa9ef
 MISC metadata.xml 332 BLAKE2B c6badaa93a0f9f3000d4865e58d38f56d57ebf51fd4ee4f8d6d6bbf3926dd4b0b7c97e46df5206622579a788c86e12de778f2207da80ba97814ff16dc8d04d38 SHA512 a3246676e0c2f0430c285ae4f58b5ca754376936860c9d04d9ef46ce111bafbfebcd25e8dc28f1abfeca92dcbc6a329f711272ad7dd501bc9a1c7b34876cbbca
diff --git a/dev-python/pykerberos/pykerberos-1.2.1.ebuild b/dev-python/pykerberos/pykerberos-1.2.1.ebuild
index 228f2018fc78..bc8f60ba2e9f 100644
--- a/dev-python/pykerberos/pykerberos-1.2.1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.2.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 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pyldap/Manifest b/dev-python/pyldap/Manifest
deleted file mode 100644
index c3e80cee3511..000000000000
--- a/dev-python/pyldap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyldap-2.4.37.tar.gz 303732 BLAKE2B a3b54b172701c2e52a9bd54745d442634b8df2f4aab134d37bf5dbc383498fbec876e12c1c703db6caeac0ce3b4bccd974b0680356e5996e327c8ac2ce52ac4c SHA512 da66669bf9eecebc8ba05ee313453b151a01147bc44c60da4936b80777ec3b69551f77be0e6f3c260dba771920d50fa6f54f1892eb0283761beed1ee8c6d83c2
-EBUILD pyldap-2.4.37.ebuild 2332 BLAKE2B 1c5d61f2c0cfc59fd62783f468360dbf5f616edf6d6e5b71f200bf6436b9d02df475cd0b2dc36d66a5867fd9a1f2cc4cb43c378d4dd1fe12c59a508d47ebffbc SHA512 7a910dc90ec06803de55ce3b2ce99dcfb01e7a4600cc42cc648dace7566840908e9313dd05ec19ef2c4154d81064d5614c20a57b7576feb60e9d9c9e7300c800
-MISC metadata.xml 367 BLAKE2B 4628dd26b49a9b739fd8eba8ead6ab2d6a019d21de4180d6b718dbbd919d0ba2020d3cc3b3ea75aecf856d994f61876aa2bab5ce126ffdc4f370d4b38637398c SHA512 8f9645c0a00f73a99d54682f17b0a1c0e462d89164ec9975c6b912ebdceaa07139d37ef68b89c4428792b2034ee6bc36df87cd91674d8c31b1f8571d81534258
diff --git a/dev-python/pyldap/metadata.xml b/dev-python/pyldap/metadata.xml
deleted file mode 100644
index 618e58e65d8a..000000000000
--- a/dev-python/pyldap/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">python-ldap</remote-id>
-		<remote-id type="github">pyldap/pyldap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyldap/pyldap-2.4.37.ebuild b/dev-python/pyldap/pyldap-2.4.37.ebuild
deleted file mode 100644
index 1fa47b9b59ed..000000000000
--- a/dev-python/pyldap/pyldap-2.4.37.ebuild
+++ /dev/null
@@ -1,76 +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} pypy )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://pypi.org/project/pyldap/ https://github.com/pyldap/pyldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-# OpenSSL is an optional runtime dep.
-# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
-RDEPEND="
-	>net-nds/openldap-2.4.11
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND+=" !dev-python/python-ldap"
-
-python_prepare_all() {
-	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
-		-i setup.cfg || die "error fixing setup.cfg"
-
-	local mylibs="ldap"
-	if use sasl; then
-		use ssl && mylibs="ldap_r"
-		mylibs="${mylibs} sasl2"
-	else
-		sed -e 's/HAVE_SASL//g' -i setup.cfg || die
-	fi
-	use ssl && mylibs="${mylibs} ssl crypto"
-	use elibc_glibc && mylibs="${mylibs} resolv"
-
-	sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
-		-i setup.cfg || die "error setting up libs in setup.cfg"
-
-	# set test expected to fail to expectedFailure
-	sed -e "s:^    def test_bad_urls:    @unittest.expectedFailure\n    def test_bad_urls:" \
-		-i Tests/t_ldapurl.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C Doc html
-}
-
-python_test() {
-	# XXX: the tests supposedly can start local slapd
-	# but it requires some manual config, it seems.
-
-	"${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Doc/.build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r Demo
-		docompress -x /usr/share/doc/${PF}/Demo
-	fi
-}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 73ed6bc6fae6..00ae2d6c003b 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -4,6 +4,6 @@ DIST pylint-1.6.5.tar.gz 465578 BLAKE2B 05412a528878633ef7529dd2f2d2d1989bc94066
 DIST pylint-1.8.4.tar.gz 512582 BLAKE2B 623e224ec71756cc2528346ac62b8e58ac4d5ef55d9e31e667d5389aa5b2dad712f60c7e90df5c831f57bf28e0ccbd00ddece4ade46410c28b67adb1a041a85f SHA512 07e55ed3f09326e1973215046e3b172f6065a7ed0ae657cba7a6825a26bb103bdbf8b83126bafd99f332fe0eec3547bcd6e618d6e9f612ddcf9c504bb850dcd9
 DIST pylint-2.3.1.tar.gz 577767 BLAKE2B 2af206a9d9be04f369c2bbc39c5ddb80c29a5a39c20d75bfec84498882eab628a7cf5abcc5786933304ed99bd00ffa142b9a58abab348c947799f962b877bb30 SHA512 924d8adc95f04ba750b3b44fe79ac569151ea7c8f693cc9867bcda3878209ebc2202931702b98f80709d161d3781b6e181aea0ded35a3323c023497e2a749ea9
 EBUILD pylint-1.6.5-r1.ebuild 1799 BLAKE2B ff78bbf82455322649ef9d4aae6305af6964443ed2507106f32f74dccd4ee84d8cf741f38135a421943a8ba66c3829860b2b7c1b64f1312c3b4c124a59362883 SHA512 9d3ddb77ecd9978253eb51bedb7d3028c69c6bf90ef8a22991b7417ccf5994145b58e71ec075a61e6319d4c9991926f0cce0a5433e8ed79ebe8072f0766cbfe5
-EBUILD pylint-1.8.4.ebuild 2449 BLAKE2B 4ad77af21b32c06775c9b93b604da818086db54a26810525fa93b586e7a3c71f4652a2b8052bef03dc3dc468944d9a592797a46d93fd3dd2b0d38f395f9dca31 SHA512 a9d5728e9f4bd078f5158fc4c7c7ee959be9885de98d7289bd9ea5924389bceb1777ff6fbed9086250cb9f67f0fede1fae06aa632a5437edaf7bb108e08f3c10
+EBUILD pylint-1.8.4.ebuild 2447 BLAKE2B 9ba8252bab95ec42e831b9d2355bc51c9efd4b65a7b3175ff974f1844d6ce430534e30625fc6c00dfea0b2a618e0b33de8245d31470c336827a22aeecdeb2e4b SHA512 d90998c7d2ca77103a5a2fed6dd2c65fd8ca5ed5ffd5f8c45280b8fde24248afacac30b710f9b231e2ec9524bb1a8a4ae091ec24548bf50b6131ba96a430a5fd
 EBUILD pylint-2.3.1.ebuild 1626 BLAKE2B a37b4525b64244e91f98d50b98260e8d4e1e25e2ac4d8427a15186355fc058cd3ba4dfe00e45d5020bc5e39baaf1402f72fdc39bef6289a50e18ff3bbfdc1001 SHA512 1baef96e3cc9db0a640fd58361062e59f06fb0010568100cbb798194ca0cb5866fdb2b433b722972a0366200f5da1dc962c3901cb0631855448bc0fa54dbbd78
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-1.8.4.ebuild b/dev-python/pylint/pylint-1.8.4.ebuild
index 18ec25bceee2..8dab159129a6 100644
--- a/dev-python/pylint/pylint-1.8.4.ebuild
+++ b/dev-python/pylint/pylint-1.8.4.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( ${RDEPEND}
-		<dev-python/pytest-3.3[${PYTHON_USEDEP}] )"
+		<dev-python/pytest-4[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
 	# remove unused dep
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index bb1604ded74b..42d997a6f14e 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -7,5 +7,5 @@ EBUILD pymysql-0.7.11.ebuild 686 BLAKE2B 35e2fe96c36059f1e1364a0ffee4eedba05df8d
 EBUILD pymysql-0.8.0.ebuild 688 BLAKE2B 4a641a543bd9bbaba90242bd032c6a6e6f303d214a9298cad25e268e1e5a804f56c7c3378d89a291ac76ce404f2daea413da62572c02eb0a15adf8f7f504a7ed SHA512 db08e96d7566ea79b33591d5493ce92786eb8e140f6c2caae974fb17ccb5bbb6d0515e2a63166df384a4561917cb7ccd1c17f016cadc6e81d969b1d16a823afd
 EBUILD pymysql-0.8.1.ebuild 688 BLAKE2B 4a641a543bd9bbaba90242bd032c6a6e6f303d214a9298cad25e268e1e5a804f56c7c3378d89a291ac76ce404f2daea413da62572c02eb0a15adf8f7f504a7ed SHA512 db08e96d7566ea79b33591d5493ce92786eb8e140f6c2caae974fb17ccb5bbb6d0515e2a63166df384a4561917cb7ccd1c17f016cadc6e81d969b1d16a823afd
 EBUILD pymysql-0.9.2.ebuild 690 BLAKE2B 0ff9760f98c27c744f7501588ab7efe74d3c168f18947af5b2d774fba8dabfa015201e309c1c12129cc861d64f308149ca53d85be6f111b6f0560602dfa933ae SHA512 0431d27769a07052f365107002f48047e141ab30a8e9f652972d5c9ab5f5d60600bdc3f01e0c23f87134e2110d5ca831a9373e34b53b8ee0c1dc82905284d87d
-EBUILD pymysql-0.9.3.ebuild 690 BLAKE2B 0ff9760f98c27c744f7501588ab7efe74d3c168f18947af5b2d774fba8dabfa015201e309c1c12129cc861d64f308149ca53d85be6f111b6f0560602dfa933ae SHA512 0431d27769a07052f365107002f48047e141ab30a8e9f652972d5c9ab5f5d60600bdc3f01e0c23f87134e2110d5ca831a9373e34b53b8ee0c1dc82905284d87d
+EBUILD pymysql-0.9.3.ebuild 688 BLAKE2B 70463377322369298e8b8f9f2c3565d9ffa2a9e32fd687a54a3df59f11d1c889b59d250649926026cad59c1f28be8a9e2c374237d6f3892842803c3afec98498 SHA512 f6a60eac9d34233271488fd3b4e9af81e6cc9d09b256a3264b112cbc814176bbf5a83a7d6c65e0d8dd7d8686ea365d2ff53484830be68956bdaa9dbca1919fc0
 MISC metadata.xml 553 BLAKE2B a3f93a6e059fcb457326fe8ca880b1a268be1d5d847a0bd8648156036428a5e2f6cbe47adda3e3cb220c236b4307bb0dba8ea616842437e2408407fae01c16bb SHA512 3799a369db7d62654ead99e579ea2b7f19e33c35654fb4f721e37a46f4a449d67f1173f45abf8e34b330e87a872c0182d7a47dcda97a6d2c40e78ebfab6841bd
diff --git a/dev-python/pymysql/pymysql-0.9.3.ebuild b/dev-python/pymysql/pymysql-0.9.3.ebuild
index 05b290620a25..8698e794d417 100644
--- a/dev-python/pymysql/pymysql-0.9.3.ebuild
+++ b/dev-python/pymysql/pymysql-0.9.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index a6324cd733a3..f672cd453b3b 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -3,5 +3,5 @@ DIST pyOpenSSL-18.0.0.tar.gz 167296 BLAKE2B 3a9c8db02e92858353389508d9791d2ff0b0
 DIST pyOpenSSL-19.0.0.tar.gz 168551 BLAKE2B 762d3358b3cc4f1e088e9464ac079e5212c537d25691e51edb3255a192c42276506c758ecf16eff999082bfd05aeb92a37741338d92036d2149b87c95008db05 SHA512 a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818
 EBUILD pyopenssl-17.5.0.ebuild 1710 BLAKE2B ceb19771cc8dca511e6e2771c7646467e37dd1000d08f5df2b43cd8b494d7c19a2a233aa013f7e769d00b6b0634f63688103cc970f499861c707ffcacee3f1b7 SHA512 2297eac460c89aa6fc7189b909f3aaef1cee3fba47854007287e279769c4d6dc52d6c7161578a67948b1ca39596931befd655085cc7a9af744d8d2cdd144c438
 EBUILD pyopenssl-18.0.0.ebuild 1724 BLAKE2B a62dc348e12c606c409d238e239f69dd35e5e92e6171f941372b29b718cd339535aed829706ea01e605932b2ffc7589397b07d25e52a78fcd840460a1feaeb3d SHA512 096bfa8ba6b0434b88078c0013c7149cf911c11b2c1d3e1bee5310fdb8031e1de91ba7ce377af09f88c20db5319f186b6e7cf7e2245ed779c6d5c850ec4807a6
-EBUILD pyopenssl-19.0.0.ebuild 1722 BLAKE2B 4e3e555b88675f2238e36a7839fd87d06d710a05d301bbb7abc802877aff81c50cc90c90d40483077cdcfe50a3fa1bb193f556dca3158afe5822049e9663949d SHA512 c00bd6c70f893cc101a22aecd4ceac0fe4d047d8b65bfc43335155d951c9f2a91bbb93b3e7c7c82dec2ea8e61441536f659b776f8082a59e27fa3159c462f7e0
+EBUILD pyopenssl-19.0.0.ebuild 1709 BLAKE2B cc86ece9600a99d038784d8642ecf439466a7804c7a7844644cb3ed72a47f2350cb9646662f16c8419041d62ea9dee93d4108b2a7fb42e6c8859933511d0eb2d SHA512 733970f2694255b8df3cc1b89d51a9b3f8c9db6f034feb2499f07a155b4bb099d173adf48facae4579d29be2ad7b3824575c022db5520687d9ff03791098bcae
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
index 78352f711172..dc6a20f16736 100644
--- a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 8773bb3a13c4..88a29249ff7d 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -5,6 +5,6 @@ DIST pyparsing_2.3.1.tar.gz 619405 BLAKE2B 4c1b9abe6ce6e511a998eff19eb32c8351444
 DIST pyparsing_2.4.0.tar.gz 625419 BLAKE2B 5555a255cbfcbb076fe4d385b2da967bc44a7110acdd1a4715fb3e22db2a3f5b7bef1ad61423f6d0419cd8cb403abe222e426a96ea755044d04e0105c2798317 SHA512 2888b60c2518b19979e00b01ea499c45cd0a98affe0551f80ea7985acd649d62b4e231e142d3efd65cdcd9e3a0182680bfe1c4d98e310fa2ac476f37ac4ff344
 EBUILD pyparsing-2.2.0.ebuild 1322 BLAKE2B 83637beed2843def41e2d8b8bb568e4c4c8ab20294f0574623ea7101da6ba7d093039deb8d2ab3ae5c2441cd86dd66299dc9aea4ed241128a70d33d66845e9f7 SHA512 5fc9367bd5135c695935e3f4ff2a4c43f6f732f3e39e8083332ddfa02fe33d981dfba9d9c4da3b725234a6c844bf49fb650cbcf24dba05708ef04a20736e06b1
 EBUILD pyparsing-2.3.0.ebuild 1249 BLAKE2B 0c55cf974cefaa227e54034152db03ba1e1effcdab6c649dd4764b1e8eb093a5b0c963830ec06f9f52cace1862999c2d9a877f818847652ee85690778fb9c929 SHA512 4fa16e9e911a2fa16e5fbe106ef313adee0a5e5dc5a5251167fb9d58ee2592c03d0ed87279484d4cfb4c27997f0dc6d3079a75467ff320c87a3cd95be6daa6a2
-EBUILD pyparsing-2.3.1.ebuild 1249 BLAKE2B 0c55cf974cefaa227e54034152db03ba1e1effcdab6c649dd4764b1e8eb093a5b0c963830ec06f9f52cace1862999c2d9a877f818847652ee85690778fb9c929 SHA512 4fa16e9e911a2fa16e5fbe106ef313adee0a5e5dc5a5251167fb9d58ee2592c03d0ed87279484d4cfb4c27997f0dc6d3079a75467ff320c87a3cd95be6daa6a2
+EBUILD pyparsing-2.3.1.ebuild 1237 BLAKE2B 536d4117490a14375ea52107c96bc20736c7316c24b253b555177012cf4a0b138dff170d4670124ab1a0bff4596c55ac1faa1c8376ec9730753020423ff1d524 SHA512 4d3a9d1302ec0860528833f8bbf7aa7af81b7fd0b332476462abe411ddb55960ae6cdf8ce1321a21f7ebc31cd1ef66a98c8581d1f1f40c2d8e2fd5e346310b33
 EBUILD pyparsing-2.4.0.ebuild 1201 BLAKE2B babfcc0c1d9a588070a883155747622c87810e136e1abe60651fe17137360418df2420cc936bfee0ed861cba545e3c6add96b18347827a66c8438136351ec8a0 SHA512 103a636bc4e3aa2c2fa4c3e5a1379d39718c9b7c075edbcfed256fd55e69f2cbdc0201827859c9049a403d9f776c85f15041935e7057189f8f271ea73bcf1e5d
 MISC metadata.xml 737 BLAKE2B 4b4199e79bc2e92c175ce249cc395d2324cdc3a3df25bb36db5884b79057ec04c63b2cef7ef27e9f656a58e0fd5aa162b8eebe076f6e673b227659a3e013df08 SHA512 2cab4251c3444c6479b4d5ff92221399e01ea5e4a6af96631ccf81cdce5f3f9cc2ab06993c9636f36469acb5b28660c41e594d0d7315c6cd9b5dbaec0deda7cf
diff --git a/dev-python/pyparsing/pyparsing-2.3.1.ebuild b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
index d1799aab5404..1f768191b166 100644
--- a/dev-python/pyparsing/pyparsing-2.3.1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 # setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index f20366d48dc1..c433289155b5 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -5,6 +5,6 @@ DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf06
 EBUILD pypax-0.9.2.ebuild 1093 BLAKE2B edc30b3507a0ec1d074b0728d7b03eeb984f9116a20cb6628c7760e0a28af15c0a3f9943dc4eb5d558ab7e2a7ce4cd2f6e006f96ae72da316f42c6f9ed1fd26a SHA512 b3b58e205a537029380179d1bded45d8eb248adbf5d3df52bcda42e0b3e47d2df9c6116d2c57065729ab0cd7e09a7c6090cb46f6655deb97f9af2bd7b130a68f
 EBUILD pypax-0.9.3.ebuild 1097 BLAKE2B 015ff94c5122e918715eea10f161271e5b2a3e36b8dfec1482e0fe4d0236f563b324eb42b701a87521b06690d49b3e6e22828fed79d684b68723197941611ed5 SHA512 5b29aa8fdca22ea0b7d459df3256d711deff11fe75560e9eff10bc1aa373f4673e6055b0543e3c6dc495a09e3c273686a596df41c7f7aa40218d92c7e692db8e
 EBUILD pypax-0.9.4.ebuild 1092 BLAKE2B d893dad6067d2aee809c8f6c8121ca7f1557d564a66c9b116b6493d9e324a4ec368e9f9f69ac5eaf08ddac3678c881094e6e67bfae88877935fd2934a83274ef SHA512 597dc17378266e61ae28b0f26784c7e0b010b34e08a2ca0caefcd546d70febeb6cd0d8aefdcd01e9fa6bc989a9652fd4627037f571b330a813ec58bbe5484876
-EBUILD pypax-0.9.5.ebuild 1094 BLAKE2B c080879e1a8c195d54c6d19b602b086766ae515056138d2297e7ffa889e7d0ec77929e8c441264b41c9293b22784c1fb37527cc287a07ec2f1ce07a01bd1b468 SHA512 ffcd9194e8ca1d09aa27c23af590372eda1db351661ad63c6df53d218480557b82cfdf02a5814bef4f351e897e4f6d3fa68c5447d516558b569d91fb6c85633a
+EBUILD pypax-0.9.5.ebuild 1093 BLAKE2B bcc8ac8e28db05d8731f736ed9e14d57df13ff5c937bee8eeca3e16120d5bb78f9e4f9bbfeb929f048b33c2f56f4d60292baf5c56cff70b1773b1fbd63c0000b SHA512 09c2145a62f778f540a69b3ccfdb5349ec03a39a4b3f26d561043fb573df7fadf275ed9856f777a99409c21d88979051fc89f35356d4ae6d63d5302aac67b98b
 EBUILD pypax-9999.ebuild 1102 BLAKE2B 3602425ccf3b84cdeb301509b502ed4b699d1f8f1246d89b2504d377feb64f22c3c64c15ed19240dc114df2d9d2895c6b34b5524636511a5836ee936b8257ba7 SHA512 1ca8235f4e14576ec1299dadcdebbed2741236475340e2f771d42eec39754d18b3ef49b4247615e6f7dd3103561bb924a9644562c65e7844913649490180c6a2
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index 8f5d968539aa..c1d8e2b4c85b 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pypowervm/Manifest b/dev-python/pypowervm/Manifest
index d5057f2bcb73..4d2a7edca29a 100644
--- a/dev-python/pypowervm/Manifest
+++ b/dev-python/pypowervm/Manifest
@@ -4,6 +4,6 @@ DIST pypowervm-1.1.20.tar.gz 906153 BLAKE2B 868571636f3c21b5d179ba587f7693dcf8e5
 DIST pypowervm-1.1.6.tar.gz 872456 BLAKE2B 02afd4c25aa5f0b005e621fe190decb2724ff289d6f1330744428bd6616a8b784e79486e4e26b46ee76a3e6346f16100cd788f705f264ca9b29b8522a2c8bc9b SHA512 31211b93f85cda9067e29700794daf9aed5c43478c27eb6dd5a150120282a7d46d4fa4fdf5fa038023153b02aae85f236d681e66646912a464bc3d265c87fefa
 EBUILD pypowervm-1.1.10.ebuild 1338 BLAKE2B d6cf74c407d4db99ce8701bf75a633e9a9fa619211ab99d58fb43bcfbf97382b66c0216653b55caddfd7523afc066dd6ecea0839e2c3701f755bccae8f15f104 SHA512 bb337c628680214d2889bf83da89fd2ac26d8e81df523474876f0a948c8cbf12b10a4514715d7d95b3798f6759d715b89dace213501265ba1d8d548bfb54dc0c
 EBUILD pypowervm-1.1.16.ebuild 1249 BLAKE2B d9182320a9cf47c7e1750a71192c3f97b406277445d1766de9da24783f7cdebb3b814bcb3b5de606330bd148ed5eb04a46febabf468c9888869b6a3c8626e2a4 SHA512 b40f87e4e5df0fa0133a627358848d6ab350a9a2a6a0cd1710654d2c0efd4f8cada71e60db142904e643bc4d8ce6aca6e5c1cf2a163d195d24ff7d31db6e2be9
-EBUILD pypowervm-1.1.20.ebuild 1253 BLAKE2B bf5ae33db8ba877c3ad5a8922cc7620b2389bba5851b1ad6714488b482c72bdc992d0a29e8390032da85fe9c1158a07b414dea5a7914494e67257549f4725459 SHA512 a82b07209b2838d9f2625396a6779a56c4f5197d592d43934da84c3f45838f68ce65343c5006a15763787ddcd9bcbb17310805f55363ebeaa34ebe322719706e
+EBUILD pypowervm-1.1.20.ebuild 1251 BLAKE2B f66f6cb41e671de9c3a89e63942f3cb18a694eb9579a54fa94ef184679abc848bf685a23d79630f9f60d83d8dd983bd01df4dae681f6435c878cee02b215e79f SHA512 1fa614a4ca78d31ae93c68edc04db4b12f4fd37576451ee5738a81c812770f777c1a6b6e74a65356fcd68749b6618870a84a4cf7ae1110142ea341d2df2a173e
 EBUILD pypowervm-1.1.6.ebuild 1244 BLAKE2B 57ac6b14b5e97f9d8bcc76ee6e81caedac3600fd1111d5144e4966602c3ed113787fcb6c4ac2564c68f8303b3e212d4e56429be393b156ff7addbe9904d42b70 SHA512 90c1ba6097eb16d090a565bcac037aca2862a8683626cd8c2e7c95c361d594c9c64c36aefc7bd5e0d079485256510688071100b241820f72f4e829f750661647
 MISC metadata.xml 383 BLAKE2B be09e21c8e64a738f362727e96417344afd5a4af5e99314274cb2e77f2c7b32c8c5d68f7e8d44b053297aa597ceeb6a1e4b41d1a30954691920b976694416d8f SHA512 e06a03085a277a53d5a04e076d240d59cd81e83d40241856a2878776792366d50bdf3e9fba2dacf2931de17234f87583b3114f3f696db1254d8a185a9da06d17
diff --git a/dev-python/pypowervm/pypowervm-1.1.20.ebuild b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
index 8483673c990c..a1e5972a5161 100644
--- a/dev-python/pypowervm/pypowervm-1.1.20.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index 52ff7af668db..60f9ed21188a 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,3 +1,5 @@
 DIST pyRFC3339-1.0.tar.gz 9325 BLAKE2B 4a02f2b128c34315def13500c2864d3198ba327fe3a39f04e14085d5dd945ffb31487c12d07e63e18c5946a14d8e380be8d85e7bea6b4df39f50550e6121379c SHA512 abcfcfcf516ab60214dc11de618d37415da2177387f51f85da99ef18b8cc0d37ed55f0ea6ba3e61292ce5a319838f322e01c1c9f3c0c4edb8341b4b135e575e3
-EBUILD pyrfc3339-1.0.ebuild 662 BLAKE2B c32b8eb0f4c7cee34fe2d5a33672440946a755cbdcbd84cbd27ddec8af625638762c4900f447ba44f64f30457a63e5b07628ecf2a7d86d6e6c3492ada53b0c7e SHA512 9b21c64deb575d9759a1a1839f474aa43d9d3afdb400823a74748e79c2b3ffa9630e1007207cca80375c58476057572636e3e7d1ecae7b9a86728bc08e5c5169
+DIST pyRFC3339-1.1.tar.gz 5290 BLAKE2B d3094a22b6903937ae5cfee1210f04b65eb05dd606fe1d3245dca8ec0719ca1a079b720568d8c8e87fea691cebe1944098f99913b97a04570f06354a883e5694 SHA512 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f
+EBUILD pyrfc3339-1.0.ebuild 666 BLAKE2B 95a81b02e00ca3ecf9037a883759b692c6ae64e38d968c3eb1056c82faee9cb20120921136b6dfbd282014185074043da4953f70a383e8459eb54aa1f22f5757 SHA512 caf59eb1859fcf66aa0cecd94c2624320bb2fa73738905b62724a015e49950ee5df412396cd761d356da928972c4dfd89e80b14e71c2f2061344f00837bb7941
+EBUILD pyrfc3339-1.1.ebuild 668 BLAKE2B 9ca2e2c2e003256ed34c4e05e4341ae7994bf7eeba7cc5b11ba7151c894ebc7ff2fe425f2f3b3b9c56c405780129fb2404e9ed9c6df9275ba8cadcd01e4c7489 SHA512 f2cd9be771b1bc18e8d713f69a468bc553512d635c5f4668c6904ae3efddfaf497aedadc7ac95bc68b3fb9f03fa3a40656d27f0b80f12cdaad329801aa479fb4
 MISC metadata.xml 373 BLAKE2B c047241275de0ee6411fa663ffe331d1fa4cbccb622680120d5c1b96b4fe07ffdde9b36a67bd2708dfc086e893c14f071b51b3f1b292e63c9a7a054ea841a6b4 SHA512 0f0ef1e95f7cf557a90cbf2493f0f1ba51c29cbe10769dc40b1dd56eb24e91c7ca6579feaa3afc65c9d90724c726f6d1bb4f978d6485018e19f39ecf81782a87
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
index 027f08e901b9..791994860ba3 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 inherit distutils-r1
 MY_PN=pyRFC3339
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
new file mode 100644
index 000000000000..0d30481718a6
--- /dev/null
+++ b/dev-python/pyrfc3339/pyrfc3339-1.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{2_7,3_5,3_6,3_7})
+
+inherit distutils-r1
+MY_PN=pyRFC3339
+
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Generates and parses RFC 3339 timestamps"
+HOMEPAGE="https://github.com/kurtraschke/pyRFC3339"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 3d9b6a601d53..94594a4f35e9 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -3,5 +3,5 @@ DIST pyroute2-0.4.21.tar.gz 577795 BLAKE2B 721f0e7958d50de356a424a5f87ab895e95fb
 DIST pyroute2-0.5.5.tar.gz 702481 BLAKE2B 7d9db1efe0d76e5fbca3f07d0ce666f919001fa26c220bd432c719aa6fc3a4d0148ea6357ed84cd5d0a6e47069994f35d2501365115b9c497674159098c2e5e5 SHA512 c7166e667b6fd21eefd34a01a0bba8467f3ae4d9526af32d5a6e96747c8aac7590da1097f1ca9b12390158e90ddfd6ff9f68c85765abbe179e8761658dda6b86
 EBUILD pyroute2-0.4.12.ebuild 496 BLAKE2B 219ee433271a4366a9ac16bd916de6374b1e0cf1e7d389392f0ec8d86f213083ca17ae6cb25d46ed0913ca37993659e0bef91e0220ab8fe73685f6624b72a84b SHA512 6f06d47e00b1fde471d5e4774515b8df4b448aaa8771d1f19c8658c83c34aadd3bee1ba0b1b1d28ab39201a5382466ae982eddd15ecbb4eb8889beb9cc238fbf
 EBUILD pyroute2-0.4.21.ebuild 496 BLAKE2B 219ee433271a4366a9ac16bd916de6374b1e0cf1e7d389392f0ec8d86f213083ca17ae6cb25d46ed0913ca37993659e0bef91e0220ab8fe73685f6624b72a84b SHA512 6f06d47e00b1fde471d5e4774515b8df4b448aaa8771d1f19c8658c83c34aadd3bee1ba0b1b1d28ab39201a5382466ae982eddd15ecbb4eb8889beb9cc238fbf
-EBUILD pyroute2-0.5.5.ebuild 496 BLAKE2B 9e8f0dc78e109ec42355e113c36e6f49b664eda8c7278b4b4cb70dc136a52cb8dfd42e64881e391104cdec05f51d90ccb89c6fab3d2c09b468c8de60f504b264 SHA512 aea168c7487596434587a31d64dbe2022b50e07f6b43fa2206bbea3f65343c4d88a75da5826959f88516fe14d65007ccee34ea91e8ed9e1f52c9847a78faacc7
+EBUILD pyroute2-0.5.5.ebuild 494 BLAKE2B e388d2448e54b67391fb5992adb5b25724c65a40d822ec8b7a1a3240820dae532a2981ab70c0edf8757111f04721e03485f39e1f2055265553c2fa7f42ef9062 SHA512 2cee28c9689ba0fff89d64f230d19f9b3f742bdd1705049a183c90369acefd9f3ee9cc43599833bda6297e816171eaa36cf519ad8db34e5f07f541707bfffb16
 MISC metadata.xml 613 BLAKE2B 81956270df2ad42126ab220bfbfc35ccd4681abf9779bad96580ce6866bfc08ea1cd2216782a8fbbe76aed58d74de752fea55d0967f24c0d3d3b6bb01f66f18c SHA512 9c88578b74af7890a2ecd8437581eff4dfbb49696d9c3e6fe1bfa807fffad66f949538aaa08d57f56a11ffe95b48c9ceb9d6b97594635b429a8a54bac3db3912
diff --git a/dev-python/pyroute2/pyroute2-0.5.5.ebuild b/dev-python/pyroute2/pyroute2-0.5.5.ebuild
index 6f691d5bd943..a984ba407ed0 100644
--- a/dev-python/pyroute2/pyroute2-0.5.5.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 302c089d7f30..3f3fd0d77298 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -2,5 +2,5 @@ DIST pysaml2-4.6.3.tar.gz 316979 BLAKE2B cf393075903269ce93dd219bd23479949ce8e39
 DIST pysaml2-4.6.5.tar.gz 319131 BLAKE2B d2b78d00cc5e65717bae267fbe88c781d4583996025eb4a9602030215f842a29b625ba41905e867d887e4564bbacdb1251170af46e5f00cc0f9d202c7741418d SHA512 da9cd23f9bef37da1079bba539f91df6a79190fcf8ab20b4c025fd8eae9b147799623dcc1376acfb6ff06c8566a58d478f8da7765195fe058d54007a2ebe79bb
 EBUILD pysaml2-4.6.3-r1.ebuild 1233 BLAKE2B 235bd4ae23a6460c9285b73d0ae154a584a5e84742dd868d7cd40938010c7cacd21493177ffb2448bc0ceb2e5e8f1e2e0ae8389f8f8ce86955cb178123797543 SHA512 e6e5148a5b73a7d62433c4cf1a36aa87bb55300283c62893650858198749693b6e8a39e020d2f2bea5e91825c38e77e5b3e8c89e09b1076e766c9c4846f8f93f
 EBUILD pysaml2-4.6.3.ebuild 827 BLAKE2B 1db32be475a21ba00773fe7a4af8dd551717a126cae519dd04f246520b8720aa94915e3479f4e95770d03e388e9bb3b8aaf9502988cb3f2f27017326e7f94c52 SHA512 f6cdc1d2dc178c9719f07ee04700eb2fb8ac8a3bdd38e512e4e5df389e6ec357ce30eb30d52def456344d67df69921c96b1df9fc7bc16c02ea7aaf081e559607
-EBUILD pysaml2-4.6.5.ebuild 1235 BLAKE2B 73d7d4799f0667f5b4e782d9c21b78c43f6ea14e86e12de01bb4efda087122d1901c3795613ffc972e9cd781f0be46655adbb6c6cfd035388d33742ea3160746 SHA512 f8053b63a66153b0e0f6794d9f38c64d1421a704e1076fbcbc70117f7602d517a1e735671875dcaccdcf814e2e7f300b4294ac1338b87e24f172942d43507797
+EBUILD pysaml2-4.6.5.ebuild 1233 BLAKE2B 74efc184b2c6bd01af8f45f9060fd9b424277ab494998fb17c1e10c04c50bcd50d1904b57599f54c89cb5de11271e106d3ce7aa5ab01a9872174f4b188c705de SHA512 cd66e34a5a5ab729ed1d6652044da758828373007f73d09812d50dd784328bda6e9d756f4b9867e72ed6dced626d833ef68b261cd68e4866e95e59b069582e0d
 MISC metadata.xml 606 BLAKE2B 5262e7d7a6f2ff32547ab8570f3aace4dfc3af9d667fdaac6ba2eba77ffd562524a136154eb7b96d4f1f7dfb316b72ee7a0311efa46153afff150c3956151b32 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348
diff --git a/dev-python/pysaml2/pysaml2-4.6.5.ebuild b/dev-python/pysaml2/pysaml2-4.6.5.ebuild
index e76f1ad55e02..89cbdf99e478 100644
--- a/dev-python/pysaml2/pysaml2-4.6.5.ebuild
+++ b/dev-python/pysaml2/pysaml2-4.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-python/pyshark/Manifest b/dev-python/pyshark/Manifest
index 8b9e1dd78eb1..1617c26eb08e 100644
--- a/dev-python/pyshark/Manifest
+++ b/dev-python/pyshark/Manifest
@@ -1,3 +1,5 @@
 DIST pyshark-0.3.7.2.tar.gz 27232 BLAKE2B b93ee24fb29990b0ab455935e773e4844c26761c2515d1254c8e72d24d70be95aa17a590cc1f5b39bb5f76db624fb7c40d06e64731948ee75a5b8e2008830968 SHA512 dbd97665fae7d3067582bf7616e025b0c5e5fa14cacdaca59c89b4e70feb3017f2d8c7d899a70c0c8707589e4735b9283914bb6ccbf432e9072c64d7e957bc15
-EBUILD pyshark-0.3.7.2.ebuild 1252 BLAKE2B ce89faace2871ae899004f63bf901dda8094ec691527ee9aef3036d798c050804c1801574fce7774cac2394726f5c170f530a77c89256595a7833de940932cf9 SHA512 79a3455bf95a21ad43879980fcf3d428cea059e202208e2d658ab45f5ddea2af780bf35961ace65a5a84399f3db9d0de0954f4887ac021aa7596da5fbf61b5da
+DIST pyshark-0.4.2.3.tar.gz 29363 BLAKE2B 91463f725eb893c3c7f7442eec5e0a8304bb8f2ecbd0ea80582c49bfd8538a5fcdb1d5d1ab2373f8e67684c78c8852af697dadf8ff041d42f8ff18a8954a6248 SHA512 bbef857dad5e5141e0ec7c04dba9faca81b17d67a7151959e9935577428cd1415e173e9c7ededff46f8621bcbbdfbe7a96ca5cfd65d7143fb6f235c0167964b6
+EBUILD pyshark-0.3.7.2-r1.ebuild 1260 BLAKE2B b04a56e9be00e69efc4b9d5f81d3489228c80751d7d76f79740c1dead7e68c248d05ee804694b348b0e6078612d61ede5c7c2668a07fe87ee590a2ac26ffedf8 SHA512 99750ec58a54b8406d71e9cfda2c5cc215720d8459ba59de6b1976439ad2e69808f035fa8a2f3c2a819a86faeaf01fede0f25b284875fdcb0415e232b8f28c89
+EBUILD pyshark-0.4.2.3.ebuild 1254 BLAKE2B af7967d5505ff0868095d3b42a07c6ed98eee807d64f1bb46d4124e7cd60fa633a4b956648340389981cb3d4771ad10e4c7974562b87fc33a891e7efdc7040a6 SHA512 ca662e1ffe01335bd11863de673321076690993096a5497614f319204e316ce40e78c8b97d8f0b8f4552bdf25f8188a437810b0d407fc80c031fa2709cde61ab
 MISC metadata.xml 378 BLAKE2B b5d298f634ff4c3ef0921697ba6ad85d6704effd115e130075507d4ab5e7cfefcd3db393f044f1607dfc6b6442363c58b9ac693281334bc981c3462c0f1a775d SHA512 17d2661a631633ebf347dfc4def34aa070c4ad5713f6124b668c3ed5336a59b639c30474e4b4cb294661648ef186797144c161a390c0d93a21de82ae8d51d8c7
diff --git a/dev-python/pyshark/pyshark-0.3.7.2.ebuild b/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild
index a2ebdaf0d066..761cfea65af2 100644
--- a/dev-python/pyshark/pyshark-0.3.7.2.ebuild
+++ b/dev-python/pyshark/pyshark-0.3.7.2-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/trollius[${PYTHON_USEDEP}]
 	virtual/python-futures[${PYTHON_USEDEP}]
-	net-analyzer/wireshark"
+	net-analyzer/wireshark[tshark]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/pyshark/pyshark-0.4.2.3.ebuild b/dev-python/pyshark/pyshark-0.4.2.3.ebuild
new file mode 100644
index 000000000000..5e6234567d6c
--- /dev/null
+++ b/dev-python/pyshark/pyshark-0.4.2.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A Python wrapper for tshark output parsing"
+HOMEPAGE="https://pypi.org/project/pyshark/ https://github.com/KimiNewt/pyshark"
+# pypi tarball is missing tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/KimiNewt/pyshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# See pyshark.egg-info/requires.txt
+RDEPEND="
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/logbook[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/trollius[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	net-analyzer/wireshark[tshark]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${P}/src"
+
+python_prepare_all() {
+	# Test fails unless portage can execute /usr/bin/dumpcap
+	# https://github.com/KimiNewt/pyshark/issues/197
+	rm "${WORKDIR}/${P}/tests/capture/test_inmem_capture.py" || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${WORKDIR}/${P}/tests" || die
+	py.test -v || die
+}
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 5a3ee92408ff..a7cc6c64d78e 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -3,5 +3,5 @@ DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
 EBUILD pytest-mock-1.10.0.ebuild 1053 BLAKE2B 557904303bf9bd18f56a6dea0e3f9094210f11a5a8d55e9ee751d547812a89160fbded658aa8a9695742821322ec050f13e74eda728c6afa6835083cc31ed31b SHA512 105f9f1a88237c927715276d8720af98a11b52c26adabb2565ac09d9da639cad1aafe2ddc2251b1ca5ee7215d570af71d479de51be72f9a6be3037b71710da75
 EBUILD pytest-mock-1.6.0.ebuild 1082 BLAKE2B 3bbb3cde15139fa3c9134250de2419623161f53a69689b64dfab6f81f73c4c1afa6001c0f8ba119376ebae6881f16c4f9a117609e0d6794aaf30cb4efc4be553 SHA512 c71cfc5c6c35799529fa21e9f0341dc5178bea61a7f6975a779c677dec3dad3e94540236839c5547a5ca179cb0cb16121cc3d0c17f7409c1812ef0312fe3c551
-EBUILD pytest-mock-1.6.3.ebuild 1046 BLAKE2B 61717627632f481cb4d42d560174375ebdbd2993661e624020bcadb730090b82f11779cd812eb3e6fbbda6db92969b926fab0dce0832d32251a24155a6b34bf5 SHA512 af3ed4640698d3e3942234abefb666e67c66d2c9c062ec29382de3c1e16cc1ce2b03b541bfd6366018f074c7c92b9f21b583a028a83fda57b8f95da9439d7be2
+EBUILD pytest-mock-1.6.3.ebuild 1053 BLAKE2B 4525429f621c5d06d9ec07ecfb14b429ac52fa7861168024d0d832449aa184ef04a5c331157cf10befe30c5902299741b2019326d2f197d080a6313388a42901 SHA512 ba49f51d47920280f96a9697c0ec81f14133019fa50b0bb43985a69908d56d6fc6ed7f1c12ff8e4c898de666f1a673216da802834f48420b0af14d77d9631a42
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
index 0a87fdae33d3..2d8b2c2a72d8 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 7b0ae7bfbf7d..72ac6f9fd82f 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..c94eaa19e7eb
--- /dev/null
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-7.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to re-run tests to eliminate flaky failures"
+HOMEPAGE="https://pypi.org/project/pytest-rerunfailures/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pytest-4.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index f636ec59f38c..6f337eeb2d7e 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,10 +1,11 @@
 AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
+AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
-DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
-DIST pytest-4.4.1.tar.gz 931385 BLAKE2B 490b7e931282f35a5d0a83d0e34057bd30e2d2188748e1dad5a09261e27e043e59ae21af24ef39345a1d566f35dd30ef0f877dcb26a927da31a79cc88c52dbe5 SHA512 a4bc18fe7d8db5433d4d52c0ced38d3d0e6a785710bdc772e007fb1f0f516db2267e608845e075ce4d69a5e71a5e741cc6d84b04622e0a04bd2ad3b6576a1473
+DIST pytest-4.4.2.tar.gz 932427 BLAKE2B 89734bc49bbfb40de1e613678682e3c5994e1991abfa6c6aac5e9d67c58db874a91c03c05ab15cb1b70680289b409db6546c3540d33a50791a882be0e2621e2c SHA512 14a5a93fef129f58f37686b39ae1bfa3a32bc81f7ee83b6f754e0d7f18e85c0c7f44f12651dc9b3eb2ff62ab4aca5665b33e1c319051c7d8e3d5e004047150ec
+DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
 EBUILD pytest-3.10.1.ebuild 2442 BLAKE2B 510febc15eb52b5e5c6b66c1849ae23911a88340172027a3c92dabe68de9e49bad4dd10265b9bfaace126b8ef61b9b9dfbe758c264d75c900ab5852dd30a9443 SHA512 ba012c44d8ec1981f36bd95c0ea17570bf64ed28ba51194be772be382adb2b1e239b2556a8549794deda4916ee94dbbe3cddd6aafc13f3d5607f2c8ba59bd5cf
-EBUILD pytest-3.2.2.ebuild 2110 BLAKE2B 4e12a4598401de0cd2cde344d5486a2bf7caf6ac248f7722dcc51c8a44f6a25b922d34b557bb938e93a26fe771318fad6b028feaba10dc38fccc1753a9feed69 SHA512 4d655f4c8e7ed79aa7c8d7820b06e74ee2509edde5ca1248021ee752a91abbe56a07ecb3c18fe1144af64ae3e5168f6210814d08b01825cba767e39627c6c3a4
 EBUILD pytest-3.4.2.ebuild 2521 BLAKE2B 7948419947d7d350f32457db8f35068f8aa1cd468a8009ce9079cb3141c78cf306cb3516dcdab00960d0507179503f45d3fac381acdbf306a8fcbb8edfc62d79 SHA512 a5ab31e0ba04e0ff0aba3c98ad1b961eb061e85092cc9b852569584b82a7d0cc9d3868f30904554abcf72f30515ce599ee9a396cc928abe2d14c9fb94df24f2b
-EBUILD pytest-4.4.1.ebuild 2111 BLAKE2B aa77e846b170a1202a912856025827fd01234be9f3faed1bac155335c9aabb5a912ba29356b3f7fdfccddb6d6b552b3e9297fafd197fb9d811d3fc368cd41f07 SHA512 37e71b9e38096cfa16003806a469cdb8cbe9e5d5031faca375089ae7851e4e7dd8737b50f43fb51313392359c3652b667751a29d4c59524c78b18101f41a2df6
+EBUILD pytest-4.4.2.ebuild 2103 BLAKE2B c24c03dea08c082154dca26b9a5d7027efcfb87a9b027fbd3397f087e3a64dc1676e49b8586572b65fe2ee61643639a3d123d6b6564a113fb6b1bc50a5b97d82 SHA512 1536b43aca2fb115f3f198b87591a191ff289540ca622e645f18e4583ed76e1a2893ac3d58ab4397426b7e21bfb5d140ed5ca4b34fd3797432e6ed53cd42a46f
+EBUILD pytest-4.5.0.ebuild 2047 BLAKE2B 09f24e2cdf05ed5b5be25e6a108f44be4eb6365cf0f0617bfcdab7362059db7aa599022a602b991e63775ab1a829c031e2344e1b3a30138c6e714de226607b7d SHA512 1a15183a7e14c2a0217ddf63180fd07056617cf387e23308ca74dbceb28685ea932dc5d5d091d1358efd9f4141ba3a317f6031503c97c58c299fd706f40e9bed
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch b/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch
new file mode 100644
index 000000000000..ae6be933bca6
--- /dev/null
+++ b/dev-python/pytest/files/pytest-4.5.0-strip-setuptools_scm.patch
@@ -0,0 +1,25 @@
+diff --git a/setup.py b/setup.py
+index 0fb5a58a..302b5dda 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,5 @@
+ from setuptools import setup
++import os
+ 
+ # TODO: if py gets upgrade to >=1.6,
+ #       remove _width_of_current_line in terminal.py
+@@ -18,10 +19,12 @@ INSTALL_REQUIRES = [
+ ]
+ 
+ 
++with open("src/_pytest/_version.py", 'wt') as fp:
++    fp.write('version = "{}"'.format(os.environ['PV']))
++
+ def main():
+     setup(
+-        use_scm_version={"write_to": "src/_pytest/_version.py"},
+-        setup_requires=["setuptools-scm", "setuptools>=40.0"],
++        version=os.environ['PV'],
+         package_dir={"": "src"},
+         # fmt: off
+         extras_require={
diff --git a/dev-python/pytest/pytest-3.2.2.ebuild b/dev-python/pytest/pytest-3.2.2.ebuild
deleted file mode 100644
index 3aead274c8dd..000000000000
--- a/dev-python/pytest/pytest-3.2.2.ebuild
+++ /dev/null
@@ -1,75 +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,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.33"
-COMMON_DEPEND="
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
-		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0"
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX testing || die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_compile_all(){
-	use doc && emake -C doc/en html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-4.4.1.ebuild b/dev-python/pytest/pytest-4.4.2.ebuild
index 1f98542589da..9c6fd6af78f3 100644
--- a/dev-python/pytest/pytest-4.4.1.ebuild
+++ b/dev-python/pytest/pytest-4.4.2.ebuild
@@ -26,10 +26,10 @@ RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
-	>=dev-python/pluggy-0.9[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.11[${PYTHON_USEDEP}]
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 
 # flake & pytest-capturelog cause a number of tests to fail
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
new file mode 100644
index 000000000000..3c2b86bcd9c2
--- /dev/null
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_5 )
+	>=dev-python/pluggy-0.11[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# In v4.1.1, pytest started being picky about its own verbosity options.
+	# running pytest on itself with -vv made 3 tests fail. This is why we don't
+	# have it below.
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index fd15b4adbf51..48f12971de5a 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -3,5 +3,5 @@ DIST python-augeas-0.4.2_pre131218.tar.xz 77636 BLAKE2B 033063d449b4c5ec2daa7a62
 DIST python-augeas-0.5.0.tar.gz 90667 BLAKE2B 5d563350c3f80db45aad87326c445e93e3563ca6eb8de17889cdc91735c61dfcf0fda4e93f15c0d450ee156d57cb71598f32cdce6f6716b0fd610b793f103641 SHA512 d93d9e21c720084ee3c1841a2172dd1a4cfb41e668de0f557bd214efd65e685a1e5fc713a7d34e0fed727fe908bb1e8a09a1c10587bc27f3708cbcdee575cc51
 EBUILD python-augeas-0.4.1.ebuild 513 BLAKE2B 7b0c1f9f0dd86d93582b08514dbbf7aeadd70067b1665e0ce844a46d41e290859ad865b3b6324b21d543afab1a38b08bdf7c091af9d2d01b13bc1b3a93c052a0 SHA512 97e9201ecf56a5a9d4b7683099c11ae81c9a3f85ab9304c97fe27ccc73066feac6978e54ed89c3e1f28f62568606ec3f8d8a90fc8007d2ceb6717413be70d201
 EBUILD python-augeas-0.4.2_pre131218.ebuild 563 BLAKE2B e478f4ec00695b4f19846f54a5ff7159f03d2d614f11edbccdbf27e2b46d773e29b982a46cc280265fcdac8e2ef1804531f16bf03af80cfa3c27bb3e36287066 SHA512 17a7094a51d5c9f9ddd179dd8140e71dd7f917609e93660c45b88712d359e6f4f6bb286adbd6273652a0c8a22853f83dd575cc8bd1ff9abecbd39f0885fd6162
-EBUILD python-augeas-0.5.0.ebuild 506 BLAKE2B 977e9af07b2c948ebb65009d1336c71a88775ea8bde78b17c89511ad9f5d5547ea046cdfb18f85a56d9f840bdb67a0ca4514780e147581de1308057288a2370b SHA512 b32af3520db21e0bfaa36858f8bb539661609ea4ee9d5062b20c0b4d8b7b211feb48b5f5dcf0d93c36c9339b8ea4a0186b327eb99f6e88c584b153805981eb57
+EBUILD python-augeas-0.5.0.ebuild 510 BLAKE2B d7920da321d279ddaa31495a10f789699dbe77723be2af64b5746d04c055f724ba1b438b688320f097aee61203bdf4d676c12576b1d1376d96266b41930a8eaf SHA512 5aa5fd3c7579ad41d033be22eb4a3772b96d5b3c7a16a4b3819208abb6e96042ffc46ad38f6c2169d57f4e70deda57c42da3dfd5e7861581032986ee05ef507b
 MISC metadata.xml 417 BLAKE2B 33e8c4549ea1d67e4007731ada6037aea72697414df3cb17a532c700670a8b47188b29726d41c888d840415b16c72cb1662ea552b73a5c96ec5ee3fc2e4b7009 SHA512 54f17c94e464ce5dde8dfc1135ea90b95ced67eac61f39a2b9e653740463396d2a564753d488e390bcec08b3e4360e92a71ce2ef5c1e1050738e71e61d27d10f
diff --git a/dev-python/python-augeas/python-augeas-0.5.0.ebuild b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
index f738b0b9121b..92a0d062d2c4 100644
--- a/dev-python/python-augeas/python-augeas-0.5.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-0.5.0.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
 
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index 89ec63236144..6e465cb41abd 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -3,5 +3,5 @@ DIST python-barbicanclient-4.6.0.tar.gz 108979 BLAKE2B cf037b7818dc2ff5a04637a35
 DIST python-barbicanclient-4.8.1.tar.gz 118919 BLAKE2B 0c29eb4fb3b77d6ef69051a956db1aae8cb151d07156e4c888259888f1a9a6eac0be9e5339ac9a3dee9dabcb1c06c6e835312b47bec4338b34842e71546e3e75 SHA512 836b54156e72faf7ec590d6f11ccc2ca61258da38368410fb65f448b8a0e0ea272d224f46f5c6f08afc7477197a090be77720e07e3a4cb60ef71982367dbfcdb
 EBUILD python-barbicanclient-4.5.2.ebuild 996 BLAKE2B 38eb8852478a33d4596e497e30974b2285f763d35527e4cbff30b3fdd318df38d98e2f7498574c7ecfd045bad39c2dae296b8700ec1135aaddcf576914c88f10 SHA512 2f536b0bc3507906a61841c07f41a87503e7740893a4192670812cac6fb7380ffb5bbf85fdc14d343db1468d0ccbbd7440a92ad872a8d9038f9a8c68a5098635
 EBUILD python-barbicanclient-4.6.0.ebuild 1003 BLAKE2B 1f651e7fbb8a0cb91317b53606e8db479a0f856b1edf1a483a45baebdc7b664ea9f3c8780c8bcf72f653b96488cdc9af73a571d4f9d4e9dcc865a2c221a550d4 SHA512 dd21b0d4bd8abc17941b01ee70d821b2f7afe3aa32ff44035c7939222eed5b30bd8d972ed669f6b6509ef61acf72a49fde39b38b47b931f591b23e9274e1151f
-EBUILD python-barbicanclient-4.8.1.ebuild 1005 BLAKE2B b2e69beb5095ef03798891298d270ac5829a1bd2467fc4a90cc629eb64c01cab58ae5e18d93746615ff94b1249b2a3917a5888ab4da92233998400f9ee5fd6ba SHA512 ac54092bfe05a22f9e5a93ce96bbb4c8b7491b3351cf490d78ab29b1bea5f48fab504072a32902d103585064d10b724f6fc865fae6872b2caf9130dfbbbca180
+EBUILD python-barbicanclient-4.8.1.ebuild 1003 BLAKE2B 6f841b88741a7ee3a0eeb3da582e9625aa207188c31f1407e6e07806e2dae3d3440fdfd9e39839cb40079def53ff954d597d9960ca1788275453fc452570d776 SHA512 5b1aba612070f14af939a559acc1b829c05b896d9ba26e9f385ed5fb353618235798372ab5ab2a7093acfa736043eee5c41d4757d10b1bff97278d0e929d983d
 MISC metadata.xml 586 BLAKE2B be3884c7ffa487cd45252e4737bbbc3cd460a0e6075b2ed38439d74c66518832c2739e1826cad8184bc794ac0af6441cd900c7e3f88fe8d41361f21796f6f87d SHA512 7e03d93945bf23a92dce98fdcc0fe7f65d4b709ac5105155cffe338e979802c55c9e6e59b876e9f77cc9719c863b0ee18b2dc94e04be1230d1841e525a019cbc
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
index 3f64c02a52c5..326c7fc61e02 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.8.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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-blazarclient/Manifest b/dev-python/python-blazarclient/Manifest
index 6bd9bc8c369a..fce92eda984e 100644
--- a/dev-python/python-blazarclient/Manifest
+++ b/dev-python/python-blazarclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-blazarclient-2.0.0.tar.gz 32078 BLAKE2B a8f7359485889d41c8e6a36f90f6279a366210d29e3080353fe32e6ee6929784c954c86f0e645d4cefe104132b557648ce27a59873a8248c68d02a0c954490c3 SHA512 af57b7a9d914ed216fe53f6e102ade25654fcf9cc0d4a422c912b2129f5905f47272ea959fab38f0ac23678e719c8b5807fa5e852b22f5f7418c72a17d25412a
 DIST python-blazarclient-2.1.0.tar.gz 32950 BLAKE2B cdad6f6e60e95ba97fff6a3d54e642679e2ba203d1aadcadb8190c9fda38dab27808ffbddcfa41852dc72504e9009ec62863991f832d086d70e22bf9652151b5 SHA512 a5d2749969d354ff96b4f223d49f69333a874f167e62663edf4209879b3783d1272dc591157b5a8d1b25206e7c796aa4e0d5966de74aac4429c2ebd9670d1987
 EBUILD python-blazarclient-2.0.0.ebuild 1097 BLAKE2B b952db5e7f825eb086b0f2c1904f72e48eeba5f7077cde1dc5767027f6e871f8d38f3a73f88d4ed370da174437b86e07c2261efac8ac9e89836b3ebdaf4168ff SHA512 a63303deb74aacde96fcae0cdab111a0e6522b89bc7f9e95f1aa2ace0d7e48af1449dc06162d5f377b708a52e6fe5cbe0af3ad9e3cc2179ca34d9bb5b55f0081
-EBUILD python-blazarclient-2.1.0.ebuild 1109 BLAKE2B 03343081fa521a8bc8c5bb6a5c9997eee0cf54944de244edcb307e230e629bc4e64dc1bdb5054461ba5f58dc7b6a5d7bd52176e79072ab6cedf8f8ea1df8f721 SHA512 03631bfc46fae8e8f61fc9bd8bb2c301a38be581563d5c0b8977f388be0e231ff784f7f0fc139146e94d8b218c7b0e3b1a42b943a99e65c104df6355746d8ac9
+EBUILD python-blazarclient-2.1.0.ebuild 1107 BLAKE2B a89fe2fc803b37913faca942a8e5b09bee26ad4177258535c27bcaf379ca4908b46b11bf9f1cf91ad5fe1be8912ca81161f0edc985740b5ca5e50a1f62e74b63 SHA512 27dee9058cba1ec63d8cc3eefc7295883fce3635fa9250d587df0d896c1387fc5b2f6db15f5e79c2584b793cca3a429708de04cca47585b90b3517f2c49c2e4f
 MISC metadata.xml 431 BLAKE2B 360c1bd7ad09d6c8ef45bab793e3b7514de1460df7eb22fe086584940812cecfb4a626ea975de1921234de7a5c151915fb80404c9ac42ba839fd8e87e1d45ea2 SHA512 2bf14d8fa014027952f8767e00ee336955fc1ce0c16979f825f1b3be7e060a2ee4f7becfaf14e885f5f08da896dc8faa15aaab797ebb522f74db7f4768f2875e
diff --git a/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild b/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
index 0b2c42972f47..ca9fcda2b289 100644
--- a/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
+++ b/dev-python/python-blazarclient/python-blazarclient-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index bd4985295f5a..9a46b049b258 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,4 @@
 DIST python-caja-1.22.0.tar.xz 288324 BLAKE2B 11649dc0d201e9bc0063ad8845ccf0ac7b474e87edce1938311723687253c73058f2411170897acf80e4166169ad2675afff171c31808b22269dcdf857954fa1 SHA512 36ac6feec8dbff345d5657d0bc9eceed7a58648c104ce309f20aaff18cedd8822fb8bc0c13662796d15391af72285fa3ae4185043cce9e471f22a2868f37cc2c
+EBUILD python-caja-1.22.0-r1.ebuild 1001 BLAKE2B a0a77984d74af9c1ad0f80c95b98d474c0305ef0dd5a520029ca4e2e5b09685fe0cbe20846a1dae01c0ab5c826ce4b4ab23cb0936b4199e1974c1daa43fde789 SHA512 84fd9fed1a8eea5913a78d586f3f815c00bde5b2bb671fa86a2b443b4993092288af72a82f7af22549a230b44028ab132f67f0be08ebee996b90796c08015629
 EBUILD python-caja-1.22.0.ebuild 999 BLAKE2B 3cc2daeef5a15ba4ff482fa0fa5de50aaf797687bfb49efcdbbc15d46031f085b2c0efb726f2a6e6489fcce2a3547eb76885ef0baad40f223fec72cf0d66b90e SHA512 cc97e381f50de131641571bd7d21deee8ebf6422fc659c5b271fbf3c6ec3723d976cb0c10745fa86d21272bec1f0a7476274add04276d875eb0f8ff63a107514
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.22.0-r1.ebuild b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..2b856fe5ad92
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Python bindings for the Caja file manager"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="doc"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=mate-base/caja-1.17.1[introspection]
+	>=x11-libs/gtk+-3.22:3"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	virtual/pkgconfig:*
+	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
+
+src_install() {
+	mate_src_install
+
+	# Keep the directory for systemwide extensions.
+	keepdir /usr/share/caja-python/extensions/
+
+	# The HTML documentation generation is broken and commented out by upstream.
+	#
+	#if use doc ; then
+	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+	#	doins -r docs/html/*
+	#fi
+}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index e4bedbcbfe4e..5e55d563ddc1 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,9 +1,9 @@
-DIST python-cinderclient-3.1.0.tar.gz 278247 BLAKE2B d5fb6b3f74c70fd58cdc8a2cf2ea7a57935fd3246de035ebfc84d1acb037ff309ff1de2954c373a453f623e78b6c84bfca194f77273420eaa46ee291a2a97c28 SHA512 6d828a96802d9a5118ab3b463ed9c8619530a69a1ca153f0c3d737e26bd692864ad2ba4c79e74a18ebf820222a75b81a9735f63c989817797689d8f399f76394
-DIST python-cinderclient-3.5.0.tar.gz 284317 BLAKE2B c231b2d67071dc01521e271cdae19d0e1bb8af387780b4f855631ae248e156110888eddd63684102d5b5769840d31e622d9db1e24ecdb90ddda06e803c6586fd SHA512 0ee11c19b404c5f335422a5a18d01529330dc8d39b58c5f8b6be28a0e682858f1fea5f21bfcfc2a272a556f1a3a61fa6a0379fadbe79b65a4ad72cccf42a6223
 DIST python-cinderclient-4.0.1.tar.gz 282913 BLAKE2B 22b20bf80950dd501b7ae89350a7c1d5f44b3489f07063160f7d69b0160b3100536dfeae7b609e709ce2eb963865279faf22ef176ffb60f33b4adc6e2d527fdc SHA512 b74f0d83019ede4598490c8bf4b675bbc75c362ce08099c8590e925d419ee2d55c23ce4d4815d6c31a3aeaf6276f4e72f4801bd629b56ac045025a181030d03c
+DIST python-cinderclient-4.0.2.tar.gz 285946 BLAKE2B 979f49275cd5e21eaaf6d3f60a96066d0584c73d7afff7c5eb8f37fc9cb735dfca13b858378e047ad091dfc086ffd7021eef42cb3e4dbdfc3f13a45612c5aa27 SHA512 79ff79ba6bd2990112b1e9d94d01a0e286c7a33b2b9028fef72bcf35dff0f12f43afd644f4574069c88035e232e96fb4dc965c51481ad8d3063b21ad32460cdb
 DIST python-cinderclient-4.1.0.tar.gz 288464 BLAKE2B 492baefef164e74eca662cbde31b77ae751730420782b9926d265548d064cef08e993279482c566f1c810a62f6cda657e59680d511e5633a7c17be8dbc6fe7c1 SHA512 e895e90dd12802c5991bd05c825b712b30bded38a5dd0dc8d845949cc7e76440959a426cb680447496cccdbb0d5aa31f3b982838a91c7b36e8e31bbaa3fb7b7a
-EBUILD python-cinderclient-3.1.0.ebuild 1254 BLAKE2B efdd26d1905e62b4b16dc528a57614bd65d20850e6ac3f70ca06b73f1ecb16fd3e01c8579012d25a4d79ac6d1f6c9217600484b5b5cdf569c9e039729c395ecf SHA512 1cd9e7239cbad9bed8350d7ac39ac5b12b15513982632ad6294f1581ae2b33910b2b171cb07d4a6fb2af5afd9ec7a964a955b52821ba276ceca0fb1d097c483e
-EBUILD python-cinderclient-3.5.0.ebuild 1115 BLAKE2B b1655810819657d180d7cfcddfc41890ae64feaa15fa40e2cc232ccc366a41ffcf0e3406f9e801f2b9ab588e5bb6dc6625bc00f0d2bb778557e6f85762d2647e SHA512 5376c512ddab44f106dd5f4201c8af903314208af7a60ef303b8f252bfd8da989f662684272ffebe6a151618f540412961c78be35db688c5d93c2ee64831bafe
+DIST python-cinderclient-4.2.0.tar.gz 284743 BLAKE2B 2306cbc80cf47086aa0dd545f73adc54cbc6fe162f972f2c5d610f26ecccbd38b0b6f028b8e1a548b63d6dcdd32b26bf3dfdcd8e9e360db0325b024e3bbe7bb0 SHA512 d61a10719fbcffd6562c9b7802ac26e317878f52f5db8a704ef57c8ed9b883eaa3a961c2f29df5746befb82b1a29714fa75082df2deebc305115e103e49eee91
 EBUILD python-cinderclient-4.0.1.ebuild 1115 BLAKE2B 19e434724a43efafcc12ab2128cce90957af6542ddec67bbf89dad921663b79b01c13f6963b8681a58c8f35dd52e97c8e2fa50011cda659899b170705ad76915 SHA512 65fd77668db7ca68188492f9f522c48f27703f0f77c114a32ae5a8e0acd6f6d3b75794f9b6a6208f21e39e58b87c411115729ea51979971efa640a8e81541069
-EBUILD python-cinderclient-4.1.0.ebuild 1119 BLAKE2B 09eff65811760148a77bd871ab289e8d37bffa8d0e975f280463619d25ac9a4ad9f1b9ba804f0b6be4beb2ecb90c5c9362c64439f6431ac460789c6d3bdfcd2d SHA512 4a8c307edac5c09623c4db0f6e32c980a8120ca1221f4a5ae035a1d45bf25482b74a3895c46a4cbbfa61693a804935a0ceb584947dee3c82b5392a2d31cfcec3
+EBUILD python-cinderclient-4.0.2.ebuild 1117 BLAKE2B 8cf1ad3bc5985c1e600a227c5c6b63e98303f01ad4349743557442d19cbee1c474cfa807123c9aa70afbf7645352ec2c230cc2c7f280ab731fcf0faec194eed2 SHA512 4f7ec3bc3deebaa4a2c64263ef29991f0181bcc917b29967a7e3834abaa24db4009cc1f9899750e05b90dc18aa4f91fd0dd2b3b20e683d45cd3573bfe7a486b9
+EBUILD python-cinderclient-4.1.0.ebuild 1117 BLAKE2B 94787b748dacc36053a90285b42b3a7f3b2c09f7f71d931eb8015dd99db406bf025a9d29141096cdaa8929eba55fafb724989ba948a83ae5fd243948952a67a3 SHA512 edce03675cbf2266dc7ea7136d5951a469b1c0ecfe651fef4b8eba7df96203abe190fa2399fb5c9ef07505e87e14b6591c69ab0f6f00bbf81d962b333496cc60
+EBUILD python-cinderclient-4.2.0.ebuild 1119 BLAKE2B 09eff65811760148a77bd871ab289e8d37bffa8d0e975f280463619d25ac9a4ad9f1b9ba804f0b6be4beb2ecb90c5c9362c64439f6431ac460789c6d3bdfcd2d SHA512 4a8c307edac5c09623c4db0f6e32c980a8120ca1221f4a5ae035a1d45bf25482b74a3895c46a4cbbfa61693a804935a0ceb584947dee3c82b5392a2d31cfcec3
 MISC metadata.xml 625 BLAKE2B a9011769fe7ab23b5b00cdfe6e209e92186abffd4a32e6b21e2741ea8b58848b3aee384d301c3bfeeaaea3632becc5db22afcd8d6b149d17db34198a89e86ca6 SHA512 397ec06d3fb289940f654600dd452f5450ab6a87b4584f5486196a5467b7b5b9251c241c28b92a17b92da9d0a094b1a4d4ec303fe8eb3087c50a560f423bf92a
diff --git a/dev-python/python-cinderclient/python-cinderclient-3.5.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.0.2.ebuild
index 7e43dabec74c..277842cadd8c 100644
--- a/dev-python/python-cinderclient/python-cinderclient-3.5.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-4.0.2.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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -23,7 +23,7 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cinderclient/python-cinderclient-4.1.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.1.0.ebuild
index c89d38330451..0dee45615822 100644
--- a/dev-python/python-cinderclient/python-cinderclient-4.1.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cinderclient/python-cinderclient-3.1.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.2.0.ebuild
index dcce29a0a003..c89d38330451 100644
--- a/dev-python/python-cinderclient/python-cinderclient-3.1.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-4.2.0.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 )
+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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -23,16 +23,13 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${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/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]"
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	sed -i '/^hacking/d' test-requirements.txt || die
diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
index a2459982f6ce..790f64104f95 100644
--- a/dev-python/python-designateclient/Manifest
+++ b/dev-python/python-designateclient/Manifest
@@ -1,7 +1,7 @@
 DIST python-designateclient-2.11.0.tar.gz 85761 BLAKE2B 7baaa417e0610fc59c2b5b3c86d69e5ddfd02fd23b94f19f0473bc55e545514a47923e48f6a831954f964f43a735668191de8e8a775e314eeb5e935718e47f31 SHA512 ba01da49100a7ddddb9394291babdbabbd1813db3fe3cb2ebd5e2be251795c7aaa8e5ea15e455ec4322a5a0481e6670bf59add49e91bf6799c748711c54e1975
 DIST python-designateclient-2.7.0.tar.gz 82808 BLAKE2B bda8ff688267ad682c0e7025f5e801f99ca7e40b8bce2a49789b18014e22e040036816638feb4cd96ce2d2ddb34613f5812a94f5158390169d2fb0934042ce45 SHA512 521399ea4b5da617a3fbb7e291215f4a17d7f0f54f11708d5d3467b43376123abba90586d61a740876770017c6d77a14ef2152ce50cd1816e931d04189ce6b23
 DIST python-designateclient-2.9.0.tar.gz 82386 BLAKE2B e36b3f66ba37b5024170c8621e293d3f1a9c50ec7ce76b9d5411e0a51b8c850fb0d104a6ee82c3f6c0dba962c05892650cae03d675e241cf17f0894eff8b2247 SHA512 04460395cf1b76d8628001e185e9301cc4964e06a61576268beffe5fbc42196e1c4015d0f273357fb93fb7b5079975e356eb25fb144cd4c1d355e704a1948e9c
-EBUILD python-designateclient-2.11.0.ebuild 1115 BLAKE2B 484177ade9006b5293f87eef10cfb4007e04147db33f3f7f2d3e419a7a4fadebb98633010707c6f664e438facee0899922a08c1ccc264353722704dbb97edab2 SHA512 152f54d8efb47a7300c6e0c3dcba4c759466d4828e9a327f19b75389e7e923ab09bef17e4749a0122ae86f18f4151463526b7dc208ffb0d3ab4f9342fff0cb1d
+EBUILD python-designateclient-2.11.0.ebuild 1113 BLAKE2B 39066744d8574f809b2d40d33d0bf6ab8f39a8d7c3b6f084d08513f4c076198dcc95e013201be192cf12b256ef2d7f8031e85ab96ec83c96520c27c270b2c548 SHA512 f79986a0f12ef1f3549311b248ee928ba1fecd324e90e8987dac0f6cfed5f1c27f41eb4587ed83d986e7fcbbe73c58032f6c7f51c1710e54a88165d23334e7bb
 EBUILD python-designateclient-2.7.0.ebuild 1112 BLAKE2B 9148318cec5723cbc259483cfc0effce541e6d4b322c236229e2a7a24341db2cc36f1de3f3068b64791e9697151c7a662129623b8f6b38fdf4ccd2e9f4160dbd SHA512 ab439bbae985781299001aa002929ba6099052378dadce5d5e2e01a3d131bd9b5446e14c83c11a56197acc6b3707fa3ec65091a2cf4f2aec42a069b0ee71cdc3
 EBUILD python-designateclient-2.9.0.ebuild 1111 BLAKE2B 9210d92a699c936f20f22b83fd8b6f891e83290da3f1601bb69d392ec4e587b990eb76849c372fd3304b154e27c1749207fc0191cedafff2cfe9208ac321e636 SHA512 b5dd1a20d44a2e0e4c32464657fee9ad8fe1cc6b0720a819999c2e02c312f9b6e2418cc6cadaf88a1944b1130ab3d499830a4834117faa80daae46f79681aa3e
 MISC metadata.xml 620 BLAKE2B 5fa33f0a7ce50185042950605d92a30c786ecfbcf0cd6ce4b948623dbf9aa18192d832f9931715d898802f644b814b11940a44d8a18a9f659453ea1304f27ddb SHA512 b42ad7a3863003103bfb4660e9b2ecd02a4ea927337c0ddcb6c3cf0f04562f86f09174218baec94df52f082b0f2b4c8fcf94a130c4cb08ea6f7cb70972b4ba9e
diff --git a/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild
index adce1c0f8a12..434497dddd33 100644
--- a/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild
+++ b/dev-python/python-designateclient/python-designateclient-2.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index ac1f315efadf..ab3573d5a9a1 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,5 +1,5 @@
-DIST python-efl-1.20.0.tar.xz 8984492 BLAKE2B 526c530d7b8dad59d01cefcbb6cad2710cb46c3b62eb0b2746c3552c8c1ef42cc4691072fbbce16a8a3b6ea9d6b5651a3645ca739e569a0f4db3dd9988ddf2fa SHA512 93d8d6c990350074e203bf3632d92b5253f34f318b30357b05ab5ab73a9f6656d127ff0c1831af1bf7c736822b483c12754085e52103eb0e41362cc28db5651f
 DIST python-efl-1.21.0.tar.xz 9544352 BLAKE2B b49fc0e0d795a0334f647f414673fdaf3b086eda35f9e2d0e9e6a03d2cde572e6076eeb62c4f977b770a72e8f14d4ae536f46d0510b8753088d80e2dfc98e43f SHA512 23a8487b660e9885a1d43a4835c560edd8d27eeb9aa44f9e1878ac1d1acf9833fc62c14036fe0fe5e0bd1144cb993b0b67bcf42c78db8505ca1b8aad0715350f
-EBUILD python-efl-1.20.0-r1.ebuild 1760 BLAKE2B d1d38ca7c7977791af467948a18b4fa915c13f2b53398d6d53564fb02cec2fde69262bd7f83b010c735c5e703ffef6577903fc9ba29712d75d51d3f1b38aca30 SHA512 7338fca85fff64ef3973231e9866c6baed83ea043c18cced13e45b7c012853df732d4bd592e70f599539eeb9c1f4a2f4f4f03933386f54988c7ce9523f4de2ff
+DIST python-efl-1.22.0.tar.xz 9523624 BLAKE2B b1b7573da8546f580dcd06be03e4746f2e991245c7bbc3477090c5a9365225bca663454a202f8e05ec6c73cbfb7496ee5f92bc2a9997900e6709b01017740db6 SHA512 27e29af764166e803ce6a833c8249a91226a4315dd658631cec57513befccdc9407b04b452054ceab3f77b429d899095b49dbada2e0fd1a63ff6059ef200e497
 EBUILD python-efl-1.21.0.ebuild 1741 BLAKE2B 6b272eac619e1d4a012beb36be641d999e49567646823db3acf62862574f186820f18a4d478595da955cb86b8eac0d5d51d53bdcdeface6609cac797b9457bc3 SHA512 5f4689c9ee6e4dfacc67e0e91c1e38b47692e786f73f8a0f53c2800fda98a60956a447a333500def9662aaf66c762f92bc24945565d04319d31e360065856c52
+EBUILD python-efl-1.22.0.ebuild 1638 BLAKE2B 55f150e9de16b83d09867ee015f24db08f78e967efe177d4756df7b1069e4b5a892da0f3ffe1c0becf21671605dde3dffa767ca908451787eef61bd50f709249 SHA512 0f6214cfd4a15256c8dc1632fe30569f63bafa0294f9028603b16f2f1a776800cd6d51f7a0ec8f9eeb08231fe5d45a8082fdf63553b70dde2b9a1a202a7af908
 MISC metadata.xml 678 BLAKE2B f63779daf5a74d59f8dc65002ae8ec55585ae58c2bb02d951fd1ced15fd68fbb4ffa18239b8ef48347ff18e5cf033faa4a141f8e4fd8898bed6d74a9fd18d065 SHA512 a618f3bf8c4eed0e00b889f2c1bc85d46dc5ef1118f393f4cf10857d0b1a75720c6a719ed97117e40420600059e34eff0be3771fa684b89d437459f012fb7c5c
diff --git a/dev-python/python-efl/python-efl-1.20.0-r1.ebuild b/dev-python/python-efl/python-efl-1.22.0.ebuild
index 327f7e124583..1f160f168884 100644
--- a/dev-python/python-efl/python-efl-1.20.0-r1.ebuild
+++ b/dev-python/python-efl/python-efl-1.22.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5..7} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
@@ -12,60 +13,55 @@ SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND="
-	=dev-libs/efl-1.20*
-	>=dev-python/dbus-python-0.83[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+RESTRICT="!test? ( test )"
+
+RDEPEND="=dev-libs/efl-1.22*
+	dev-python/dbus-python[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
-		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		media-gfx/graphviz
-	)
-"
-
-python_compile_all() {
-	if use doc ; then
-		# Point sphinx to right location with built sources
-		sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py || die
-
-		esetup.py build_doc --build-dir "${S}"/build/doc/
-	fi
-
-	distutils-r1_python_compile
-}
+	)"
 
-python_test() {
-	cd "${S}"/tests || die
+src_prepare() {
+	default
 
 	# Tries to download a file under /tmp
-	rm -f ecore/test_09_file_download.py || die
+	rm tests/ecore/test_09_file_download.py || die
 
 	# Tries to use that file which failed to download
-	rm -f ecore/test_10_file_monitor.py || die
+	rm tests/ecore/test_10_file_monitor.py || die
 
-	# Seems to need connman up and running during the test, requires:
-	# net-misc/connman
-	# dev-libs/efl[connman]
-	rm -f ecore/test_11_con.py || die
+	# Needs an active internet connection
+	rm tests/ecore/test_11_con.py || die
 
 	# Test fails because of deleted files above
-	sed -i 's/>= 13/>= 10/g' ecore/test_08_exe.py || die
+	sed -i 's/>= 13/>= 10/g' tests/ecore/test_08_exe.py || die
 
-	sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
-	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+	# Make tests verbose
+	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
 }
 
-python_install_all() {
+python_compile_all() {
 	if use doc ; then
-		local HTML_DOCS=( build/doc/html/. )
+		esetup.py build_doc --build-dir "${S}"/build/doc/
 	fi
 
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd tests/ || die
+	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ./build/doc/html/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 148282798508..f58a57546b86 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-glanceclient-2.13.1.tar.gz 187298 BLAKE2B e2fa34ea7840404e183fbb77592f656b296d54942581b2e1dda71285f791cf7f7d5b3b6ef2da28deb4e314f1d35395548e923f548854b7ad3ef4aa50ad000d62 SHA512 deb8454aea8b2c231604663fac2f6515e3cd6e86dc1cf3cd2174ba2e35f9d605bf162f5a089d80f52da11f97c540f5c160b96864b85d7535463ec170cba81689
 DIST python-glanceclient-2.16.0.tar.gz 189395 BLAKE2B 9de8b162c1eb5bfb44700f41cbdcd4f8a983d8c7bd7b281df09db67df6a0de5dee905330f03c967be9e1c3b2aaa379e4c8594f7f4cdbb34870a1e87cb7ccaf1f SHA512 b853f529752247873d9f319d4ec6f4cabc89ee4c26a0c1013e7609fc38e3c9f68d774b3682166e8155e21572a0a011eb6859a84c253ca9f7a9b8b1ccf79b5322
 EBUILD python-glanceclient-2.13.1.ebuild 2482 BLAKE2B 4e81e78d4e40a6d9e7913b5215dd721cf05554f57978ebad3f5b061d8d08e1e129f47b2934473885dbb51a07530adaaaee2591290cda6ea4fd4cd3e6846a6495 SHA512 6d07c1d89f6178098a67a8c9a62df65971ab6dd69c6cdecc3ca20e7212794b7b62f83de3fdcb1559fb5c5a0722525b1b8dbb4f708cabd178896b275cf5a87b25
-EBUILD python-glanceclient-2.16.0.ebuild 2486 BLAKE2B ebb0b0900de23049d07a92f46033bc6e0cd7db6bafe0fff0bc3a1a7ae47182eb2ec50fb2cd6d7d73ae7537f907986390e32a42c4f9b22830fbadfda33e8c6765 SHA512 934d43b4e5ebaf498dfa9a02ae9155e0251b24a269cd826d6b1de89ef1000ca8b479d8a55f81f7b0b2254d15779560c4b87f6948669812ce4fe1744cb28e8f7c
+EBUILD python-glanceclient-2.16.0.ebuild 2484 BLAKE2B daf69c0c3cfb54f9e617fabd05b1d73e090cd8cf04633914dfa894db18374b0cc3b60c6a684bc5c41d3f4f19f5bfb7e60468461e8383f3bdf9fdf7a397a3ca3c SHA512 43dc80839af621283b9c782f1948ff1e8244900496bead7cc6249bdfac63efd3dab8ac9446ae746805d79149e94c6f71513cc17111d9585bf587a6987f0a13c1
 MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild
index 9795334878a9..ac7282a691dd 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 162c32f5eeaa..ab091d942314 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,7 +1,5 @@
-DIST python-heatclient-1.11.1.tar.gz 166963 BLAKE2B 340c9f1ed054815176af8da9b3035d8e260730fdd389317190281314af7b3df60214dc780036b098a15485bf2cd5b02010eacaf474746a73d7d7ee94972c14da SHA512 f4ffc4706a2630753c11423270ef18a344603ec6b1d5afc550fb8f3cfeca1bf4fbd0c32670318eded6b81a810fcdff68faf9039c6290c6a106bf8618502efe78
 DIST python-heatclient-1.16.2.tar.gz 173543 BLAKE2B f5b4016166bba804a2704b2cc3203438e7ebdae429f85b74e89ccc6d1b2db2de32d4acc6622138b211f5d8657876001b83977d55d56f0cd5906df99eb92a429e SHA512 eb566e5c0270a0cdb8994194a757102febf88869a61bec65e345fd62f8ae9c0b3609bf27f758d37088d69d2227cbbe086960123feebfae7f543ba2bac2133b0e
 DIST python-heatclient-1.17.0.tar.gz 172475 BLAKE2B 79dbaa2b6f3bc5e97ac4f2630e3e5ef5a320b7b37b1abdfee5ce66df6c63c9d488770135ffdaff53d3e88f93becd8f26019c4c1967624693c9c0ce1479055181 SHA512 44a16f32ede251c36546a0dcab2ca2ca0e145ce924f257c623cc375e52a851094639529a77d770d2703e28f9446e27e03424240fdc0272096e91703180dd6190
-EBUILD python-heatclient-1.11.1.ebuild 2657 BLAKE2B 2dc8abf00bfac5ee586524cf3a7b1d7cd19409a2a92189aab3a70128e82c55b9963b5b98446b26a12fa55de905861f1d1c31dd659c8c8d466564e5b330e0913d SHA512 06b857508bfc1e91adaf571b75fbc0e5f16739213fa57d2abc6fdd8284049c7f49603a2d852d74b2f566f3938f6590d7ad98f94cec5425b2cdc0eed162101cea
-EBUILD python-heatclient-1.16.2.ebuild 2801 BLAKE2B 116f7848f864841e133997315889d5c5fb9e1d9c051bfa3c0b300cc8410b9e9a2f6e5d9cbd9c98fb83d8f277159171aafa78ef005de1eb3a5da7f6a2e9a44a2c SHA512 2469802f214bbb268e9e1953fb7976ffb2caa0d15b4b5ad512e73245f8ae7a2b0164a2929d8e1bace5fdcb05326e7cd7ac0095f1404aafed448c6a7d890d214b
-EBUILD python-heatclient-1.17.0.ebuild 2805 BLAKE2B 319f029d52a5ded081b931d5a6089bae7346143e0021d1eccd3436e25dafb7497df6a601a1a4d35e0ec6c5bab3c3e399de47a1d6d587863d2d1792e8a8bcc17c SHA512 2d58e6c91d2330984391ebde85e18d905094de5ce5a8cfb7f339eabe8d1c839ecbad691a327b98f407069c25980a2bf9323f57633209c8513e08972457447cb7
+EBUILD python-heatclient-1.16.2.ebuild 2802 BLAKE2B 0fe904c2801751648f7b316c4ed931ff6064a037967c2acf4734ad22d196c3d95670b166a259856f38c06aa0901d75184aa0292072b1f27ccb217b666c575394 SHA512 824884f57d3c39e4d0d02354d94d7acd6e04f3b0a0afbb6018733620a79bff70343969c944892e3a9938da21b12ec936373048c4883895408eb02d5cd4bc8106
+EBUILD python-heatclient-1.17.0.ebuild 2804 BLAKE2B 21a6372fad7dbfd8d5b1ab61cbfbbecd717a59a7058c18174e74e382d0e95301a9a3f5ab00c750a985b242a4aad73d4ea72760714bd38cbd622c2b19082cdf3b SHA512 90f2fd19bd4c520b85abeed38873fc443ed2b841e1abb7447c20336ce4766d3ccbfa1eadc5ce3abf52527abc415fb86ea90c9640f3ca7c75e8f6a86522f9315e
 MISC metadata.xml 582 BLAKE2B 51e093bfad4008e3d662b8eb5d3714815f7ced2ce68867b2b4dddceff4cad927a60b84706dbb14a36609720e96259a744460a3cd82a068810e1de6173bcf7dc1 SHA512 b0af42a00c8e7e226f912a056edf53b3fdaf356457fd76edd34cb243d45e7f6427fac8bebd39e1aad57c0d16da8e222b3c6414fa9c5b85728294032afdf5804c
diff --git a/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild b/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
deleted file mode 100644
index a419ba4a264b..000000000000
--- a/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
+++ /dev/null
@@ -1,86 +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="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		!~dev-python/mox3-0.19.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.11.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}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${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/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^tempest/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init
-	testr run || die "testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild b/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild
index 705ad7bab074..275a9a5320de 100644
--- a/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-1.16.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/python-heatclient/python-heatclient-1.17.0.ebuild b/dev-python/python-heatclient/python-heatclient-1.17.0.ebuild
index 35a1a592d823..4166ec545aff 100644
--- a/dev-python/python-heatclient/python-heatclient-1.17.0.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-1.17.0.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 862b9ebdce21..ac1bd1d45a4e 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,5 +1,7 @@
 DIST python-ironicclient-1.17.0.tar.gz 206742 BLAKE2B 8fb92acb02e146916dfebd677ac1c179e78b0c16af80fe59361de6def1435d58466a1b9aef9798a05e0ed2ddc30e860e7da7579c2e6a336ff5f220d41b93b51e SHA512 3a1594d499dbfb508a87e87459308cdeb3eac9987116c8a7a250c5751fc1d4785056033e521ec5d99514a2b6c84362e7576dfec9c4941970422cf2757262c651
 DIST python-ironicclient-2.2.1.tar.gz 220436 BLAKE2B b36a5d0b2c297f52a121aa96007ce03556199d7d6139198e39114f2931fd7004bdf76fc5eca369247975bb9eb6d853a2fb4be133976de0ddfeb5767ead6c3c1a SHA512 1827dba991c59cea8a43dd11d0f8f0f1dd6ae41a7f1f28d9d200bac61ae9a4901ac280107fa91a95ebf24072634eadee2e0140f5e1cf5962496f34997815aa04
-EBUILD python-ironicclient-1.17.0.ebuild 2773 BLAKE2B 9f3196eb384c40d3daa0b688cee0fa5dd029ef1687c62c92c2b074945542065e63228c8d080c8af57f7028cd07a741b058cc5c0df026dafd7ee4bc17896c9c7c SHA512 fe344e2bf8cb91c36c927849ee7000fc0fbb2770cb3f38ccbf88de6eef4d5286d62f9317fa8100c9e84aa91c76f812c694cc83789b4652dbca4b956e0862c760
-EBUILD python-ironicclient-2.2.1.ebuild 2580 BLAKE2B 3f928832748140adbc0bbf14cf9fe4d3a803f03a7124862e8b53e475f5adb95213fb81db9b22d6956a3b43508dd8b1c0a969213b65f2fd5e6222e58213ffc577 SHA512 43cd5699ab9a2e3817c6746f5eb2b209e12b83f92ba2ace2d395c8f21fe0e00b69b56d8fb90ff3fd2ec66aa7f934a67611d6404956d877d53b56c4e10e297193
+DIST python-ironicclient-2.7.1.tar.gz 246190 BLAKE2B c31a439d9175a1915e34988e6e22fe2f05c722925928e30316a3f87023e393a8ee98ca1dbcca19760c009b28c7815478648259865316fac493e1c674cf70fce5 SHA512 654fa4f20b258094d4b05c34f059fa06f12638a210283b6821f6be5acf54bd15a03c73960a7a94d14635a1361370976d86e6b233bd1868c89d9aa82fc1fe7a8f
+EBUILD python-ironicclient-1.17.0.ebuild 2774 BLAKE2B 4d0240a4ab59e5d5fde2b742fa248e42b957c362ba5d7cf5df227ca5a7b5d9e619b4393e0639d590956bd9b65a65cb96ae8e78a9e0ee09d8e5c0f9ffa0b6758d SHA512 0dd1f3272a03b0439e358d2754006e9e28acd768d24c7a17da60616b8017a891bc735f2483861ecd703fcb8da813f436a452c9cb89f7ddecdbe199d097ad7848
+EBUILD python-ironicclient-2.2.1.ebuild 2581 BLAKE2B dea76f384d32da7eff18471a10559785636a99976fe8a733ce3cd2fc3ee97359200173fec199956a5518873939c833f5bcd4a7856902bf92665f52b7a8562b1c SHA512 c61ab7e9d98a0d2b2b314146cd549ef85c9d1e05b2d2d4f23f677d9fff52b8c7d77e977a4c8dd198090c0ba59152d060ecac98318c7a8fb4b3f2944cc4648da9
+EBUILD python-ironicclient-2.7.1.ebuild 2387 BLAKE2B c05eaeea4b9f56297be738adc77a25812f39ab83c95f70be5810888ccd9255365f8b41686ab3d0f74156519bbfa0048e9afb45e1fd77110790c22578a5bb3eea SHA512 ccf2fca5de70a59cb877c35e61fbff550c9cd641f5fc20c33f88b9945cb7f8966e8a12e4a649d0a196140cee2977ae10c55091ae6cadc1b193606492be1bda66
 MISC metadata.xml 462 BLAKE2B cda46aaa523a8b818fb5e2dd53bc4db023da327cace7f21db32939249266f7cda27e09718d41701fdd03a2e9ab7c131c147d379525c8036ea2564b799fb90b4e SHA512 8e3b7de241be41bf1af0431ba75d275c5295f197b1c80174d52bc1f38c413300c9a267eedd7034f01200ddced7ddd0143942ebb4a496665ca1105551fb411453
diff --git a/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild
index c90d4089d854..a4871c43ffd0 100644
--- a/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-1.17.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild
index adb7e024a0a8..1765b56df128 100644
--- a/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-2.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/python-ironicclient/python-ironicclient-2.7.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-2.7.1.ebuild
new file mode 100644
index 000000000000..580c14e0457a
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-2.7.1.ebuild
@@ -0,0 +1,74 @@
+# 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="Python bindings for the Ironic API"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+CRDEPEND="
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+		!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^tempest/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index f31309c59054..78bf00133db4 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,7 +1,7 @@
 DIST python-keystoneclient-3.15.0.tar.gz 306850 BLAKE2B 5101f0854d3c9cc2ac2165e66df4fe28f9da64d6a96de2e4c1eb9bac26228d7a987f8149fc32a99a3015f43982f0d664555bc1361ca22c86ab68c2d36776605f SHA512 f02d6efe1563a92c5ae1a374568a7b47e281f3df026168eb8cc8e0b31e5029af6534341738b07423713705df845c63708a8f0f845e9a929c107a3f13dd5f9578
 DIST python-keystoneclient-3.17.0.tar.gz 308264 BLAKE2B f9c10a97c9b5e4e12d58a010274306af4923792909dd8646e9073299ecc284ef40902231f63e20ffc41e413f2a2c465b1fa949f0bc2d8772fca92718d9ef5853 SHA512 20b40a85498738c77070fd795a044693b55fe52aa2b50966112ba8d452fec7fe6a257d9f40aa4404401e7c4206f15230d7fdf65a14269922e281b910ea548284
 DIST python-keystoneclient-3.19.0.tar.gz 314873 BLAKE2B 32c445a4095dd1071820a7cd0a130d23ebbb38b1f3ffbf350b55ccf8645d8e87f11591f60d22668c1b0451834b8d793e99e2ad6c333974f3727e3d0145506248 SHA512 c55b17851cb39eda5fb9a86e0c1f4f6269afeb5af4a703c072444df073f520d0546b43f28356d2f401810b75728915c0f6beb6e36f141780b7b80c0c45cb60f0
-EBUILD python-keystoneclient-3.15.0.ebuild 1220 BLAKE2B ba96aa00da4990fb05a34012d4edd2f8297db7a2e3dfd83efa0af2b3af74eccd4d3474eb26163709cc90745dfdfab13b761df48a6ac5bbc751d06f7c29d00e98 SHA512 87c3fc63e43942160329d00d93f6a47c9e592064051ec2534fb2dc051ea2dc564360b54091f9d4fbdee1daac4ab1e88c792e0ca8c9bb2ecd5036c033e7256c95
-EBUILD python-keystoneclient-3.17.0.ebuild 1220 BLAKE2B 9c97337baba1aff530431af1647d56da44ea2143bce2fabfa6d6d4a2894ac8e9363c91c3290dba34e18d9064f38cf4e57dd3a27b1bdb4d849b1ffb2da4ebf423 SHA512 2fa5adfc9233d1cc854b89779f16de385bda14aea9205f9a1c747d2a5f463bd246744dd1a5193a5c5e373dcfa7d8500bb5fda95eb0c31443c3df8d40578a4a7d
-EBUILD python-keystoneclient-3.19.0.ebuild 1224 BLAKE2B 3ea8aed45507524c30c2835a07c720a6902f4832ef3c79611c1d7b0aa9a06b68c2ffeaaaa19c63f8e2cc8be6645cc494f4ec03f3633333c1f4cfad4af0cc1297 SHA512 22629e592f0eb2afe4b5334cefe12180883a05c08a93644686a1a0b5b5d4e82254dd61172213b8afbcf292997cb663e466c77261e4659e5ee228938e364a4238
+EBUILD python-keystoneclient-3.15.0.ebuild 1221 BLAKE2B 87efdbee088afab007a68c2a3972fdbd471c8246802b49175394707b86ac338b56ea176ecc09b73261588c26dd115919798de368756c0e4e19d84ad6a3beffce SHA512 0962b73835a45fed0c02d45175d940cc188a9bdbe55f07089b76ef9ac147ed86df4f4fd0dd4111234e8e456e047059a442f0599f74aca57866141255898cbeaa
+EBUILD python-keystoneclient-3.17.0.ebuild 1221 BLAKE2B 65d3be04d90470e5e6e2f77b97e006c60ff61b1373ee3b412f762d1f41d5336b3a1f85efd25145de226b0c6465f945991b931f12f781a6dbc695413291f27c83 SHA512 ad70a58b6f0ae7a8f0dfccb3909f7c8114fba85cf37613016e943c9212071798e609d68c07be2d121d3d7358a386883d16c83496a9f6dc476b69cd91a1f5b521
+EBUILD python-keystoneclient-3.19.0.ebuild 1223 BLAKE2B ed8ec6a8348fbc05ad732739986f69d19e6d97b8bdab17eca90bd523d5bd022aa1304c1df6eaf9b04fbd6b9edff42da4f0663513a33319779fbed9583a972a4b SHA512 22bde83ebb76fbe41ccd5c6a77da52944421cd69b95bf84b08817c343e05137871580d4487f544f112283b3f344ab7673c3e79384b3859e38ffadeea450c6241
 MISC metadata.xml 557 BLAKE2B 83a915231d68ba03af636bfafe7a052f567bacf3d746e37093855c78ee1a2bcb11e919924f9aa4a721df0da9b22463ba732de9f9f105cc1ced03bc19ea1fe980 SHA512 5ec4344a761069fd31f8d86351548d0316c421e9a6795b604ece495883587cd8f579f535076cf43eba2114a4cf62eba77a6f96f49bca3a51acbcee6e3d24a718
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
index fe92af8ab21a..05e5bcbe7912 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.17.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.17.0.ebuild
index 37580b9fff90..fcbd969d6a54 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.17.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.17.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.19.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.19.0.ebuild
index f9d2535f537d..cd8b0a506f7f 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.19.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.19.0.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
+HOMEPAGE="https://www.openstack.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="test"
 
diff --git a/dev-python/python-magnumclient/Manifest b/dev-python/python-magnumclient/Manifest
index 48e9a439024d..5cfe306dea69 100644
--- a/dev-python/python-magnumclient/Manifest
+++ b/dev-python/python-magnumclient/Manifest
@@ -1,7 +1,7 @@
 DIST python-magnumclient-2.12.0.tar.gz 106073 BLAKE2B aec03c74429b1934ea46aa8109f4f779aa06281136eab2ad422c851ca347f6703faec9feadb7bc49423b4e335cfedb3ebecaddaba7c9cdb32e8a8ca0de9118ca SHA512 a6d8790b87801ca313bb119e75490cb2913a11558925b6a49e276a7bfed102cf8e575f344fce8e31223f835c4961c50c2918844689ef88ef34c72c8a1032f340
 DIST python-magnumclient-2.3.1.tar.gz 74501 BLAKE2B 8262d8c172018f1174c7462554f901e12249ee825d067913fa269e6fffc265c5a2a885065aa6a6b44ee1940d00b3308bd2502a8290bdd056bd50457e573be472 SHA512 17af04eeb22d386bd43d7d8e49a418b7b577847fd7ee5751880ac8706fd44993c5af43bd347e0a431013fcbd6ff220e4f38818f95ae0456f7f6cb6ce8de606e3
 DIST python-magnumclient-2.9.0.tar.gz 101660 BLAKE2B 528b9cc02832a91edab1b9f5f983637544688e35d5e01880294b8348bf3ea9889a23c4ffbe0a8fef8f57efdc0dcb226b427140da8191bd57441fae76c99d021f SHA512 2c320d20e7914081e93fa19b23c483b2454fcaec19868976e4b7f489e997f0550f1d7dabb4d58fbf7ff6f23c0c2e0962ac968ecb3a356dd995e4fbafd12520f4
-EBUILD python-magnumclient-2.12.0.ebuild 1572 BLAKE2B 7c91f06a21253feeaa1acd1e95896e48d4d1d477fbea49fdd00b44781652b2396830d981b745403a0e3b023b0ff5ddee34d28267ee5cfba9d3d3594028248e7b SHA512 5fd8793b2fb4469779a86527064ea1bdb81f975e0fa9074a57d903dab3bada3572677eecdc6024622f0083669bd4e8061c075d294a548bdb5ba4c18b55ffd085
+EBUILD python-magnumclient-2.12.0.ebuild 1570 BLAKE2B 01b915e12cd04c791574e1d7eeb873c17556266c1731035917f9774956de964fd1185864987a9c55570ffed0858ab6728a205144dcc12dd74de2c364cf97862f SHA512 e094ea0f1c6845d33850fdbb1c3cb9b32945b842c363352a7249944dd37208a5b05a68005f9c6096c3a711c0ca1ecedecb93da279fec8aa422918bea8df2cadf
 EBUILD python-magnumclient-2.3.1.ebuild 1652 BLAKE2B cf91e0a8207b8b81aa7263e99662463e95634bef9860ad50de680d1caaf90de699fa1559d2e56fb77be84dbf7f69cd406091369f65379577e492b575ea79343a SHA512 21e1668a948125143f04134c28762b49f2d5e0f0995267e4abc64faae233e156b0d8a95fe4f9c67375325e27dda7c8d33295df38b3460fc24c86b2731e1bad7e
 EBUILD python-magnumclient-2.9.0.ebuild 1619 BLAKE2B 98b258aa97935751baf8454edc25259a1f155712a99fea524c959520fff2bb3ea4924637b139dfe3f1cb02b1062dae046463c2792a790e28414e06af087f7997 SHA512 8af699f775271bffde17d892b740b3d537cb9eba2b5429dbac61ceb512b84e9d8c00a77132ba0e40a0a6383a7917e1d9f8d8a3fa9b323a6e492e8819d2292650
 MISC metadata.xml 610 BLAKE2B 532ff58caf9789485db0e81caef4e9bfe6332e0194b15cc9058084810604a75622e405eb4199d90ff9b9f326a51fce96757772ab722dc683b65648168e6f3090 SHA512 598aef60abc1d45b3c6dd00f3db16a6effc1dd826e98d349348b422c9a4f1926f79531e9f3ccf106f934d59fef499bb0e5a1b3571d702e66a8d78dcbb90e3e0a
diff --git a/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild b/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
index e9cbe993a2ea..f608e96a8d47 100644
--- a/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
+++ b/dev-python/python-magnumclient/python-magnumclient-2.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-manilaclient/Manifest b/dev-python/python-manilaclient/Manifest
index 9a8d37d76d46..d2a6caeb4177 100644
--- a/dev-python/python-manilaclient/Manifest
+++ b/dev-python/python-manilaclient/Manifest
@@ -3,5 +3,5 @@ DIST python-manilaclient-1.21.0.tar.gz 208720 BLAKE2B 62249b9d3ba22e77d59e060e37
 DIST python-manilaclient-1.27.0.tar.gz 214632 BLAKE2B 5a0b6433712ae34f52b72838a771a6e81c7c28ff0b049f208bdf9b5fd311025ebe90e850b071def454f76245f19a28b27fea5dda59473f445e9882917eae90d9 SHA512 0dd621c8ff22abdf81177887fc8bc7b9792d637eabc092de06d5059ed3fcea0218961643a1e5256fd130e5d1753be143b474342d9daf5c8e5e39c305527ad811
 EBUILD python-manilaclient-1.14.0.ebuild 1326 BLAKE2B 2ef68454bf58e1832f00088aba530d0e0d3ca711fd1fb13206d1cd679e05639cca54697b52e88fd6311f4e42b36c0f1a44c7729615af7f31add7169f41fbbe2d SHA512 bf4b5ceaab690f7b58c625400a86da7708f5d4a07e759ceb9a7924914db43f83b2a7c65c4edc1581ccc5f36af72c2bd1b1becf90900dfbbb082a3b021380aa3d
 EBUILD python-manilaclient-1.21.0.ebuild 1429 BLAKE2B 60639ed6ffd98934b8dcfded412148ba03d9d75a63e2dab61227ec5fefbd4e58d8c6faa4e6cfc95b05cabefe365fe51369ea2ebbed1ae22f3e580bcf4ac5b035 SHA512 da897884ea46d4ca009a45d578c2508e0027912cee6dd6640d0af2289c52205e2eb910f4f6c6b1067bce74c1ed5bb6c68e06fc8bc78f0faed54689b11b7d0c24
-EBUILD python-manilaclient-1.27.0.ebuild 1479 BLAKE2B 2a535620e09e1c17772e712435ac1aaf665a2eb083bd7e0865da05c3401c1f79e40632ff8df9624b00ad6902d8bd933b307bdec87705eaf8a95a0ef1a18f71ed SHA512 02451c578236b7c01766225f2ff5ad4576fc794f35d21da25d963567eda17f0e96c90f8c84a9a85372b938500100a424ffa1e4d3a8311b7c547918d5c1bba122
+EBUILD python-manilaclient-1.27.0.ebuild 1477 BLAKE2B 6f178522c8ffdae9754e7f0179dc1d448874b997fe3decb0db7c0b53f28bae660273d39965eef501fd96ed4980966ec79d88d6d833011ccf8870add628cd6b1f SHA512 4e990aa90585e76f581edf21bb8b683a241cfedd07553de0005a7e33dddff1798eebcb7dca5b5d87287e8ccd6f207b8ecf66aae5d73472a94bc1ffd1a4d5f32e
 MISC metadata.xml 610 BLAKE2B 9ff81f126608795602d31173afdff53356b7dd97c211523dce93af86ab9dc0d57c84117401a72fbfc2c2fcc6467d0e1a0adceb7c1616c6c0cc9294945fd987f8 SHA512 917b1ad570615b9d3a509c55e7ab70d88f47cdc7efbc9cf0f141be5ef5316141d0327050b61f8a64a87836a409b08ae410886a8634a8df137cd032bf1c205208
diff --git a/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild b/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild
index 67263cf25243..143c8fd3a8a7 100644
--- a/dev-python/python-manilaclient/python-manilaclient-1.27.0.ebuild
+++ b/dev-python/python-manilaclient/python-manilaclient-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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 6b854085ccd6..24df5244f427 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -3,5 +3,5 @@ DIST python-memcached-1.58.tar.gz 30562 BLAKE2B 928aeca2b0d6d99fb16ee8c8c970ccc4
 DIST python-memcached-1.59.tar.gz 22210 BLAKE2B 50387821d50cf974ada738346e016eb736043078721bf905782f41df1f27574244d03b6b94ac9e5ccab7aeecfa8ca4c5a78cec2c41d15fda8756c7cb3bce9aa1 SHA512 a25cbb9efb3babe85e1523bdabfe4644b93b3a6a7268787a3928f724f833ce0eea7d2ef676d1b7f894cdfe293129975b35cb46ec553c92810dbc18013bfabece
 EBUILD python-memcached-1.53-r1.ebuild 1213 BLAKE2B 76827f4837a5d0bd58e84262a58dfebc297de4272f37d5d322df3ca36018d9f273c73fccf4a2ab94a5d0b3597b5526ddd6d83818af29fe55b4695222e07a3218 SHA512 e104823d6aad4fc854203d8efa60934efd5eb944d8a172503e6cd9931a9fe9200388a6439eb2f55bd8a4f20057200b6b047341ebec1f59190b23ae3b8c580554
 EBUILD python-memcached-1.58.ebuild 1282 BLAKE2B 15d4930661b61ef1559a1e2e81e555ba304b7111184f3fb93d2d993258538c5ed7367619a28d60a67adfc826f00ef8882406b49ee75c967473d00fc75ef4b21c SHA512 e842f1d78e6e07c89831aac3ee1c1e1c913ecf4aaafb0bac54ddc8e3045cc92e1cd4b81f9413f47f836c5dfc30a8802c0fabbfae42d8c6516df285c6831561dc
-EBUILD python-memcached-1.59.ebuild 1286 BLAKE2B 6396c2a131802b553eebe4dd413234f6ff5d515f5958a655d842d94faa10e9197c80eb81a6785db55a6eceac3e2b056924bef22d3c10a65cdbe9f7cad2a9d497 SHA512 1e78f42292b989093d906548edc0ba4957329558d457dd90b0ff84373a6df1ead608cf39fa50d9f9bc24f2267e891a41cfc134a6ebfc924b6e5c0a8d1f9cfc4e
+EBUILD python-memcached-1.59.ebuild 1283 BLAKE2B ad71ce3e12591bf1ce00251f6ae0d28c276fd0e50e7238b0f29a402164c619c70ba71b238b3f6ce6b339ca62605d426f01da98b10c6bbecd4fd170c117575a6d SHA512 94b3b63e7d3552d886ebfbcd2ccd7d46152fb3853d92d4201faaa0fab66279e5630759ba6d15c1be5ce1c92708946d60a96c0af90b129cd790c43177c98c5d64
 MISC metadata.xml 611 BLAKE2B fa7a75bea6b08f6ab65ff4b5d4d8e3022912ba8cb86c6dd3fd2d8f5bb224f89ae9db977c2197a39e6541193ed41366c4bdaa404138a18b2d31afc412b967cacc SHA512 9070f42bf5f3fb721f41309c7a24f29168f1179f9327f1334dcd5bd7b38ae98bbc682c2f0cfb7874c8e20e92ce25bffdc5d3f21870316c6d35cd57e1049f8d90
diff --git a/dev-python/python-memcached/python-memcached-1.59.ebuild b/dev-python/python-memcached/python-memcached-1.59.ebuild
index 72fc868d05af..6d41a1745de5 100644
--- a/dev-python/python-memcached/python-memcached-1.59.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.59.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OSL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/python-mistralclient/Manifest b/dev-python/python-mistralclient/Manifest
index 7b8d1caf33ff..20937d5b1f2a 100644
--- a/dev-python/python-mistralclient/Manifest
+++ b/dev-python/python-mistralclient/Manifest
@@ -1,7 +1,9 @@
 DIST python-mistralclient-3.0.2.tar.gz 78255 BLAKE2B 58d9fda6ac9b87493008ebc809ae128b2e71443af854b7719928134f9802b0da7877eab79ad96b60e47f222815b4c4476ff93f43af557e79dc88c2f714e0eb3a SHA512 3f2bcdf7723e3acba9c34947fb26c2ad3814b89ee43a26d3779f4ac7ae0845c4129c98d1a5b6deca2e2dcf77aec128639af4e8e650863cc19b7c03864bae7ab4
 DIST python-mistralclient-3.1.4.tar.gz 77670 BLAKE2B 37184cf32606affb1e08381c1a6f4d47a68d0dfc3abf4276110c7c667b12f8dc57f859f47561ff3368ccf36e684d63570dc1a82325f62a0d8e8e59366c7ba9e0 SHA512 dc9d79e79bf0f1829b218db43deb715ab000eb2dcf6d8cebfec912acac3b111d4dee9101aae7868d631a87fabe6014048709585e6817071c73ee95a8cd7f6baa
 DIST python-mistralclient-3.8.0.tar.gz 95855 BLAKE2B 2432ad1fd80a6e4803af512a96c51381ee20652a01a3dac07b3894717c8f599760907b36dd71ed172b853be021b63971d264588d27efbff208924fd4d4871a13 SHA512 02a4ef4cfada8f2733456082c5fbe8ce055bed4b9b768093851b57df3d115323416a6087803e1a0307245f8b107d2c08348e0d027b2dc813632c1002dd947b14
+DIST python-mistralclient-3.8.1.tar.gz 95616 BLAKE2B bc7185522b24e30321c5f57b6bc31cf239873343bce66e901e8928aedbc3caef36102a8ee67e01f6b46f77cc0d708006ac69ec4147a22b72e52e01441e39eec4 SHA512 ccde34b3ac6e12137d57dbfce597a8f9c43824a8b2450af15ab065fe03469edf0787a2b91c8e5e1da78de5d9d4d20213701e992d4c41e61c459fd987461d5298
 EBUILD python-mistralclient-3.0.2.ebuild 1163 BLAKE2B 30a532f84ca821a416b50d2013fc1c601bb8655a8c7eeacfe1fc683c2968f31d7ec4741326a38534c63993573be9d38ad1ad8664595a86c49c371cca30890259 SHA512 c5bdc38a7673457c7d3dcb1b7c39cc3e64bd96892973c42bff584032e6d4d734f8201c4ce83c4c54c74a57ba8b1ac0a0ee0d78ecf181a24fc2605ccd5b2b5a6c
 EBUILD python-mistralclient-3.1.4.ebuild 1194 BLAKE2B 3cbb8f45b70f52cda1890687b016476d8761e774ea1609d866469ce6c23cc0aa3860bd8dcc8cfb8745d9c0f4c2c9bea218cefce84e288433f3b73af0786ea9f9 SHA512 2e7f9e479fee5097e59f99328bd181e23d2fd528e12324cc3e337a74a4e2231a7950b4a70792627d60c6aa4c46c6f0f3bdddca78c6eb77f2636ae5935e810002
-EBUILD python-mistralclient-3.8.0.ebuild 1302 BLAKE2B ae2083aee8aa6661a832cc6371b6ce965226d724fdfc3160a4fdeaf3c13de191ce8ebc32b696150e5b2a0d21d8908969a50d57890761fc02b8f46cd459a9bee4 SHA512 622fd589f181c137c8d7308d48f2ac0624d520fa3feda2fddcb624331d30a1873172d440ef79966523e1ce8f424187db6904e33e8d2f01dc7d282d27b3a8ab76
+EBUILD python-mistralclient-3.8.0.ebuild 1300 BLAKE2B 3e202b5f90b0133af55d6879d3132e13e6118d067b0d03ef110422a37160fa9d214f0733ff582262bf33dba8395601e7234b68707bc8d752289b4fd640931b29 SHA512 527e374452029ba22034602b826e22eefa705ef9209c38f66f51ee798206e87ed1b4fa54a09d3a6412ff9ad37a4225e84aa49b5a4efb21270b4c9be5515a73d8
+EBUILD python-mistralclient-3.8.1.ebuild 1302 BLAKE2B ae2083aee8aa6661a832cc6371b6ce965226d724fdfc3160a4fdeaf3c13de191ce8ebc32b696150e5b2a0d21d8908969a50d57890761fc02b8f46cd459a9bee4 SHA512 622fd589f181c137c8d7308d48f2ac0624d520fa3feda2fddcb624331d30a1873172d440ef79966523e1ce8f424187db6904e33e8d2f01dc7d282d27b3a8ab76
 MISC metadata.xml 635 BLAKE2B 7d074b84873590ac98f48bfde93536bca796bf1544ee050a900f0e6dcaf9fc4f48e47dae31201e530cefe1cf58343d4bd13a07c0cb4314b05636c732e2ae47c1 SHA512 f3e92e2bb38afdbfc7605c5244d6f60b0c72843617197e7bdb08031d69ca283b544b88af340ce75382bf2135150f9314eaffbf1b0e45c16a9434e15c89131622
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.8.0.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.8.0.ebuild
index 4ebcb5970c1c..bf184dbd7052 100644
--- a/dev-python/python-mistralclient/python-mistralclient-3.8.0.ebuild
+++ b/dev-python/python-mistralclient/python-mistralclient-3.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild
new file mode 100644
index 000000000000..4ebcb5970c1c
--- /dev/null
+++ b/dev-python/python-mistralclient/python-mistralclient-3.8.1.ebuild
@@ -0,0 +1,41 @@
+# 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 Mistral API"
+HOMEPAGE="https://github.com/openstack/python-mistralclient"
+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"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-monascaclient/Manifest b/dev-python/python-monascaclient/Manifest
index 9d102989429c..27322e409963 100644
--- a/dev-python/python-monascaclient/Manifest
+++ b/dev-python/python-monascaclient/Manifest
@@ -1,9 +1,11 @@
 DIST python-monascaclient-1.12.1.tar.gz 45871 BLAKE2B f90c6b9f5bdf9812b27d77de2080bb01ccf4f0ffc9ecb0d9d2cc5cfea8f51921789199bb376fdf86d8169ff616602d4ab8b680e227fd1e1574d164fd666765f7 SHA512 36966125bc1efac226323320fb6e7cf90fba6a540c2fa3817bba0d70b78bbbd4627a4dc9d46206c7ca94baf4822ad6b38796e7caf44cf75e742029d80f83a88a
 DIST python-monascaclient-1.14.0.tar.gz 45815 BLAKE2B c333b376b2ed87299886249a971b500166310cb397fd519a2ed2481aea775dd84d7c82345380c477e70c0fcf977d9d30522850d6e5189d4430c97beedf1110a3 SHA512 9b2c47ca01580048477ded52b28c15ea6a8bb0442e9f86943c9efe52c14ddb62ba7307bc5cdf3ef24a0e198caa9029ab88c91e1c750ef55d4b29dfd02b4718da
+DIST python-monascaclient-1.15.0.tar.gz 46868 BLAKE2B fe78e21e0324f6a4b95d8583c43a9bf166896b3e610ad884d278208cd3e5597038c7a04b96f5e3ad6913e2a23c13dbcb4937bed05982a12c154cccae6698adda SHA512 d9378d01d78742e26abfc82ffcb13d64451ce10e6d3182a03893f21bcc76e9b961c3daaed6d9635b6bc709e5782f44e20485b53468bb2d825d64b18c6b9bca50
 DIST python-monascaclient-1.5.1.tar.gz 62677 BLAKE2B 5edc6003cb5e234e6e8a54009232aee002bb52f4d48eb589e167e1309b4dbf30827e4100b1e7a75df97495d1b0083a1d8c033c0b068d88b6d0df0f7232cf408e SHA512 d6513b5d49fcf09a9f7b6c56ac8ef2dd27b5d18148a0ee20d58a62c3b1d332df3f154d559ddadcf972291a2e30bb204d4bc26b28b69a0ae568ab8e8b7ce81a1e
 DIST python-monascaclient-1.7.0.tar.gz 50363 BLAKE2B 831d908588ec4635b037ca968d92bcd2578f141448cbc35d62b44baa59e2dfcaa452dd66a824d0104a07b2090bb24933c4e0bfddb0022b0a4125067607ce7d4b SHA512 b4cdcd227aa02463be9bcd095c957cd0ab834724a2551fae40b2924a8cabd1dc879c2e1a89c989834a3523055a2f2faeaffe8e4f8b0d50b37dbf9441efbd8942
 EBUILD python-monascaclient-1.12.1.ebuild 1245 BLAKE2B c6ed75ac0479114dc39e73356e6dddc287b4fe9c635eb3cb85b626f4d77ed092f343af580422fe5d7d6bc11b8c8053b0c7c539f1b5bd83470d18c5dfdc5f354f SHA512 d32f696eb48597b1853cc492251d80c93e4b975ec955ff03f3488b6c56b28156abaacfcd100094ea16fda6dcada72e5fbcc1b226a39e2f6c9a91eeca9e40978d
-EBUILD python-monascaclient-1.14.0.ebuild 1249 BLAKE2B d41a697bba124d737b5f9a1d3178e2f50806f734450596e7b7abd97ee52d7c87c8334363088a23923de8020c39a0496115abdfe7591dd491adfecc4571c3765e SHA512 af02aea2d407b7b4579393bffe79dff38a47d072d215720b73819e301d86d71494e7f255792a31ce5dc3fa327130c7e4f056808f72455625ce9b1d733b54088b
+EBUILD python-monascaclient-1.14.0.ebuild 1247 BLAKE2B 80da652704da6a6663fd8300a2e64db30cd588b0e72131e9301e62c81971a6b9bbf73e3f66cb8df6a7a3597c9eb4d75e6bbfe8aa538bc33ab08b7432ec83886e SHA512 fbf38ed20795ac5ee172a4ee4c27ec2e7dc5e22cf74e61fc696eeadd19c4d68f4ffc3ddd4bb9d70f2a66dd4f81fe40293a440713dc072998ff77ddbccca4f70e
+EBUILD python-monascaclient-1.15.0.ebuild 1249 BLAKE2B d41a697bba124d737b5f9a1d3178e2f50806f734450596e7b7abd97ee52d7c87c8334363088a23923de8020c39a0496115abdfe7591dd491adfecc4571c3765e SHA512 af02aea2d407b7b4579393bffe79dff38a47d072d215720b73819e301d86d71494e7f255792a31ce5dc3fa327130c7e4f056808f72455625ce9b1d733b54088b
 EBUILD python-monascaclient-1.5.1.ebuild 1581 BLAKE2B 2cc3fd1d1a9965b4937c778568e9d4869e23da08ff02800bb659f1ce6c9f8fa91bc1d63e8d97f9622437ed2ab335ab41ff364879bfcdf4b2a2f37d88b5db62c4 SHA512 2acbde18e5afe53af8a558b53c939e575eb4d16ee0ac41903dc5073f299613d03964f9d888e4bcc95e6a70e465d31ad5a0a26f3f98dfc279fe89fa7a454a5e24
 EBUILD python-monascaclient-1.7.0.ebuild 1244 BLAKE2B 06406039ef101bace899cd59ef5ec877150264630497e56fb602b5fb26ade92870abae824108d9ceba58dbee332b7ca30e85e0a82e8277cb435ea5ba62545005 SHA512 5bc9af36f1c028f02f138c0f174d7a3ba6e39821a8e1340617d75d6d829fdc5ec25003ede7c892bd03ea051d07083c76fbb20724563a9da1db850c554672d9d1
 MISC metadata.xml 635 BLAKE2B cd2cedd1168ce9005dc1a4da260be2501333a5d93a5b82914d729a4a6033aa100a99b83c54695e1e28297883cc8ace8eeba9946c04733a273c79f80cd210afa9 SHA512 48ee0716888ea7082498f9e62a76c9b422bb4595b24ef612f771e93ad634ead94a25eeb77a1dcc89c49bc1fdf529d2e40a3083e273e4155f231c5be6e176fbda
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.14.0.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.14.0.ebuild
index a899302fd277..d403de6e09e1 100644
--- a/dev-python/python-monascaclient/python-monascaclient-1.14.0.ebuild
+++ b/dev-python/python-monascaclient/python-monascaclient-1.14.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
diff --git a/dev-python/python-monascaclient/python-monascaclient-1.15.0.ebuild b/dev-python/python-monascaclient/python-monascaclient-1.15.0.ebuild
new file mode 100644
index 000000000000..a899302fd277
--- /dev/null
+++ b/dev-python/python-monascaclient/python-monascaclient-1.15.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Monasca API"
+HOMEPAGE="https://github.com/openstack/python-monascaclient"
+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"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/osc-lib-1.8.0[${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/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 2a23417811d6..86642ddc94fd 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,7 +1,9 @@
 DIST python-nbxmpp-0.5.6.tar.gz 1330311 BLAKE2B 8db09bf02c3bb6a82092a419066b2af9900c494b6bc840097f3055dd9bd1fcc80520a7b4d2f7fb84b762499d677648fe952828995bada128089d538aff1db460 SHA512 1ae90dc6d7117e8fae837975dbc4b84a848caef451c8ef99fb106148a12e29429255d0595c0eee26cb185d01e42a84ddb7636f41d4ee259fedf26cf0d956a43c
 DIST python-nbxmpp-0.6.1.tar.gz 1331188 BLAKE2B d8ddad6897c6b98f20a3abfad66f3968b6fa318e2516ecba0b888c199a293770eb26222117821f145fddf4ee0ffd95968b767c0d0445fef2f0513a43aefac752 SHA512 399608b7be39e802d3302004b97f67120ba80aa870331553399f3d35d161ea01f04f690b65b9d6e82e30472701d981a539c89e608b741ae96d54ce6be11f03f2
+DIST python-nbxmpp-0.6.10.tar.bz2 1063786 BLAKE2B 6d7295a5e6f926cbca709e0774ae8c141e20293c723f3a431a52bacc64639e7cee5820b4e070fae35397a5e5d8c76089d5d1966bf53cef8f0da462134321df6e SHA512 0982a6035ee30edfe9f7d5cc11dcc870ad1dddca851fffc2c26088cd28083f56f5c57df49dcd28b5e6967f02aef03e0ad2f7b2036a908748c66e5e7510e6c7ed
 DIST python-nbxmpp-0.6.6.tar.gz 1332465 BLAKE2B b6e28842c8cd42b3e259c62cedc917c8e142d916bc4d2f711e0e804c69b08a0d362cd3951b40373d1be18e3bdfa29f7c7f56ee10e0bf543214cb4d73db508e24 SHA512 729ec2c5d170cb5784e0a7a0097276e0cfcf98671af6c1304bc8c890cbd81349d91ccbe68af88e9f3b95803e33371cf2bf7fbc3891d7d6106ccc06bb9036e2fe
 EBUILD python-nbxmpp-0.5.6.ebuild 532 BLAKE2B c8d5d16b06e0d3292e0e00271648c8237b7f7408dd9b59cbfe2e25de35184231d9e86597ce014f0769cc82ce36a33def8251cf115fca5279a1c33b5357001f0e SHA512 1baa9ae815ff95987d6c8ceff2490fde9b3ff4d7b13278b793e33106c348ee12c96e5bfbfaa5761d203067753e7a3366d0645a309eef9cd79e3ea084e855dac0
 EBUILD python-nbxmpp-0.6.1.ebuild 537 BLAKE2B 39aa9f26acd7f3cc9dcc12bda6fe88ce0e3070ba3a90cc4fc60616fc0419a020b48c15b57f75b7ca0c40821088ad7b8e0f8164ac804074fdfe0bc68ec5fa92d0 SHA512 386813550c503ad540abea81523388cca2a5b612a05c5f9f8bac9e967d2078a0446a6190796ab2922d1ed3595b7c779a734c159220fe474f9e90874cdc86834c
+EBUILD python-nbxmpp-0.6.10.ebuild 555 BLAKE2B f64d7dfea524b58fa881974181c8ac827507d3bd5034938cc2e2317a939c795c47992a72fd5b88993c3a0bf64295629453180e657a00e425946ee851e96f0929 SHA512 9a6bce8f71b49d5d6932dc35a6c0ad62710ce410444a10716dae08a40edb4b9227dd6023b876ecc7faca39657fdf895ce7f3a875c5b075e34311dc1b8eb00e84
 EBUILD python-nbxmpp-0.6.6.ebuild 535 BLAKE2B 2388c9f8e24b20f9b635e43e6850795953284aa20bea002bb364704ff556ddb873f25314482a0303581028c4e655f6466e66f8d92ab2286d5eaf7a868adb02b7 SHA512 2f07fb5c6b87979e97b456e580b92190adac58b389677399cad4da445bc6deab22655a92c3055293cfdbfc9fd88bd52b21f7fd771b4074a11252daf09db8dc37
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
new file mode 100644
index 000000000000..b11c8aeba04f
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
@@ -0,0 +1,17 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python-nbxmpp-nbxmpp-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 965f642dd856..8eef1b3bbba6 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,9 +1,5 @@
 DIST python-neutronclient-6.12.0.tar.gz 290025 BLAKE2B f863826a531708fda1b9ddb43f8bfd8f66fbba99ce3fe4afc1135d20fe4718dc7f11789c3e75cf52089690ce0286bf5339c9253d1e7e35916befb52ed905448a SHA512 c7e69e263b37aa14b59b08ecc12f13210e1bd6f10cde10d8b4d5b8b9f912d604e23ff41eed684baf09bb6dc278393a55ca87d6e41e0986235cd3366d321dd85f
-DIST python-neutronclient-6.5.0.tar.gz 255893 BLAKE2B f7e6f6225e476c200b82bb4ca224b500078bd8357377a7d5d8a331531647ddce9df4bbc42e9d9cebee689d031bd47216c8fc9bce0ad2b3228890b8cbfd8979f8 SHA512 77d4f86f2bc066026c903c9c694dfe2de747dc7caec268853a3d2ae8e27a47b39695b33bd81b182334717fbab7817873ae468b928e85622204c348e5b18e0930
-DIST python-neutronclient-6.7.0.tar.gz 286482 BLAKE2B db64746641ce58cff379ea131f05c37e962cbb64323d4e76436f4b0b9169a954396b13530894e0c09c439072d7d040286f0face1e12ae537b417e7e14ddc600d SHA512 4201ce10173c91ade8b4699d54136e583da1cdd74ac340cad9f419c56d71e0cdcdb78a70795e69a8c5e13d2feba240315b976f32fd96f6561b696425f3c69885
 DIST python-neutronclient-6.9.0.tar.gz 284879 BLAKE2B 720d26489dae7e50617ec83c266ac1197dc1934a3b8f5e8a0e285227421cf8814d96d57ab30710b63eb92406663aafb29fe8d8d7efa1e1d2e74c116eaac5902c SHA512 89f5a2004c7888f11a1a17f4287ddf6942e083fc3871be4a8590a5bb86ec557584165a75cb6470ea3f19526eea882b0174746b20800211d11d10fea1210df74f
-EBUILD python-neutronclient-6.12.0.ebuild 3444 BLAKE2B 115dded061e2f98297e0b8792bb8a20e2d32b33f5767a09f188d78e1f943aa46a62a7edfb5d295fa6af22bc08d70bb9c72898fdb10d2bea58f3047a643fb21ac SHA512 25cac80ac92b1ea202fdf12c835b41aaafc887d14c094450a41b6cb52af4c7ff7dac0397b608956e977c7635324e3e6e4141e0661290689a3d137c5a06449581
-EBUILD python-neutronclient-6.5.0.ebuild 3507 BLAKE2B 8108c8b421182bd12500de959cd673871c997929a3078f09fdb1363c70a854488504286d8322a71351be3b31d83db2888713f97891b52e6079bd690d707f97ad SHA512 55afcd347f6c2367ea8f3d56b8478f0e33172228d80109af08059cf7955536d9b110d7bfb76d4fb35d0c60197e01b0eb83edfe0f1f8b9507d1aebc33b683ae80
-EBUILD python-neutronclient-6.7.0.ebuild 3355 BLAKE2B 35fc16d26b73bd10ad33afb8cb03c6b467229c186aec8560782782f2cd667058a31b404047649403387a888a55418364c08455f3fcc6381147693913eec6aa9a SHA512 d95127f775a06639b63fe2bfff19d132b608e14176a20756143e89cad236454eba2cc250b5e68da39f0c8bbb040a7e35843bbe925d3601811d31f80b735b0818
+EBUILD python-neutronclient-6.12.0.ebuild 3442 BLAKE2B c0e334e92f9e4d259289754344a65314842c83245c0da751b328585de6f255225005bc060cfa7e410233c8b7655698d5f47852ecfe4c87d9c6f2d247bf07e6d5 SHA512 50992930534a8e55aad486c9a3d4161ba020e0c418a047c23ad11e138c9c240eab5a8360d70339b031d8fa591684a019ac86f61be72b45d8383c07f7daa7b76b
 EBUILD python-neutronclient-6.9.0.ebuild 3403 BLAKE2B 3b5926e2f084ccf9d89ffe40ff8d065c9e5a6c61f318faeeaaf2d92b09422bea1a8d9d3b49fb3c1c9b0811904429524c0c8cfe3634e6469e09667cef79f13e7b SHA512 38a9637444651dc0938efaca1c00bd1aee201fa1bcf376da9d81a7be99563bb22adb39d56acd0876bc50d39a1c63cbdf93390866c2750408482a73614ac255af
 MISC metadata.xml 619 BLAKE2B 441c1d5a2f0b4d0cd6469cf8626e6895fd4dc36dae8db594a2f2364abcd1ea77c9f51f0c85b2deec8ae51a8464eddb00f71c57d2d11558523720caa8fb317dd3 SHA512 d99562185b29417c559143d8fe8102a062dfda0cd7c07f9f01d1c5f11a75eac521e98c9048a23ce74ed34e198ed06bbe2a40990651caf7f9ecfa98975a8fb91f
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
index 47a9ef198b2c..dc0ed5640e9b 100644
--- a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.5.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.5.0.ebuild
deleted file mode 100644
index 02bb3151f80d..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-6.5.0.ebuild
+++ /dev/null
@@ -1,102 +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 Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-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/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		!~dev-python/mox3-0.19.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-		!~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.7.0[${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/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.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
-	sed -i '/^flake8-import-order/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D%/}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.7.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.7.0.ebuild
deleted file mode 100644
index a1155db039e3..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-6.7.0.ebuild
+++ /dev/null
@@ -1,99 +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 Quantum API"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-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/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.20.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.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
-	sed -i '/^flake8-import-order/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
-}
-
-python_install() {
-	distutils-r1_python_install
-	#stupid stupid
-	local SITEDIR="${D%/}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.egg-info )
-	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 5751486afd77..7a403ec58700 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -3,7 +3,7 @@ DIST python-novaclient-13.0.0.tar.gz 312459 BLAKE2B c6be6e7f4f7ec554100adf7fa0ff
 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 2361 BLAKE2B 2b04ef23f6fe57f18ef724be3fe0f38766ebf4204c9a07d7a7eea4556c9aeb02fcbc1a858b86c00fb3c76a50e903ae733787a7545d395cda906eebdff66de4d5 SHA512 dea757d772bb814912a7510c3f26d6216c4d294667f328a902c5a091ffc04f752a998004b2b1dff8408b47514a6ed830c3ad67dba4540818ff163b0d852c13ab
+EBUILD python-novaclient-13.0.0.ebuild 2359 BLAKE2B 309dadfe3778a0e64155ca7120f818eb480f315946c660fb1d9f74c5e6b6aaf07a2adf3d69dadbff2960661eb076e169e19e6dbc7e342710ed32fe78e1813efe SHA512 0b07d9959ed84c5987e713d36aa9e9ea89f00e209fcc632fc4a671ed06561c69c6310106701ff1440d2e48c96c7c547d5637e2f76f922486e83dbfa57bbcbbe5
 EBUILD python-novaclient-7.1.2.ebuild 2390 BLAKE2B d4a856764ed0d880d043e75cdec5229245aec40e73dcba0b90f396d911a2e357b176b9583898b682b8dbf5ca14b78ca50357dd9409f6cb276d0c8234b1824579 SHA512 ce9a3af7e47badcecafbc4085787c5095993d76a99b07c48dbb00946021f636fd1c589fe4c93182a8f01ac498fa2057c4ab638279ecc24639bbf4fbb239874e7
 EBUILD python-novaclient-9.1.2.ebuild 2567 BLAKE2B 0c9aa58112f0b5ebdafce403fc8ca71a40de279e5d27a7e0e9ed34f6018fc7ba9c541823878bf691369c77a8c4b208bef391ee9eecf81b0fc22d82aa89fd0204 SHA512 1d6f0ba892a300a79f24a7999f6479f3184879b9ed6937d92ae5d319694741df0c121969a5fb498795fc64d6a9cb24a3265e18c42dd95a0ea5b6c09b0200ecd0
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild
index 5c078c718de5..bfd223c9f5d4 100644
--- a/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-13.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-octaviaclient/Manifest b/dev-python/python-octaviaclient/Manifest
index feb802532636..35d2728274d8 100644
--- a/dev-python/python-octaviaclient/Manifest
+++ b/dev-python/python-octaviaclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-octaviaclient-1.4.0.tar.gz 50495 BLAKE2B 726032aee6d37b050cd9f4d1fa276daecdeae107f05825f2eec37236a4a4eaf3ab70143b5dcd3cac8a13fbb9655027c3d78b474771ba8b205be0a566991c54ab SHA512 216bfb56292bb479cdd8520931a509208454feaf8b1d5664679929bde570a4a99288c99cb195e6e9e81b8599d27a4bc68b8f24e5a7cc3aa1a82c22405078a6aa
 DIST python-octaviaclient-1.8.0.tar.gz 63332 BLAKE2B 7944fd80b5d0ac8b1ff5d0a324d45a4150f6afda865e1db5dec490e5f33850a3fda57214303e1b3c1a65f0b594ec16b49b2f3755e2a303c518ccd09dd3791fe7 SHA512 d73c36f683b6bec0a26d4d118bccb827cd0da494f315762c170b59a2cdef3d138481b26bdcc43e8f9f50128937a39fab8f83c0d8fbc52314f8e3f59f2031a92a
 EBUILD python-octaviaclient-1.4.0.ebuild 2062 BLAKE2B 94dcbcc6e6722e8be4c0b33e446175585e13543ff42f4bee8ecf40feb1edb44448cf59814706c611ebfc02f5923c10dce4317992ded76a78fd7077160b272646 SHA512 cc0d8852c8ca08d2f5a654e2cf4a2a4360ad33b0de253854da446c26abb31731e3e9a38d4e0f47e3f2932eda0fc0fda98828421a2a5bc73bf4c73a355f34a3b6
-EBUILD python-octaviaclient-1.8.0.ebuild 2182 BLAKE2B 789220654a90c615b40f28214e90ec103d94e94e8f0c6a47fc82d6677106b6556b19ccedad950bb6c1e3cceae478ca3b034439d0c5dcc6bfd49793ea517d3c39 SHA512 a5f546d8e0562da4908d563fefdd2bd4aec377577df7335e357c8d913728570a0967fc0454a9a5f9e1feada229ee75430eeec0abd4fe30557f6f21c2dc2b4e53
+EBUILD python-octaviaclient-1.8.0.ebuild 2180 BLAKE2B c38596874720753797e7a1f222e5e5d6cec83e0573b6e7501dee4d1e1488e95d5d3705fddec871669387fc8ac544a9fe9122d035044613ba11c925301544f37e SHA512 414cec1f021647bc34151667389b4200b94b056c8e71ed9bab381836072d7c2e1eb0b5092b8457ddd95a87d5c55ad0e28b7327ab30d2217f5f47d9c3ae14298a
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild b/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
index c30ab394ea80..995cdd35afd8 100644
--- a/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
+++ b/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 5bd364180ef1..bb2c931c7421 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -3,5 +3,5 @@ DIST python-openstackclient-3.16.2.tar.gz 697555 BLAKE2B 11a911d8b11912d70c5e05d
 DIST python-openstackclient-3.18.0.tar.gz 719216 BLAKE2B 5895361b1d5a957a4d56d555e47c97519136002200e89dc3dfbf9966e4981a2803b3a63daa3b1905775101dede6de59c4cd82dfe36547587ba7b4c464fe58d4c SHA512 7afa430c9c623e1bb47b6a089307f9d4a788e08671a2e8539640733558ae023f5c5b1c8e34f3a01b1469f966e19d8680755757321bb93bb4c10a145fa5e0625c
 EBUILD python-openstackclient-3.14.3.ebuild 1289 BLAKE2B cee402fc1ee5811cc8c27491669e377970e635289ec257b0838fd31306749531ba0491a972bdcf7f274cbd5fe15a4c23b210fbd971fe04adca0162c89b54fa0f SHA512 e46803e91dac3e03ca6bc3b3bcfbb169b628dd312f88086defcf1846773f6a8f2ebb2ea2168e5fd1f2e64b77ce2e9e63b80527e2f2587ce9617880558d69077f
 EBUILD python-openstackclient-3.16.2.ebuild 1291 BLAKE2B 5e1c5856991e06cf187799457ac8524fca0e5781fc93e67994ae0a8d7b37813775523d821ca85d1aeeb0af547631fa38619dab255ee64356c4b2fe9e8f60165f SHA512 e89deefa78a3385c14c53d701536b8eae1ae6d3f952b43af768a4eaaf2bdb767fd9a3d10f45ea077941d410b4fc778608d31bdbb61ee5a43ba9864deb30f6328
-EBUILD python-openstackclient-3.18.0.ebuild 1296 BLAKE2B 01b60a22bd4d9ee3bc67eed9a5abf091fa6cdc5d75c0a55a6ae18e879aabf98295497f9c7699596ceecb4c52fdad7a895314df7fff89b5bd365436a9e5b909cd SHA512 ee8a6deca41958576154f5a9c79632f151838adb9723eb514ae0c3e08d4ca2d07916b7087b72c389daabc5abf647001b9df4373df68d95151f103911604f753e
+EBUILD python-openstackclient-3.18.0.ebuild 1294 BLAKE2B 582ab810b104c0f2afed80537e71c1ec5b1a1343f9aefa0be36c30a0305fdd4b92e3156840fbdc2038978553c916738cba9a21b80ff7b588d22476d84ff47f38 SHA512 e91e2669922615be39875ca6cf73090d5b6bee8dcd74567fc0599d1ef31f7d08e55afff95708d0a57e10b85cd6ee773b40af81dee91f75efaa6fc48da168ffe2
 MISC metadata.xml 632 BLAKE2B 4e989558d44ee733b380fae3f269ec9ca0c511caa1fd8259cac90dd3ded82f4137444f32801efd2440da95b98c2864509c5068432de830591ccaed2072029c91 SHA512 c37cb6d5ee55b8f7184a2db66dab3e6fbc3627b1869487e9d4e00928cdf1dbfb5d3d28a2d7f72290503b10b393a193a9849c497df6438ce230e418b68fd3ca4c
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild
index 383df66dde4d..964cac874dd2 100644
--- a/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-3.18.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index 9e04569625d7..d048e80151ca 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -3,5 +3,5 @@ DIST python-saharaclient-1.5.0.tar.gz 94824 BLAKE2B cacc3f2e8a1df5f7e50f5b5c0047
 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
-EBUILD python-saharaclient-2.2.0.ebuild 1740 BLAKE2B 2219c123ff2263340c36c37b3db16292627c0e810acab6652ff28b57291b603c952ed97e52369b434800db251454a60e000de8189e36c827f3fb9e5eb3128b03 SHA512 02a31f26bd75027f6df4d67bd55fe49fabad560f898ba3d14e6e349e89ea686104ac171cfd182e60b1ece19c8ea72a00f9cb3308c5bf7c8220c234c8ddde990c
+EBUILD python-saharaclient-2.2.0.ebuild 1738 BLAKE2B 554ba20d1cd4c03bd61d54664d548fa0a16738f5c1c45020d7ffccae6aaa61bdc9f7e1347c9fd1fbd8e21942ebba3af991efe4c6f945e8cd8f18fcb5e02a0e30 SHA512 443bc055b43dd26fbcd95843b875bd001af6ac8404b4fa444a139b8dcfc01a3f6f95b27355c1b90420106e55ebdeb41aed2085a94cdce74698992e5d7ef9c0cc
 MISC metadata.xml 643 BLAKE2B 2a3c45ea4f9fa3c045cb88796e093436e66719daf71739c7679882f11123f2ac405926c8405046aed4efb55328d7235619192b9b7f978f7571c673e306953834 SHA512 4ab105b6287560e19a7b6ba8e999da16bdb520ff8f1a812e0e17ebff9c1edd2f7ec1475978ee478c556d31af8c201555669c92ff388de45a206b45005ec95d2c
diff --git a/dev-python/python-saharaclient/python-saharaclient-2.2.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-2.2.0.ebuild
index 981baeb7c401..6b8d67117b5d 100644
--- a/dev-python/python-saharaclient/python-saharaclient-2.2.0.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-sense-hat/Manifest b/dev-python/python-sense-hat/Manifest
index ffd2190019f5..e33beb373bc8 100644
--- a/dev-python/python-sense-hat/Manifest
+++ b/dev-python/python-sense-hat/Manifest
@@ -1,3 +1,3 @@
 DIST python-sense-hat-2.2.0.tar.gz 20841 BLAKE2B 59e6b9111fb90493e6bda00ce4a4c143dcb84d8b6529efadaf2f337adb38a8fb4287cbd9a303070ea4f335f1e03c6f4789e6f8fbe64a7c70db20675bdae7c6a1 SHA512 71914f6f22206cff23992a6908698978741a46bf9b98648388bac4550f39e8de73db6bd389b79585eba6e82160649a8c8da4217d515bbdbcb50d47218415f3ac
-EBUILD python-sense-hat-2.2.0-r1.ebuild 631 BLAKE2B 4a213e71a7c5c735f4a802317f266f12d2d5b5595a37fc0d8819359b4a07ab5d232924441b00c8b8a04f94a6d1a0ddc8126ecf5daff647994a7706acbfb34b79 SHA512 f76ffbe7c76c197a5a057b73ffaebdb2856b67b0210b629c3c113900ac9232dbe2cb80d7b3db9f5be961c4df7a92b0ba32513beca0055e8968e6eb66e1edd7d0
+EBUILD python-sense-hat-2.2.0-r1.ebuild 630 BLAKE2B fcf29767ae39934d5a24ec3e0e7a02b1a019cb87c56857f52754772780b2121acd91ef33a1c08a0d83729ee3d466494cbe4fd6e5c691f8de109232682081b450 SHA512 c01792344d20cf4763121a96f8b8d148548bb0f6d430de5c41cf32194987fdcc2f9b9a818f673c862932d75a127eefe6e1329fd477bb3220879d6d22b37cea34
 MISC metadata.xml 771 BLAKE2B 05de535f0e56d7233bc94020ee828866757b95725e8f9f3cbd7681ca7ff6b92000dd8176af44115ebfae157886ec305513ec6f1f12cc56a233ff3fdc73e63fb6 SHA512 e4c3cb494bb4c8b874be22478577f0ee6a4f3f6c12a8eb00e27d6a854d5c88265714ee438486663e315c36c84369c67785ebc38764617644cda0bd6bfd314cfa
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
index d622d095f0b1..e4d5aa8c01db 100644
--- a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
+++ b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/RPi-Distro/python-sense-hat/archive/v${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64"
+KEYWORDS="amd64 arm arm64"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index 7d16f9681ce9..c075e51d9def 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -9,5 +9,5 @@ EBUILD python-swiftclient-3.1.0.ebuild 1752 BLAKE2B 70f4db3b9b16d63b503427b84a0a
 EBUILD python-swiftclient-3.3.0.ebuild 1768 BLAKE2B aa8e841d22ff678628d39d47fd520eaf0b9e674d20f8bde87f18b8f5a41e15cbe431e481bf9075dc4a346285dc315b1afcfd4896eed7347bc37c3ab344f92f62 SHA512 f4d55b6961e8f9a2020d3447e6ff9cce95efe58501fec11024675a50bbd5875ff79718729d7d328c5f495090d657159d8d269ca97f25ecbc8fd32c2b6914479b
 EBUILD python-swiftclient-3.4.0.ebuild 1768 BLAKE2B aa8e841d22ff678628d39d47fd520eaf0b9e674d20f8bde87f18b8f5a41e15cbe431e481bf9075dc4a346285dc315b1afcfd4896eed7347bc37c3ab344f92f62 SHA512 f4d55b6961e8f9a2020d3447e6ff9cce95efe58501fec11024675a50bbd5875ff79718729d7d328c5f495090d657159d8d269ca97f25ecbc8fd32c2b6914479b
 EBUILD python-swiftclient-3.5.0.ebuild 1875 BLAKE2B 148d54392bef92b700b678399a10c4f7dc206f525db1945a02de635ae05749f5f6600fef781acd041cad1af2493c12311a8dba8302150c64b830752be85f6eef SHA512 cbe860fd2e699b8c76403f055c39a5d587f61f6f483012883b9b8a0cf3ca33b970a1f73c18ddae502f434f0ca4795ab6e5001a1a3d11b84ee651f1fb46a2f353
-EBUILD python-swiftclient-3.7.0.ebuild 1978 BLAKE2B 962b95f82ecc09c0c26ff61b64e09c5803f518c96d8a474e418d2de3d193f936f255de0aaaa7c998c0256d15259b2352ef50925b6cb9eac1bee94ccba77f2ffa SHA512 d85f9db46a3347611ff38de4c6557ee2427a83bf81d05513b2d372bf4bbad67d26ada391241dd3ac8d3d050756dae08f3cc8e3feb84d11ed8a17cca99321ea19
+EBUILD python-swiftclient-3.7.0.ebuild 1976 BLAKE2B 22a201df1b5002e99fa17b5756b391cbf71a2e0f24b365c2c626f7df1e1d4eb5c97542b2ddcc579a1ac062465a90baedb89964f2d3e0c12e6ee480950ae30a7a SHA512 d4eca0c7518422ae9898968401f3f33063a36fb8be987ebb36dba6afef40a98f19044a762b6326b1a7f4c55153cccd086e8155c212244811ec8599faf8610b5d
 MISC metadata.xml 597 BLAKE2B c32e50a6b0ff995f2c237c4a6e7ca80636487a9ca4d412c74e6032a32230141f36949fa42cd39ad293a456d8961cbe14e86d6df3a772f88c76283956c46830a5 SHA512 fdcb820e96b82093910b251aff11fd5831253b86972435fe6456bdbfbeba4cc0c9d0dcfe10078103d5e7b7f29cb84e5f379293be94c30ea54fe4af741e097435
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
index 738017430dcb..f897ac94fcf5 100644
--- a/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-troveclient/Manifest b/dev-python/python-troveclient/Manifest
index c2114c077bc0..5e3ccf3b928e 100644
--- a/dev-python/python-troveclient/Manifest
+++ b/dev-python/python-troveclient/Manifest
@@ -2,6 +2,6 @@ DIST python-troveclient-1.3.0.tar.gz 130542 BLAKE2B 335358dd589ce2feeb03f2fe7da5
 DIST python-troveclient-2.17.0.tar.gz 189560 BLAKE2B 680d76af88b8242956eb8e7a8644c11b47fee785eb0940bca1d3b8c5c500c3c233ac0e452d7a609d10028571e68ad52d47d3834898e98642cbb93b0b17f0db40 SHA512 b314115d2c50c87658b02f5dfe9a22f68cb31ba89c3baedf45bf87c4f482aeb235c751753da538bb38c514600b374b1d3f43e17d4a8b929738b4c742e28c63d8
 DIST python-troveclient-2.5.0.tar.gz 149926 BLAKE2B 11acb39afed5ed018a83861fa344e1d482bfa179e0bce97e517e392daf982d868b0c24aeae2406732ddb39e71ab977832df76b55354975d671ee17421cca72cd SHA512 83e7cafec8ce4d65a55d8854bc2e2fbc657d567e4dc2b42a64c527c656ba5f253839511582c5ca2dda970bebb4555390b895a882b87a2eacb86ccbfac9c09a97
 EBUILD python-troveclient-1.3.0.ebuild 1792 BLAKE2B 7570e4f87aa028da70315ea5a903bdad22193461bb36bb10d2e324dccd903a04ac5d0206a8fcbd4e950645d1b5a819917a71acafc32bc4290eb4b5b33801e5b7 SHA512 49e604e2f257a141f92de0283c991d3b3144ab2346271bdc58c2ce19c8b2b10e32d064ac50cd5a78591bb1ceb4e98746b9860df078ab1a2f2fa8053c1f5e3e54
-EBUILD python-troveclient-2.17.0.ebuild 2100 BLAKE2B dc676e43b6ecb3d900e7ecce3c99006d00a0b68735f2ad5cc5797159131f763c0869311e234c5f77cd30feb32e69f69abb338c6b0bb21bb65cf8f75978cdd288 SHA512 6d333b965c902b63824204cd96a2c1b3e0192b18e8178c78e5a07761ca0cbac0a7f90d59c47b4aaaf7f172162ddf6040bffb494b39e243ed33a122eedfaba618
+EBUILD python-troveclient-2.17.0.ebuild 2098 BLAKE2B 73bf1aee69dac4c56e0c1e3874c27ca294bc62de778664ae1da3f69be70696cc74fb5df8785dd30087aa3ee3d3953f6a2d8d32841903ff5c45ca897095c41364 SHA512 7d3f227db6a5f5785a847ae83ab8f3698df174c03178ea99993df2d09a38c496fe01f417f2e008f632915bf98b9656670ed957fada3f78ca96f4c707a1608fe6
 EBUILD python-troveclient-2.5.0.ebuild 2078 BLAKE2B 29a66e5314ced13e1dce1b127c572eae4b14da1c108357d81b8f6bdb4bcd0560a305ce20b9ea5e575b333135d3e95d51d95a0dd861f520bf2b60aa89ebe8d66c SHA512 d1297ec3f5b36a1e1a5d77e9c94c6ba3b64005846f23ddb85db88802df535bb14946726b7ece2215b1051d2493e707d0a9dc0b09504c83f418d4a7c57ce3ddee
 MISC metadata.xml 669 BLAKE2B 0cded2233b688bdcc98e7a140c018450a1ca1d151520ed71d0c3c4d1d079edbcd212cd0608d7e3d646555dc94248648767f88049bc375e4551a3aef3b9ba6a5e SHA512 ca61691e9d8d0f274e7d187ef24d080059f79f6fab866ded771a08740f15559456a50a5dd97ec2eb73dffec1324097331f4c4185bdd62a6dfbed37b75da2f426
diff --git a/dev-python/python-troveclient/python-troveclient-2.17.0.ebuild b/dev-python/python-troveclient/python-troveclient-2.17.0.ebuild
index 8d527a53ccd2..5f06554da565 100644
--- a/dev-python/python-troveclient/python-troveclient-2.17.0.ebuild
+++ b/dev-python/python-troveclient/python-troveclient-2.17.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-zaqarclient/Manifest b/dev-python/python-zaqarclient/Manifest
index 6e0ceabe7973..5e9936dbad5f 100644
--- a/dev-python/python-zaqarclient/Manifest
+++ b/dev-python/python-zaqarclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-zaqarclient-1.11.0.tar.gz 85724 BLAKE2B 84e34998a76bd475b3aad2882f076f8ca89dcfc1a24155d0e88269fda3d82d4b1348461d1f59a5f21726dbc56b37219d9e75957737452e759672505a1f16a4c9 SHA512 4b57cd336a6517760d32a5e01a7c87a9ee0526323a222faa6fcd6e33a506b0746d6418e9eee3fa00e7ba4a01912ee108fe1feb3469e0a14089cc760a0756b7fb
 DIST python-zaqarclient-1.2.0.tar.gz 66649 BLAKE2B b1fc054661562b861c39344c73abc8c85fd585b47099a8625ed2a4862997693b793c77698c6147da44affda12cd17d529b5b028d867d5b74400bd7dde13ef4e1 SHA512 1590839460815daa1f0754d47ef789e0c2d2a078265bbb6595eac32114a36c5f15512a2781841955fe99cbdf2cdaa8a13061f535229a284f5b98f97d017dd8a2
-EBUILD python-zaqarclient-1.11.0.ebuild 1211 BLAKE2B 4c4e418c260e6c8579be9a8725452576dab02954a199193ee68319201a58cc7979c3518f06e3be199bc0a0095dd0ac04484e744666021a23cde52f1c4cdfc474 SHA512 61176845ad7a8236bd772ee0c01da68b1aab4a39eb7b225c24e8e443cae26826804f76fede8fffac0004eb400bd9f457b7a5122d18d28d0f284ff586e14559dc
+EBUILD python-zaqarclient-1.11.0.ebuild 1209 BLAKE2B 3a7ac912ec98359ecf6b935c775b75384a5f73796bb0845628b706247d6219fccbce940869e1cb7b4fc23c16357fd4a9532f1d7d02908926e683c4c7d6eb935b SHA512 7fe3425ef51827657ed6c94eaa7ef0448f2199088728824af860dcb7b6758ea6ccbf2e9c25645f7a3112c5751e50a0f1317c2d602c9db1c2ed4453dfb47e2979
 EBUILD python-zaqarclient-1.2.0.ebuild 1231 BLAKE2B 3f98d1a5e0da71b62d362b1d5619a58c88d1221e4830ec564cb44e4924defbbbc2fd211c6102570bffccbd513b2437aabac6dacb0f9d06749e7e8984c5e9dcc8 SHA512 2c0b856cfe3c72cf25a81c3c8d082579093880cd882c455f61bdce1eebd87885b5502e5df405d887efb87ed769074ae766ad509a134b9a4e853223a60f5bcf16
 MISC metadata.xml 607 BLAKE2B 28721f37ce75146475891a79e765fc5ebc12f2e4067b259328fd63fc6aabb16d328d720c2e31cfe538841a638f15e63f141b35a930495e132470cdc0a3777a63 SHA512 73cd47155606b208b2ba83664732ec7fda229f075a86837bae68344bb3fbc10756a049a1f83815f65346d93fbee7a30b629c6769646da2385afab6237173038e
diff --git a/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild b/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild
index ffda29d8a9d2..88534f6f23d1 100644
--- a/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild
+++ b/dev-python/python-zaqarclient/python-zaqarclient-1.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index 8e47de0b9fbf..8febae17d5f5 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -3,5 +3,5 @@ DIST python-zunclient-2.1.0.tar.gz 99821 BLAKE2B 0784c5b47ac7bc1d9764e856173554f
 DIST python-zunclient-3.3.0.tar.gz 112986 BLAKE2B 4e605144b19e938c3d4fe556d647c6e6e112ab3419961318a3f711ac0e29d87f3fea5d5a1f16c836e669ee1dfab78f3d8039e0e829038e213d06a657743066c8 SHA512 1d3be57a673359efbabde71e34a3e5e7b0778d60d8f469273f087ad5927040258bf4dca264ced64d6a4236f05cde51fdca0f644a0dad4ba3af5d333dbaccd5fc
 EBUILD python-zunclient-1.1.0.ebuild 1108 BLAKE2B 92bca42c515930e85a2b20e788df6920a8e4101b66e7d9f9aab9e4ee3448091dfbf97fe2221a57f2ed0e6efdd0c7f6821678916ef9cdd7be8b0ad010a62aba04 SHA512 0ea222613ba1bbd577b85c0d24b970ac8885da07eeac6271c2a156357a53db94b43aa9da1bf271b21c2166353e170e9cfc4408f938deb9883c6f44c3d00e4b16
 EBUILD python-zunclient-2.1.0.ebuild 1101 BLAKE2B 2c8917305db22cf42bfcea00c7ee0cf03378c3f5564637c2dc33dd010a55f202d494577eecb424bfbbcdb6c26ac8c991421f9897682f7d8dfc7414511f681809 SHA512 3c5548b18e156d67cefe71a9cdd6f381d8d8b766df86d30545f5d37d3acf9a6a0c595e5cd32752f1aaf7e904641504ed2d1093b6e0f8e341aa149c54ccba11ff
-EBUILD python-zunclient-3.3.0.ebuild 1105 BLAKE2B 54d1efe4a858df922e4712c265baf79494aa813da32fd277d0b7f0829b432871016008719a67e23cb73d1d3fc65e870dfafae0a9c224c802159d793c0c74ef39 SHA512 72cc82d89c57651a3e811d902b11bc67a8103ddb4e696d60a3d6c33fb346f03cd2d3b31fd1a08244283f6d07ec62833f7f901e009b7493bfd83c2724829af68b
+EBUILD python-zunclient-3.3.0.ebuild 1103 BLAKE2B 2b328c15b0fce2e1292ca9f2e55f427d68467f6a6ff0f5b31b65ecb2ba17c4919fe524a8520b3d7a6cd5836a7641c5603185b7f66b409ade8effda22c6d57693 SHA512 f94ff91ea0db2c6cfb455f91c29f5aa6f6a47e1ff5d34a90360c21a7e837c94b28e04fd715cedd1a019633f9d9a62e7c465172419c6c76c8832b8a7502f3b2a1
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild b/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild
index 82f16c05431c..c3928b71157a 100644
--- a/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild
+++ b/dev-python/python-zunclient/python-zunclient-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index e744d374ca38..57a471eb93e8 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -10,5 +10,5 @@ DIST pytz-2018.9.tar.gz 310705 BLAKE2B 38e4f403e299ca3c24e5cde66bc02ebb861abfb7b
 EBUILD pytz-2016.3.ebuild 1000 BLAKE2B d661605ccd232dbb3b483bb62f2777b9edd29c34235afdac34629ce94779c5113b3271192869adf2606b4fe68c12ce5e83e65b81406c0eadb7d6adddc2de1435 SHA512 8924b9cf267d360ccfbb9fb97a6cb8a80dc091b2aa6f78513a688b3aa023f3c9b93254780ec3cfca2dc39b85da2ec8e7a7bd25e2a4d9f050425f186a9644ae66
 EBUILD pytz-2017.2.ebuild 1020 BLAKE2B 144e9a9f47bfc1a6adad952bc9cb82566ed977b3a4b877fb26db4a6153de757eedfe22ae20f8a2d3c1b7f0f13a8088bdfc78ba86ca2f39bb6d4982be35de772b SHA512 fec66335a459ef6b820a53649f8602fe3dc421772ee8500ef751eca048dcccb4ce6198123cef414c92ded56919dc065394ce51b9aadbaf85186b307d85ccfca4
 EBUILD pytz-2018.4.ebuild 1024 BLAKE2B b9fff2e8c7748b3a05723f2684625a0d219b5c98f1325b2e6182e9e7c9a91d4717a622946d4ca3ee9ea3287be8c80368e105327c4b92705e6366caaf393d9d3e SHA512 db2e80eabe64bf54140a53d1901f016dc5c2f56b16dbe21f343940fbcc347ff43c708d194a1cb2044cbd79321bbfeef7650db60be77654ca5694273b6cacc909
-EBUILD pytz-2018.9.ebuild 1037 BLAKE2B 1edd1fe022b455ef61b1743e0d3f2a0b14e4003bd78d24303674855f5bee9b915d5a2f0bbb593582888d0c78e5ddeecd3b83174408ac319badf3d014f21348d3 SHA512 f48df965bff43047c4479d4b60d6a8b9d4c58769d71a1621f7c9e4fcb4227e69c443bf934c1877fd0010b7b8269dcd27cac8b8ef55355333a4c190536e0321d6
+EBUILD pytz-2018.9.ebuild 1024 BLAKE2B b9fff2e8c7748b3a05723f2684625a0d219b5c98f1325b2e6182e9e7c9a91d4717a622946d4ca3ee9ea3287be8c80368e105327c4b92705e6366caaf393d9d3e SHA512 db2e80eabe64bf54140a53d1901f016dc5c2f56b16dbe21f343940fbcc347ff43c708d194a1cb2044cbd79321bbfeef7650db60be77654ca5694273b6cacc909
 MISC metadata.xml 739 BLAKE2B d96611c8cdfc1d45fa86eabcbcc60ed1d3f7e7d2a358a2fc5cf54a64ac3427140299651263e0be1cc4d2f87750df81c4adac9512be75ab334d38f44a375238ea SHA512 b7c9e6ea1b5bd128f1c5ce0a77171d0b7cdbb6f8ffb186d92aa4167d2d84c60c28c647cae66ffc7532350bca13ab65aaab5eb441f68321fc786a14b90f8813e8
diff --git a/dev-python/pytz/pytz-2018.9.ebuild b/dev-python/pytz/pytz-2018.9.ebuild
index af9dc7ad0716..08965fe3c1ba 100644
--- a/dev-python/pytz/pytz-2018.9.ebuild
+++ b/dev-python/pytz/pytz-2018.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64	~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/readme/Manifest b/dev-python/readme/Manifest
deleted file mode 100644
index 3eae2bfee897..000000000000
--- a/dev-python/readme/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST readme-0.6.0.tar.gz 9938 BLAKE2B b71e83ee0b2c890f4ea6330ca3409231ab4fbc52ce94a7e7e1136e53f7c13b1bb356bd19d46e53f4db37814427dcfd294a339347067ef0fa756fd7164e49699a SHA512 73c41c728171a18a963460459aa19d559f38ad34d54a9840820feb1329a0d71c1b0eb32ce773a4f8e9d361e534bfd916e376fe1a3fe8b8a9eb91fffac3ef565c
-EBUILD readme-0.6.0.ebuild 898 BLAKE2B 5f3da909528575f38bde651cf34fd69a63d736699d98278a5f6e74af8b7b228fa2a7d0491e9c7f8f5f8141875e719d70fdf8c2a466d16d9b6f462bd440ab8086 SHA512 1741003b5a3af4773b3bf2fa88a71d5236a5146c90fb54e353f4a45ac0358c0bcc707236e0741e273e0b192e85c0776b09cf4099996afb90349a9ef462e8ddaf
-MISC metadata.xml 372 BLAKE2B 8e16abe2027f5e8c1491d3f8bae5019884bffe4b4dc5162592bde885af6d3d82e1afb3973a56253a52b01eaa245dc2a2ce58a67a79108c0c57a9c3f0b902a390 SHA512 97168e8c89035983857c0c5d3f3241665d3dfb7088e591563835214cfc2786e11f7a5ab95b0deda2f017dd2c2c3713d8dc6d7c76950ed163285013b6a4b39dda
diff --git a/dev-python/readme/readme-0.6.0.ebuild b/dev-python/readme/readme-0.6.0.ebuild
deleted file mode 100644
index 3da6e421afdc..000000000000
--- a/dev-python/readme/readme-0.6.0.ebuild
+++ /dev/null
@@ -1,35 +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} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme https://pypi.org/project/readme/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
-IUSE="test"
-
-RDEPEND="
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-DOCS=( README.rst )
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 8ec0499b6815..5f953fef739e 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -6,5 +6,5 @@ DIST redis-py-3.2.1.tar.gz 124692 BLAKE2B fc7a773ab0a7e13f034b9efa174806b024733f
 EBUILD redis-py-2.10.5.ebuild 1449 BLAKE2B 975be762e17cf1130ab6a24aa79c04ca8f6b07a83e25ceb7543d85f34e0e597b9f5acdda44d47c7d160727c76467e291e46a3f8259698e179af715a5575737f9 SHA512 88bf38a1e7e5d657934a38ddedc531084858929991d4a7d39072edbf628a24add3481a9499f390eb2515c99155cf4dbfce93ff1c4f5c925fac60bc19e3437e59
 EBUILD redis-py-2.10.6.ebuild 1462 BLAKE2B 04294f2b1c7e4a656d3c7a6e5c9a81b996cb26b46f7b26af6102808bcbb7d2946541fa6710f69bc2f407a700ed4c74f16768793be15078281423d27a7e19247e SHA512 2c2da5abdfea11a6d58765a4180c111713cf908544ab275505898c3048be9d9802612709a1cf26202d5a8ea5375ec0cb9e42cce9212c9122c7910f1f9888df60
 EBUILD redis-py-2.9.1.ebuild 1520 BLAKE2B d8297865c4ae317a5cde149b4c58841b1275d22e5f97d0a9c7f86700b310927da525bb10d948f115163b7b48dc3aec8a08c815e7bbfa5c48f0b5051eabe68e1c SHA512 cfb89b61487b775591126872fd834903fb6899b7b110df93efcc2f396484b1299e4adc87629645fa6dfbe93ffdfae0013692a498784450b4cb1fdaf8c3a95d71
-EBUILD redis-py-3.2.1.ebuild 1453 BLAKE2B e7d77258b0775bcbbfc6ec864fdde0d9da584f16eb7473dd798923021f8a974971213b74c02f62b8f2a2cf41345df92d3c2cee1c2bf9a60e3699508468763b96 SHA512 e6dba490c05143598354ccfd6aced1ebd0393c6931f492401fd5b118b18b93a2f947f9ed637143bd84e0e1ae01af19cb7d09cb690bde5054203adf01c9afcc65
+EBUILD redis-py-3.2.1.ebuild 1448 BLAKE2B 5b2b99961949260a264ef619bd5636a276b16f1ebf2e63d8c30bc08e95032b4715c1aee1cfcad7cb412cc00d28354f799cd54025b035d03c467063287d9d9819 SHA512 9756e96059afbff51c180a0a70af56d2197f7c9fb5ff0ab269d9b29b79779e63625a32ab8d3d43e950c7f375c90e681f562b72ab84e3d5149f1dd61801caa376
 MISC metadata.xml 380 BLAKE2B 993e671ed9c6a9649a8dc0d95207b4dc1f90cb38eb8af6e470fc9e18b496768b541c033ee961957d56ee93b335c54447b741fad38f71498188480822350b508b SHA512 5e03d25770ee53beb71d1efa039401a5598572bbf6cd441c904fb5c074d212c0c05934c6f86abb566e913ac65bd84db3cdaca8b83c182dad57d0fcffdeb9aa4b
diff --git a/dev-python/redis-py/redis-py-3.2.1.ebuild b/dev-python/redis-py/redis-py-3.2.1.ebuild
index c44fb76ecd3c..c32fb107d671 100644
--- a/dev-python/redis-py/redis-py-3.2.1.ebuild
+++ b/dev-python/redis-py/redis-py-3.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/rednose/Manifest b/dev-python/rednose/Manifest
index 6a8e72172fe7..02bba9c98457 100644
--- a/dev-python/rednose/Manifest
+++ b/dev-python/rednose/Manifest
@@ -1,5 +1,5 @@
 DIST rednose-0.4.1.tar.gz 5888 BLAKE2B b221403c676947ed61e6d9aa2f32c069ca6171a6594aaa0e9fb2d0299c304e64eb7634d845d03e64b2a608fa9be2694131428f563465f0c686db8ed7e4bdbef9 SHA512 a9ff3bbbf35e6799a66728feb81f6d83b88ea9804bbebfc64d626d4bdb002c8e7a655027861b694fda15b9b8b24d7e3de2554f284e1683eafbf24eb24c4a192a
 DIST rednose-0.4.3.tar.gz 6046 BLAKE2B 0486d4743d0aecbbcc49cbee108e3d6841d6f3f4e6165614c96122dc9b9a626ad56cea9703f04adad83db3a2dcd934896eed93ad5ebd30c9a7f6711e3e1be375 SHA512 e0169599f251cd90a2906e489b870e7d10322a82253a3a814bc71aa257bea34bd5eb833b637dbae3128f8f37df79929aa4d6331e246654c83eb16118d637182a
 EBUILD rednose-0.4.1.ebuild 477 BLAKE2B 8b8d0c98fbf5d6703e587c1b8eb90578de6f6bd8da42e7afa3b2176d26c16159b278d460ea867e463e2e34c0380aad31c4a7a4be3f05a9470ed14129dce7926e SHA512 954eef5bdd78b4aa21e80327836a8d96fd9c9bfccc38efd94ac1b4a3417c8b3ca0da3d2ba80b87ad9818b94f94911b724ae250bff901ef5f9b04268fc580aa0b
-EBUILD rednose-0.4.3.ebuild 587 BLAKE2B c1f4240e0d35c9756ee82e97341ba53455c90b705a03719296b54c99e9275bcfcafd5f9eb1a0c1b875f95437e8f0435d1d3d199d4db3c77bc7e1851e59a3076f SHA512 286345aad30690ff9283403ca13d4be8e1e3ed0798eedd86e739f1a352bb5b23853855e3c65dfda502bb5e21e97c2247338b4efaa1d8b159d69ae5c5c9108d44
+EBUILD rednose-0.4.3.ebuild 591 BLAKE2B a4d66229d3347e1867abcc45fb0a6531de9ac4c49f16f93289730d98526631964cc3de252126ef0755f07e89c34a566367fa1c271b49a70e4e36695df56b210d SHA512 6da6a92ad070af97bf33d0f57fdad9c88140aca97042d7e6d9b450d0b2e804979ca187c56fa0648ee703ba26ef3c498bacccda2154111eee7bc2ecc36bc7b2eb
 MISC metadata.xml 213 BLAKE2B 1e766602261a36b4b08092e26df3c49d5b61aee0b8db481ac725ef25c5a8a186a2dd62a8c153cfeb355372b50be596b21c4435f794d8131cec520884c6048192 SHA512 c259346d3ce8ae708deed1a255e59c42c64b88b8301fbc2be5754e8f2327a2f5d21818da297b100d3ea35012d7ddc4004c7af19e70e2d80a1c74281b566235e9
diff --git a/dev-python/rednose/rednose-0.4.3.ebuild b/dev-python/rednose/rednose-0.4.3.ebuild
index 04deddebb31d..cbbac622f9d8 100644
--- a/dev-python/rednose/rednose-0.4.3.ebuild
+++ b/dev-python/rednose/rednose-0.4.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 140dbe0c9e77..2159abb221e2 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -3,9 +3,7 @@ AUX reportlab-3.5.13-pillow-VERSION.patch 915 BLAKE2B 91f1177441882f055f0d9b1fb3
 AUX reportlab-no-pip.patch 419 BLAKE2B c09e5ea741b04dbeb7791f713d9171995d99da73706201da9c14018b7a1789621ae53317ae8d170fc50fecf860b7b0c84c1016b24a505eef778ae6fc964fcf01 SHA512 1a5f4bced7be3c706b57c262dfd84fb539af42ae49541cf68d01963c8c79c96ad0a8389f36f486a485d258e9aa860c195e061c3c34070cfca3e64b52b6c89cd1
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
-DIST reportlab-3.4.0.tar.gz 1995779 BLAKE2B e1111e784ead913f803ba8151bf3585fdba9fb5e0c1d568c839d5ac08f5e6757b608c8049644264dd1f0bee5b4bb0c1750640a70feef34eff8e276d9929377e9 SHA512 7f00074b93be49e1aa7650e61381e285598599911b12a6b63c0f12d6eb64bc59afb6907b683350740b0a81c99a3164373b27e18cfccc0f9da12405c3dacd1ff7
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
-EBUILD reportlab-3.3.0-r2.ebuild 1659 BLAKE2B 2f0e5871d4d1e8c0f42e4abd9386e01e6e6fd08dc4f0ee332faf16e8b66c8b9b9a84f96b9ff2f683083c15d4d8d31138d9529810777dcad027b297eeec8eae4b SHA512 d31ec1db215b1d63f32daee10f9d63f2b5ad84e257fd3eb7cdb99207bded2e5aa6d86aea0caff8fcf99da3386e5d3867c5c62c870496eb9ce7feb3b8dd851ae1
-EBUILD reportlab-3.4.0-r1.ebuild 1697 BLAKE2B 741c218e77668915842cad4e663c8c635d81858fad293416ad26985fb7a6af66c1ee11fe98229d629b8f8a0d0aa95437c3faa45b0cf438ec7077e874c01d3af1 SHA512 d5413012b5b053e84c53e11695e89535dc95dde1b412f4a2068cc3d515f946d2bb151af751899b53c785eaa61448fd59c91a3c0e22e17b4e1bc0b9e0c0b7f0f6
-EBUILD reportlab-3.5.13-r1.ebuild 1531 BLAKE2B e5390d202b491c72809269934fb19ae6d24245d87f84271178d865b57054e49c1f99ac8c992b97caaf6fadb9a5cba93bbc373c6cd94c25d4c61b639cbce6a879 SHA512 8b896f725d19fefd4a558936b7ac032aa397d04ed72516660cd41ad5c3b3ac2336215ae89b18fe80decc910416bcc62e6b71f5861f74e2a701d47055dd4c92c8
+EBUILD reportlab-3.3.0-r2.ebuild 1654 BLAKE2B 75324010068f8d97897151151776bfef87401dfa7859fa7b825d59b667843dde3e5e514e4039893534f7c5a6af5c38a937ab18ad48629c43f7f9a67c28671646 SHA512 a80631147edfc37e13fe28dfb03953e343ce26dfaa8769eda29809c0cdd0c5c39e51e3605e682a15a957268a6a80156e6edef5f9a2eac4949a642fdce8b260d1
+EBUILD reportlab-3.5.13-r1.ebuild 1530 BLAKE2B 9540c908ef3cb1317bdfcdaf68ea7af27e3e027ea5d41bb885b51ca521cb97fdf25ba6597b989a6a9e8fcdd6101c5c5ea20b81c4d28f7262e4a7392203abbaef SHA512 e9bb38eb1a61d46b50fdcf4573291d0d4babfcc5248eeb6c347fa1de5f8387c3911b9f7150b8e70667158778694b0daa03fad63bd618609cb5df3c69376ad15d
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
index ecd6d0d6040d..12a2dfe730fa 100644
--- a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
+++ b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~
 IUSE="doc examples"
 
 RDEPEND="
-	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+	<dev-python/pillow-6[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
 	media-libs/libart_lgpl
 	sys-libs/zlib
 "
diff --git a/dev-python/reportlab/reportlab-3.4.0-r1.ebuild b/dev-python/reportlab/reportlab-3.4.0-r1.ebuild
deleted file mode 100644
index 3f938a4559f9..000000000000
--- a/dev-python/reportlab/reportlab-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) # Tests crash with pypy
-
-inherit distutils-r1 flag-o-matic prefix
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="http://www.reportlab.com/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/pillow-2.4.0[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-	media-libs/libart_lgpl
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/reportlab-no-pip.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	sed -i \
-		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
-		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
-		src/reportlab/rl_config.py || die
-
-	eprefixify setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd tests > /dev/null || die
-	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	if use examples ; then
-		docinto examples
-		dosod -r demos/. tools/pythonpoint/demos
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index 77800e21ecca..2bd3932549b3 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index f631286cc431..e6e472992cb6 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -2,5 +2,5 @@ DIST repoze.lru-0.6.tar.gz 19814 BLAKE2B af86797daf286daa709556194d9aac5d72151b1
 DIST repoze.lru-0.7.tar.gz 19591 BLAKE2B 839cd757ab51943b46cab22190c4e3bb829f7a94ad66647aa99072d535b7366778b57aedc556c8c91f012534154e6e2ef7608b2d4db2b64e7ba54486404a183e SHA512 c4d8b015931c4265fa8559f99c9d5016835574b368ebe0d49fe503afe908020b2bf29836606134e00c6c0aa436d52a00bb73d6ab80e98d0802f54bd2e4686476
 EBUILD repoze-lru-0.6-r2.ebuild 536 BLAKE2B 34db41f1a0011a812de3f5a32025cb87d5b1db8e6be99d9b6e47d74b8cc68a5c412fc0859d1bedbe48d2cd36d592bca410a4d1f87e80fd819a2198a9621ab8db SHA512 d5d9db949a5cb2f18ee7d7b9e8f18d73bf1aa68e22068f02bdcf80056de86ed2dad48b83fc7a6ca4c1adb034b7604830dc51f70b9756442a577da02136668365
 EBUILD repoze-lru-0.6-r3.ebuild 696 BLAKE2B 88fe62a7a2565defef5a55011ad3ac133b2e8c88910c02bfaf370a07ff3c6228473e725c5f877a49d084e33f8c749c140f9b45e0f8fefebd3bf1cd1900ea734a SHA512 bb2e5721c3282e31ff302bb87d43b332dc638ba0818e5180748420cc4957e69eaed28d931998b39ecce1687da3c5521205b8f8ec9b43cf23f4b96af90975540e
-EBUILD repoze-lru-0.7.ebuild 699 BLAKE2B 808239458392285c7636f2036bc30e87a1be372e202419694a7319a3818400cfcf83656d13be1338d49cf774b6959449436bb01f2285e9dfa2b8bc8cbe35e5c3 SHA512 0b7cceb54bbc6969f7fa3d8d122128ca9ead4110878f0ddad7469a4b9b968ec4851bd927e61ca717923a853c08249435668c25d7a75590ee53e5b951df09906e
+EBUILD repoze-lru-0.7.ebuild 697 BLAKE2B 657a00c48f9ca91c43226e74cb07f315a52d1094e697660bf7890bfd57469276c1851b510906a4b91a71c58d4e1eabef1242c3007bcc313d311c16b377cf33da SHA512 872d3606373ff3fe9af60f38597a5a783a0c1f44712cb4297a26b6442af085f670ec905030e7f48fb04d4d1d0513642fb238dca35933e1a3871f99a8603c6162
 MISC metadata.xml 323 BLAKE2B e5e3343e9f27fdf721439dc80ca3704efa0bdf76a1c13b5d7d872c2541540cffa8ce4efff0ca2f5469af4130d2d37c52bc2dc3f0c535438a96e3dc2b7b3a41bc SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d
diff --git a/dev-python/repoze-lru/repoze-lru-0.7.ebuild b/dev-python/repoze-lru/repoze-lru-0.7.ebuild
index 202284b77384..09eb88095d2b 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 64f9055f8e40..57a29344feb8 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -3,8 +3,10 @@ DIST requests-toolbelt-0.5.1.tar.gz 187981 BLAKE2B 1e3cfafd8e0b8625dc92ff40bf88d
 DIST requests-toolbelt-0.7.0.tar.gz 194062 BLAKE2B ea7120e58ea23dbe1d17bc2f8c346ec00bd00d62a4c8fdefa1490b9b3ed62a0dcf45ce60b071fcbc7e510d943ec4f10a7031525bd24f5fb02749125cbccc9f0b SHA512 77f11d12643d7cacf0c5dab5c5490359fc6f11c038d56d6ae27939394c5788622edb230d38d2202192eec6a7b1229feeb5669cd6a33c78f6891699d017e8205e
 DIST requests-toolbelt-0.7.1.tar.gz 194670 BLAKE2B 3f8b5950d3a87f519f40e2d21bce13ba2d3ed205b5d7f4fa0872339df391e5477f262b104697b264a75783d686eb44231ff2943bfe56f13695d63869227c48c5 SHA512 2559db13054c4d9b7c459603809a16d8d9a9c1a348369e1bc68e557bae10c41291286112e3b4a71e83b42203d40fa5cbc8441028693eeb986162d212a65f68ac
 DIST requests-toolbelt-0.8.0.tar.gz 196129 BLAKE2B 435059ff2879c44a274641c49adae9986c761fcabe567826454d3f055db7e3e5c95905f1d178dcb37e2173bf856a9fb168a856c1301026e8c5d0de6cafb4be51 SHA512 71a4ed8961b742cb1b5b0deec7f9052a2a177d2ed6e4f13ebe22b56b7f1b6b1bad2736f1640c8b41398b082eddc1c1205f0c446602d979d5bf370fb0e10ecc88
+DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
 EBUILD requests-toolbelt-0.5.1.ebuild 489 BLAKE2B 4cff955e05c70096f61c16b8ef0317fa5fe630a8cd040cef4ca04f3b4a59d171722f1b70960d01ecaa72823462d33a71e9fe8d39abbfb824300e561e8296733f SHA512 ad842f351e7d2ca8b8e0f442aa816e9fde6d8e3b5c198568cb8295ad34d55bd8dd8cedc2134f8e71c5480d100f6153809de37b3e7c8ea85849509c9a3f819d8d
 EBUILD requests-toolbelt-0.7.0.ebuild 489 BLAKE2B a7e893356fb041f13bfb37c72b2e2bc8f79dbd4787a1d7bd95312f6edab39c82c627cc1e5f074b56ed750f6d8ec891258a9c498ea1b4fb7eb45dd51ca7c81c09 SHA512 bbe8529cf6abe455edcf1fb8b4556411aa7a4cdde54f71d89c4906a1c9c4ce385c437c55a35660bf47ef54344351c80ac7db0d4147ca37b12d5d05b4de50cc30
 EBUILD requests-toolbelt-0.7.1.ebuild 759 BLAKE2B 385251bcac0036c48fccc83456ece8aa12e34322aec749488fca694b4e28f25647d0f8112c36aca08d9a74bb6c5055581b5d575909f5c461ea4f4998cb562879 SHA512 b7680df8a24d8f5e994d890c0cf962f274e0e8b2bdda857af673669c0d2af69d860f2cf11658bd0d434ffe54b0703ce9a75b0e1fedf16226a7b066936c81ac5e
 EBUILD requests-toolbelt-0.8.0.ebuild 1042 BLAKE2B 7f94fcd22dea93322e3faa641fb54e0e4856191894912b8387806dacaa12386f338a257aba012c5a084fdd3a5738fd28f732c795346b4f0a5e7409d170ef4f14 SHA512 618f44f24bad2cffe25c3ded828593d9ede70edae37d83f60e38ea5c1ab48ea75610e23d0825e2532c497559d9a02534f2687f80886995f024908b858affa1b7
+EBUILD requests-toolbelt-0.9.1.ebuild 1048 BLAKE2B 7a0b3298b0fdf56da4432a7359f72e5686ed8a9242c29bce5661f224ade3126f5ef54a160a13a314f4d6a35d5b6dd6e1292f27c4068cd2af579318fa3347cbb0 SHA512 0abcae87d4e0086c549510aceb91178efa02de20a3739d663dc48d479c8c96bc64adc0a96aa3f7b06af69bbf31ac7ab84e937b0e7d0ee7c865d6e118e0b3e840
 MISC metadata.xml 297 BLAKE2B 0dbab9c3d9697a1ac5ab03c7111a1862d977546c23cf42967669a6e3a19eff6e81b2a0701cfc2e11904c220026a5bc7b19934cca17339ab7f9037891ab5b2c8f SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
new file mode 100644
index 000000000000..d7c16d63b6c0
--- /dev/null
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.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=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility belt for advanced users of python-requests"
+HOMEPAGE="https://toolbelt.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/betamax[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst HISTORY.rst README.rst )
+PATCHES=(
+	"${FILESDIR}/requests-toolbelt-0.8.0-test-tracebacks.patch"
+)
+
+# Known python2.7 test failures do to upstream
+# not testing with newer requests versions
+# bug: https://bugs.gentoo.org/635824
+# https://github.com/requests/toolbelt/issues/213
+RESTRICT=test
+
+python_test() {
+	py.test -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 081536809f69..109f22ebb9fc 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,5 @@
 DIST responses-0.6.0.tar.gz 14073 BLAKE2B 27d4a4a380a9154ded1030278213c0cd87308a488199c277050fa2a0a1dad87a61086094bc35279ff9c4201d06c59613bd1b0dbd18b4d83b8321341f6f1c4bb0 SHA512 32d41be5850f0040a4f2ad82a057d6ef73f0f83f7d3c250fa223d5614470b0b8b58790667af76ecc6b0b7e8e2a0a069c46c7913e983730c968c603e2716dec0b
 DIST responses-0.9.0.tar.gz 19766 BLAKE2B bd98c24d6458f33f7b8ad68edb3d0fc595a7d7b31889ff8270e1add13d537d80d67c3628ea6630674e8d49837f9d3933f680b366b4a7fab10048640a50129c48 SHA512 e5312587845cc9a3a938fa5d052ac1f04950d2eea5d83192c54affe079ee6593f3e249a24a8b43b1985c9fdc9131bfb477b93ca8a75d0386ed33cd56cc37d5ff
 EBUILD responses-0.6.0.ebuild 763 BLAKE2B fc091c52d8ce7017ff6754ad8efad7906f9c9341e004dd416ee8ccf48df9c21a4fb00936746ea6ebb2ec7487e156627e2a8411d26e12ef1a2139ffbabba12de0 SHA512 8ef46a4e30052b4b93b37e2435732ddb499c597f702ba06af6a50695feb30b3b99fa56cfa82b9d75eb13733696f2d3bac9d37b6b86d6eea71e08113a9cf46da8
-EBUILD responses-0.9.0.ebuild 830 BLAKE2B fbf9b37d54f89c4a58f090aae80b03cac21bb9a561d9e19ad74f4e8fd7af457328a7ab40acf79ba2377678d1f6fb9ae888d20a51366a98bf8168338c5a4b8e1a SHA512 d1b93cd9eb0a7bfb45b6f73b7f80be243908e88723700b11cf47d53abe52174b915928783cf4453cc5309bc94b75b8c1543a993bc126c5a2588d6e4544e982ea
+EBUILD responses-0.9.0.ebuild 828 BLAKE2B 39af019ecaf21ef8080f035491c09b7862e37fda461c53ea5500173140d69ba1b277acd63f634557e073ed291713c25a3e3c06579be0ae22c005c8ecee2373c1 SHA512 62fb3debe24e745852f02246554e98c2a1a156e2cdb90c72b99e0d65b84139397e0e9a348e23a378031ad1d1926cd3aa3f70f38ce202570d252b140d6647ebc9
 MISC metadata.xml 438 BLAKE2B 9a2c389d84feb9087edaad524953e8a439dc914f293a1f5dc9a15f36101965ece4e28ab5f57b193dd30a2134b17e96feb218c898fd1164dd0c94234b54689a1f SHA512 efdf808423b4e47a6888b09d08b563f36a13867d355476ec10e7f247e6841bf682cb35c4432a011458d496dae79acb1ad4a38e03d3895a53e666edc3c9d4fca1
diff --git a/dev-python/responses/responses-0.9.0.ebuild b/dev-python/responses/responses-0.9.0.ebuild
index adc19c42a829..89f4ab099d7d 100644
--- a/dev-python/responses/responses-0.9.0.ebuild
+++ b/dev-python/responses/responses-0.9.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index dd5287bb7860..712c0562893f 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -5,5 +5,5 @@ DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbc
 EBUILD rfc3986-0.3.1.ebuild 686 BLAKE2B 9f0bd1c385290078ed8663b8ad488e397e64c591f542c68101578168bf2479a92bc0d868f0b02a75a5c7841126076aaf46496e07e1fb897b48f93f041f49e73c SHA512 491690df366757ea34a039733f1a0df0b0643137f2bc40141dd11cf945948de3f47959e1de773c23dc7060bae093ac47d04b7bf3c89bd480d0dba039a64516b2
 EBUILD rfc3986-0.4.1.ebuild 690 BLAKE2B f7639837c58d894feec2e5b92f56116f408be2f499f80d512222cac28798b7b2be9d30d141e90fb71ca86cc13dbe41b35813bd23c251931fc1988cfc4cf1aac8 SHA512 2e294c4cc04988aeaef22ac15617fd903205a286d9e818e5317b604427e31f867064731d5468b3c6627ab4470904724dd6adc7725b090185aac110c579f07395
 EBUILD rfc3986-1.1.0.ebuild 688 BLAKE2B c44320f38cb46cd539b198d5458bb48d7535bb6713fe41a4732b1bdfaec54614d4a8f81f4273d0dd92cbde35d33f4223352242a18bafe4712002d4a1f8208d0c SHA512 9f2283b456e0302f2bc41704c2f0cacd585453cff5c781ec61ab44c1875dfd7b7106a20d0328832ed4b4adceb335d026c368bd58325e28a51aa17765b46662e6
-EBUILD rfc3986-1.2.0.ebuild 696 BLAKE2B aed883c7bac181b9904041363facfa1734b8149fed1d8008b1542908d559221e63bd9583359cef7b123c22d47fc13269b1c7fadcaa0577091c83c93f7d5228ab SHA512 240469fc29d6f77410d120e50270614a519fd345ca4f81d3ffa834d9bb17747a49770bb44ecdcfbb269f7f54e33950b0e9c304b5b0fbcf526595cceb4e5c1634
+EBUILD rfc3986-1.2.0.ebuild 687 BLAKE2B d6497000ea1852e52f43e44c90f5026ee9c98ff257f5f692f56894fa2f34e1e6425cade3ba4b5ee043437b5a7d6d890338b40876ba61729abef2861c942cdbc1 SHA512 156c01c2b8d1f22b3f91644e973e382b8ec0454d9e9067b6ff66c354fa056a69672ffce0b65cc93f1b55b201aacc6d0ab9b6ac568dcbd5179b75817972320802
 MISC metadata.xml 601 BLAKE2B 0cd1efd0eab6850689b22d3012463b24fe77156d81ab4cef046f2bedf7c8d1bc9b82707bb8e493243fe6d1b0958f8e7936f749c1e90a66c3b7052d13d7655b4d SHA512 2a535235ea1111e30083c9e7799fa584e624aa39fbbb715b49aefb0ddb8b96135da1533f8bad3e4190b6eada990da906f1bbba66fa9b5a29baf4963161c52426
diff --git a/dev-python/rfc3986/rfc3986-1.2.0.ebuild b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
index 28f57b19268a..21da327e4a5c 100644
--- a/dev-python/rfc3986/rfc3986-1.2.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index 69f80e6e24d7..7b4cf03bbf8c 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,8 +1,6 @@
-DIST rosdistro-0.7.0.tar.gz 60092 BLAKE2B f68dde51a3e6b5efe26608130d3a69536803baad92565c7d7cb25b22f71be4cc8bb3869d72abefa7e4de4446ff7f3f49037e789c39d9ac401fff30dd8d9fc082 SHA512 8def3e3d405483f9cd51dbe82bfbb7605a50d2d14dcd9712e3e93c5c091953df430203b2383d46c1db2248678fbf2b84638328f47a256296c78229b7783e724e
-DIST rosdistro-0.7.1.tar.gz 60093 BLAKE2B b6e16af1b20ccc31a23365e9c74123c6cd2b17b4b522b925e66628cec0608c29bb73ffd22ca21e05f85ea20681b37d1acb95634f652e16e515e4615aec65b1b8 SHA512 cb22d331fc71324de518336b1e3afd8b9e54180b3deae55dedc619aa6308dd5ec0ffe22dfd7e2e8e362bb56b14602db9242a8b81d71f2745c9f94db94aa91ccb
 DIST rosdistro-0.7.2.tar.gz 60091 BLAKE2B 40f2a47fcf5a13d0b8b9eb29fcee9bfbd811a7541dac74e6be76e2c67ba34adf0b7c2df8804300e35262bbb36efa890128e06217c93ecfc834015010e344e42d SHA512 ca6c0d19c2218efe8bf27c1cc22c4c9b683dccb5f8029208e0b581cb358fbe32733895896b1afece45b6576f254f4535032cea962587aa47d93235767c6baf60
-EBUILD rosdistro-0.7.0.ebuild 1034 BLAKE2B d91786449f5db17442a81ab8afcadc5f025b93158ac3b4e36dfa23c7d30b7adbdd3e384e8ca7c1c281de15083781101538ace0a5a8d123cb557d5df181ba9173 SHA512 48ff23cbb89af415569624b08ff1d6b7175126ae7c2f0dd1a892667646930900998d6d7415c10d83043d59298dcaeaef988cb80b33a35411ecd5f71cf267bffa
-EBUILD rosdistro-0.7.1.ebuild 1034 BLAKE2B d91786449f5db17442a81ab8afcadc5f025b93158ac3b4e36dfa23c7d30b7adbdd3e384e8ca7c1c281de15083781101538ace0a5a8d123cb557d5df181ba9173 SHA512 48ff23cbb89af415569624b08ff1d6b7175126ae7c2f0dd1a892667646930900998d6d7415c10d83043d59298dcaeaef988cb80b33a35411ecd5f71cf267bffa
+DIST rosdistro-0.7.4.tar.gz 60365 BLAKE2B a2b9af6b584abc057d0b5e7d1087438834801eea33555fb094bc938e1ec642a5d41057f61ee3d3f80ca3ea083e8cb6989f6907cfbc9973067a32d0ee505101d8 SHA512 9e2cbc88290b3a132fa5aeec446ca25a89365367a57a97f49cc26533139f91b2a50a1f2f6176f4333900bf7fa21d49c9836d65e74dc8322fe8c5811c49794291
 EBUILD rosdistro-0.7.2.ebuild 1034 BLAKE2B d91786449f5db17442a81ab8afcadc5f025b93158ac3b4e36dfa23c7d30b7adbdd3e384e8ca7c1c281de15083781101538ace0a5a8d123cb557d5df181ba9173 SHA512 48ff23cbb89af415569624b08ff1d6b7175126ae7c2f0dd1a892667646930900998d6d7415c10d83043d59298dcaeaef988cb80b33a35411ecd5f71cf267bffa
+EBUILD rosdistro-0.7.4.ebuild 1034 BLAKE2B d91786449f5db17442a81ab8afcadc5f025b93158ac3b4e36dfa23c7d30b7adbdd3e384e8ca7c1c281de15083781101538ace0a5a8d123cb557d5df181ba9173 SHA512 48ff23cbb89af415569624b08ff1d6b7175126ae7c2f0dd1a892667646930900998d6d7415c10d83043d59298dcaeaef988cb80b33a35411ecd5f71cf267bffa
 EBUILD rosdistro-9999.ebuild 1034 BLAKE2B d91786449f5db17442a81ab8afcadc5f025b93158ac3b4e36dfa23c7d30b7adbdd3e384e8ca7c1c281de15083781101538ace0a5a8d123cb557d5df181ba9173 SHA512 48ff23cbb89af415569624b08ff1d6b7175126ae7c2f0dd1a892667646930900998d6d7415c10d83043d59298dcaeaef988cb80b33a35411ecd5f71cf267bffa
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.7.1.ebuild b/dev-python/rosdistro/rosdistro-0.7.1.ebuild
deleted file mode 100644
index e7e27bc9f9fc..000000000000
--- a/dev-python/rosdistro/rosdistro-0.7.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Tools to work with catkinized rosdistro files"
-HOMEPAGE="http://wiki.ros.org/rosdistro"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.7.0.ebuild b/dev-python/rosdistro/rosdistro-0.7.4.ebuild
index e7e27bc9f9fc..e7e27bc9f9fc 100644
--- a/dev-python/rosdistro/rosdistro-0.7.0.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.7.4.ebuild
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index ae46fe2850a2..91a1d4ec2d43 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,7 +1,9 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 DIST rospkg-1.1.4.tar.gz 89554 BLAKE2B b307482cc3df0f2a178dd427a37160cfdc3c407b2135a28854f3df0ff964ed57c17a8ee358a1aa90b3d735e0913bc6c3c8ea1084efdef5fd01933166e21ebac8 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5
 DIST rospkg-1.1.7.tar.gz 90200 BLAKE2B 5b64be62b292ed8d216058d9e906451c74ebfecced92da2888b6e6340a217f56460b9dad6fb741a1b78c156513adfb435407dfac19a9fcbca49b180662b879a2 SHA512 7d6915a32370786384220cd0d62087e0f82648e96f2006853dfb1486ff5b6c3343e32b9ac8a33ad1c1a8c758499475553b081166ca7ee0c72659855a2b09f151
+DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6
 EBUILD rospkg-1.1.4.ebuild 1076 BLAKE2B 8cd3171fd85c97e5c42382d0281de4629cdba1f36bf5046a671fd2f6b91089ee96e70c73524552e20b9d53ee5bee07896fde9210016ee8753cfe53b838c2eb27 SHA512 2a9964c1cd662b51ba68bb8d19f37cc3a9888dcc7376fe3efa229623e3de46cffe027847e457a7b2c04d52b599e159b30b699d2d29dfde9974f9451b7c133c48
 EBUILD rospkg-1.1.7.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
+EBUILD rospkg-1.1.9.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
 EBUILD rospkg-9999.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.1.9.ebuild b/dev-python/rospkg/rospkg-1.1.9.ebuild
new file mode 100644
index 000000000000..0e81f9b79bb0
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.1.9.ebuild
@@ -0,0 +1,48 @@
+# 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} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+	# Needed for tests
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
+
+python_test() {
+	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 3841b18bacc3..84a9834a3b5d 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,5 +1,5 @@
 DIST rpy2-2.6.2.tar.gz 171655 BLAKE2B f590e63dbbb6f5aa9f18d7475136005fa993d32af41e12a8e33fda0232a73d444f83341aa2dac3ec8300cf68de83e377d5f6caabb27b5d439af795126670e286 SHA512 7a060ccc26a03dc93d75edb85d92f1ab31af96ba140932ff8e699cd5855e6078b1e0ffceed135d32deb6c8f273ebcc8b02be38e9b8fc66778cc2adab5745f542
 DIST rpy2-2.9.0.tar.gz 193062 BLAKE2B 92492821856e516f8f620397cba2e0ffb17718156c7c3a0bc8df8e744f0adf1ea6006e5c762ba99aa142fe06d327a240bf5d616175e81a80d28a21265c9771aa SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2
 EBUILD rpy-2.6.2.ebuild 1269 BLAKE2B 8c7bb8b122735659a24e5b291134277552c951a20029b8246227b927404a226115d91fe2aa32d0270d0025da893f4b6f3eb8a6a5a28382c2931c4319e36503ab SHA512 2e19f9e6a29fd707ac56d620e69d8631889b267a65054cbc8fd733080aaa5f4dabbd8ea4fb04ca3d3aab002e0af0209e07b871bf3f66a6d73e19e800fd4d9702
-EBUILD rpy-2.9.0.ebuild 1231 BLAKE2B c3e5f557c5f153e67bec455fd2cebc033e9d4c85a26a341784204f59108ce9e5b3dbe070d3c7fd9eee93938067e1dfe65164f5a3c4678da0e2fc669bfa7a4472 SHA512 883013a82111b1ded9a04a502934688838575f5fb47082ac8efdc51b9e4225ac616f5819f53616c544a3812066208db99c3297d29d6d70cb000efe84d7259f6f
+EBUILD rpy-2.9.0.ebuild 1229 BLAKE2B 3f7b3aecc04c078fb74d1f2a40924ad9099ceb61638b1a0a8c3620f1be1beb36cc5030bba219ed7cac5eabf7fcf0f7ba9f234d444e6970ddda945879f8077e22 SHA512 037df3b284e2bbab8e705aab72dfba8794ce2721fea9980fe765e17a23c913502eafa185d7af5b74d3fd074f2ba6e9114fffb50b0e1390a6c82bc128dfc910d3
 MISC metadata.xml 700 BLAKE2B 42fce60e594dbff010837724886940504b6d01545afbb9330238139855b4350247180cd05875935e9ce807808e02979733b000eb15558a7dd764b7e444a7b4c1 SHA512 f70b91d3a53220b814460d8836d0d04500b0c9fa62395a8264d81a8d952ec8f2090d20cfa55cd60ccd2698a947b61c6284c036abc298a9c18a7807302c15d8af
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
index 2668d9da81b7..d200fde0ea29 100644
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # ggplot2 is a test dep but not in portage
diff --git a/dev-python/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index 1abf17ca4f42..d6d1c0964f88 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
-EBUILD rtimulib-7.2.1-r1.ebuild 571 BLAKE2B 9184c75f8acb7a90d458a80914819f7a99c48d381fa3fdc0bc09d97de342360e07e27033f31bfcb2caa62bbbdeb8dce4233f4ad81b027cb923bc508d23141972 SHA512 2f1a801ab187febd759ed1d8e34556bd6f8dc709cb0f788f402460c7a0817ec56360e15209b4a5b99e6756b4c78a8b22ce0642be2e05ba75f740e6bca07c7b9c
+EBUILD rtimulib-7.2.1-r1.ebuild 570 BLAKE2B 1228b6e3448a2bf1c7ce79e8402e1297f2fee3cd8206553210ab7c16bd967030a38d402fa2e2ceeb0ccac2fc5c9082a680b75b7d4597d765f41c9b340061fa6a SHA512 4236b324b75e18d4b5baf0c2fd302a7374a3a7821018ae7661342898f309b2ff5b77ba56707664cb503077384ef4af9a00fd3a0441c7516977489eddab000b22
 MISC metadata.xml 848 BLAKE2B 8a0045ba1eb894fd8b3796e1e301e6bc11510a78f9ce3943309448f5235b0bb8865bed7d81b5da7f5dffdbc251c1a5ce908a5448d109e7e61ab433d234dca868 SHA512 1f5e646966e092c296948894357743d5be29e23e1abead62a748ec3d8237025d212bd48b9b5a15eecfbd486b02bda4e81c5ff2fee4eb08c0ef0d5f91b47e0a3c
diff --git a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
index c9aa1a2f7fc5..d7dfd2beb7c8 100644
--- a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
+++ b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/RPi-Distro/${MY_PN}/archive/V${PV}.tar.gz -> ${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 ~x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index 01746fc5dca9..2519ab0816b3 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -5,5 +5,5 @@ DIST rtslib-fb-2.1.69.tar.gz 69825 BLAKE2B d5bc7a526495922e9c00f81d11f5436b77a91
 EBUILD rtslib-fb-2.1.62.ebuild 603 BLAKE2B 5d6105a09aaac61200ae008cc683dda2d28661082beef081fb936e33b667fd9cd47e93609176dfe6c9dac2c672a92efaa81e996c2a6925bc5b763e8d736837f3 SHA512 393c11607161fb1d4e63fb345c736fd9688aaabc21c68e1b56762b28cff022e06ccb5ee1b9ae20cfc8b2245fa011fbea1669a8a80270da80bcc415cfd4763a39
 EBUILD rtslib-fb-2.1.66-r1.ebuild 613 BLAKE2B 42da9aff9404c1b3ae1b48fefd61d9d66c543c75e30cfe121a383e286b338d175993877a8f4a31957fbebe3868af0aeab5c3a074ab4b56faad68bd113d77cd64 SHA512 3999bac218ef47173311cb3ae7804a74f329e39fb1b1a3c5d6fae55d497168a39b0965ded2cbc997db0793ae68cab5e73ac1b8a0e9016a00e8920502447a0feb
 EBUILD rtslib-fb-2.1.66.ebuild 603 BLAKE2B 5d6105a09aaac61200ae008cc683dda2d28661082beef081fb936e33b667fd9cd47e93609176dfe6c9dac2c672a92efaa81e996c2a6925bc5b763e8d736837f3 SHA512 393c11607161fb1d4e63fb345c736fd9688aaabc21c68e1b56762b28cff022e06ccb5ee1b9ae20cfc8b2245fa011fbea1669a8a80270da80bcc415cfd4763a39
-EBUILD rtslib-fb-2.1.69.ebuild 689 BLAKE2B e728ee66b76be05799370c4be576adba86356f31e393fb05e87360d54c0ab0a775472f9f0bebd94a4fae965540437117ce618e87758ee3eb3c64cc5a181232d4 SHA512 54615385af01dccf41c37b13a521847b9f16df48f21549b80d325f8ca3f5beea5d802ff4518e64fe1f092fee7cda0b3b1251941d9e88a8a75a11238cd2e25fc5
+EBUILD rtslib-fb-2.1.69.ebuild 687 BLAKE2B 728967c3f3892180e7a6ad85a38692abd6ac24d1fc9f109092d8b47e4ec8bb885d3aabd07394385c56e043f7e45bddfa8423c7624f0e35b38f98749231df1213 SHA512 9d7c7ada67af15ba0bb2040676f9e2b49d867ce53fb13f59af599728297cb9dcafc72fc986f70780108ba74286b9994b92cc564fcebf1e9a6a181dc153e50c45
 MISC metadata.xml 827 BLAKE2B 488d8f9e2e3cdbf10224b0312e83fa23887952e960b6aa8ff95780acbbd9ef96175aa51bbd14e934af300903cecdcc50795c6078d210e833b5db9654bd5f217c SHA512 2082be66a05829bef801444b95306dbfe427e11f3f3f64049c1e96207f62603708c503bae6c92ababb371e640a2c0a071bd07bf37e69d341926d5654c6b8337f
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
index 036a2dc3cb2b..7da9795dc0a0 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index b1d17cf8f210..dd32efe73150 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,5 +1,5 @@
 DIST s3fs-0.1.2.tar.gz 24574 BLAKE2B 2b62202d8ceec078ca93c6da895a81648c83e0fbd764dbcf4cb1a0ce2c2a8a7cd16a3cc5162d095ec1272b52c9da743d8c8d21f5b351e6a4f3d63cbd77d9b43c SHA512 52be23ccb2dd8c63675287895d00fda94adf010ac878ca12e5c8eefa25c7076c000b53bb4d2bb7886550cdd0d226cdf51aeee12f2ad7bac46537f190ba72ec2f
 DIST s3fs-0.1.5.tar.gz 27215 BLAKE2B 84f059eafe14a4faf8945c355763d31a49f38c3ae6cb05170dbff0e7ad435f9ea79617fc538d237b565d20a0b11603ea44d9e71339fd40c1ad16ad0af903bbd5 SHA512 5285da6d82de1e68c4cb0fad5a93eeb59fdffba663691d79cafd1b428b60e17fa21e0ff3a50df701cad7f351017cdc538954b0516782e5ddcf6c3d5910f71144
 EBUILD s3fs-0.1.2.ebuild 637 BLAKE2B c3cfabb167884b1503bc46c9792b12e0b5dbcef9753a85bef2531cd01a84c07c30464f98b79f8dbcf152b3c2b9ef3a17488a6556076f7157319e037bd1ca0101 SHA512 01faab5b74f04662b6989ff0211c5cc9f9c15b959a1afa30d14d968ee71bf338dedcd316038ebb1c3b13e03c220f1f6aab8adb5f8a25d7113a077f7f22960a1f
-EBUILD s3fs-0.1.5.ebuild 642 BLAKE2B 37480dc6f8c00151207622945e04464b7b1a2555c6e1e31adbcf5ae35d776da32b9d9cd10e3e9cee39a0b821b2daeaf6972e3a6188b5f4cc2a37de5b017cae60 SHA512 98aca3376a693cf2c56b104c056bd0e8b1fd73df54aa681dab0d3020c0c20cdf276a714219fca2b9571edb16e33b49f48c48de1a2ad19cd2f6177898a2bf68e0
+EBUILD s3fs-0.1.5.ebuild 640 BLAKE2B e9af38f626c9c96d6f5c3ddbb873e6cfdc96477741b0f2fd23ef48f9a25635c64a38817168b0db2799b1dbc65b094d33a61f969315ff5ad2ba507aa76ca987dc SHA512 ae6521088a20697b74df81a0dcb5a78c4766783ee25c0e9b2009ffa907cb5ea046606b14e1b82a1617f9ae70b34a0a9c725c290574cf0b1963585d3a64016866
 MISC metadata.xml 519 BLAKE2B c4ab17bb17c687ac00bf13ae441685f6484334dc588f65138dc616f7cd8a49debe0eac5ec11c2d7485eb48855238ffcb25612d687b75ca52d58a921b311e455d SHA512 f8c6696ea3f62243be9f39ea56dafe0bdf137b49aaa3ac2bd793301c043645d2ce63c6cd7cc1a476a8f554317ce518f501ce0775f89f8bebb66e3d3d806f4926
diff --git a/dev-python/s3fs/s3fs-0.1.5.ebuild b/dev-python/s3fs/s3fs-0.1.5.ebuild
index 6f4e46cf6e24..a97c590b933d 100644
--- a/dev-python/s3fs/s3fs-0.1.5.ebuild
+++ b/dev-python/s3fs/s3fs-0.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 434d2af7b98b..53bc032b6c51 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -2,6 +2,6 @@ DIST scrypt-0.8.0.tar.gz 39042 BLAKE2B 305973f0093fd3f9f132c448a5155c58f7306df31
 DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5
 DIST scrypt-0.8.6.tar.gz 52986 BLAKE2B dbf9f28e03dbe8f37696c6d227dfc719d3952d3182ddba49fd6c2aaf34e53db4a84a412ccec1ac8c83abaa5c12c6d6bb36107cf90a60a5776b1a9f596d1f85f3 SHA512 f0f3bd61a5fcb55a1d6af5b7062202446c2c0595e88617f1e53c4ded6a9b1ab857fda9e8d153c0b3bbceee49a818dd428776522c6b0919b15096fd230b13ef60
 EBUILD scrypt-0.8.0.ebuild 615 BLAKE2B 2afc001298eb4b14406828cf0c8db16aaa9b187f00dcfc038a1287bc223b0cc79e2a1bc94e7934472b7d222f71de34dc7545e5d24d8968f024cc0fac6e84cf71 SHA512 76b1fb11f31019c149d0b65cb319e83117354416e4ab0d2c4c9a86da5c83833b8c80a5e923c39b06159eed39145127e469809147b570c42962c90671dc884ffa
-EBUILD scrypt-0.8.13.ebuild 571 BLAKE2B 177fdf9fcc96be757dc4a494e3fd3a4da833c8e10afea37b76f4b8f7605baaca40963089750226adb16a4c6b1b88c5a19c17a57aafeeb4d577e528a7d75a7944 SHA512 157c7849d987e4e0513ff5e6b789f639db931b66b124892ad33711b4ba0dc195ec654f43b13bfcba9a826783935fd53175ba5fbc090e9707aef8db5889a01cba
+EBUILD scrypt-0.8.13.ebuild 569 BLAKE2B 23faf89bd8ddf88a3ea99303464931dd5d78e0487685f0e485fa15586b0b67618abc90f73a032c2fea516933fbb96c7ea0f35f9cd477a3c6761453afc2465724 SHA512 64414cc20fb6b4528c74e5203bf5a1bb3a15c8c239cf51b7afd06e3374e3dfdbe9317767eb3172fba6d759688ce3e4f1230679a38a3010fb5e0815df5e560481
 EBUILD scrypt-0.8.6.ebuild 571 BLAKE2B 177fdf9fcc96be757dc4a494e3fd3a4da833c8e10afea37b76f4b8f7605baaca40963089750226adb16a4c6b1b88c5a19c17a57aafeeb4d577e528a7d75a7944 SHA512 157c7849d987e4e0513ff5e6b789f639db931b66b124892ad33711b4ba0dc195ec654f43b13bfcba9a826783935fd53175ba5fbc090e9707aef8db5889a01cba
 MISC metadata.xml 586 BLAKE2B a5f49db551f2768d1474c483127fb555d0015d59896d3016c4036cf19d719c4f996c31f2f3bea9bf92c0e4d8d21979dfeb917974727944c16eab40a3bd15e82f SHA512 67277df1509df252e7366080edf19500697aad8ffe6192839f61fea76391803525ca05c377e8d1f1b67d606e47fc7047b4714f55a2cc9166642329a4af4cb92c
diff --git a/dev-python/scrypt/scrypt-0.8.13.ebuild b/dev-python/scrypt/scrypt-0.8.13.ebuild
index d51927464797..b1de37480d91 100644
--- a/dev-python/scrypt/scrypt-0.8.13.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.13.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 SLOT="0"
 IUSE="test doc"
 
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index f19a6e384fae..274274f9f596 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,5 +1,7 @@
 DIST SecretStorage-2.3.1.tar.gz 16073 BLAKE2B e4769e748ee39596c51012a6ac626dba2b019238a8237678c47d713c2af4b0e88b50d0068b5dbf3a405b9f7b14a7df64aabf751009dd21ab25de65ead2a79c38 SHA512 69a2c86a1abd904b7d71bbb59cead3b2588cf88d7f35cbaf64d18ff9aa9ed62ba9f79d0bebd10136aa8a0edb1ff8a1d1aff70cf8e519dc74303993ef0d564047
 DIST SecretStorage-3.1.0.tar.gz 17767 BLAKE2B e234a7f34b5ca2debfd04d4f3b4b4e2a1625aa346133e464bbc1f094381445e3d0c5460457c687f55f6682c6b6085a757edb23a6029fe5c2abf139278203f326 SHA512 a044009480b359aecb0c8782f04e4d02c3c1c0e682f72733896c98f386562c43766318963452d60028d0a92d02903130278cf26a5c206f5f0909e106bdb2d133
+DIST SecretStorage-3.1.1.tar.gz 17036 BLAKE2B 1dda10a5f74727ec29392ff2a3ec65b841aff86db21223ebdbf291afcc9ac7ee68de8c62e5929aa45aafabc791ac02ed80b6785e69f2d4b51d827fce8bbb3443 SHA512 295e0f75c772edf153480730dc20051f06e60e040a18f169620cb4aaa37b8c1a254a496464d3794a38cf49fa884a7b561fe364816f0d12a5b2622c77259f03cf
 EBUILD secretstorage-2.3.1.ebuild 685 BLAKE2B 5224d391e50831fbf97acf6ef2c9e5375037400ea81f5deb04010fd206369461e99b54a9d8bcadb47333bf7d4270b9213cf20a6e0f9553e7d05849df4a3bdfbd SHA512 ec262452b5dd402eb99e013e4da29804d0d2df0b566869efb2beaa3b4d3af3f7e8c38b3372c4e77d28da7ded7e36263cbf47b819bdf159aa03163f37f43e176e
 EBUILD secretstorage-3.1.0.ebuild 1069 BLAKE2B 702c60c40f07c6196e45fe96bddce9049cec6f24ab4ef488dd36245a85592c8d743d7d7a8c1df6565687d00fb3df1be06d4f8b3c39daabfc710aa174420158b7 SHA512 1b7e96d396029f2e804279477b501b95c5c6e61882aee5a68fe871844d874f51ae86e62deba076aa7178d25dd4e1c5b008daef65db51d2568c2d911cb2e4fb48
+EBUILD secretstorage-3.1.1.ebuild 1069 BLAKE2B 702c60c40f07c6196e45fe96bddce9049cec6f24ab4ef488dd36245a85592c8d743d7d7a8c1df6565687d00fb3df1be06d4f8b3c39daabfc710aa174420158b7 SHA512 1b7e96d396029f2e804279477b501b95c5c6e61882aee5a68fe871844d874f51ae86e62deba076aa7178d25dd4e1c5b008daef65db51d2568c2d911cb2e4fb48
 MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-3.1.1.ebuild b/dev-python/secretstorage/secretstorage-3.1.1.ebuild
new file mode 100644
index 000000000000..d05e995ee3db
--- /dev/null
+++ b/dev-python/secretstorage/secretstorage-3.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="SecretStorage"
+
+DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API."
+HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/alabaster[${PYTHON_USEDEP}]
+	)
+	test? ( ${RDEPEND} )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	dbus-run-session "${EPYTHON}" -m unittest discover -v -s tests \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index ab7970024602..e19768764c7f 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,6 +1,6 @@
 DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
 DIST setproctitle-1.1.8.tar.gz 23208 BLAKE2B b77fdabe04b274e0dba2555b195267f57f1e52b82c523b1a690b5583eecc8ded90a35452f1c6ac15b5b082acc1c76dba973089bd9c11b4244a397f7fb1263168 SHA512 9d0ab8e65afd7e1ac019ea47995498dae1f82d8aebb333dfc4c953e745441cb9a8db942ad8417522d1f9a805bc50ad680f3a37cb4cbbd4214d261d4fed600b20
 EBUILD setproctitle-1.1.10-r1.ebuild 1244 BLAKE2B f92328346f23b52c64b368acf48d47bf9978c741de49fd7b7edb0e23891e1b9b0633bf9c31d61d2df9808ffa1a161b4a143d19f9d6a0ecfa5b0f7de1124114cd SHA512 b5a7ee6ed0af4fec3cefd0b516d628c826c509a65c475e8c38d884954d4216d972293d3108f7d588b927a337faedb1cedb8d43f21abbe1910af7b3b8cf213be1
-EBUILD setproctitle-1.1.10.ebuild 1243 BLAKE2B 73645083e97bd4ef026b88411ad6f9175998ff22abed5770a1ec7f32eb9973bf454b97f916f0152ac3ecf654a7c2fd65df9289e5222353e5dcd1df125c921a8c SHA512 260e30839270d3cec8e5ba8c1c14bf357c14d7a0a4159e94421a503841e5d5ff61558cf05faf1b8f1b65fbf96449ac948bfc461298575efe737a64921352561c
+EBUILD setproctitle-1.1.10.ebuild 1235 BLAKE2B ed1168b5ad4b58d341f222670e996ace0e5cc6f3fbfadff990f549e7934062a2230b73fdd4211f38a1f06817b5169e9d84838498eecd1942cb92f15e9d0dbf69 SHA512 1e0be6b3638bfdccf8912007a292d012039bd751cf4c9a6fd8d2a5852287720046e9bb4420806e6baabe500ebbb3f55da5ecc6272f59f4d51b672650ef95b7c6
 EBUILD setproctitle-1.1.8.ebuild 1508 BLAKE2B fc93c74a127d961afef9b2a778ca6371a97d337791037b918d2e12e96a471759e1d447ab4c0174d624e8edace7d1f8c95310b2defddbad6e36097291eeb2e213 SHA512 e2f4986f143d6606d4de95c36a35fb9a2db599eaa18f5458d14bb4cdaa397871ce5713140f49555768ab156673de4b84953c56525dfabc0551993e269f76387d
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.1.10.ebuild b/dev-python/setproctitle/setproctitle-1.1.10.ebuild
index 3ed920ddd2b3..a72496126fa4 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10.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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 63ab50c3acbb..68b462ca2326 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,14 +1,9 @@
-AUX setuptools_scm-3.1.0-test-failures.patch 4040 BLAKE2B c256db00c9e98623d5274a1815cc86abef6c42fd501bf58675a1982ded7305500777595ff8df3099d5ac1608f987d3a415a3aa964178a6946b11ead720f4ddf8 SHA512 e8901a796dd54ae51d11dfb47f389d098d68adc6551789bb893034c6e264d91c9fc8af1f9f2b394d229051f2fda25f79e81b95734d93b7083dc2c6914c218d65
 DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816
 DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5afb9953244659833a61e810c9029227e1cc25a067a59cec5666add76863070ae5b7dc2600953a45def886e52378a3399 SHA512 0aa6056c03fe100cdaa7b11c9d2073431bb5c3904a80a994a8263c0ccac81f7a2c0b6c7e6dfd09ad605c5ff0e86981b894b42920cb69d1ef1d43ea08b2ddd4a0
-DIST setuptools_scm-1.16.1.tar.gz 28956 BLAKE2B 6721830e9ef171768afb94e6d6aacb829665658599409880e87c58e1bf2c6366d04a666ff60ed5d689bf376c258eda93367a4c52fe28ec694a3a93ac109db1fb SHA512 fd5017648c4a8af696e8528eab37061776e8495e2de3640f726e5e4347836eca5a13cbe54fc0c2223c3ae80ede1a81a6f3d9c0910a417545b9f9f206e5177a13
-DIST setuptools_scm-2.1.0.tar.gz 32776 BLAKE2B 7a141f3fa826a82931b6c33afd19d3185f98b735451c03651b875051e514eab287b20ee382a9576841b6f1283b9d1bf3dcbd0aabc41d2f1143cf960b856c8492 SHA512 69ce171aa4d3b576883efffb350c59f38bfe8b35bd8e4e8fa1128d9f8a3e6cfaab832633e91fada36126f8e7e2c18663fad621d62c9834be1b5d36c58ae1d1c8
-DIST setuptools_scm-3.1.0.tar.gz 35585 BLAKE2B 7ecbdf325467cb3e5217150c548b99603e1bb851a3bc8c694acf3aeb0da798ec853d13b29ad0537bdf5c1010834576786e0dde3965d61991554a12cf206ba7e0 SHA512 bd84bb02900ddc7de2f02dd7cb62bafdea7040ebdc2506b72d05f2c6a6d16be903321e576f63a04f2aa13d8c75b1834dec7d9ea8444e8330281f8e586a3d6426
 DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937289f91f8fead5230ea7082d85275d5d988d655854a36afd48d6b621eaa261ac9a0cd486acc115f0e389fb6828645e8b SHA512 1995754654f8bf509ec7f2186857ba0005dbaea0b1c734f521becb9d022c127e7b36f21da8defd5ec9883de5d0d4afe006f9d152c4cefe6beadf8b878e949eb2
+DIST setuptools_scm-3.3.1.tar.gz 40183 BLAKE2B 417cb000c3edba7da8e92b8fb5b1d906d2ef0170eecc4c0b9d2ea490ef6bad4cbf5ca172bee0fc536c83605d361604c728bf4097f520ef8e62ee2d4f004e3db1 SHA512 cd8f3d1e97743097791001197c18a2c8336b9e499a543ec5d1ab6e9b613ef1417b59e34c329507a73c2626506ee892ccaee74dddc5c0950ff71c0bdfba954dc3
 EBUILD setuptools_scm-1.15.6-r1.ebuild 1354 BLAKE2B 3edb6f41ae5e11e6eafce2795b49776206340b1f8c637cd33a661a21c41c3fb1acf9d50c6e502e9630d29287fe83b53a022ba909795d25d39e41d52708545dfa SHA512 e43291aa02e92328970431c641492e46b40b9c0619384c4acd15d8bb1ed6368a54b774049ffca2dbd6ce56abe1f0440e4f6e22d5ccc959644864928c41d18b12
 EBUILD setuptools_scm-1.15.7.ebuild 1478 BLAKE2B 06655a6e5a4337ba5bc488d0e4751fde18fc8b130b83f06813452e2a929e4ec4b5283e81fb2a8d16f0697cafb0b7be4c1664fdfcfdb0f967f1a6c000bfe88d04 SHA512 226ffc6926f636a954eddbe8833cb4c41124c0ea880849047f080bb04b4dd25a77fc6dbc1263ea58b8894f82d529dca7af30f646378caee51e02dd282874e8c0
-EBUILD setuptools_scm-1.16.1.ebuild 1367 BLAKE2B d7d05d6b6d6fb9825bb3d1c4fb3b43ebbb236f39fbaf90dd8573cc751cb87f08d53b071471c1bed767112d8bbd4b14f3d934a6a285053e31fddc8a68f37ce188 SHA512 4b3e4a135cd4de0f2dd57865f4bbdb5a014fe9390da7b559d8122589ee78ede0390516f8d8e7c9e22f0666d82b2112cd748e2f41f61a8c2bba4d942d9538b5f7
-EBUILD setuptools_scm-2.1.0.ebuild 1068 BLAKE2B 17848c18da1ec9149a74bec35988a319a75d6462287ed47e3226f27f0c8c237d4657e71662e1079c5a2c3cee29caa9025ad7e0a17e74e01210d12de7680fb223 SHA512 8b81de2dac351eadfd2cb7adca0ba7184da2c154ab4371d2a30889d5bf4794d974f55939320e7baba3d27082ca7397c8c36e2205db32bafaf93d1a4af702ffbe
-EBUILD setuptools_scm-3.1.0.ebuild 1173 BLAKE2B 74d8b7a2530742d43f988d323f45262ef92c517cd94a04b4ab03b5428bfab83d607b69c932717e7aa4b71fd5c455226127e6cecd9705fbc643699a3625a58c1a SHA512 c595337f6c5a0a594b68072ba1002058de8571d47bf7230575ce3d40fa2ba0ecb78fb0e4eb0aacf5cbfc1b0f60a65c0999911b55a1794cbc403c57df6065aec8
-EBUILD setuptools_scm-3.2.0.ebuild 1095 BLAKE2B d58557a09375e07e05b31b4ed9db0580f971c55d0928a86dac5ed794cfcfffb944a40ecdbfc38276741e4f3e86950b32aceb93e8401c230d8ed773871f24b325 SHA512 50bd2f74c4df8c5d5f572878dcdbe550dbea5e5e277be9052f59b95f4f35b74a0b200d27bb727e6069d6337e83f0b2080b3d398d1808094f93cc53a968eab808
+EBUILD setuptools_scm-3.2.0.ebuild 1315 BLAKE2B 567b3673ce8d21436cfc24eab1ec351cc2d0686cec0d109c86b7542137fc647ff8ee834458f95b0ccd3874e83ce6e11ccbb8b737d745d516d0963259debcb15f SHA512 aeaf940ddefdaf28f713c43e5e3c0e9fad9b9cdcbce5fb741008165fdbe5a4bcd825f69f923f9d02ff277013df829be6441c2ee9d1893b25be2cfea5a4fafcc2
+EBUILD setuptools_scm-3.3.1.ebuild 1318 BLAKE2B 5e628c70571b727c27ae06c1537fcf890d06a24ad5998077c095bdc3ca41ce9a5e123f4a5e31908b11aa688167ac95dec0fae5ae38d34d44eed4b76b0ef321be SHA512 b608962363a546fdd2db76f688449bc2dc407b5cbcc5287adaeeee7842590c388c6e79af3f1273e254c823b7aee8acd646b244ad480f837cdd57c786a83cae9f
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch b/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch
deleted file mode 100644
index 420bd6828b42..000000000000
--- a/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/src/setuptools_scm/hg.py b/src/setuptools_scm/hg.py
-index 972f493..8fedd68 100644
---- a/src/setuptools_scm/hg.py
-+++ b/src/setuptools_scm/hg.py
-@@ -13,7 +13,7 @@ def _hg_tagdist_normalize_tagcommit(config, tag, dist, node, branch):
-         "(branch(.)"  # look for revisions in this branch only
-         " and tag({tag!r})::."  # after the last tag
-         # ignore commits that only modify .hgtags and nothing else:
--        " and (merge() or file('re:^(?!\.hgtags).*$'))"
-+        " and (merge() or file('re:^(?!\\.hgtags).*$'))"
-         " and not tag({tag!r}))"  # ignore the tagged commit itself
-     ).format(
-         tag=tag
-@@ -70,7 +70,9 @@ def parse(root, config=None):
- 
- def get_latest_normalizable_tag(root):
-     # Gets all tags containing a '.' (see #229) from oldest to newest
--    cmd = ["hg", "log", "-r", "ancestors(.) and tag('re:\.')", "--template", "{tags}\n"]
-+    cmd = [
-+        "hg", "log", "-r", "ancestors(.) and tag('re:\\.')", "--template", "{tags}\n"
-+    ]
-     outlines = do(cmd, root).split()
-     if not outlines:
-         return "null"
-diff --git a/testing/test_functions.py b/testing/test_functions.py
-index 14d8961..c3d78b6 100644
---- a/testing/test_functions.py
-+++ b/testing/test_functions.py
-@@ -8,6 +8,8 @@ from setuptools_scm.version import (
-     format_version,
-     tag_to_version,
- )
-+
-+from setuptools_scm.config import Configuration
- from setuptools_scm.utils import has_command
- 
- PY3 = sys.version_info > (2,)
-@@ -33,12 +35,14 @@ def test_next_tag(tag, expected):
-     assert guess_next_version(version) == expected
- 
- 
-+c = Configuration()
-+
- VERSIONS = {
--    "exact": meta("1.1", distance=None, dirty=False),
--    "zerodistance": meta("1.1", distance=0, dirty=False),
--    "dirty": meta("1.1", distance=None, dirty=True),
--    "distance": meta("1.1", distance=3, dirty=False),
--    "distancedirty": meta("1.1", distance=3, dirty=True),
-+    "exact": meta("1.1", distance=None, dirty=False, config=c),
-+    "zerodistance": meta("1.1", distance=0, dirty=False, config=c),
-+    "dirty": meta("1.1", distance=None, dirty=True, config=c),
-+    "distance": meta("1.1", distance=3, dirty=False, config=c),
-+    "distancedirty": meta("1.1", distance=3, dirty=True, config=c),
- }
- 
- 
-diff --git a/testing/test_version.py b/testing/test_version.py
-index be940ef..a287a0d 100644
---- a/testing/test_version.py
-+++ b/testing/test_version.py
-@@ -3,33 +3,36 @@ from setuptools_scm.config import Configuration
- from setuptools_scm.version import meta, simplified_semver_version, tags_to_versions
- 
- 
-+c = Configuration()
-+
-+
- @pytest.mark.parametrize(
-     "version, expected_next",
-     [
--        pytest.param(meta("1.0.0"), "1.0.0", id="exact"),
--        pytest.param(meta("1.0"), "1.0.0", id="short_tag"),
-+        pytest.param(meta("1.0.0", config=c), "1.0.0", id="exact"),
-+        pytest.param(meta("1.0", config=c), "1.0.0", id="short_tag"),
-         pytest.param(
--            meta("1.0.0", distance=2, branch="default"),
-+            meta("1.0.0", distance=2, branch="default", config=c),
-             "1.0.1.dev2",
-             id="normal_branch",
-         ),
-         pytest.param(
--            meta("1.0", distance=2, branch="default"),
-+            meta("1.0", distance=2, branch="default", config=c),
-             "1.0.1.dev2",
-             id="normal_branch_short_tag",
-         ),
-         pytest.param(
--            meta("1.0.0", distance=2, branch="feature"),
-+            meta("1.0.0", distance=2, branch="feature", config=c),
-             "1.1.0.dev2",
-             id="feature_branch",
-         ),
-         pytest.param(
--            meta("1.0", distance=2, branch="feature"),
-+            meta("1.0", distance=2, branch="feature", config=c),
-             "1.1.0.dev2",
-             id="feature_branch_short_tag",
-         ),
-         pytest.param(
--            meta("1.0.0", distance=2, branch="features/test"),
-+            meta("1.0.0", distance=2, branch="features/test", config=c),
-             "1.1.0.dev2",
-             id="feature_in_branch",
-         ),
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
deleted file mode 100644
index dd01bd8e1182..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
+++ /dev/null
@@ -1,37 +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} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="git mercurial test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v -v -x -k testing/test_basic_api.py || die "tests failed under ${EPYTHON}"
-	py.test -v -v -x -k testing/test_functions.py || die "tests failed under ${EPYTHON}"
-	py.test -v -v -x -k testing/test_main.py || die "tests failed under ${EPYTHON}"
-	py.test -v -v -x -k testing/test_regressions.py || die "tests failed under ${EPYTHON}"
-	if use git; then
-		py.test -v -v -x -k testing/test_git.py || die "tests failed under ${EPYTHON}"
-	fi
-	if use mercurial; then
-		py.test -v -v -x -k testing/test_mercurial.py || die "tests failed under ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild
deleted file mode 100644
index 290e271e0500..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +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,7} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-python_prepare_all() {
-	# network access
-	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
-	# all fetch specific setuptools versions
-	rm testing/test_setuptools_support.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
index 7ea05108202a..1bf03fdf621c 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -29,11 +29,18 @@ python_prepare_all() {
 	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
 	# all fetch specific setuptools versions
 	rm testing/test_setuptools_support.py || die
+	# remove self-dependency
+	sed -i -e "/arguments\.update/s@scm_config()@{'version': '${PV}'}@" \
+		-e "/__main__/i del sys.path[0]" setup.py || die
 
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	distutils_install_for_testing
+	PYTHONPATH= distutils_install_for_testing
 	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
 }
+
+python_install() {
+	PYTHONPATH= distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
index 46e4533a38d2..bd949c207fb6 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.3.1.ebuild
@@ -25,19 +25,22 @@ DEPEND="
 		dev-vcs/mercurial )"
 
 python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/setuptools_scm-3.1.0-test-failures.patch
-	)
-
 	# network access
 	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
 	# all fetch specific setuptools versions
 	rm testing/test_setuptools_support.py || die
+	# remove self-dependency
+	sed -i -e "/arguments\.update/s@scm_config()@{'version': '${PV}'}@" \
+		-e "/__main__/i del sys.path[0]" setup.py || die
 
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	distutils_install_for_testing
+	PYTHONPATH= distutils_install_for_testing
 	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
 }
+
+python_install() {
+	PYTHONPATH= distutils-r1_python_install
+}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index d7b9f52c873c..85fd0b35ea88 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,8 +1,6 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
-DIST sip-4.19.15.tar.gz 1053921 BLAKE2B afe0f1c2faf839305d21da05a667e649c37ab42c95df86d237bbd8f39a6b8bb7224da547467311bf82a85ce8f0fafd8bb6dd7cbf6050f2b157773339438d6277 SHA512 9518a5e90d54758b13dd8752669d4deb175cea8d8cdf810deaf554cd157d32ab7e394d23c774993fac3b7c02d56445b80962457d59f5cda543917a0251816422
-DIST sip-4.19.16.tar.gz 1055966 BLAKE2B 0c078c7d747c3b92e739227829233dddd3c9e7c86ff50f80cd428bc8717f4ba22741fbabfd76d8e263c18a09ad14e7dfbde3423e984d31cd9a5734b1eaa25c86 SHA512 6a4e3e8580e914544c9037db61ab9cf05e2460cf2dbdeb67d30c949aa150952d2bb337061f7c7a9222251b04f83a1db1554ff576c3e83b8f60851b442133befa
+DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 EBUILD sip-4.19.13.ebuild 2891 BLAKE2B 799512a3976f954dcc293bdb0255522b101ee7cad9b1a9973d76cf1edb2671da8ad275490e86e2d3fa441191ddb7305d36deb8c14f23dcbec0fa80bf457fb75e SHA512 045a51bc5eb0ccc44fc6a1f232e0fcc32e02844f97faa69fe047262e811bfa4b10aa11925c53614cf8bdfa6f2d251348f6554ad5f30c12b583712b0b1d11b3c1
-EBUILD sip-4.19.15.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
-EBUILD sip-4.19.16.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
+EBUILD sip-4.19.17.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
 MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/sip-4.19.16.ebuild b/dev-python/sip/sip-4.19.16.ebuild
deleted file mode 100644
index cbfa17402c9d..000000000000
--- a/dev-python/sip/sip-4.19.16.ebuild
+++ /dev/null
@@ -1,98 +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 python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		local incdir=$(python_get_includedir)
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sysroot="${ESYSROOT}/usr"
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="${incdir#${SYSROOT}}"
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.15.ebuild b/dev-python/sip/sip-4.19.17.ebuild
index cbfa17402c9d..cbfa17402c9d 100644
--- a/dev-python/sip/sip-4.19.15.ebuild
+++ b/dev-python/sip/sip-4.19.17.ebuild
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 1e2d2f371c6e..5a1eb6b8767d 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -5,5 +5,5 @@ DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d
 DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
 EBUILD six-1.10.0.ebuild 1812 BLAKE2B 3c80bf52257d35729775a0ed85967121bc8692f767d10dccf6776bff50bd4538bf4d35b77d056787c5ffc184d0c32d58f9f4882dee6a5ffe731351055fdd9d31 SHA512 bb3988ee2cec3a829f5b5a7f015c17b3403133f5b0a2c6f9816aba12a51c17f8f03167a5246b22cba9bdc5e3f68850895a177789388b815a3a241c8c6562a80c
 EBUILD six-1.11.0.ebuild 1076 BLAKE2B 27360f6f640ba24351015c24474b21988d5cb83400de1f4f8808e938773e43685ed5bf70fec0df49d2ee10c64d05825fe9b5e0096e251a51cc7a5bb2bdce0eb7 SHA512 edaf82638887abfff0c938c13fa3b448c9b0f5022440ead7dddc93f921aa2ffe89cbf19b9f01e34eb4a1be062b95196098de30c74919dd4054daac248ea6d142
-EBUILD six-1.12.0.ebuild 1089 BLAKE2B 566f1b9c0906ae40d5c0df311fe85049056e2f0e8f150631a99d43954475164cab4123376181194baea030ea174760b6354984d6e36d60aed13f2739a9cb7924 SHA512 9dc97745ea720a2a62dfdf6c382f2dfc7fa4578e3287175b394cbad11659f877be989044c1a7c903150d4cf01c2a7d094c6f8d9b78820ebc17f168901c8f9f08
+EBUILD six-1.12.0.ebuild 1076 BLAKE2B 36fb7f8be1c2cb363942d55bc2a8e3f4b0438854724e8698c263a547e9317b29fbe685340964ad09da58edba68aeaf146433fbf00882c27958ad78807c747a91 SHA512 c965d107bbf8b2b5fa039e34685bdeb229ce760b16fb48e8193f9979f58e7b14d836d13c4cdf42b69ad6ff2340b3ba932fae20d5f7c025cdcdd6677643b0815f
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.12.0.ebuild b/dev-python/six/six-1.12.0.ebuild
index 32632e98d9da..5fd069bd0531 100644
--- a/dev-python/six/six-1.12.0.ebuild
+++ b/dev-python/six/six-1.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+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"
 
 DEPEND="
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index 0beb3f3f8e1e..43fa39b1d4ce 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-httpdomain-1.4.0.tar.gz 12192 BLAKE2B e4250a3814448d87255a6cef4fafb9be86bec1d7670fd30d2988cdc0c8d6db67fd18a1e9e02588754bd03ae7261806ce1d79d7bb8d94f47f2e2086a6897a67cb SHA512 85d4d0898a1703a1742755814200253b875795b5f267b08adb00c7d8d7c15c434718ce0f93656e7b698df89c958a9f6f3f3403bdc6d08f6df322fd80371f1d70
 DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 BLAKE2B ca08a5cdc22d9898c6972ce8b7585fc4f185e3a0c8e49302bfafbfc88b4bb69d9d3deaf15cca2dfcd2f218199f509023aeb542129fea2003cecb2e8ef8215fd4 SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a
 EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 628 BLAKE2B de6da6768a19e3f1635c3e74cf98341057e02ea9309cd3e79783e1848b7627fd8b740bfc6962bcfcd590ad20f12baf7a2b0e4cd46263709477d0cf1e2729021c SHA512 a57f1863814760beba628ad803ac1893b1a7e40444be6ee66eba9b42f1851ca10fa10aaa82b5e7b4c7b2d5c3b61f3b97cb256b3fcd905effe5f85e9d12ce929c
-EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 815 BLAKE2B 7e3383c852eb249a46ab38f62824286f289d3cb5798c780a0c00c0138b9de3cd92163d64f5c313fcb0ac5038c1c022b5b4d941432386c3aaf1ea93e3a2c17be4 SHA512 bc76efd437abfac98750b4fe22eb24141f010cd0b23e1775fa7383a18538e4ba82ca4bd614f1f044ecb4f6518af32f43fac369cf6af4c7e62e4bf02aa4da1088
+EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 813 BLAKE2B e857583568e311e9081dc22a30f703cbc0fc2016218d9088d1d73bec71fe5965ab36dfe97103b3d2cd30b534bc2c9c64fb0b53ea3b4c04c4824c55d6fec79328 SHA512 e61e1363af9ce7f46b797fd77a4d6eceb0ee8bd9d8284c6f04b26dd799f5a894a7d068fe1d31f044a64ce3b56f87bc66d7d9efc16b7e6fc4fdda3a9c184360e0
 MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
index e404d8a44382..7ae35c21f4ac 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 8c83ea10ccf3..e9cf00db2599 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -4,5 +4,5 @@ DIST SQLAlchemy-1.2.18.tar.gz 5675143 BLAKE2B 2e0a54d16b64801cb60b619c39dfba64d3
 DIST SQLAlchemy-1.3.3.tar.gz 5864870 BLAKE2B d109e0daf0afdeaba946c4b18d14428c108ff15041876c9a35cf8e5783f9b9a1896e69760b249c53af35e4575e66f4b59c855b4a244d7f6569fadfb52c5a400d SHA512 f8e0f580ba5cc7eaed985e5a3af8cdcc2dddddcd64bdf02b247242eeab542b5666a93d46166b5edb4b28af3b89df44bccfa92d5bf94cc0e173dbcd369ae6487c
 EBUILD sqlalchemy-0.7.10.ebuild 1580 BLAKE2B 6860bdd76eef99dd397c69450f1fea1af0ec7b1c6b07088b35887342161dfe6a67052a2ff8514ae00f1f5e4323766a8235af2cdb1b4739967e32c8334845e219 SHA512 9c405ee96b959895ab7eb155352186ea5a49a263053a819369cc672f2c835dc64a06d6d41d2bf2ca5a245e986a788d9cc80b679674e4f6f16988e88d7bcab876
 EBUILD sqlalchemy-1.2.18.ebuild 1801 BLAKE2B 6672f802ecd8d243ab6e8ce1426667ad2ca97a73f6b5903b4a599101fec127dfc65c9cf51ce8393c84879c16f4603bd1504acb39e3ae20ea4022eecb91657611 SHA512 4dd721d58adf5969dfa13b8e62be73ec3ab0e445a70f67602705399fcd6b3d3a96839616c14d5fdec966f2d29437e0a600c4438bdc9af53d46b7c333b40d34f7
-EBUILD sqlalchemy-1.3.3.ebuild 1639 BLAKE2B c595eff295699697b7b29fb89c792cdce36f8beffc4d9348960892d93bf563ac0f567b44fe1f6ffd5a97b39a2ab44793855be27cdcf2f628e24217795b210c56 SHA512 49634419930dc6a39d41ec1c6997f3b73b3e57329cb061272a45421fc46fa8c9a7380a11c63cb1ff368210b6f54249b4958f34df7b8833d23e4941126155dc73
+EBUILD sqlalchemy-1.3.3.ebuild 1636 BLAKE2B 3f82484cfbcae857d6ec8324d60730766819d88ed21fab915e6beb03b2054043db9edb0e1f09c011b1cadad7cb029aebe4146fe0fef9973feb7c8c0b54cc7a2e SHA512 83b3ae34ab2396f7da75bb1ff349bda530885037c15c5c5b987bc8ad22739e416d71f82da04ac326a69c13e09b73ad2e8cdb0bc0d3034b21d195dec2bd4ecc49
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
index 726882ac64da..0a6116f1b314 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index da5cf69ba0d9..b5d7c30e965e 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -5,6 +5,6 @@ DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302b
 EBUILD ssl-fetch-0.2.1.ebuild 1172 BLAKE2B a0de0313f46536c024a93aa3ab5ba9d2717bd5958ca49ccbb7616064c5d3f7725cfec435a773470445e3ff77becc8fd4cf86200cbb7420134b2bc53cd8b1f6ac SHA512 91ad4f69b93a5a349e79549b5a5d90fa091d6539c7e4e233504c9199b669761cf1ec930a287dd887647af8a0c523d59ad134022a58f15b6253bd796456bfb3c4
 EBUILD ssl-fetch-0.2.ebuild 1121 BLAKE2B 84ff7d6a0e25576ad2554d443eb03073a77d25e1bff2499062fab7967c5f486d0b68215f819858baff4c0683a16bc4b9629c5e3675d5fb9ff9e981568202885c SHA512 fccceda3dfb9a3453774a6e2d869b124dc5a5e9dbacf7731145546043618404e8ddc2d4cb180fe330b05610360fc81004c8d68bd69a346470cd6712103e00542
 EBUILD ssl-fetch-0.3.ebuild 1175 BLAKE2B acd460a33a2e5d35ceb45cb7ed0c8997c27463b0785d4fed948bdff9c943b3b5ebadefc53440cc27950fa7b3c1282a2872cf3fe1dbf5ef1e74a45811bf467058 SHA512 80960d72992004b49dddc5fae88032658bc4199d0ab3324a408f4e964f90a32632647e2e89a7506fb753ffb5305c95bd0a44749f1d81d513571f44ad92ada0ab
-EBUILD ssl-fetch-0.4.ebuild 1213 BLAKE2B f5e6af7f7c37ab10d334f7d7b34ad47c31817e5af333a3eaf34dd0766f8442d4c8580091f11e2ce2ef9821e5a92fd7092837c777801c62ef7720d5e407b80469 SHA512 295140c3a7a5f0f92f023b72e065be91e10d1c989ce778abd7ebe65765f6f66b3f46e549df7517bce7506ad353beb58cc5888f2bbb4b99bddbb375725d2d4baa
+EBUILD ssl-fetch-0.4.ebuild 1212 BLAKE2B d8840a3f8cf46f8a6e781f6458761f2e3e9a3d1a71576e291daa4d38e23fa5f5dd9ac39b2007a9a08f51eb7f34c6b6c173703b74e11fa8fdc2cdd40d61206f9d SHA512 a6596764b746deffd047e79c3c48d11c7f7874a57232ae7ca5d8d0813ee1d35a1e460bf2296f93ba495cf1885c5e7b663799e4727bd93ba43802556a40209f5a
 EBUILD ssl-fetch-9999.ebuild 1083 BLAKE2B 5e606414488255e0a569fff17ed248b6c00fa18d3a0274fab0d0bea0c61960f1cfd6c715c2d56c3d6d854f9d037fdffb97f1a5d2005da6e68847f8a1428de80f SHA512 53ced939d12b731679a3120a147e7a7ef5c4f1e31e8893fcc80ad2f521373f25f93939a46e0b85e0b540d877d0337fa77fce75633d72f1dec580da3882ec2ec5
 MISC metadata.xml 585 BLAKE2B 660e38c7d1e6eb94fd0d517ccb3cdf563f0bf62e2b427368932a76fee743def08d377db47f8f3c7269a9f8bc89a72d4bbd7ed1280453e505a5365a4e1e541fce SHA512 e654050b05973990c8ff763039fd131a2f08916f81caf09d36cb5baa8fc91c4b15522319e22ffc689ce52a0d0c8fb63af5bacd894d9904e993242b3a8d653ae5
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index bfa241c172fe..7e1a6008b11c 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND=""
 
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index 39ce8eb2d941..ec0e80768d09 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,5 +1,5 @@
 DIST statsd-3.2.1.tar.gz 166047 BLAKE2B b0bf102823cefb8a698b759881ebb395c7408b8b5fff7cf304aaa0ecbad2fa8381fe05efa3cdd9c36c44c7188e46173235f9fe2cbed9fb940d8d5231f455d6bc SHA512 c5166fabcef2158aeb29b07b9bd1d241bc30847eb0e2c7694ee097b3a262e2590189ee10daecb368807002bd96fed16e749ca744b51b5e946d48fe2931a0d8e8
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
 EBUILD statsd-3.2.1.ebuild 609 BLAKE2B a8314672aa8cd9cc9d18764e4906de14e4cb07289a91b0f87dde19f325fb73f5070b9a6ef70f713c6ae51831a0cba06e20eed51ec305c0a820f6f0ecf3879b0a SHA512 2dc952bedd5a863cd2d8d4943059c07ff3e33b9bf243d7967c6689977d87dc4273da90f60c27bf013ef32e3cf7f39b8635b35356e193b1b90e748d5f2806c429
-EBUILD statsd-3.3.0.ebuild 611 BLAKE2B f59db288abcc80ff786160c05b3f4fd11649f6244936e793b17aec8156bc1f9b53affa8c20283a69ab6aed42f4642bcf76d5a51d7f93ff71127c9a98a340efaf SHA512 01815fa4fe597ed4026d0adbb94ff7649fcc2a5a8a692ce55d0978cda235bb14024731bb59e6fc3c862fc99d3fe691b6e5c11043cacaad447d98911d3ce935cb
+EBUILD statsd-3.3.0.ebuild 609 BLAKE2B 86ab763a2d62206d2a3a19341d06cb8107574778b930b1f8c4ca31537472b6c6ff3fa2f631b55b1692d569fa4a89361175e802f115b80ce19149e7ec94b7e3ae SHA512 5f5e6c21b9bd9b7244605dc2f129299280c6e8811e58b2fc94188e8cc8764923c7a72fb222a48cb7cb13b573df4c956113cb6a1a16551fecdd84998e9d81ce9d
 MISC metadata.xml 498 BLAKE2B a8ee652db5a3283200bccbd950e8a927442db0d995fbd9181ec3b638c1875614792024b11486450ec60b9554374195c97623b7e2a6bda6e11fee5a77f18386a9 SHA512 02243a16aaec81a9d06a08f0ff1c741d5bcf6f9d8fbf3c2037b03c1752112257c9c357720957871e25f963e84c93121fe4a5ddb69208bcfb2c29937ec7743ebd
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
index 2518e975bac7..b10fc5af3fd0 100644
--- a/dev-python/statsd/statsd-3.3.0.ebuild
+++ b/dev-python/statsd/statsd-3.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 7d9759461ff3..5713b9287010 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -5,6 +5,6 @@ DIST statsmodels-0.8.0.tar.gz 9464851 BLAKE2B f4bcf38c0292dcdfef9e3e34519f4dff00
 DIST statsmodels-0.9.0.tar.gz 12658359 BLAKE2B 1b451edc281ac8bfd35441d7f31ff02c7068b854c06a5e50fcb6fb2ff3c023bbee264a25407078f99ca08e467676a32c1a0156dec668673bad3e8d7a46a95154 SHA512 a0310129ee915dce5006e4e40190d19c3a09facad398ff089fa4a244d51a035f9591267fd8d34a00ce82e4cab893df96787596f9d350d878e97a0bb3305f1bd5
 EBUILD statsmodels-0.6.1.ebuild 1792 BLAKE2B 466c9e00a7617f5d83f8d1027806e87e774105019ff0dd92b41a3d128e7aca4f1bfdb88a08abeed3d4c9b7a55853b7cd69d6efb5a816ac3b604efd169043e200 SHA512 503c1757dc8fef000ac727b308ba82a708a4889ba45b0079680054a825e590117be14aa8c6e570c8a74d550e245940d2a685365e0f56f29a90a695b03ab43f57
 EBUILD statsmodels-0.8.0.ebuild 1956 BLAKE2B 062b0f52a24530a21b61d5d03d3d23ff9ba79b1d9acc8ff66abe189924c69de09cd590f54e4a680c5a1d1be2a8df7fba4e8746225007b03cdd94f37030ca56b9 SHA512 f5ea4a6ab92a3bd46580584d8d1383c26b7454d42921638e718e8b01662f1a9c88665421edfa37205d3248f9ad1b13829d2126aeff8a77a64f45ef4a6adb602f
-EBUILD statsmodels-0.9.0.ebuild 3420 BLAKE2B 0334ef641b19102d9bf3c26b01840b48966e53fed4ca75a9fb679bb2f01be552d955d1fb8b393e9dd127e314c8348182e526f6cad7f9fd263ee173e5e25d247c SHA512 60bb24e3f7bfdf5c5e9a8ff15f4bd1da9e64441ad51f552f93f8c6343bc278b2dcf58ace0d6a4364132521ed1eb1aea3ff5bcb4b905a56baaa39fde845faa301
+EBUILD statsmodels-0.9.0.ebuild 3418 BLAKE2B f43be66306cf960c88a13cbafacd7b38d7d7c93c6083b4e27c8398d0d89fafc03f0f4b082d2caa908a56bde5f3356dfa8d8055c9fc46cdcf7f93ca7ad3c38716 SHA512 158eeb086ff5044888f1eade424e87bb62811c53ae5308d44580d58e9ff63a677666f6d5ae40b32f56fb79d450b29c571744eb8863a0979c5c3b2bb58276e444
 EBUILD statsmodels-9999.ebuild 1969 BLAKE2B 984cc1b86cafd3a0e6fd04a76ec3e71b641c70e9cd7355fa344ac0763c294a20abd6bf90077d87fc1a538515154cbb538d9cd316f473284fdf3e560ae5fbee0d SHA512 443600d08a91493449a18fd19092c64dd1b895a4271bf03ccd30e754aea0635241ae77a34f62c715c114c17b6c3207680bc89de7960e9b6bbf36860341d8de2a
 MISC metadata.xml 1318 BLAKE2B fda44c0af74692331673e5e440e4180d9610cbf50d96c19da4ff19728bcd31ec6cd30a48fb382da3489904b2f361957af54c7bc6983320b9b6fca04ca561aa52 SHA512 30d166a37e102503c22ca6112f297cb6db6d2f795062657f23d7c98cf1871275c28faea7be4bcc117817aae122eb5bbed1d5da1a327058980a3f87ce083fcb13
diff --git a/dev-python/statsmodels/statsmodels-0.9.0.ebuild b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
index 07d99df053c1..d995aab43ee2 100644
--- a/dev-python/statsmodels/statsmodels-0.9.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 COMMON_DEPEND="
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 5499e24a5f01..8fa3e01e9067 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -3,5 +3,5 @@ DIST stevedore-1.28.0.tar.gz 504872 BLAKE2B 6a9ba88ab950f17898d2dd76d75cd7bc7031
 DIST stevedore-1.30.1.tar.gz 507795 BLAKE2B 92af8ac52dd28d765df32bd127d76aed0d0d66e2a4edc772aecb35ae78b52e9091203991a457be732d62a2987cc378d0c62cdd94898ad7e41f33b320401d4fa9 SHA512 3316ba9c73dc5499588a65fb0abc85ffc8eeea14dc94fbaced6379246098f03201d8a13dc64510a0840cb3d266ac83ffbb957738a61ee2a36440611833bab4ef
 EBUILD stevedore-1.25.1.ebuild 1631 BLAKE2B 10ee5e1990b1fdf2016863d21b8a3af86a536b394742a77126b528c181bd9713f17bcf25f7bb8cdf8dfdffbe32c504aab9fe3ead3d013fa570e58ee0dd669cae SHA512 1a77bd2a4fda7b2adbae46b36efda0cb59bd6403d4deab15e4d99d3805ab23b6415622190d891c74dcacc499f6c3a40e7dd52894cf76559b921ceccb7197ae4e
 EBUILD stevedore-1.28.0.ebuild 1633 BLAKE2B 219a26c2220b623d020acc5ba9d69990bfdb6ec890b1ab7cd2684a0fdaf5dea95077b13081addf97180d051a80db1261bedfca2ce666a3ffc9bc5259791c8d5a SHA512 0afa8f79607e453e87301d23772495d5373e2ddc9164c8ccec4043b510fd20361b264947e46a5ad5be507c58579c5b2ed190154038e8576822fc0d5e81f1165a
-EBUILD stevedore-1.30.1.ebuild 1719 BLAKE2B 18afcedfd57f77c633035407f6fda4dd57338ebb6cfc3351fa0443df87a8455fa560378d4640ba213bc64e8d6bab3497f6a0b2cdb0b008f8e1a7d83fd1eb2332 SHA512 5d1ceba357dd53e262d2581fd92916ba799de45828493c70313b570b6c3b8b7d8ebdc01fb36ca1ff8bb8853d58731d01e940a8b80fa1614d2d9cde88fb451292
+EBUILD stevedore-1.30.1.ebuild 1716 BLAKE2B 37c0305ea63497860f18bc9e385ce25ff147ccfb6d1d302823b83896fd3afbc3b228d0572675a5e94df949a6a9b25736afe4ba5764656f03041e827484720a5a SHA512 7f86082196565e19447fd5defa055b42c878134101b4d5d0fd60960ea48022c89e6dc27f26ace10d87e30dad69261775f97cd26b952623fe49c71846fbe238d5
 MISC metadata.xml 496 BLAKE2B 4de4391203bfd30055b9b6399abeb5b53c2a363779c895d4e0efb1de2d929510a0d7e02541290000a63526d44d32d50ea7c41728a4ec1e5d6ab41a7ab57414b4 SHA512 569ee9efc45e2445b71ffe7201ea92a7bdae048de528664d2a908b94c3fb23f6632e2457623c5b0d961dcf7aac2d96c6385d225628a3c5234363159f56961f00
diff --git a/dev-python/stevedore/stevedore-1.30.1.ebuild b/dev-python/stevedore/stevedore-1.30.1.ebuild
index 6070364a022d..3ad9d997958e 100644
--- a/dev-python/stevedore/stevedore-1.30.1.ebuild
+++ b/dev-python/stevedore/stevedore-1.30.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 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
new file mode 100644
index 000000000000..c61c78fe8355
--- /dev/null
+++ b/dev-python/sybil/Manifest
@@ -0,0 +1,3 @@
+DIST sybil-1.2.0.tar.gz 28720 BLAKE2B fc2fda9763a33cf89f47b5edf3aacf1d3c9ba712cc6e292dce0549393f2177afb6ff058e6c4ac96b0ffcc44149dab4c8da5da50ef6850555e374ca25906b1e14 SHA512 9355bfe2873eb9cec866a1c267deb876f3e6b1e452e0b7c951e5ffb642e79cb6602bc81384ff4e5bfff1adc0be2c95bcfa291d34b7690feae9b280a92b6b5c85
+EBUILD sybil-1.2.0.ebuild 460 BLAKE2B 4ce258e1534378f3d4fa9650a8f07cd46055acaabf2e390d4d541f799be254a393d1ca697cfc56d8dfba79064b303c5b40e5a4ac749135ca3cd6330a18b37276 SHA512 1ba467559276878c7a8dbf3e12cf1a905c084d342702eda4e04e2320a34aa34987ffd3fa9fd072e261212a6b827778f0e61e87f27279cf4560f591772bd63b39
+MISC metadata.xml 372 BLAKE2B ee52c5344be6eac7a7a79165e71cf7d198d8ee21591c4bbe5b8ebfb830019aa9bd32cb4912e6aaa59ca9e2147262278f2bafa3b24a89fcb67e930ed2a033c281 SHA512 c586f579a99f202fc403523fa870bc7aa31a437527091c413abf4c47795671ebbb783c74afe32790e25c75c9aeb19dbd0e6dd7367cdcb69ebf128367502b86de
diff --git a/dev-python/readme/metadata.xml b/dev-python/sybil/metadata.xml
index c1e6480907b6..b56cda1be741 100644
--- a/dev-python/readme/metadata.xml
+++ b/dev-python/sybil/metadata.xml
@@ -6,7 +6,7 @@
     <name>Python</name>
   </maintainer>
   <upstream>
-    <remote-id type="pypi">readme</remote-id>
-    <remote-id type="github">pypa/readme</remote-id>
+    <remote-id type="pypi">sybil</remote-id>
+    <remote-id type="github">cjw296/sybil</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/sybil/sybil-1.2.0.ebuild b/dev-python/sybil/sybil-1.2.0.ebuild
new file mode 100644
index 000000000000..6273cc68d1a9
--- /dev/null
+++ b/dev-python/sybil/sybil-1.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 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="Automated testing for the examples in your documentation"
+HOMEPAGE="https://github.com/cjw296/sybil"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index 8c81e913b519..ddebded86794 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -2,8 +2,10 @@ DIST taskflow-2.14.1.tar.gz 1060937 BLAKE2B cf6092aebd6365ed2677d54528d1a40ca0d0
 DIST taskflow-2.9.1.tar.gz 1061514 BLAKE2B abef1651311da6ea1f475510e293e6b1eab1c8508e981b1889a7a810053a4b07522efcf81b21cbbd792704e2bcb59b5844de8fbe044cf357fa0b83aeee9a7687 SHA512 a8211edb2c4507b2f9845ebfbd028701d341266ea8d000bee60a037b726b1d2ad5e6432aca781659d91dac13198451495270eeba821f5905fb20f27c0d758b77
 DIST taskflow-3.1.0.tar.gz 1062425 BLAKE2B 8aa5ed0bcc52db3032d6abee03a48327d9790321fd927488cab13176ac10aab46cb57e29b9df81337fe9a7789816148d9f1f9f5f8790c152099c4fbf87ecb72b SHA512 fe37d8eb2a4c22fccabb2779a7318e5075617bcc692dd36460169b4dd75637cc753bf7abb117322d77be8e74b40c260c64032e37cf8d51ef11ce99fa7cbc72ab
 DIST taskflow-3.4.0.tar.gz 1067856 BLAKE2B 1244fa3124cb09114130ecb1bf9bac1b7471cf6d9f6e297c8445a5a447d7fc81e435ef56783359bd00b35dc3219d35e0f1f26ff1b1593bf99ee83592178794e5 SHA512 16d0494e9062a1a22364ed0c4429d6fecca87b4d0328c3c711c53173e79bc1caeea24f4ea5e5d64c5d6d519fa2b5088eb3a232169e6f0062d964c98bf8b81241
+DIST taskflow-3.5.0.tar.gz 1068208 BLAKE2B 5c11faf60f332aad442c5415219f572a6b14735fdeb30f305a1e033067a847bbb6a827395bd1f02ae20e11b682adf31585848ecac47438b1860fd04b51a7d5b4 SHA512 635123ed975461a84790be2edb09f45e3c372fa03918f6f6257b4a3725f67a83a958f80ca15f1da5eb7d5f6223ba8fb8a6bdc6941b9eb9572c12274fb2d75ac0
 EBUILD taskflow-2.14.1.ebuild 1538 BLAKE2B a3cfb8676b6053872874f22136f387b5d86b3ce1b9b5bac1d9a45354bc8d6d82bab387c4454f90f830680663ceb12d1efcffb8abab66c686cc94ce5f1132d81a SHA512 59e8bf06d700eef96e5dac3651beafcbb39ccbd6e9d0d048960bafe1d8814e7c87aeac856c9300cc455b8a1ab071b08289c046e5e6a170bca7e8deb21cd94cae
 EBUILD taskflow-2.9.1.ebuild 1454 BLAKE2B 38b248cad39baeceb465a2ab097fd4e78c9fbad8075d316fa1da8a92092aee47c4961a9390f05ab1340080504b1e6c304ef27c4284bd652851fd6e6384c18b7a SHA512 215e4cbae09de572864a234f3fc4698395ed18cb7ffa5226432b58e3834c933a7505ce3fe6763ad78fff9105acfca0b09a4e7ee4b773b3b43307b3b253fd7783
 EBUILD taskflow-3.1.0.ebuild 1491 BLAKE2B a6f45efc2caf6735d025e0af2792a3d44bf312524133b345dc2ee55f582464b5cbf14cf83e444ea7b5f56abb50092518f326573ed09b8d9c0de681027760038d SHA512 df33dfe1e10b54cda67649d89c1ae2ecf2c6d4352fa804f2cc5b1f17a451006eac9e07e73959f033229e6bc83e4f298caef373bf7fd5f2efbaabb1216a5a5019
-EBUILD taskflow-3.4.0.ebuild 1495 BLAKE2B 090270448787de492de74dd4b8a722e9edb7f3f9f89923be927a25ae1902df171daf96890a497ca5c07e14fef962df4fc3ae449a35fc7469c4a2f734235adf77 SHA512 f71190fa6e784df200df362edb1be8a7f7fddf1d13b4a0da54bc9742a371c5fd4f755e3eb04b2b8b1e2668e63bf964374f9705887a1a35c2a3f7f6580f649c58
+EBUILD taskflow-3.4.0.ebuild 1493 BLAKE2B aa44e7b3c6d1c5bf087043be62f3b287abbb6327fc7c5c49d48c759cdeabe78a4d4bc60474a9b98572b40482e9b8e175f941111b166ac8f7bd26e09c9eeb7b84 SHA512 35fb8b9798acf5180ff4981ce7f51e30af441b4aae585f80452391b82d403163ce05e25ae5a5b153b53f6656f40eafef407e299fd01bb6d02de4f53674dd07f1
+EBUILD taskflow-3.5.0.ebuild 1495 BLAKE2B 090270448787de492de74dd4b8a722e9edb7f3f9f89923be927a25ae1902df171daf96890a497ca5c07e14fef962df4fc3ae449a35fc7469c4a2f734235adf77 SHA512 f71190fa6e784df200df362edb1be8a7f7fddf1d13b4a0da54bc9742a371c5fd4f755e3eb04b2b8b1e2668e63bf964374f9705887a1a35c2a3f7f6580f649c58
 MISC metadata.xml 676 BLAKE2B 32a696fc754d94e1d1f37e67ec09de6c588f9ee3eb151dcf81f955f7b0632c522796343131a5acbf73e852ef78f89ce7bca6060c6fb83b9611e084e20a5df3e5 SHA512 c274ae9882c74b8bcaeb054b9feade463c1fa7f2f6ac559091a4bed85075198873c4b994cca1f28083b682bbcf66dbb31971da97f9074a1b04a57a6eb0a612ad
diff --git a/dev-python/taskflow/taskflow-3.4.0.ebuild b/dev-python/taskflow/taskflow-3.4.0.ebuild
index ab5d9a48bae0..3a6781627266 100644
--- a/dev-python/taskflow/taskflow-3.4.0.ebuild
+++ b/dev-python/taskflow/taskflow-3.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/taskflow/taskflow-3.5.0.ebuild b/dev-python/taskflow/taskflow-3.5.0.ebuild
new file mode 100644
index 000000000000..ab5d9a48bae0
--- /dev/null
+++ b/dev-python/taskflow/taskflow-3.5.0.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
+
+DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
+HOMEPAGE="https://github.com/openstack/taskflow"
+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=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/automaton-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 84fcba2d8a90..1a3b77113c69 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,3 +1,5 @@
 DIST testfixtures-4.9.1.tar.gz 90117 BLAKE2B 6560d4072f8b0108b7d7708c980f40df1a05af88df86dd01926bdf0eab107744fc89d75bdedaced7300c24a52a9d1c0685f5dd3f5f732121ff97af6d0859055a SHA512 20053d22297b7852382a4f2bf6d76bde6489f788a9073aaae407f68bb6b3d7bdc4a045868cf7c99fd294936768745ee7d652c86a4a96c33fb0e95fa0d96d2a59
+DIST testfixtures-6.8.2.tar.gz 110838 BLAKE2B 4b83a1459aec4bc4b4dcdff48603958bfd115806ce0c567faad37ac273e93096cf964af08d24b98c1743d6302d1b2f6f9c9498023c781ab3e9170e2eda74cefe SHA512 ce6561d976a0b8f79ae72aaca6f5ffa8d1cae30ad73d3d88625ed4fe55da5f0a913785fa3e9aeb4268dfb243a7b74dddc262554521a71c766089383aa5b0e022
 EBUILD testfixtures-4.9.1.ebuild 1600 BLAKE2B 6d83ba2f3f7d67f65c7ba3bbc1d79a3e2dfdfa8ab1a3f4c883a4915dc403dc5fa41cf0834748abe368ad36480886b3c255cd7d937749d255d80df132b45854aa SHA512 a32b2f7f83745d2767d89ff3a33c11316612cfa416966f8abda19218c8a32fbb4c1bad9a6fe4234f7858141f1ee6a5ac6799cd8fc3afd4abb11c6279fea4c4f8
+EBUILD testfixtures-6.8.2.ebuild 1595 BLAKE2B 976b4a2390abf33da8d760eb5aca582d9c619e8424d38cd7dbc1b53c606952a44f505bb483e762cab4235031d9cbb64d3f24d86cb82ecb06e8cdef64970ca4f3 SHA512 aa3d988517face2068dc11c03d0a2e0fd7f10ed9f1f813c55fe3be117c1d972ee0ae40dce15e5c091a17f5f592bff87268d06f97e35b689f3e5c53626a51f582
 MISC metadata.xml 390 BLAKE2B 7211b89e4130b65db09254857e522420bae09bce05ff1065c6fa53802cddabe3536c8631e2ae79ab63d63f4d2550113e49a5d0834d7ed782524678a38b5c1144 SHA512 b5acb87f7a097840d861cf348e917f652b81712f9c4b408bd4a3b0f5a7b051bd1731735b2b3f63aa56144a032e6ea54fe3691c5858cb678666b6c4d701088776
diff --git a/dev-python/testfixtures/testfixtures-6.8.2.ebuild b/dev-python/testfixtures/testfixtures-6.8.2.ebuild
new file mode 100644
index 000000000000..9944852b60cd
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.8.2.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pkginfo[${PYTHON_USEDEP}]' python2_7 pypy )
+	)
+	test? (
+		dev-python/django[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent un-needed download during build, fix Makefile for doc build
+	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
+
+	# remove test that tests the stripped zope-component test_components.ComponentsTests
+	rm -f testfixtures/tests/test_components.py docs/components.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="." \
+	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
+	pytest -vv || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index e0f99bf61672..59aea3ee55d6 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -5,5 +5,5 @@ DIST Theano-1.0.4.tar.gz 2840691 BLAKE2B 7f89caee3dd50d75ff09693fde7926f2b7da0f9
 EBUILD theano-0.7.0.ebuild 1005 BLAKE2B 934cfe616a4ecf858ea278fa26c71c39655310d1377e8ec4fd57ce7bb642004b861d75840e238e04e238562cd4c86d4cd5a2f960b6f0fc566bc8e7562f473137 SHA512 5d15c8eb54bc2a6db09e5f2279b54526bcce8c07041808d6a021d41200fce309b3aa430c95702d1e5d6e549102070489c36498bde0ae717d93c301ef868107d0
 EBUILD theano-0.8.2.ebuild 1318 BLAKE2B 37f9d3621049e0390b4176c7030cc52d462f6554ade04352100933e69ac86208c72a152157c294be83325ee0e10d2de09e4d3970e597fc938861c27039658e6f SHA512 b9b9ba53140214000fee23d7d922232e08e68a53a37270c3e59e8b90835c12de008c75f34e8803b1ffbd404d74dbae6f80848f749d8ad877338ce42092ba618e
 EBUILD theano-0.9.0.ebuild 1324 BLAKE2B e88ad98b369b26daa8c9b36c0e32e4f498766826a2d5ec750449c6dbc46278bfc51fc8c067b80dcad14e3e5df505146eabce71eeb20563232ab3a8697fa14d34 SHA512 43ff59f5eaae7840fd1d7ed4cd9d48650c6edabc576920055ce49a6bf203b49f3a498b139fcef676987c6cf11b3205794f2323c3cb2e778cf214a77128adfeed
-EBUILD theano-1.0.4.ebuild 1285 BLAKE2B 83061f41b1ad7de8a9697b76b9bc6a7dd04b5daa7cf85e9a28e3b53ff50f6f45c6287b7c39b39299128698883c4d730326bcc27cd829687a29e448736c86f6c7 SHA512 ebe5df36d9058ae0146e54c888a9d7a889a431820999218011b8656b4b31ed21195d2275bbb5d0686232cbf7e7a98e499ea7e440c4340710b34500ecb8824f69
+EBUILD theano-1.0.4.ebuild 1280 BLAKE2B a5d2f87aa9de8f919db66a732fb040c04fd7d0b380fb5183e27f4030d3cd07533f42c1fb827c0f497ed2e02872c8caa61f67a3c2d9eab230c2a50789a2164ce5 SHA512 a5458837aaf5e48f6d390309f29263264c9e5b1504a18dec2d433958d60adf6a46cc7d747b423d8b278cc9c2a9965e4429320acd881843c5b65588f5093bad09
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-1.0.4.ebuild b/dev-python/theano/theano-1.0.4.ebuild
index 6351d160efda..2bfe26861e2f 100644
--- a/dev-python/theano/theano-1.0.4.ebuild
+++ b/dev-python/theano/theano-1.0.4.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 eutils
 
 DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
 HOMEPAGE="https://github.com/Theano/Theano"
-SRC_URI="mirror://pypi/theano/${PN^}/${PN^}-${PV}.tar.gz"
+SRC_URI="mirror://pypi/T/${PN^}/${PN^}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/tinyrpc/Manifest b/dev-python/tinyrpc/Manifest
index 443b3c7520c6..3bc29ebe18d8 100644
--- a/dev-python/tinyrpc/Manifest
+++ b/dev-python/tinyrpc/Manifest
@@ -1,5 +1,5 @@
 DIST tinyrpc-0.9.4.tar.gz 18432 BLAKE2B 47f9b6c550a24869e962b8fa26ecd4befd7df0b892d2929d2a8fdfbf819a856461c9bfde952bd61ee6a735566583827d45487066bf73afd3543092505767a437 SHA512 4f806d94675ecbc56f74d5dcdd418337fb32d70360c69854112c20776ce38bfb3da2be82d19db0e94247ff2639347628f429b25bb3461500b97160b8995c170b
 DIST tinyrpc-1.0.1.tar.gz 23299 BLAKE2B c1b5b9028f978594907db7d7e23b0d5b4a7fcfabb49e660a8fc5352462fd7995f841f08d96fa4845a1b82a0718cdcfd26e94901ceaecfd30bd11b917a0987fc7 SHA512 9a27e002959a54fae1ac8d89ac931cdd52b7ee96eb08c4c19f7eda4bc402834b53b0d9a3f0be857e5205df7e9597a1391e1376d6354a7d0b6085b81d8dc24b93
-EBUILD tinyrpc-0.9.4.ebuild 988 BLAKE2B 645d9baf2559eeb6acc916ef15550ae27c7fdf801db5a03b3172d644e85e9dcb9189fd7c6c1f583d26364b7f20dc5624ab6b1c90d6fdce3e5df41b6d463e7fba SHA512 e2d9d5382d33934984abc51ec4cc1f78a407504fb440fb1bb1b45448d95c919a06541d31cbe77eedc28d24c2df2311dff492811152450060f4984c134347e7c6
-EBUILD tinyrpc-1.0.1.ebuild 978 BLAKE2B 2b7a8f7dc3e7885468652ec226cd5a5a21f01a0570191602b0d2e073a42e21eb333beb539e31ea05068bfcc6b853d8da27917172d9fda421e9bc18486bc1d3d9 SHA512 fe607d89561a39c10455181711f6593377c1da0fadb15a39d03326d1734939206f3920682b3e34546dabd19ae196b75187c3a72679fdb973a75dc50002ff4269
+EBUILD tinyrpc-0.9.4.ebuild 986 BLAKE2B db453c42bf1ac63ed558c68dbe86aea2db047617a5a9e92859181792feac5aad13126a6c2815e926df6fdfbd1f809dae388315bb9257c620e6d95faae8eb03d4 SHA512 379f6d5364276bff7a7a5a0c09bb1fc4c0a58e1260f65d0d5429a3184c25c109b701a7bdab4a0e18ce68be8a6b663662b6ec1c11f58a2648946ae757e42dbb05
+EBUILD tinyrpc-1.0.1.ebuild 976 BLAKE2B f9b8c62f74af2aea50301332707f7e709bf6bd5c33cd43d86c1f766e015bdfc8ce25c5f7236b5aa4f7b342f1b9e341cf9d07267f04bad3b63fe07a194205b010 SHA512 6d4ef91d899de75651fab16f50357a74e17a49d2a182a71d611e9868c7b40c6e927fd1b4b5277b2b50d841da8d7af9a2971e6bbe2350bc2d0cf585721ddf17a1
 MISC metadata.xml 890 BLAKE2B a4ae092a73f9e43688cd809fd9e3129eeb20b53bcc17b2b3f385f6c15a6a3c248bd333ee1b288f527b1f84a5c1ed5273195bc47dc5e99fd3c5fabf16b308ecea SHA512 2cc182370624a60856ec5518d5d9dcc8c895bb11b9af8b828f3687c5d1b11fdb7aebfd87b7bb33d141137e41c09683b756350fd3548312b5f5a2a07ce0f72e6b
diff --git a/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild b/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild
index 9c1f036dd42d..321d64f1f5c0 100644
--- a/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild
+++ b/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gevent httpclient jsonext websocket wsgi zmq"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tinyrpc/tinyrpc-1.0.1.ebuild b/dev-python/tinyrpc/tinyrpc-1.0.1.ebuild
index b0f8227a4ed8..e05f2a18a04d 100644
--- a/dev-python/tinyrpc/tinyrpc-1.0.1.ebuild
+++ b/dev-python/tinyrpc/tinyrpc-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gevent httpclient jsonext websocket wsgi zmq"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 77e334eb5487..24558babdada 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 557 BLAKE2B bec07acf9f29e5bdd1c53677285bffb8f7c79fd776c7441fc81f194294bfe6a353ee0e472ff60b6405196b30a1bb67eb09a8a2bb9f6763753b6df7ebd0f4a309 SHA512 53ec1f6b2a984f80116b20ad444bbc6a8547738b2a351ccd7ab5406b7df1fa9bcaec6e488e432198d8246968a728b43f882abdb9366e38fc14bad4bb8b1af4f3
+EBUILD toml-0.10.0.ebuild 564 BLAKE2B c5d295bb330297024a29d6a7096b1f75fd23829d2ea8b2b1d482e06ebb83f39a7916bb9e11a9c65f4247523e872c3483757ef29c14dd59d59dc68636583689a7 SHA512 33726d2645bd719a37a30edb1ad00af1dfbd1ed4f9a5641d5e2848956fcfce0f27cb75a7b5d41e9e03e22737385e0c3da6a24b309c7267914558acdc2f211897
 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 d5fd3caf2142..ad45d93349b5 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 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 # peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
 # particularly worth the trouble.
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index aace0fe56800..76ac4b609f4b 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -3,5 +3,5 @@ DIST toolz-0.8.2.tar.gz 45486 BLAKE2B fdc949807efc44c335e542c0a0f8262976747c5fb2
 DIST toolz-0.9.0.tar.gz 45544 BLAKE2B 8de1702a38423f71ae6da24396c7a00428b13cef262efb0fceee454bf67a09a1ab4f4093c84c38234713b38ae4058c4039f2bfcb3c7286daba112e4eda23186c SHA512 f55a773d322b4ece104724c58d89bb41a35ec43f45b14fe367865934162ef06cf7da783b53498405552df75d83fba15bb61ce5ee0661b6122c5984352e80de3d
 EBUILD toolz-0.8.0.ebuild 443 BLAKE2B c1560feeda2d941470730db0c68ea51ed46fd0c7856275a9c62548abeba95b12231386367a4ec799f43530215ee62aec10ff603127a356faba98dc13fd0340b9 SHA512 ceeab981705e15ce6396538a2a2a638292426eaee35b9fd22d29dc0a9c7f4cddccf6ff195cf073ac9cc5eae719ab86b09723d4f93badd783f6098ca150b4321d
 EBUILD toolz-0.8.2.ebuild 451 BLAKE2B 7755fc9362b2c08933f2b9bffa87e3644ff717068a9571428acf556bed79a11905e80c8082a126aedf564c732e4e78042b4bd3530200ff854762115a5b9559af SHA512 9bcab865b5b9bc9377a7dff08b094ee3db99bee9252278298b431b6caebed6f9363eb7ec894b36235e9083d7c7acfd8961b916fe8700a78bca8d73bd32503089
-EBUILD toolz-0.9.0.ebuild 454 BLAKE2B 23592ab33e784beffe4e0a8d25b26ce4654174a8be7e78f7bf4d8211fa646049efce543c55a9d8002d4225706e2f13c0eaa9dd9110f650ca3b7e57f956dc9ac8 SHA512 fb749e9e2a87c983c68ffef0c52e54b8980010550c086c5d5ee7022f3f273fcb5d749ef2e95750395c60ae261914c20a7088071baa4b8caf53d34090cb62e414
+EBUILD toolz-0.9.0.ebuild 452 BLAKE2B f59f2e43855bb506039b9adb7262d18d8d47863266f397907c5513bc91c3545d23432748742d492d5a0717ef77dec520655a3277f43d1e78fe7ea582ee5d625d SHA512 3af0843bff15e68b2ce59ce4a0c1661a36c4baf163a6b2f9ce049c2ad0189893eda0602f501198c2dd07b59ffef5d0ce9671ba7b38044db2476c4d13c242666b
 MISC metadata.xml 308 BLAKE2B 2f9bcec9b5e7f76a32f38ecfe3aaf74e6ee231151af12cd6c98671bd4fd40a31110c739e0dcc4d60a7413abf7d8dd268f244553e8b549a58bfb9cdf920b8fcf4 SHA512 06df1cb87c23af8446b55a5c3da9617686a03547ab9c1d4cbaeb53759f789961963ce947ccf559db057c01d0cebf8da1a37fe46da9133932717aabfb40a7e177
diff --git a/dev-python/toolz/toolz-0.9.0.ebuild b/dev-python/toolz/toolz-0.9.0.ebuild
index bbd67badb744..a9ea1fccf435 100644
--- a/dev-python/toolz/toolz-0.9.0.ebuild
+++ b/dev-python/toolz/toolz-0.9.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 31bdc422a4ab..e34dabf68363 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,8 +1,10 @@
+AUX tox-3.10.0-skip-broken-tests.patch 2725 BLAKE2B 112b5be6c97c27ab531f88c01d4ba13452cf25bc46515bf6c6751951595124d257f85083d9a99c9cc8956370f0390facd07abbe1e9f21c627c531bff639eeef1 SHA512 67e93d9ba10c464f66170342e8bc20f48e57505b72b845effa7e8defb34eaef90ff4b3495847dc7696d5b50359ab032d207ea88dddcf669b3d315bed31e73b29
 AUX tox-3.7.0-skip-broken-tests.patch 1607 BLAKE2B e25c18c9706914a8e7e209a7a9eaaa3407cd339b9d4fdfbfc13d3daf0598034b0f877491caa13fb21c777983e901ef3aa035b491b59aaca14f09c34af576ca55 SHA512 8a8b684ca56612016ef60df0082a71b0d21619600453f5f93f732d7676afa7785350a0d3d088146a5856820fe877ed186660968c54782b6aa14c79ad0ed879fd
+AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
+DIST tox-3.10.0.tar.gz 279571 BLAKE2B 7aa77dfee2fe3141626d13f37f2c711cd0891ae7b484f7fe6ab7731d35455a898964c52cedc954a6d4108137e2d73fe9628bb893aa7a337d8e69da15b8516811 SHA512 a1cadf3f8de494b5c7f2e8ae1be11fd42f29ae805b5761f6a22763c303625c860475c5435aaf437e6f2d0213be1ad826d9b6a0950aed21c054a94d492cc85047
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-DIST tox-3.7.0.tar.gz 267854 BLAKE2B 9b32e6010f47d00e5ad81b31a8b9e809162ec9438c8a98df3e86c37692a3040bc0158d106f5698cdb6e240be54db80ce8b3c4c8710732f85d9eedfe1a0814852 SHA512 7e12f3407c1ad51ae5839bdd7907c7b05654f3a145270573326fbe3903d22c6e63a930c242ecaf1eae746043da090703e48ead7e27973294711f45077217ed37
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B f9523dd73e57889bc345f1e6d9e47a70b5c63727bd029fd0cdeeba79ca0e6c523248c845270035d4e26d70f31ea788fe94e2d69529bb99625db2a1f49880553c SHA512 09987e74d9cdf82fee990dc7e1813ed8df54a8ffbc157413c6fa0b61763853640066c108b78556601d16f278bdd303d572f4721dcc8dbcd7f4183187f4fe4692
+EBUILD tox-3.10.0.ebuild 1422 BLAKE2B a5a50dbb389b09a6d65e07e24ddf0c6b35d41dd4e18d24312a07e29b823ff7ba1bcf50c6798e873727c764e87a899de49c05d7d80907e19221b69f0f40b3625f SHA512 9f6dd4aad20846936bc8937502e475fc17dd90a7c2d439a1ed6a43f2dcf6d21aae023346dcaade87e8fdb46c0be85dd54f8d7a41b0e8442bfb4f2fcdbd8e327c
 EBUILD tox-3.2.1.ebuild 1953 BLAKE2B 20ef7befbe5fced2de522b65745e159fdbdc323c887eaad5feeda601bc68180651716913e8c84a5fe778a52ce3dcd0db2b7ee76309cd3e7583c2b90914c0ad74 SHA512 255146b77fedd2a709cb6b0bffeac1469811028d7dd806219107139bc27a171826dee2cb0d65672e8e206cd8c0d37fa5d84dab8d81b53aa6b5627b39a9e0e376
-EBUILD tox-3.7.0.ebuild 1270 BLAKE2B af455ec8766bbb88af6eb36be75cc287d9b7ef977e91076ec1df07c75cbd686df6a6043c5445e8531f0e0dbaa30b5bd953589d17ad53d8fb2d22c5467a5130a3 SHA512 b4089abe7796147979f7c3709af0b07a89df482988d6d3a90a0fd3a1416fc7d265e809a9c09bdfe5cdd114b68da4e075645ec86aaf31dbc67fd7423984249ae1
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch b/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch
new file mode 100644
index 000000000000..56f692948d36
--- /dev/null
+++ b/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch
@@ -0,0 +1,61 @@
+diff --git a/tests/integration/test_provision_int.py b/tests/integration/test_provision_int.py
+index 6a8ac18..56dbe95 100644
+--- a/tests/integration/test_provision_int.py
++++ b/tests/integration/test_provision_int.py
+@@ -43,7 +43,7 @@ def test_provision_missing(initproj, cmd):
+ @pytest.mark.skipif(
+     "sys.platform == 'win32'", reason="triggering SIGINT reliably on Windows is hard"
+ )
+-def test_provision_interrupt_child(initproj, monkeypatch, capfd):
++def xtest_provision_interrupt_child(initproj, monkeypatch, capfd):
+     monkeypatch.delenv(str("PYTHONPATH"), raising=False)
+     monkeypatch.setenv(str("TOX_REPORTER_TIMESTAMP"), str("1"))
+     initproj(
+diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
+index c64ec1b..b16a4f2 100644
+--- a/tests/unit/config/test_config.py
++++ b/tests/unit/config/test_config.py
+@@ -1886,7 +1886,7 @@ class TestConfigTestEnv:
+         for name, config in configs.items():
+             assert config.basepython == "python{}.{}".format(name[2], name[3])
+ 
+-    def test_default_factors_conflict(self, newconfig, capsys):
++    def xtest_default_factors_conflict(self, newconfig, capsys):
+         with pytest.warns(UserWarning, match=r"conflicting basepython .*"):
+             config = newconfig(
+                 """
+diff --git a/tests/unit/test_interpreters.py b/tests/unit/test_interpreters.py
+index 1eba27e..af7930b 100644
+--- a/tests/unit/test_interpreters.py
++++ b/tests/unit/test_interpreters.py
+@@ -40,7 +40,7 @@ def test_locate_via_py(monkeypatch):
+     assert tox.interpreters.locate_via_py(spec)
+ 
+ 
+-def test_tox_get_python_executable():
++def xtest_tox_get_python_executable():
+     class envconfig:
+         basepython = sys.executable
+         envname = "pyxx"
+@@ -84,7 +84,7 @@ def test_tox_get_python_executable():
+ 
+ 
+ @pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows")
+-def test_find_alias_on_path(monkeypatch, tmp_path):
++def xtest_find_alias_on_path(monkeypatch, tmp_path):
+     reporter.update_default_reporter(Verbosity.DEFAULT, Verbosity.DEBUG)
+     magic = tmp_path / "magic{}".format(os.path.splitext(sys.executable)[1])
+     os.symlink(sys.executable, str(magic))
+diff --git a/tests/unit/test_venv.py b/tests/unit/test_venv.py
+index 0523112..3db5416 100644
+--- a/tests/unit/test_venv.py
++++ b/tests/unit/test_venv.py
+@@ -445,7 +445,7 @@ def test_install_command_not_installed_bash(newmocksession):
+     mocksession.report.expect("warning", "*test command found but not*")
+ 
+ 
+-def test_install_python3(newmocksession):
++def xtest_install_python3(newmocksession):
+     if not py.path.local.sysfind("python3"):
+         pytest.skip("needs python3")
+     mocksession = newmocksession(
diff --git a/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch b/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch
new file mode 100644
index 000000000000..f6f78af192dd
--- /dev/null
+++ b/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch
@@ -0,0 +1,30 @@
+diff --git a/setup.py b/setup.py
+index 73f2540..8d6f3c3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,19 +1,13 @@
+ # -*- coding: utf-8 -*-
+-import textwrap
++import os
+ 
+ from setuptools import setup
+ 
+-setup(
+-    use_scm_version={
+-        "write_to": "src/tox/version.py",
+-        "write_to_template": textwrap.dedent(
+-            """
+-             # coding: utf-8
+-             from __future__ import unicode_literals
++VERSION = os.environ['PV']
++with open('src/tox/version.py', 'wt') as fp:
++    fp.write("__version__ = u'{}'".format(VERSION))
+ 
+-             __version__ = {version!r}
+-             """
+-        ).lstrip(),
+-    },
++setup(
++    version=VERSION,
+     package_dir={"": "src"},
+ )
diff --git a/dev-python/tox/tox-3.7.0.ebuild b/dev-python/tox/tox-3.10.0.ebuild
index 4a32bc04c976..586d4e574d5c 100644
--- a/dev-python/tox/tox-3.7.0.ebuild
+++ b/dev-python/tox/tox-3.10.0.ebuild
@@ -9,11 +9,11 @@ inherit distutils-r1
 
 DESCRIPTION="virtualenv-based automation of test activities"
 HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
@@ -28,17 +28,22 @@ RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	dev-python/virtualenv[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-2[${PYTHON_USEDEP}]
 	test? (
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		<dev-python/flaky-4
 		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-		<dev-python/pytest-4.0
 		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
 	)"
 
 # for some reason, --deselect doesn't work in tox's tests
-PATCHES=( "${FILESDIR}/${PN}-3.7.0-skip-broken-tests.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.10.0-skip-broken-tests.patch"
+	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
+)
 
 python_test() {
+	distutils_install_for_testing
 	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"
 }
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index f2a2ac8a4eb4..c320f373453a 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -6,5 +6,5 @@ DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40
 EBUILD urllib3-1.22.ebuild 1750 BLAKE2B 053a1a4590e26d363c8a7b76fb2bc69f16a2d20e7532e44b5b6f15f0a1cb3e4594318ee1d3cc3f28014fd0f4f077d0a056448e720a6ca0f596412aa411436081 SHA512 a8cbb45a3aefbe76aa0119d2a67aed90ed95769c68e296da7aed7a2d85b53c42c4235c8439608351da6eeb03a2f97c25bd25ce1be78efa1aaf91c4fc4954ba38
 EBUILD urllib3-1.23.ebuild 1906 BLAKE2B d3e2981f3133db3ac25739a5740c278ccd238d6a926265be96da15b200341f50bf138cf685b0d28735bbdc9328d45b237a8a45dde63f920b2075f05db421b6e9 SHA512 a38a14962ac9ffd7e86397545974721aff6c745da4d25ef07a99d0c4effb670b9d95f74b3efbfb8fd7624cc118621d99c26de2d9fec691f8f2d4b6d92221df62
 EBUILD urllib3-1.24.1.ebuild 1819 BLAKE2B b1d16553a388611486ade62774bffbf471eeb3336e4a4c7d42b2e1721239081b2cca61c48eb91291a387d24619763b13bc8ed08faa8461b0e53a4e61309d51ea SHA512 8b7aec6288e77c410e4ce47c983f1033a120610478d4ea95e0f813c314ab8f917211ff77abe419bd9bff21b8c884b86963a17a77aeec407462c66c526b9c9158
-EBUILD urllib3-1.24.2.ebuild 1816 BLAKE2B 69318d1cde8471103d9d9a4116b39fb99593114b09496af5319808605b816e7b38a802293c219e091042df9595907469e05a4c6e123e9ff089d422db4052d19a SHA512 b10ef510ad19d1b74255f0cd1e504e4b017d19a7d95b54d47a1f538b89ebffebf889a19d91b7c21623ad96796b728c68cfa1e694261e431f4a96692e66338b86
+EBUILD urllib3-1.24.2.ebuild 1814 BLAKE2B 2f124b96049df7a8c9f0cae1637689aa6412d7103566dd5784ede69aec0df4726600bfff1dda9c7b13c5628c33b9d48fc1b9f6394685eef03b2e81597cbba224 SHA512 6aed5290f3754a77a7e2f42dd492672c4bf4a05a4f1af95d3e0a213ffda25af2063af689995b25127bf6176b1814706ea4dc468760e8de1a491d0d653276323c
 MISC metadata.xml 376 BLAKE2B 2e9ba1b23bd9ab2770d23ce9bdf21f4083f46184c22d1dc0bd449b6605c24a2ef0168e1503327b549ba55e81b7bb52fe5f73fa375f06f3c64fabfac6cf5a9d77 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index fdfc815c685f..7682ae685c2d 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 #RESTRICT="test"
 
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 1ad8f065242c..ca0a4582c939 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -3,5 +3,5 @@ DIST warlock-1.2.0.tar.gz 8210 BLAKE2B 61e7dc9e033d0893b93eb2e9e82310366dfbc6aa3
 DIST warlock-1.3.0.tar.gz 8853 BLAKE2B 51b313f81cc7009b2b336d6ea7ecf5b78adfe33b3efee3abd9b2296f90716db25fcd4a06eb6946c26c3700ccf5d090da716bd4c5a7864f285e26bd2504700c3c SHA512 0c60c624e89782009a79a0174e6855a9d3a084403f5fa8fc676ad28c42184ff44c43684d6ab68262045f75588932ab4679dffb05f7762c290741ca645d90f32a
 EBUILD warlock-1.1.0.ebuild 1014 BLAKE2B 21c7e91e757c90abd05654f2d86ae08a41d8d5f7125bda7b0745480ba3a273bded1bcd6843658b0caddefe5ae663847b4b6427c88d1ecb9a94bc35a09bb292c5 SHA512 80a96149527454a7637f6ccc8182bee548a6a2fe59632e3d5be8e4af2773f2fbc9e75d4e38075dd440b1412657cfd790cf35f95a0a0041c7faf148bc4bb2536f
 EBUILD warlock-1.2.0.ebuild 1014 BLAKE2B 21c7e91e757c90abd05654f2d86ae08a41d8d5f7125bda7b0745480ba3a273bded1bcd6843658b0caddefe5ae663847b4b6427c88d1ecb9a94bc35a09bb292c5 SHA512 80a96149527454a7637f6ccc8182bee548a6a2fe59632e3d5be8e4af2773f2fbc9e75d4e38075dd440b1412657cfd790cf35f95a0a0041c7faf148bc4bb2536f
-EBUILD warlock-1.3.0.ebuild 1018 BLAKE2B c1ea18707658f46c93a53d610d87a8ef702a33e8ddce180b7b1dd9edafefd72baec5d27b8de6282f6af3ff7d5e4dc205aaa83c6af5df954b31168a03c65c954e SHA512 c89897813ad95a4301b2e571736a95c92eace16ec1fdd041d0d50e791d48801b6b6bd583e8f860b8dc00ca3f65188d7187a3e9fbd46e69cf48a35b75f781e23d
+EBUILD warlock-1.3.0.ebuild 1016 BLAKE2B 7a85c3d2aefa591102e07cc610c5bde8342bbb2960fbed14fc124d77d8a8c90cbd241158f1695183a1b0bd41535320beff23f259ea50ee0ba4e961c39ca50e0e SHA512 974f8b59d5dafea06816d0c7de91911025c595f02a9d950b96eb73e3188e70024382213fb1a50225c11b99e02cf1a74456655ddb430230a4ed06656b9f2da89b
 MISC metadata.xml 589 BLAKE2B d4c6019cd5e0683baa797b05835a7be6f335b5ec5fc16464e910a8cdd777c21678a319829b4893710a44a82d1194dab59656f9138cc792c7eef285696668c8e0 SHA512 35d027f2d7bb036d8b017e1c171839e7cb926d5764da9e61b3acc72a94419e850c87523a8b9852639d5cd6a6cef1e814dd65192a562da0a45c203968d5f152a7
diff --git a/dev-python/warlock/warlock-1.3.0.ebuild b/dev-python/warlock/warlock-1.3.0.ebuild
index 8de95a0e1765..49335f642f35 100644
--- a/dev-python/warlock/warlock-1.3.0.ebuild
+++ b/dev-python/warlock/warlock-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 88a1fe2d0f42..5c37c59953fa 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,4 @@
 DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
 EBUILD wcwidth-0.1.7-r1.ebuild 680 BLAKE2B dd84d57b1d6facb4f00628adae6f299386a26022985b41445e9ceead3fcd1ae9638788f92f8b717cc8978e111dfefc633036c7ee941ce3e083633c1a508606ab SHA512 9827e9fc4ecca0fc8c688ca3fa400bf624199ed42cebcf29c9a775842b6036c9b9748b84ef9c82ea559a6dc557dc107e59cb49eb3d0bb79399405af9ec63d8d2
-EBUILD wcwidth-0.1.7.ebuild 651 BLAKE2B d6983f8d0cde778e0b557bcb5a5e62c77656e78b4c52e1e982ac305ad20c21d24ce89a2c1d2450fbda08e2ba9c7c598fab35c88c38f08195ec33139506d04613 SHA512 f03b23558da6f2d95414a302b0edf92ba386a42718239a625b256d438d5d91df390c8eb763cf94cd633dcd1bb9a762de1292c2f9d8141c79302ae2ecd96be0ea
+EBUILD wcwidth-0.1.7-r2.ebuild 691 BLAKE2B 10fba9bba7cc1e3b94671d9a159127d11f12b207be0885d2dc0b6bbb15fc881fa94a35c758e8bfb6227f0df0928757b7db3242731a76b69bff97c4b61541de15 SHA512 f61aa89b57e6599989706d4c9458256038ccf456393b90fe2651e10ce9f4b9abd9cf81760021cfcff08fbd3fa2ff944ba939e2dc9fa314c8a401d358f9cb894b
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
index 7ed4bf456424..81af73f089b6 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
@@ -23,5 +23,5 @@ DEPEND="${RDEPEND}
 "
 
 python_test() {
-	py.test -v -rs --strict wcwidth/tests || die
+	pytest -v -rs --strict wcwidth/tests || die
 }
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index b730b11bea7b..de709c287229 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -6,5 +6,5 @@ EBUILD webob-1.7.3.ebuild 1067 BLAKE2B 472295e417be504bfdb2ef1e9cb782665436fc3d5
 EBUILD webob-1.7.4.ebuild 1066 BLAKE2B 1be7cf99afaabb8af90668b8516e7e9197810e7e741623d76a7a004da5f08ddbf03a6d36d6f2a57d103e58933243633c7cde498560590ee71642c374ee3abd21 SHA512 64675418edb8cdc92e2799b579bea7d883b5ade46d079268160616c699f8d1600f8ee8e8ac5fc51121c58eaf5d83e17fbaff307727d1b78a811238aabc313cea
 EBUILD webob-1.8.2-r1.ebuild 1078 BLAKE2B 4bb1211c67d3a92e4d24ece6bb4767eaf5578a052a1023fabac96fe18c6cf95e7a27a54502f4a278134681ce016a8617686e0445dd227c42f68bef51896704ec SHA512 61e63326093fdc61cbf0ffcdf8885b4e3d261aa722561599b70dcb5fbc159c7509b6d8e83749a937ff19493d3c97e6344210ff2918e5b8a80e506bbe82c19e15
 EBUILD webob-1.8.2.ebuild 1062 BLAKE2B 13cd02ca2d5d9c04fbc7b13ac2e2235e684ac724fe957b63f32fd6c2032086fe3de724d13397f4b4544d91dc3b0d2804fed4aff4c8858e54c67197b71c37913f SHA512 0f65983cae24d665e31c063e2d99b1019117033805131ff109405b7a343387f4551e02adc3e1ccb6fb012123120e5d3cb177981aad6ea395206baf79e82ef145
-EBUILD webob-1.8.5.ebuild 1078 BLAKE2B 4bb1211c67d3a92e4d24ece6bb4767eaf5578a052a1023fabac96fe18c6cf95e7a27a54502f4a278134681ce016a8617686e0445dd227c42f68bef51896704ec SHA512 61e63326093fdc61cbf0ffcdf8885b4e3d261aa722561599b70dcb5fbc159c7509b6d8e83749a937ff19493d3c97e6344210ff2918e5b8a80e506bbe82c19e15
+EBUILD webob-1.8.5.ebuild 1068 BLAKE2B a2a806f204967587b99724bda64d3801d589ca950832520909cba25904f3edfa093f17d298de06a358ecabd1cf41c53f79f6ae182c2b374f449cb68e6b1a717f SHA512 889498791c4b8575bf99f225a90da38d24618c51b4a1d9fc654da958554984956a64d4e9e964c7d38e92bec4ffa4cfaf19ba9b5d8b7aefa9bd856dbbddf0869e
 MISC metadata.xml 308 BLAKE2B b14e4d8d46fb386647015b3ba5028f737f440f53e8a13d3afb4b9f418fccdb902f81728c825f65969577d765140230ea623ff66814b12789d45f22e53ae48534 SHA512 cab03951839671b7600ab7903e1b27c98a02101d4a5f34b6a2382ad8f925049d82e4e4ff32c904d4dfcd7f4865124d7adf194933a5d2790b9f3ce1a9478e8234
diff --git a/dev-python/webob/webob-1.8.5.ebuild b/dev-python/webob/webob-1.8.5.ebuild
index 17c6f9332b83..587599a9d65e 100644
--- a/dev-python/webob/webob-1.8.5.ebuild
+++ b/dev-python/webob/webob-1.8.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index e892cf4bb7f1..78fd3831e643 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,6 +1,6 @@
 AUX xarray-0.10.8-skip-broken-test.patch 513 BLAKE2B c4d6298732029f509df209679b7d5fa285a9093053a08a1668a7f12e97a9d2d3738b170b05eb0b681c1a631268dc8213124eafa6cbcb9ba8dbfb53d6da0dbd49 SHA512 8b70650a30d0e5ce5d6c88c19515fb176de2151414042ba8a73b340e2cc6bdc1976ec0b4c723b4943178a886d29bae1e192059452c61e8eb2065b39ed18f23c5
 DIST xarray-0.10.8.tar.gz 1630608 BLAKE2B d211918a73c81842b0850ed65daa41015e5ab16da9aebe56b86252aeae16141cf540e22b6ed7c758f6db74ca68c9f81dce0ce65db7d054db6ca9d2b4b62e7b0d SHA512 962650f49690638cda9cd91e2d09209138127dd603a7a1e10407e114ee806f61a33f6e4ffaf63474c2d5ad0ce31717e5cae5e3965179a198c62bef013df252a5
 DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359 SHA512 f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
-EBUILD xarray-0.10.8.ebuild 821 BLAKE2B f5d4994188396f99a484ee29f1164ffdfd0649b1de58203897b1441e731b813dc2daac3ee48f950fdcaeb253277b584e7727ba1824d3b4553a0d9bebf8816c45 SHA512 7c72cf0d7f14f7c0d6be7817bcb267c8fa991be6c74baeb98a79ba95c4fae98460ce594c803185b40c4cad3f192bf7f00723162684e0198e5bc3e520af1763b3
+EBUILD xarray-0.10.8.ebuild 819 BLAKE2B 0be2d82e06f735360aae9e720b7b02d961f3d5f6b48c2816ad65281389914cde5fcf3c1ddffd981ec462e157ca742f7ecfd102a244c0ecf2779a95f384c8892e SHA512 94ec2a8095bdb758925ce467f707760c109febdc89cc010e0dd8f107ed0c2660e58524f6a7a91e21b741634187bcab323d242311b7fd86f12afae2d6f6805c1b
 EBUILD xarray-0.12.1.ebuild 793 BLAKE2B 5e8832d0ecbfd96eb3c2708bf91ef7b5303c50c47724272fb0de97f1ebebd5aa91621804f959325369de0bd45f1c8e5d7591c32d1ecde106de4aa26636d2b5ed SHA512 968a8b9f525efd640655306a6630bcf4fc979fe8aca5ba876d506af72b953ff8cce1f68fd93e49d2905e7e798eaac1a91d7dfb177fb4856e5a5909d20a6fcf33
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/xarray-0.10.8.ebuild b/dev-python/xarray/xarray-0.10.8.ebuild
index 7f8209076949..2f32c26bec2e 100644
--- a/dev-python/xarray/xarray-0.10.8.ebuild
+++ b/dev-python/xarray/xarray-0.10.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 986070e39abb..42fdfb95a768 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,6 +1,6 @@
 AUX xlrd-0.9.3-column.patch 2424 BLAKE2B 91f0870dd89b2a81519d35ac0e0615c04d969f2f2d586fd9077e273fc61ff5341679304ac931585193cc426c5f8c7535b99a168d6d3cfd6c8368e3e638d1970c SHA512 1d28f32101499dc9e22912aa92a0450e638c9d708bf42a93f10f7f07a7535532b61eb1028fc335a1c84e92608cbaefa6c1e042f70a005cdb0dc73392315d52f8
 DIST xlrd-0.9.4.tar.gz 322945 BLAKE2B cdeac4ab7c68e14d564fdd6f1da35e09a6c3a070af1111bb33e7533bdc534e05ddcb59384a72cdcbad452b26e35529431f50c2511e68422aa53f7133cfcf6141 SHA512 61d21a6b0bf5a72f75b98f6a62245fd2d0d8b091b56f31cd39e83ff0d68edba5370f81b50020f6ac52d08b0b49c0920bf44661d8501ecbde5baee7d991037a6d
-DIST xlrd-1.0.0.tar.gz 2563654 BLAKE2B fc20293adc7789088a15dff6322f7bb5ab53dfdf444a97096b321aec23ce1008e4a4ba7beb5d4f16c026a9c976cc1ae1d1f6b8b46a5559102417800ba76fb450 SHA512 a9ab8f18d09827f68584bdaa3cc6651302c6d420afb3cd588d21d5f3e7fa1b4c9e5bb31661111b3bd14ed17d69f563dc515859e2aacef63aefdca3b6d98d274e
+DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
 EBUILD xlrd-0.9.4.ebuild 843 BLAKE2B 07495c64f0ce5af4f96a35f3ee20cce6eee7985b49938f2da2c981b2f960cf5fc96435cb7f3d203d9e1d53a06914cfbd099534ced72cfe1118694c96de21a805 SHA512 37c2cf3d2cad32b352af169902a4ab2027a3041e97dac7895400bfe75e7d01b87020510ca47bcd08a0400ac3e5cd9b926ecdacf00ac0c0fb0c7c1cde93a12d15
-EBUILD xlrd-1.0.0.ebuild 728 BLAKE2B d5e1fa0381950a67563e318073785665b753438fa38e155a26b9372b414ee9820768881d3d8c7a5957aed4e192d40f8f5701ff4ce107c6b4fb7307fa675eff14 SHA512 527c225766ec51e8066e17cc614daa8b4576a34e69cb29a142586ef371a79a5137e580f71e58a69c8d1ad68ddb8082cab1efaecf782e625758e812682afcc3e3
+EBUILD xlrd-1.2.0.ebuild 777 BLAKE2B 3ed32bf3663acb8a0037419cee35478591a6bfe53bbcc492db80c52be0ac84a1bb528d6d0504b9e7a3af176fd949864d430029f9ef666c685165fe75ab7c5f83 SHA512 66593d1be7e756fb30e99ebb0e373c86cb22e8b9faee70f08d9dc06e8ff118b49e15f54a1026ccd903def6ffbe6401d6030b79d6a901f98693045ebf54417eea
 MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/xlrd-1.0.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index 569de25697dd..60f8b54c6cf6 100644
--- a/dev-python/xlrd/xlrd-1.0.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -13,9 +13,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
 python_prepare_all() {
 	# Remove this if examples get reintroduced
 	sed -i -e "s/test_names_demo/_&/" tests/test_open_workbook.py || die
diff --git a/dev-python/xlutils/Manifest b/dev-python/xlutils/Manifest
index 114a0d73bc6c..e1ce644d25e6 100644
--- a/dev-python/xlutils/Manifest
+++ b/dev-python/xlutils/Manifest
@@ -1,5 +1,6 @@
+AUX xlutils-2.0.0-fix-tests.patch 651 BLAKE2B 9ea3c4c51fa818b29cf715813f2fcb3e48764b50df9499a7a233d9c2b8e57b467d21529713ab64359993b5925958e25db2e1ae3d5cfab6e4c24926f940836e33 SHA512 70e38d47a07232c025da62d2f7859f1a85b6cf5516a49b31e64066cd4feda066923d5f2b6ff4d7d0339e47bb0eba1b8d090eefae516c4bbeea8ae974d842ed2a
 DIST xlutils-1.7.1.tar.gz 62278 BLAKE2B 5d90074a660ad15405d6a6e75e2da9a8eb45a7e516c70f4e0a1d34eb8db0d8a9b865ad0241d7d39719f77b1bcc4b3bea5e5ce358ebabc81b46a2ed6d4176ee58 SHA512 196ec5cf99e7ad5a612c455e4e293461ac89e6e93c28790e34dcce544c8689a9ab122e37458d3b6ff24137c3646607fa8768ab3a4c2fa4a3e2e59e0ac05d675a
 DIST xlutils-2.0.0.tar.gz 61614 BLAKE2B 51fde8ef1a0a88ecccfb3cfb332fe8a31101d29865cfa6201001d272db34a5f210e988ccb99ba00344f80dd457a5c91866af12061af9342d556953700cf02916 SHA512 7b6c39912a2b23d718b1aaac2f21770f1e5b156fdc7416f11d4a7e6b52195ffffb982aecb52b5571599eb4928c7e09bbfb20fdf2554f0c49c286b243e2fb3ea9
 EBUILD xlutils-1.7.1.ebuild 870 BLAKE2B 3a0a0f91918a7b155e48a40028396cec72d5ba200edc2f6b749a15d872c5bc7ce1c7e0d2ccf631b2db18ed73371bc6f7ed3c888412fa399931451fe52ad825ba SHA512 28947f317dbfe44c3c2ad0796201ea048539346da333bfb995bd61c47a6e3788dcc9b7d75279d9690200c37d1591e3bf137659a89657064ffe274390581ea3b4
-EBUILD xlutils-2.0.0.ebuild 822 BLAKE2B ab66146ca6f0c007b84a0847994614fdfc3160ce94604b5ebb2e51c9620f71b4a171bae3260b14a5f0fceb0c4faf051a92a05a900c5fdd1987ec6607b9253627 SHA512 bf233c23083299a929f21ebfd0a5b23f460fbd00dd70f20386a3ba948e4a090bbd754cac7b094c09dd6f70d3fcc7efb90024d1b0532919237a20f05838b89115
+EBUILD xlutils-2.0.0-r1.ebuild 1036 BLAKE2B ca1b08a990956110277fe76b6fe56f571bb1c6b3491108c83e4884bb1414e854a1cf7ec5997cb2e740cba610ac8e92939f8e4e41e57ccf77bbed85fe4707bf14 SHA512 779e21c7eb8b96c44dd907c43e07533e179f938743b9ab507f5df35c34760fb37433927c43c9c0eba3828eab5707b9be52b1fc7c3f50547add202f5a91b73150
 MISC metadata.xml 320 BLAKE2B 73ea3f716e530a41155508ff0562a9264659d59bf40a8bdbd4a75e3d073a83e96a6c3a520be9ce1f300c32f3e5262f231464503e36f7988ddd9972447a308459 SHA512 c83e7b88d50078775118f9c2b9a7edeef32272247ae55c30a99d1c9927b4d3fdfe12393500f93fb3a2a7ec37d0d249355d39887a4f26e75f9c24d585ae3204c4
diff --git a/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch b/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch
new file mode 100644
index 000000000000..b7e74925095e
--- /dev/null
+++ b/dev-python/xlutils/files/xlutils-2.0.0-fix-tests.patch
@@ -0,0 +1,23 @@
+From e9edf279ba2e699be92da7611368cf92b4d87cec Mon Sep 17 00:00:00 2001
+From: Chris Withers <chris@simplistix.co.uk>
+Date: Wed, 4 Apr 2018 08:05:06 +0100
+Subject: [PATCH] fix test expectations
+
+---
+ xlutils/tests/test_view.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/xlutils/tests/test_view.py b/xlutils/tests/test_view.py
+index 7b32892..5b4aa2b 100644
+--- a/xlutils/tests/test_view.py
++++ b/xlutils/tests/test_view.py
+@@ -219,6 +219,8 @@ def test_does_not_match(self):
+ ('XX',)
+ 
+ actual:
+-(u'',)'''
++(u'',)
++
++While comparing [5][1]: 'XX' (expected) != u'' (actual)'''
+ 
+         compare(expected, actual=str(s.raised))
diff --git a/dev-python/xlutils/xlutils-2.0.0.ebuild b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
index d701317d1024..1da8b0f0d4bc 100644
--- a/dev-python/xlutils/xlutils-2.0.0.ebuild
+++ b/dev-python/xlutils/xlutils-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
@@ -18,18 +18,25 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="
-	dev-python/xlwt[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]"
+	>=dev-python/xlwt-1.3[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.2[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/errorhandler[${PYTHON_USEDEP}]
-		dev-python/manuel[${PYTHON_USEDEP}]
+		>=dev-python/errorhandler-2[${PYTHON_USEDEP}]
+		>=dev-python/manuel-1.9[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/testfixtures[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-fix-tests.patch"
+)
+
 python_test() {
-	py.test -v xlutils/tests || die "Tests fail with ${EPYTHON}"
+	# upstream runs its tests with nose, but the suite actually runs better
+	# when ran through pytest...
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 3cd4c284a368..f8f64d53fbf1 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,6 +1,7 @@
 AUX docbuild.patch 568 BLAKE2B 372adc29b0f7c8f8cb840979f49c555b87ba1e5f7801d5c5f65f6127b78c0480d3bfe6517e71bc05085c7e4226be29f45fdec80f826241f785656b5639f05372 SHA512 588a3cdfe582f449b7bd75df5d6f29e327a20bf472317bfd839013f40a406c19529ad2ec3d0f258aced22e3d18e80bc25f1b8a398ab1b6ffbafbe1e36ee66f65
-DIST xlwt-1.0.0.tar.gz 129588 BLAKE2B e900aec8efc254539936a7e5998c17116c3d95c66fe169aff8caaf11a9509cfbebe29f9cc5ea4a5f6b5b1cdf28f9e08cdd33ce7ae4bf474b4d51df491605f372 SHA512 45788a506635f1ef6380d46aa0af724e511e401e8347dcf48dbf4e2d90e7f4c7f66838cd9616cf58807ffb939daba1f47b0d2cf449f8cb528db41fba84cc8866
+AUX xlwt-1.3.0-no-intersphinx.patch 447 BLAKE2B 7d861dfcecf1a811c129569703dfb29bace4c8dd7de1b8bad89a4d93b03d80b7b79df5409c69b8ab4b132b16595d1c608885225ef41488382f4811147ae23ccb SHA512 f5c1e731a0a88f012dfc1b62ae37edc71082f3b6e5726389cf4722d69ce69821d1fffa8e2fb7537854325942c1157f68c168d8dbd82936918a1f164cd80f5010
 DIST xlwt-1.2.0.tar.gz 153909 BLAKE2B 553315b6f6ba822122c18cfabaf5a30f25a6ccdc1c507bf7fbf293df42e380520ef647d3501b51443a90f77c59497b87c70f6a71d3b3ce53658d3a6cf2356f6a SHA512 e0be61f6a54ac39c91cf03a1a7535c464045539f6a040f000921815e3280bd341770d72f4353891a10dde7c1b51eab4ccb1ae1c10bbf779108346fba8484eef8
-EBUILD xlwt-1.0.0.ebuild 1201 BLAKE2B d8e49df5aa5a783f97f5e6db049677fab6c8afb2724d16dee618584c34217e94e6a9e0f36ef82ee03a01a039d64f57627263b41da5c8c1b3b2eb94c2177d8803 SHA512 1bc44e177f1e01d753ff25bab2deec5be523f2569a33563157025b1cc9baa325393ad2b4ff008aabb5e783b5b146396b064c232e34d5f664ee59ef6f56ef4011
+DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
 EBUILD xlwt-1.2.0.ebuild 1251 BLAKE2B 4f4f733874228768a86ac7fb7aeb8b73df20864780d02eabba37d186bea284da6652c6fa9213752f517fcee41abdd7341067ed82da0c293f539ecd7541a983a2 SHA512 96ddb68fff59342a4fcc3631217c4336063c19e136a14a62794137fec5871a24cd3bb068c21032789b3aea2baa88a02e3962e9ec779c9f2960ab980d2a7869d7
+EBUILD xlwt-1.3.0.ebuild 1274 BLAKE2B 0d775356d7a6fe81d4c3f123db1797e5520542ad3ccd67cf7df0d3382d95707187b406d3d37296f4dc32711a654f49ec502f9078f113456789421a97ff037ff2 SHA512 196c9463ebc6b3e1daf7c5ba67c826530f82fa5b6d6e94fa264fefa4b2648db012bc0086954cc28ba9b803cf1e7842021ec625a1cfd55cb0cbfd9b79fe05536d
 MISC metadata.xml 659 BLAKE2B e2b6dbf5e4f15d1c105a7d4e6d6e9014feaa235b203818d0d6bad64e9156bbad060e02d3e7e54bebc44e5e6a85d6c10e516e0793dcc0dbd48738ffa4e63ef069 SHA512 eb8056746b86c2e29196ab25a01cdb899716b4a76f6dab5134e863d43882df8b68ad1374a6c81733560612c187beeeda5106bfbb3aef3881c3b7a476db91921c
diff --git a/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch b/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch
new file mode 100644
index 000000000000..2ef29a1d6cf2
--- /dev/null
+++ b/dev-python/xlwt/files/xlwt-1.3.0-no-intersphinx.patch
@@ -0,0 +1,13 @@
+diff --git a/docs/conf.py b/docs/conf.py
+index c55fa2f..25db355 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -4,7 +4,7 @@ import os, pkginfo
+ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+ pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__), os.pardir))
+ 
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+ source_suffix = '.rst'
+ master_doc = 'index'
+ project = u'xlwt'
diff --git a/dev-python/xlwt/xlwt-1.0.0.ebuild b/dev-python/xlwt/xlwt-1.3.0.ebuild
index 747ef3f2e45c..64bd2dff33b4 100644
--- a/dev-python/xlwt/xlwt-1.0.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_5 pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 DEPEND="
@@ -25,7 +25,7 @@ DEPEND="
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 # Prevent d'loading in the doc build
-PATCHES=( "${FILESDIR}"/docbuild.patch )
+PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-intersphinx.patch" )
 
 python_prepare_all() {
 	# Don't install documentation and examples in site-packages directories.
@@ -44,6 +44,9 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index 05cf20263135..55aa34f3cd57 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,5 +1,5 @@
 DIST yappi-0.98.tar.gz 37074 BLAKE2B 3a2c60f7c5987681f242230fc4fa0b87f924c0d1dbaedd3c240d30e6c440e2604e7add789cfd37052301a1f0ab99c81e2de30249fd6c83d5ba00624e131d266a SHA512 699e1845aac8e3c701c495913862597240b264c396b0b6ad0e9d6d533138caaeb883baeb036dc7b57bddf02ba411475401b2db77527d2ee63409d73b80f32098
 DIST yappi-1.0.tar.gz 38939 BLAKE2B b07b38bc07ffb6ba7aea3728ba6977680ca7f2dcc499778110aa31e733c512e5704cd580d01faf3344849df6772f110472a01328447228e9c45180beefc36f3e SHA512 d743c471ee3797b9f3b24c831fcb4ddf2cec7c13c56e567c0618eeada9a534ca0b114929da623a2c67142c61f3c38b024b25ba5e32883113148f4377f7574905
 EBUILD yappi-0.98.ebuild 521 BLAKE2B 0b508731e7b48284de71ec6261bb2c1304dadd4424c942f8f4f5787fe2783675f1e0bf8a3546b76fc4fa7d1a9f673e100c80e7a72b759efe5cc1c385145acac6 SHA512 5b453d85eb25e79d531986fe71c074ec22de8610fb312930388dbd66632c4e12b53f0ab8b664aa563b409a18546c269d8f9577acc236a4d3d73a534fd5f25f2e
-EBUILD yappi-1.0.ebuild 530 BLAKE2B 91adaaac7c2807831274cdabbf373393e0892d1541bd974345c3324187498633e1ed574551b8544c21c3c9d575c30b30c6c14d14b2c64850ca2b764e7ce854ae SHA512 3f1fefb5901d5b32ef950c3e73ab3ba7bc38c74e6d38b5e59219bfd5eef775db2a7609dbd1fa0e72be7eb7b2b2846acb484dca0d0da1ad8524aaddc1b187a74d
+EBUILD yappi-1.0.ebuild 528 BLAKE2B 68480ad6e3ce939eda9b7327f2373f862d26e3034d91a4a71842883a52ebc3811d752cbae7190cde57f0290edcd3425cb4a925230b893bd37ba073982f4f9964 SHA512 0c49fcc8cceaa11271398881fef9e0ac4010631e5c1b19fc0c5140fe90309d39f9fcde0d83f6f6c397acd2ac7bab5337d8a5f4079f29d09011140f1a50aa56df
 MISC metadata.xml 491 BLAKE2B bd3b3283c39af67f7a1f55891d3168bf6bc054052007bec6303016d3f6b513cd20f94c83f427cd849b951102085b390e69dd4ac2d2d44a6b31bb5f1ff3f10af1 SHA512 d058a5d7d593e801967cbd8764ce0e55480580995a68cd3d35802932249fa015267052895d360fc13cda379333d1cf8222e02f486e68477afe1e2af1168731fc
diff --git a/dev-python/yappi/yappi-1.0.ebuild b/dev-python/yappi/yappi-1.0.ebuild
index 7a8e183156f8..83b910c85909 100644
--- a/dev-python/yappi/yappi-1.0.ebuild
+++ b/dev-python/yappi/yappi-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zVMCloudConnector/Manifest b/dev-python/zVMCloudConnector/Manifest
index eb0373013ab2..615ec40f946c 100644
--- a/dev-python/zVMCloudConnector/Manifest
+++ b/dev-python/zVMCloudConnector/Manifest
@@ -1,5 +1,5 @@
 DIST zVMCloudConnector-1.2.2.tar.gz 183984 BLAKE2B cb7c16edb1ec332689ef8c4709e4cf82c64767c49b503279c9280b33b392715a2caaad6275f66a57cbf51f824d9e2f8f207308454955c2fcf89712945e160b28 SHA512 0f947d517efa705dc50494a1e4f2c201f980378eb4e51ef8d98a7af7be8a73ed0dccda836651d5b631fe0bcde58d208d107c54a1109ba892b37d73422db4ffee
 DIST zVMCloudConnector-1.4.1.tar.gz 238562 BLAKE2B 048caf53328cb96589ba4cdba747dce662cf931a9356e10325733800188e945a7f32cbfc5d6eed7900563b384952b8103b446d28c4c5c5ff7b51444605c7a8bc SHA512 206776bd04ef547df530438efe6209db7374c33727d13269f6f3632aa69c74713b358e628dc4fab8afc6657ac65a17bd2ec4c6f2984385de2187581fd734e65c
 EBUILD zVMCloudConnector-1.2.2.ebuild 794 BLAKE2B 0c15e1ad55f4f207152c0fcf57b5547e46c0c6034e9a37b38a7f16ec1e02ef0a8a0b8653f23b2293a8d3659d6fbeab204ee210d79bf3d03df97e50cbb9698727 SHA512 0b8bbf0ada7feffe0ab6e992d2d1779912d9b8983cd1d9b077c38fe89c6cc169d5735bd7baadbc05419b4ce2eea9ab2d0247dbd3238e102279c3c1913e55d8de
-EBUILD zVMCloudConnector-1.4.1.ebuild 806 BLAKE2B 0b18790cefe3dd058113cf2aac09aff80d5d6cb9b414836373514675382b7d2178ed09e2237242b8406edbe777b350e0bcb3b15c2524499bb65d92b029f7781b SHA512 7f1986231208cc6b27c809824fa5d885805be509125b833034b2915014b12cf539b483d6e989c54c714766b7b231f0069d57f46db4d0e8e00b38a31f65c99323
+EBUILD zVMCloudConnector-1.4.1.ebuild 804 BLAKE2B 1d99067b8e1f620ea2c3ed398964c40d75ce14714e2509b1cb12a99ea0c4fdb62606adfe19dcb98578a7fdb0a67dd32d48af346d9cfc7db3a7c2ee36480e645d SHA512 d7925a62dfc3d03a5d63d6eab6aadc476468ca40a21fd8f2b8ae754893f3ab16f92fcb10a583c8beb0c12ed9a190b550a95b9bf6469abbae75fa91ddfc31d6b9
 MISC metadata.xml 530 BLAKE2B 8376b5853991714f02d764dd8a29fc99eea8b524264114fb29118b55a30ac33aa643d1235ad2c8d4ed42836ea6e818e4a544defaa9eb598d13bb1405adb054bd SHA512 0a9490c18da93cc8d55373ba27ac71d4a81a77756bcbf9817a08a74c0903aa00f891cb758903007b0e17ee81256dd0eb4ab559d0e1974c8f94668552a11e5fbc
diff --git a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
index 89181976847b..b98a792aa84c 100644
--- a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
+++ b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.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"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
index db9315588540..51d789242c62 100644
--- a/dev-python/zict/Manifest
+++ b/dev-python/zict/Manifest
@@ -1,5 +1,5 @@
 DIST zict-0.1.2.tar.gz 10839 BLAKE2B 6256e6202f6cca1db025d21c42b98163ad897ceda6a1b878e75165b358ec0a4b9150f04ecdc05f5408dd74c97212b8301d1f45d91f92dad138789570ffcfa562 SHA512 13fc6647bc1506bc5e8f69d39a07851a06634949ce917f294762ff3143c8a539117f8731b103df2663708fa1e8c968359985d9c4273aa952f500a89019c176e3
 DIST zict-0.1.3.tar.gz 11199 BLAKE2B f91c51888816b3b3693ee272379e36c58141afeba14cf25eff9e1416cd59900ca9ab146d7fe806a22939e97dfb3f1657e443eb1420f4d5170a3723df32c3d73b SHA512 2051ff589f9dfc822ceb6a0adebb62e7b782bd426be5035163e78031814927dca221bfcc27ce47fb3d0287b1ec7e1ff120ccebf150e447df213aaa2136f744a4
 EBUILD zict-0.1.2.ebuild 656 BLAKE2B 96eceb9e31a456165283e44119f0142aef66e65b31aa86da2638fc3b02fb44b5c358c55f190da0e782bb1cd43d9f027b3762698fbe68b8b5e7c711dee9502b29 SHA512 b272c603549bb40a54121d67c18c9a2139c5fdd8278d3a8944f0cae71ce6c420296745a217dd02b4cedead03adc728f645bfdcd4226f24cebd22561d43d626f6
-EBUILD zict-0.1.3.ebuild 652 BLAKE2B dab9229d3d47b718ed9ff3aca7389c6a186ff4b7c2abb11892aef08381173031120f14389c9d88877053e484569956dec38e13ce24e089a19f86e46e6fb3ab73 SHA512 c62380ac5211ec05f3bf6dab24cc93e3bf5b6c8edba6a628eeb51b337aa3575ac949535c93e28e74521998ec194bea134cb88e5f4f9a644e983bd90d3bf5a4fe
+EBUILD zict-0.1.3.ebuild 650 BLAKE2B 88ffeb6d381618ce18343d3660e13726aa7d3ee5968e6ab5f0393f90e3876dd845a9feeb19c76c7991bf248b695365ce9704ca856c441363d39b823d6e799020 SHA512 af3eca5260ef5c92934c99f1f21417ef5b02ef271dc039b26332b8a246515ca7083159c535a1aace3650c8cc49b1e1c9d92579ada619154824fd951c5f0d66f9
 MISC metadata.xml 372 BLAKE2B e0704ea4318d17b85ab75fb9818e2ec6993173823f2b0d8fb92413e9ea83095a5ad95c05e69c4f6ae447c9cc2fe7a2735355b311e84b6036780a6b48ae5e7ff4 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0
diff --git a/dev-python/zict/zict-0.1.3.ebuild b/dev-python/zict/zict-0.1.3.ebuild
index 7c2c1e3d994b..78a99d7b7c28 100644
--- a/dev-python/zict/zict-0.1.3.ebuild
+++ b/dev-python/zict/zict-0.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/HeapDict[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 4b16e50ec3b7..3386a733108c 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,5 +1,5 @@
 DIST zope.component-4.3.0.tar.gz 85971 BLAKE2B af49d4e523edddaeaf288f8602f6f8c6a92e9fec9ada88878f6a0be2ed9c859842d312f9888c6e806ef762f1ddbb5260a2da37dc992551d496c090cdd4338486 SHA512 0c078bf2471bee44acac0c291c3159f4315cdbdb3eaa504f97c1b345fdba5efff6a1514ee2ab558ff3c3e4a18924f982de7c7ddf323080ee99f573d6776d91cc
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
 EBUILD zope-component-4.3.0-r1.ebuild 976 BLAKE2B 7d83ae12c48638e9e296ee6873abd7f26b3ca2f6c86c11692fbf737d3a501e8329d9234a48f88d64f3a8814d9f0dbffd4b78c9644d63117d643d7d64eaaaff6c SHA512 2419e33a6ead03dcb25b5272e00b3e3a5a5e556d8cf373f1a271339d2e74bca4734ee64ddb0f240c73934cf2abe189a4206f73dfc7d82cf63d92b7d31b701a4a
-EBUILD zope-component-4.4.1.ebuild 993 BLAKE2B c48996ad2aa360191aa597c0d028591710a4dce3d35fd94175472481a7b14a88f5fb49a6276023f9c78a99bf652b863d06fe2064c464c87ab5934ce8e5380c62 SHA512 d3b013576c07f77c7af9c37e401c00574c22e7e32dbe6f3adc1dc118c0bd74342c190030c8cb502eb6c933e62905fe07afc357cb3dd1e9d839aa607dff9a7d08
+EBUILD zope-component-4.4.1.ebuild 997 BLAKE2B a4ae855199a608037c411cc006eb9b691f57485bffd233a76133c07267936486ea4352eced94d4aabb5f1aa3d6984d492cdf3d890dda9ee70ed832ed52155ffa SHA512 c990e18432a2fb95f659b41fe81aa45a54c72299362af7be426a18c146f25d39ae0d2d2b85a2754b614ae14c03f8d7ffe3ac85a9476fceabba5568083ab6aa6e
 MISC metadata.xml 386 BLAKE2B 0a14d662d38198dc4d4075246edbd47d6645e8210cc5fcf92f2cb00f6e6f7d24a202bd0b57125f3b2057cd62c3745a0ba0cac27a437b2f479204cc74aed6c527 SHA512 adb346917ce5dd31ef902cb6e247143f753bb42e22f41300d89b192291f5bc9ab1b6c2aa43c63e5a21b7ceff4a4e6187bed6d8b398121411e5e9f04df2e736ad
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index 6414a1722d9e..8f436cb0f0a8 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.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=(python{2_7,3_5,3_6})
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
 inherit distutils-r1
 MY_PN=zope.component
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index caeaf7aa0fea..06432e0f297b 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,5 +1,5 @@
 DIST zstandard-0.11.0.tar.gz 641440 BLAKE2B 291db5ecb798a186aaaa0779e2972eb3889cc318ba7a99f0c40988676556bad8c6978181fbe5f797e9936615f965a8b57e711ed99ab2fa761272797a340bffbd SHA512 96e6faa3c31fce59379e037e4e7789b91d1608703ad8540fc8fe3d249ec65670377f2c3233ff21d7ff90a1478ac1fbbd2e169fe2d798a6889a200d71540f75a7
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
 EBUILD zstandard-0.11.0.ebuild 670 BLAKE2B d50ef13ab06e001181527671afec0d3154e93a5d4965526de7f287a6fbbde250918cf8f573794212b638ed2d71ae312486ed3c421559a0559396abbd793aeb24 SHA512 2f77dac42d7c8ac18bd9b61e99918a99eb7b7be6ab8cfc39284e6b17202a6e834b23a2deccb0f7f76ef35666010e871c43a932ca8d42214794b2cfa054aebb43
-EBUILD zstandard-0.8.1.ebuild 675 BLAKE2B 758b1174c523b7add5ed19aa2d058f93514f9138e9eecad2fb5a81b87d2d4070358b77939ddeff025fbf90d3fca76a83cff5eb26aaf28ff522e309c2e3f4d3eb SHA512 b82573e848ff0fc6375a18592d3c15bf19d01682abbc9a00567d3336ba4f9a2a36f03cc7fbb8d4621d1feaf99370e601ebd8da579b78f91b604f12bb26a5439a
+EBUILD zstandard-0.8.1.ebuild 673 BLAKE2B c48230a447ccce387bd7b46ffab830d103ca219309db5d6b6468aab127a5a48594ab567d56f16b880a64736c115e397080605c26d29618740cfd433625ca64d4 SHA512 d5df28dc7aa760e481e52b92339b42c331fd7f5c8d163e249f91d5a65dc38afe9879a556878b2a645e043122a68a7ca8650408467b96450ae5e2933a4f849b04
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index 1dd87f82449e..bc7830f5c867 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
commit	eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree	3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /dev-python
parent	a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)