gentoo resync : 24.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-24 17:22:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-24 17:22:19 +0000
commit: aa3411e241a201d53a2689766fe419f2756819f3 (patch)
tree: cc19adfde0a10aab1ab566c8dfe3c1616e5cc390 /dev-python
parent: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (diff)
121 files changed, 990 insertions, 342 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a02460c387bf..8eb41ece039f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index 04a104e18b69..ddc4c5a18fe1 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,5 +1,5 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
 EBUILD PyContracts-1.7.9.ebuild 1067 BLAKE2B 564f2e0e6ea2f21e1d0f026e6bb72fc43c3336d75cd912c2dc29a3c96c6cd6c6aa67cca290df02d54ec7caa96c38228d94353008da3c8f4760a08b9388a68437 SHA512 68db35374bd07a52bb816608fbc25bd4d6a38e711673e0d11018c2f6cb70746200d8e222f05d1436e8d1e52c541bcdc248a94e03ac406a68ccc1b9fc1de20271
-EBUILD PyContracts-1.8.0.ebuild 1072 BLAKE2B 8a72ec58cf48c860da7cd67d65524ed56487d86ed931e6f0f6d06b844473f4cac2279e4e572313e505e33948aa120bcbdd3401a55cc295a43eec7b90b53fb9b8 SHA512 b520d83aae8e69d9182934bed690c68c925f4c858c9f322434713e7d40350a99287cb21cd28cd2309b2da44ec7ecec22fadcf0127887780f159350a9d9a4acd5
+EBUILD PyContracts-1.8.0.ebuild 1069 BLAKE2B 9fa567b9828b248179c8507d680cbe8321f88e6c31d94556e0fe9952d04fd1940c7828c35f0df644d3aab4d2492f3acd545799fa6983dcfaaf20b9e2de1c8f1a SHA512 adcd02df401a2d27a3bf68060a56c82777e83aaada95efb71fcbcd99165d1d414665558e55241e003aaf9b48a5357bce07a41f1c7c333af900b7cd90c0fb3c9e
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.8.0.ebuild b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
index 4edfab3163de..59f2f27c8715 100644
--- a/dev-python/PyContracts/PyContracts-1.8.0.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 4bee9ab8340e..994e150312b5 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,3 +1,5 @@
 DIST sip-4.19.14.tar.gz 1049688 BLAKE2B 8e68910f533d0f58bef1f20ec58579ce0166efaee2caef1c64d4e9878b0887040d9284a9fa5ee48d7a4f0949866d0b988b0d962303f0ace03a4ad48bd08eec5d SHA512 afde261331f38eac863d8cea0e343649f460f0b9a603d7fe91f14583904ea4b488bbd88d20fad5c985c43c6c1683fffee38676d94831ac8f2de40d9ed4d0423e
-EBUILD PyQt5-sip-4.19.14.ebuild 2099 BLAKE2B a578672bafe7a45d1650a64e3e0bc39faf237b0fd8fbac8122c4fd5caf117825199ba5c477ad727bfaff0d394e064b34d42d0d8b4474c21b99016ec7361f8f23 SHA512 c94768f4cdd1e2a07810f3e8a221c8d8b224b736f95813f4ec9c1630446d5bf7001ae16812e5469bb32e6420f054c50e948d7d27bd435218f1096cf73502c32a
+DIST sip-4.19.15.tar.gz 1053921 BLAKE2B afe0f1c2faf839305d21da05a667e649c37ab42c95df86d237bbd8f39a6b8bb7224da547467311bf82a85ce8f0fafd8bb6dd7cbf6050f2b157773339438d6277 SHA512 9518a5e90d54758b13dd8752669d4deb175cea8d8cdf810deaf554cd157d32ab7e394d23c774993fac3b7c02d56445b80962457d59f5cda543917a0251816422
+EBUILD PyQt5-sip-4.19.14.ebuild 2097 BLAKE2B b50c71d8ddad2216f19adb8a2fea212c9002de0ca75f5bcce020fe113f0f0446d84fa6b90c0ac4bb42093d835fe3554426ed106df5c1be071642d501447396ba SHA512 1e4244b0d3698aaad9e2fac07aa07b6cb1a552a9e7ac5f5565f2992ab160b9231a854c6bef076acf14f2e314886462b4f5974b58c405d0685801a3dd9c517faa
+EBUILD PyQt5-sip-4.19.15.ebuild 2097 BLAKE2B b50c71d8ddad2216f19adb8a2fea212c9002de0ca75f5bcce020fe113f0f0446d84fa6b90c0ac4bb42093d835fe3554426ed106df5c1be071642d501447396ba SHA512 1e4244b0d3698aaad9e2fac07aa07b6cb1a552a9e7ac5f5565f2992ab160b9231a854c6bef076acf14f2e314886462b4f5974b58c405d0685801a3dd9c517faa
 MISC metadata.xml 654 BLAKE2B f52693b58abff10e80d2fe004ccca0b97aa157e07c27005c72fe79bc9ba3894c33042c9be2d10f8fc15aa8f0451041b60255eaad96ec78dedc422e7ca2f58564 SHA512 4ad600dc1af2a9f6494350a028909e51deea7b18bf6a50a6f1860163310bc0534cd530ac5d6dea043e7b7e532fd2219069e12b33271cedc00c7a9dda9161711f
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.14.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.14.ebuild
index d71ee7c69488..0f179c01f2ef 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.14.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild
new file mode 100644
index 000000000000..0f179c01f2ef
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.15.ebuild
@@ -0,0 +1,91 @@
+# 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="Private sip module for PyQt5"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+MY_P=sip-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/sip/${MY_P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+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 myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sip-module PyQt5.sip
+			--sysroot="${ESYSROOT}/usr"
+			--no-tools
+			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_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 93bf31da17e0..c3898bf8fd01 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,9 +1,11 @@
 AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662fd63590e097fbb8b681ac02cb3d96c9670ab1a1bbe873c1c1320dd78cc4c738f9f714c8ffd5be732bc15f084ad7ca721 SHA512 bfe80fa6018174a6981777031ffa97bc834e17848580d02c994c61507aa4ea16091e582b6bbc3754d469de1901fa8cf2e3e12240cced44fd0dbe928bdd360925
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
+DIST PyQt5_gpl-5.12.1.tar.gz 3147086 BLAKE2B d5a018f1fca401b9f70dd16e2a28ea380c8a83f5e18dc8577e317dae5904a7b95f8fe979bf7f574f95e71222c514565fbf051b1de87f97cd2ab70c09d04e86ac SHA512 f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67
 DIST PyQt5_gpl-5.12.dev1812231618.tar.gz 3120289 BLAKE2B 2d48eaa39090ed60f971b84c96d148fba05c58fe15196f9a99c7a6c8302f364623dd0e1f0cc16d6fb527606cabf6cb072316319252b65f44c9652c1d95ca9fa6 SHA512 6a95fb02fe1eea3e7fb9a03da457a036f92f5404074e7234eeb52e5941bd247343e3d34d4054dc5a604b380fc2a227f7fe5ae250fcd4449da4a3fe856ab8eba3
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
-EBUILD PyQt5-5.10.1-r1.ebuild 5734 BLAKE2B 4830d56f6c211d23c85b479504d93426382a2bc4531ebd383e9039189c9b894a23ac6c3ed3e6faeaea2eed8fa5da040b282b1661487b852a56e7285b71d1940e SHA512 e6015c904e41fc24508377cf9dd1dd72907d41f239211132805ffbd432b5dba7b1dbeeeab8d3c269e23f3a599a9ab60b1386d60060203f1f7afe4e83d3cfa458
-EBUILD PyQt5-5.12_pre1812231618.ebuild 5669 BLAKE2B 5dc7ddd6bf0d0df02fab060b50730d0d96c357e4157e7f7475bbf72c36803f5b55cc461355526ba7827d284fee1f3e28e1300e3cbfdfeeeeba683337cdf9e48c SHA512 a0c5ba28d3eb81e51ca408db1da1266848a4888e954919e38d542122820529806a28fbc23d5fa6d605e02cbca9a1a2795ba7a8c6d6ff0fe235723b4f6789b4c1
-EBUILD PyQt5-5.9.2.ebuild 5662 BLAKE2B 58bc9d3d91e3c7e8c8e49bb4095c37c8428eba4568b9136a16e72c1389dee408ea7a209f795e660200eccf530b7b4f285066d7b92d479cc37946f05b7d3eec85 SHA512 46118296b6ff41478121464896050e58e552f8e8e16de232f44211d86516a111dfd0bf02c10ee92f3dd19e9cea05f43982287b59ca1e16d4ba1125d21ebce010
-MISC metadata.xml 2525 BLAKE2B 86896a8756022dca6a547db2ab96c775abde3278ec815d277df048179ea4c5b2ae89e5162cb8b835accf398bbc36119a36e8a9a05cafe2a32d9dd11e67149f78 SHA512 2f47008d13004bfb56d30e08230c7142fb65968e09e1bbf0423d475c6236783e0197bba65670cd2358ea96a2f682004584607ab8f9c66ad22e7d92bb1f23408d
+EBUILD PyQt5-5.10.1-r1.ebuild 5732 BLAKE2B f4b7b84dc0ab1a5704fa169865ea0e06f3195a94200040d479940405b7ca2dd70c33f6242721d0b803e1d0e2eda84f1e4f8353b5aeaa16a94046cd617468a018 SHA512 06a7fee183d87a4f707584023983b35bbeb4b7ebcd07ef6c57e62cc151b8767a9d484c634c63e24bab70608844d26ab17e9f82f2fd939975dd92030aaaaa6b64
+EBUILD PyQt5-5.12.1.ebuild 5688 BLAKE2B 0c537a07f29b0c2979be9f224952ec6120e2cc8ca39fbeea07b8700513036be4ce41ac108c29fa63a13d1d8b7f2a4551c837637abf320730d7cf375c09e9727e SHA512 d1617fc93fcf20f52756c19797d4ffc38c1a116e0fe1da529552cd8557079bf08c14ee8b2d315f5864d376739c71bc1c9980ceda6389c6fc61ca1888d69809cf
+EBUILD PyQt5-5.12_pre1812231618.ebuild 5667 BLAKE2B b00ad4f8e3df66614016272d7cab47994b88c93249d567b17dbe7545d1bb7bed356be780e94be0cf050300de36761195a10581381451390a8be2fe20ad8fdd0a SHA512 0e8c0d847c7c0f899d6f215d95347f33c7b28dc34f488f41e400d35e584fb91e3e9b73091d3e163cfc9236a15d2b5925e57a7c2dcefa1dd801a441ecefd3334a
+EBUILD PyQt5-5.9.2.ebuild 5660 BLAKE2B 92c6ceb0c5332a6104828fed577d76f77e1c1b0d93d77ee28b83ae08e75f99c7475783ad24522dcd64e54e17b34a1b36dc2ead1f6967a986ccbefd26a9b7c432 SHA512 95831e63830e5a3962e36adca333784954c9b219a8bb818d04ce4a8212ebf14a5045e48822c8de48f4e381c8a8b26bd50164807855eb5dbf3cee2ce022b2b6d7
+MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
index 8b331f240fb1..d0f6fd5829f8 100644
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
diff --git a/dev-python/PyQt5/PyQt5-5.12.1.ebuild b/dev-python/PyQt5/PyQt5-5.12.1.ebuild
new file mode 100644
index 000000000000..7098afbaeb71
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.12.1.ebuild
@@ -0,0 +1,196 @@
+# 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_P=${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/PyQt5/${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 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} )
+	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"
+			--sip-incdir="$(python_get_includedir)"
+			--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)
+			$(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)
+			$(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
+
+		eqmake5 -recursive ${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}/${PN}_tmp_root
+		# parallel install fails because mk_distinfo.py runs too early
+		emake -j1 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)/${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/PyQt5/PyQt5-5.12_pre1812231618.ebuild b/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild
index 7db840ce9df6..c4cd1a3276d0 100644
--- a/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12_pre1812231618.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
diff --git a/dev-python/PyQt5/PyQt5-5.9.2.ebuild b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
index 2a9f2c434ae8..a4aa37a0d7da 100644
--- a/dev-python/PyQt5/PyQt5-5.9.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit multibuild python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
diff --git a/dev-python/PyQt5/metadata.xml b/dev-python/PyQt5/metadata.xml
index 92725cf1722d..3ed574acb761 100644
--- a/dev-python/PyQt5/metadata.xml
+++ b/dev-python/PyQt5/metadata.xml
@@ -38,9 +38,9 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/PyQt5/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/PyQt5/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
-		<doc>https://pyqt.readthedocs.io/</doc>
 		<remote-id type="pypi">PyQt5</remote-id>
-		<remote-id type="sourceforge">pyqt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/argon2_cffi/Manifest b/dev-python/argon2_cffi/Manifest
index f823244f011b..0a33d95dc8c9 100644
--- a/dev-python/argon2_cffi/Manifest
+++ b/dev-python/argon2_cffi/Manifest
@@ -1,3 +1,3 @@
-DIST argon2_cffi-18.3.0.tar.gz 1806363 BLAKE2B b60711ac929792ccd87a948f213288d4d47f45bf4bb52a1f6ac698d229e0953e37186c4e7d140231c205777be2fe31982a808cc676c13f12fe8602381665b74c SHA512 482a97ca17a23e4c1f93a0642e5aab1f2556d10f8a24d74afd051e6b58533c4767465abbfe8f1d39c150c5dbb191ad138d08e70633721753c7d317dbaf1cb375
-EBUILD argon2_cffi-18.3.0.ebuild 1172 BLAKE2B c2ce2a0410afa76935e54fdf7bb73ace85051817ce2716558226addb678b933f0dde93e9f135db262e2229145bb10b0d7bc889e4f669a424b0f36123ae9d8adf SHA512 66999c73637722feba791a9e9ac9d63e6fce862e758b2abd3f3695a9abba74674f9e340170d0c98f2169578e47f9230b2fc75cc8b61c87c2ef6da97a4db191b6
+DIST argon2_cffi-19.1.0.tar.gz 1808120 BLAKE2B f30afe3c270fe4ff41ee97418a49480d7ec7235db659d033926cb7380afb664ab61cfb41fbae2f8581c6873c474746431a1360abc134244803acab73836ed533 SHA512 9bc10f0dfbb199e0ae0c9bd6a7c9183a5b0b108966d89bacf8ee744a926d400bccc14869b889a2482be4a5c48bd7ed0464cf316ecad74b758a5493beed7d466c
+EBUILD argon2_cffi-19.1.0.ebuild 1172 BLAKE2B dcbf978bfe30bafc835d0d8609073ed99a9b936838a01326e16e7f73fb68715d1f8d34d8aa674f7d4a37344ba1065be34890859684d0f51c82bb61ab80014985 SHA512 07f25990ddf6c1a8008c0cbca312b8a8e1d91e871f76d18dad9993d2631be40d1780d48dff99e39c3ba7f9b62e15ba6b8680eb56ceb1052b39354679a2417c57
 MISC metadata.xml 727 BLAKE2B 8ca033f1a646a7d55dd8c78f483998d8ee34863d372c88b0d9e42c7d1fa7a14962b9a2e9c19aa13d0d35c7cd0e68599419a9641982dd376d76ade5c98d3cf338 SHA512 770cffcd4f6ecbf4fe93463bdb1670a9ec882844da62ac8ce18d606efcda6f314a3942b205d6a4ec54aee6b53f784faf6d19482601c9b570567217c31c6846b2
diff --git a/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild b/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
index 14c6988af3e6..74c7ac49809d 100644
--- a/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild
+++ b/dev-python/argon2_cffi/argon2_cffi-19.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index be2899e959e5..3fdf08a5c5f8 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -3,5 +3,5 @@ DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b
 DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40cefee847061a2019bb27f0982091e7628737211421ada351937caf9c6734cb445ee6462ce84b381030b013bd05 SHA512 a6f307d312a3ceb721071b5212297c73d2306894b5fafd39265578041a2859bd6f041ac43a654bdda4175a70a4e90e0db1ee35cd43fa620cd5c594b5d1988a74
 EBUILD automat-0.5.0.ebuild 1220 BLAKE2B b4d3ccecec979fd015d59acef3a304cb17e2d5400578536d7a8c25f5699104ef6670a4e582f8feb8d04a7df255b95d830b8a1c3477f1a8622a7cff340c71b225 SHA512 88099c32c2730c19717a0a2a5020d7be29c51bd3581138b4a0d67b4563e9e6c921cefd828a3443039dd28874ff9fa85d19d4f8f3ac9bc9df6e3fdd9478c38897
 EBUILD automat-0.6.0.ebuild 1238 BLAKE2B 7cc573a302a0701e9bb40aa39dd17d04ae681b8eb7f13e2fdab5bbe8039c8e6bc6f5fc664d82ff5008df01848eec852e3d2da5178e9a7c7f4e7507b8c5644e01 SHA512 c5ba1ec51df7b90b5d9b9a69670194c91090583687309c81ed14a7eb47556747ed3a91fef6dde183bdd4d8e3662b1dd660f51971220a4e4edc2fd172863394cf
-EBUILD automat-0.7.0.ebuild 1440 BLAKE2B 599de0092fc4a004b9c7ddf47511a3b7c9ca4e85770dd347cca3d70b4b711b715488f58012f6eaa40ad43124f0d51df995d78b80bd03856ab480e451824c0cee SHA512 7e6479cb62370918228fdb9a3386485457eebb338b56ebea9961b37c1eb9fcb4036e6a35b7332bc930046e4d2f9d9d8f1f8d26c5079b822a90a542d320349733
+EBUILD automat-0.7.0.ebuild 1453 BLAKE2B b88b2f689d457a55b89819d27e63b0266b097c19d3e36b4d3d91f594a10f3f4573b9599fda60025ac588292146484a4ef20b8403fd77b272a34e93ba916a2d89 SHA512 9bfae1781d8ea2fde61093d99e87c8c40b93cbc7639c969676b518bcf6bc97b1e4e9ae7d1890515e1d9ceb1f928da158deafd87bc9282f149489988519316d9d
 MISC metadata.xml 622 BLAKE2B 10fa7f62095186a07a588b374c55dc084a483ff8848caff3322822964d57175a729e82948f984f4348a1cd0e5d7bc08c1d548ef674fb93aa08bd55343c53ba63 SHA512 f9feb6bd4b545a707d0539d42d20a0371eeb8a9e0984e922b3a0416a0dda97b6783c21cf1ec63868c200535d9a46e80b820424a1d7199074419780b3e7328333
diff --git a/dev-python/automat/automat-0.7.0.ebuild b/dev-python/automat/automat-0.7.0.ebuild
index 31c408a3704c..96fbe84f14f0 100644
--- a/dev-python/automat/automat-0.7.0.ebuild
+++ b/dev-python/automat/automat-0.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index c983a2c84492..df6593e26bd9 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,13 +2,13 @@ DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.0.1.src.tar.xz 12488668 BLAKE2B b80247b5caf81661dfa715d9bf454b8023221bd27ce49b6bd8cd66f40ffe01448e40fb828fbcc64e49f059af7a7c5a95a0737b0b998454ac5c1dd39388150fa6 SHA512 df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194
-DIST cfe-8.0.0rc5.src.tar.xz 12864516 BLAKE2B b1c982d83e0a911a7375d07f9f2f52956b3595674252e6e7d8d8ef4015b51171c59a2d3306c00fcd83ae2fff2eb3d58cc9d4cdeadaca02c4fc3a6242f57959fe SHA512 40f3b6069e40fc4f831662912a8f4c3ab1579587bf48c1fcd9e80287b7e26e8b70becfce525a0b55b1b8283f20a9d67d232cf5ce10189a39d655e2fe3fb3dd73
+DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
 EBUILD clang-python-7.0.1.ebuild 1103 BLAKE2B 880675335893e206636b121e60d025df935a8ac0c08d77c2b9d399f1152e8067f7fa4a95a06487aa51bc5ca53254ec8d661ebaa68c03286e19f1eaa2f26cb6e8 SHA512 a12d2a01febd8cab4e04350e897aeb59865f2a4a891a7aaddfe38f7bb2556595d6e367a9463bd4478b3aa691e41c031e8323c0bc36130c4d96449c0a84999e5c
 EBUILD clang-python-7.0.9999.ebuild 1059 BLAKE2B 1ab0d9234fbebea281bf2235f870e6cd468063f2ec5c20f7af3b797e6135aa6730ccea8cbde5ae5993394da1563897f5b45adba1d644257f6bc300b6da5500f9 SHA512 23882089855c9485ccf23129542f3b6a5e891776cf422c9b16a0e534e4084f59d5bfe4526d2510cc094ce8cab311ec141dc76ee45cbee7d43665aaef58c9fec2
-EBUILD clang-python-8.0.0_rc5.ebuild 1106 BLAKE2B a02a1b4e88343f276c1b5efef16ff11963cc9c3a6b27b25506e3bcc60225991e93fa56728c11f059957881c062d133166b63ae1fdcf725d0dc565ce9b981aa31 SHA512 ea05b647ee32b17b215f2039e3ad93f76202fc80277421e8a616ab044c8179b879327d3221a628a4634754271d8d430177b10208a88b271f0b5ecf3d213d9f81
+EBUILD clang-python-8.0.0.ebuild 1103 BLAKE2B 8258eed1efbd477658d3a6e61836bf7d49bf9df3af481863975708694ff49e3981f6d3309ffd0a8e4b3cebc6284fff78a89027f562f7a36bf1f6eb6b54b14688 SHA512 dfa1cb8ee06be45e4365c8c453f1eced329c7747a8e4be526edc8000cc019960d510c3efb4f7bb77b84c4f258180c9349d090a78b12140875fa032f0e572a1b0
 EBUILD clang-python-8.0.9999.ebuild 1056 BLAKE2B 9f18a22421c36ba3796b6fe759e05d5ee5b8ca449e292145c7eda6733c614ffe012f40d0e12ce336ef496a9889463f090fb96180c146975052adc73d8cacd690 SHA512 39239de81290208b734fcd8035a9b8dbc75a0ae9a9cbcfbb7432be5f83b71f2254389ddd139b1c0c9ad59eda86269932a720a02f6dc277ee15178298fbf49a1d
 EBUILD clang-python-9999.ebuild 1034 BLAKE2B 3a56c0e391daf98889ba3959f8aa5c944c9930ac482c8beca5f814978507f9869a213384224c6965ade96a3f0b17f83aff9924f07d5ad2d03ed7df8660a54df6 SHA512 bff0eee11762f352ab6616086b19506a2ea0530284f50da24538eb8078d2c04af1d1aa2a8616adecb6bdeab8853728b2f4b5c3133fa15810f00a64855182c486
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-8.0.0_rc5.ebuild b/dev-python/clang-python/clang-python-8.0.0.ebuild
index ba2878b26983..9a7fbe1d66a9 100644
--- a/dev-python/clang-python/clang-python-8.0.0_rc5.ebuild
+++ b/dev-python/clang-python/clang-python-8.0.0.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
 MY_P=cfe-${PV/_/}.src
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index 97b0b1975a07..da632c86e469 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,5 +1,5 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
 DIST constantly-15.1.0.tar.gz 21465 BLAKE2B fc3781e521f3a9988567c437e456e2f8215b8d61115e076d4f9fc52926125540f59bad457413105422d31184506bf7fd3fa38711dae8a8057b38941f2c5584bb SHA512 ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3
-EBUILD constantly-15.1.0-r1.ebuild 693 BLAKE2B b6279a1ceb6cdfc3e592cdd5b5d7c2d5d6f6792a4b328015e04c7cda66ced2af026b8c04e8c9f20d6f10f7e9452962ec2c0db1ab3a5df389715bcc5f4ab0d66a SHA512 938d08f68f32da5a8c25692345e73adab4a5404dc8ba38643e1ab290fca4ad1ba8f984bd24f0bb723bcfae959d9703c5c431841535a2c64550b1a0dda5030455
+EBUILD constantly-15.1.0-r1.ebuild 706 BLAKE2B 18f9e38ca011bf1ba3cf080d242afbf33444ca4afd0250ae44b2c4148e6da0ec21eb4d594f0ea796d2f1568eac7245b662d6c317ccf55fb824247b91c88dd208 SHA512 f8d6b30b320c857c66decc0227ef8a406981d6e44e0b7897376dcb1d19e41331c65e98d6d81236301f9765e08e9982d1cf3235f09b9f108627866ef36fb4d1ae
 EBUILD constantly-15.1.0.ebuild 566 BLAKE2B 4f01bc98dee8711bacdccc142d6e3fd9d93d003c1615107d434fcb0038176f24b2295af83d5a1cb79ed908f76d75200efa9abc53d695a4a4a20c2601b65cf69d SHA512 13ce8cc80e673a10fdb4a37c9a8f1477178aeac8920ef194e993970efeff715598e0a3df52bb4faeb726fe5a8ea75a00c6518860c6ce3bc14089aa014f9e4392
 MISC metadata.xml 714 BLAKE2B 696bd5218dd217515c0b9d6ac7afc0da90ac2ed404120221de9b35a84621533cf1aa8d55878c722f55a59c2a36a4216a092c88efa0936e94dc980a1ed577c990 SHA512 850ed41a1f806475ac8a877f78d4c4df161a81ea47fe08df8e0fd9161f6823ca401519b8c007f06f5db182924e906ffc9ca912b72b4f2f9e66a5ad80d8f67f66
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 07d7abb44261..348fedc80de9 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index a49c49959669..327749602784 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -2,5 +2,5 @@ AUX cssutils-1.0.1-pypy-test-backport.patch 1215 BLAKE2B 8a6859fb3721a1c36541c81
 DIST cssutils-1.0.1.tar.gz 353621 BLAKE2B 142320e2358acb1b5b95400f42fb5eb40840602bd204f68a1896ea92b35dfe2ce6f316d84cf5d21a2ef8047f4748294b908057fa12cab352b42d7ab2ffcfaa6f SHA512 932a128443cc31f689d91c7c75a04ddc79824b4e5c0779e48d30fa0a3a760cad82d8208264ec95a3b120c38962f2eabf6b3456aa8f81d24e9c9718e95fd6bf83
 DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda
 EBUILD cssutils-1.0.1.ebuild 1303 BLAKE2B 0fd67a170ef9be0cb5bc2142cf9e4a72c01b6c9d692524f25a4c40bd23028c38b67cca1aca670edf957240b8fbbd8ab9cdea4f03f78460eed33307e0237758e0 SHA512 4c7ad7e7330b3f4423d9900c7fa0aa144eec3d3478f3562bff1969073882955df1954681c4f649c272239ddd33d1ffc671127ac281fddfb2234b9e4d27ee597d
-EBUILD cssutils-1.0.2.ebuild 1250 BLAKE2B 780ae60403e6bfe7031d4edb993805d6493dabc21cff135d9132088d2cff69836100ca0a08de4157834c6034e97509f1fd5b6508679728a71851f5a377aec5ab SHA512 3d81ae75d85e948e4f00a4317c75db64e6dc8484bc352443243843a4e185ef5098465942c5ee22ef4e056187f70508046f2a0ec760e8f07cd99033959dbdcf92
+EBUILD cssutils-1.0.2-r1.ebuild 1249 BLAKE2B 1740cfe820676c1a1c7b2fe03b9bd010e8b65db86074ac8aa1e5ecb3586d90f1ab0d6084f5d84bd027a4295b3c01c21679668dbdd61eac46cb3553509319344a SHA512 f933ca14c5ac0a8e01a5ad4be74f464b6b9ca1a16021610da36e4d430e8f30c2cfa105d51083e8021ff838003fb85c9fcae91da632c3ef59bec09f59eb90eb27
 MISC metadata.xml 669 BLAKE2B 1d3cf25cab5d7a828451da5ec24ccae08e31141e6ec2ffe3efaead8284a4a7763a1c5d053138bbbc2f3846a45dcb6bb353efaffdf0a83fc110f13a6af13ed1ac SHA512 3fe0661179833d29c8a5e5ae2b7d872ad860354c58bff8e18935f5876fd95cf8fdfbb4ebda9719198dfce891647d04f263d213b74eca635005098a89a0402294
diff --git a/dev-python/cssutils/cssutils-1.0.2.ebuild b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
index bcb2600b3e7f..0542c6dff73a 100644
--- a/dev-python/cssutils/cssutils-1.0.2.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 0e3a731bf768..ba3702bcf093 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -2,6 +2,6 @@ AUX curtsies-typing.patch 330 BLAKE2B caee67d514f926271fcbe498a06cb811ce48035317
 DIST curtsies-0.2.11.tar.gz 46740 BLAKE2B 103355b8467617ac4890ca0d2c444336963d91934539c79314f4319b9fe273973c6464247cf2f5d07ae2ec5fcf45f302c80fdc94cd159715cd204d12870a54f1 SHA512 1fd71d9bc4125a427a5990c6fcef4f73f6e677096eda8d29f7dfee7fe6fc3a350fc66c4383d5e9370a3ed19dfa211285f8b99c425b154e22d3cb4718e1f1d05e
 DIST curtsies-0.3.0.tar.gz 47120 BLAKE2B 51d6bf5686c275690c6b906e7eba642aebd54dccb106463a9b1733e2174fa26a30b8365a17d6cfa18244fb74693364a3aa5184a17f2460425a57fb8912d6bcaf SHA512 b1fc09a4e9aefe09b878a5c710ef86c90f93895a8ed40b40a3c13b24a2dfc1fe771ace11c20e3fed4fcdd0bed8b9615ee3c2bcf200fa34fbfb895a4a7b57b14c
 EBUILD curtsies-0.2.11.ebuild 811 BLAKE2B af43ed770c79d81b365fb99c57aedefa2b76917dfbcc692b87c3e4e8f661ca128518af275c69a7abcebb741deab0277d5562307ac7335aed6238bf045c0f2a07 SHA512 e147f44ca548af38f2b12638d3c79be5763f09f1f684bb67da08fd03322155b6b560e096b6499be906cab32e42b84b09d6beafb0425a48ddd4add943aa87468f
-EBUILD curtsies-0.3.0-r1.ebuild 971 BLAKE2B 66817e56558163f7b71e76d9afe95d792248f54e1c7e7620cde4bab99916e8cbe477e542f227adce579fa081d6fa2fd639ba8109c27bb0e5f66d68472121ca2a SHA512 9fc2f463fb42e5a653ca5ced30a3f2b4f65a724453c03c15e352818fc1540853e3c8fc5c99c1de4229d30120c41a691bc9325514e6cab65ad1558c0612436bd2
+EBUILD curtsies-0.3.0-r1.ebuild 899 BLAKE2B ac586d9b5ce48d9e6ab52db13872a3e23d4d1f97e9d7d1d35a26dfdd596d7f3f6a19ef2b5e770065bf0287653c3b41852a781161013ee791dd85ff0fa0232ff1 SHA512 b78b754915735183078e75ebc6a087aae84dfaaa8ff1e14b63da31db400b10a2db30caff5c5f95338630bbfed625e33555009a5fd7b4c32401b5f21ac41aacff
 EBUILD curtsies-0.3.0.ebuild 813 BLAKE2B 82a61b80ae0050ff4ee92de7dbc6a28bc67bb6e71c87201d84bcef8b1fd638d008b519583228e3af20592a78cff40e736872ae6e313fef44cfb4fd447405507f SHA512 2e90c1b2b073aae72efb869af2bc96d15cf612de8a46bf4c9a0daf82252a2c12d279c7ca99bf417904f9c061e72ac03c34fc5ccb08eaa446ec2a64a91b39bbf1
 MISC metadata.xml 387 BLAKE2B bdddb5521d99066f5585c1180d4cab02d11d48f1118f2548bd0d4889d83d9c59a4fde4d018950b34c4e930c33b034439d500fe21f861ee139a8e5d997cce73a8 SHA512 c5e6232c1d85452c22de8bb1b112abe47881e3d0c4fcdda8b7e22ac7544222b63b48becaa225d40ce2a3025966474a0f9bae126f0348b1ada65c1447921dc714
diff --git a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
index b12c3e7ffddb..47f4f1a2b20a 100644
--- a/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0-r1.ebuild
@@ -19,8 +19,7 @@ IUSE="test"
 RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
 	>=dev-python/wcwidth-0.1.4[${PYTHON_USEDEP}]
-	python_targets_python2_7? ( dev-python/typing[python_targets_python2_7] )
-	python_targets_python3_4? ( dev-python/typing[python_targets_python3_4] )
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python{2_7,3_4})
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 0e6592d5b34a..183e8f896fac 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -2,7 +2,9 @@ AUX dask-0.18.2-skip-broken-test.patch 1349 BLAKE2B 8ebe780c900407dcf9052828059b
 DIST dask-0.10.2.tar.gz 357356 BLAKE2B 6d00529eb550de682221875d8c4fbf4c0447168b6c87327b02d0320cdd37e6490f67e7f0a09f814b9cdb453080785b011cdc50ba9b063c6569b4825833df92b4 SHA512 92bd671ff1483fe87edd34330dce321b88362d80ef4d836ab4eede87fdad5f657c51d03a9885a53924fb3becb504a8843cf852be08c88f5389f04c3f1b8aefe2
 DIST dask-0.15.1.tar.gz 2147022 BLAKE2B 79c3355e8f3c202e598b32ca057c237d07db283b04b99ea713a820869207af9f46cb80ab58c0a058ac327873851f2d89050a4b9d7ecac3c1e1173f6be5349848 SHA512 44e7119c2a8d15efb89e265e5752edb117dd06da8a5e7511b68c5859e9068aedb3595540645304f0322f869c83df79a497d731bcade79612f8fd3f4eaaf3763b
 DIST dask-0.18.2.tar.gz 2324709 BLAKE2B c74507b63299388b05c94b1e59cc45051a55ccc70e89eb6eaafeba7aed2aa496c03ff9468467a9303f4ab630810838a8a7ea75b96d6a85d665d0cc2744792a54 SHA512 d5d59f13c33e7d70fe63da1f40a82296dfed34a009f70dae9db6157f8a20dbf7a7913e667882eb21191d5c3e3e8c440a3686d8d1b2bc206fedd025f24b23f005
+DIST dask-1.1.3.tar.gz 2371430 BLAKE2B 158a18c5126157d8b6c4e34dade437ccaadb721cd3824548cfe2dd659357236adb5919501b0996b3a944b5640f1cc48c769976b51c3c411315e37e7e6e8b96c4 SHA512 7efcd3fb497b81986126bd365fa54f19870103506b5e6645b029eb9d12bd7619073e95d045b0fda9133ff8a2bfa21df64fce135d3ff1b2225dd64633839a6166
 EBUILD dask-0.10.2.ebuild 946 BLAKE2B c07be78c3879641077aee95e11be90880e27e81eab40a849f81fe44491556a3b000e5ec34a32094acc55239ceafc7c046eca49d8c2bba331979311e9d878c2b7 SHA512 611c1b6d68e0f6c74f90d2063d69e3b3e149aa0b95596c71b1cece2f8c1fb5e9fb5ef971ac857943d2e19eb52924152acc82150a45ed2bad59e2d14ed1ba46a9
 EBUILD dask-0.15.1.ebuild 1092 BLAKE2B c1713589564dc2fc2b83e30d32de2dad08015631ee385822078338246786f96a642c893366843f7045ff7b3918f52879187490d90feec279b27e4cf8bf68a3c5 SHA512 0d25a6946282883a334a93b8773f8fb79df65595b67dcbf854b425a264f944285a93f572a3595ed5506a89b47307f9a1e635ea60bef068ef4439bc29c0bdd4c8
 EBUILD dask-0.18.2.ebuild 1213 BLAKE2B 617dcc661b265b552789150eacfb6dfbace2675782fdc67c7c97173ad3db9bb94bcf66602bd2167b79c7bb3806422c8b0669066e8b262929af943bb5f9a9b2af SHA512 126085967eb2ba6867ee2358f939fa5ad808c6c17e1a51076e7bdd41f010455ebdbd8382d36eca2bb54dfd3bcdd0bc99f271e8147dfdb4cc1ce078bafc41ca9a
+EBUILD dask-1.1.3.ebuild 1196 BLAKE2B 3366bda467952534646b739a733d37e99322dd2b0de0f82309b9ac37806360ad7b3c81344dada654c4ef41ff1d4bd37ae6ca78c8affc53c9f68d5d10bc44cde1 SHA512 1c896f01e5a9135d77cb510dc00c21dca057d3c420d9948c71488e83224f5f688d36ea965dd7d29aa0f0ebcfe247d450f25e72a4737efb98c4bc1ef844f557a9
 MISC metadata.xml 777 BLAKE2B 5574aa56065f36366ee721e25b1bfe06127a22a94666bfdcd1b62e4d03456948bb22db23f64ac7ffbab9816ad508f97fe23a2c9a0e34cd58a61946c6098585d7 SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850
diff --git a/dev-python/dask/dask-1.1.3.ebuild b/dev-python/dask/dask-1.1.3.ebuild
new file mode 100644
index 000000000000..0dbf844c58cd
--- /dev/null
+++ b/dev-python/dask/dask-1.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="http://dask.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="distributed test"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.7.3[${PYTHON_USEDEP}]
+	distributed? (
+		>=dev-python/distributed-1.16[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.18.2-skip-broken-test.patch"
+)
+
+python_test() {
+	pytest -v dask || die
+}
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index ff6009a30c6c..d67693fa607e 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,3 +1,3 @@
 DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
-EBUILD defusedxml-0.5.0.ebuild 747 BLAKE2B 46576d0153dcc610b06beffdfa296073454e3f66a65df6826eabcf58caa7d1664ba68d96d1cdef9ed4a42439a4b117b19202304caae89842474edfa7e070da6d SHA512 0908b2df179d7b8d363b28d686317e8b93ae315b7dfbb75b711fd15bfe59f3c66dc44977a943583cf4f17450941ca28e73b11ff153df4078d000174d9dcb5080
+EBUILD defusedxml-0.5.0.ebuild 760 BLAKE2B 4403f40180e218945437eda9fd5698c0a4a2a370824064532f357376a11621b00c2d92756994099b5325c4d2fabf698a201bdaa01fbc06a1ce2c281189a059dd SHA512 52e015a4114a30017a7b6ebf6d3be4f0fd08b1526fc1d9a6296d1bf2a558766054ec36ac74941a696044b2b2e7ceb4da2f005426b6e1359c6f5401f80b9a0b3a
 MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index ef86559ae681..6704b3094ee7 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
 HOMEPAGE="https://bitbucket.org/tiran/defusedxml https://pypi.org/project/defusedxml/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux"
 IUSE="examples"
 
 LICENSE="PSF-2"
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 794428f46628..a9426d100cd9 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,6 +1,8 @@
 AUX docs.patch 697 BLAKE2B 049d893d773ca447315ca5aebec808e6933dc39cc6ebb40b06291e5f80d1c7292fc7565e4ed66264eab29d36dc0b610cd6f2864d040c641d82bc921dbc8640c3 SHA512 e9f0607d6f770d451c53e851d6141cd0cdd63ee59e654eab0c3454b9f724f36086115760614470dd42e8f8afc63b018bd695cd596d2ac71530e4a5eaab379779
 DIST django-auth-ldap-1.2.2.tar.gz 131086 BLAKE2B 78f93eb24620907f5b5671972e2b80ec6e59cdc42a455c298bef4c3215616228735a0647b0646b683357bc16ea6d03488aa86626e2ad51211a382ee2d0482909 SHA512 676d1114faeb9a2956ed51c586afea7618c1bf62867d3525596599391f8327b8f22a075c4203311df88279c317ca37b9097b59e55a64330afee6eb1c5a9c9ac3
 DIST django-auth-ldap-1.2.7.tar.gz 131431 BLAKE2B 03fac590118d25ad0d9d8a3ac5dd8bb24f138f193bf27ae85d4e2776be79bb31ca7efb278fd05ca1d45976116ca7ec79ec3b510ca380dd8912ce47f1522ad348 SHA512 2ca29bdceb4b2540f7c90c9dfdfd7a02f91e72cd44ae062cebff84199dab737ee69ada56269189ec0dd70ee7916c3373acba50866280ad080c4c68dd69dffb09
+DIST django-auth-ldap-1.7.0.tar.gz 48897 BLAKE2B b4b196e4cd0882a48d2437326cda57394963fa44a64a3cf5a0ff668bb86243da3979e2746e096a458a5bf1d3c8be687f3d3fe456f5a6b0ada11ebd1f4787e323 SHA512 6478b2ef43e6f49acff3dd2e3a2a462ae02a3f1475d5615ba2f14bfd5efe2b232a3d2008902177d90822fea6b096a05814a5f028f4eec5ee09c5e5a62793e73d
 EBUILD django-auth-ldap-1.2.2.ebuild 1095 BLAKE2B 4812e2d22c451417d33e8986519c63b580e2b6e296947e1028e8c936991abd85da12ca6b34ba71902ca039b24e805879935d028ed90bd369a15c25bf41abb351 SHA512 5f7ea4e4d09077576260829640c5513428fd7355943ec2a1e93df8b5dc697090a3c3241786d33344f12f2b0b556322098c3b52513aaab7b18f8821dcc6e8dbee
 EBUILD django-auth-ldap-1.2.7.ebuild 1053 BLAKE2B 00ecb60473127200ec35f775961382d1cbcb97318ea791a24b45d8f18d13987b2240d88fe3d547b781c499f3bfe853071d9d169a0a520cb90a6926431f466ead SHA512 d83209650888a3490b20b64e24e137b487f1340b06d4057e83d550c962e573c55d15acc3700c2b15d73b5ec21ee9d0fba8b1d14e4aea5a0fea9a32b482e9a989
+EBUILD django-auth-ldap-1.7.0.ebuild 824 BLAKE2B 14457834fdf184d103ae94ec578ae5b1208d99a3e6a6e6ef537b673eb9957193cc2e13480556fd3a2a8c2b46539f911cb8e08bc3f9700e5acdcae960bd4f83e0 SHA512 edc90be8109f5c5d370404272564785877fdabde5e4dec0568795ae3b8fd658002b181be9d958cef78019648b9d43170810843a4beaa9549885b2e8c918ee42d
 MISC metadata.xml 398 BLAKE2B 89e1948a1d118a27477e02fc01d630aaf7c9199cd913a08efc5510fec05996e1aef84fbac359d09ef73a5de083b1920747928c3626afe7aa9c1c9dfa720f16c1 SHA512 e3350f6ab3d2c07965eb2c6ba1d82a929bea8e9974d8a2cdc12acde88aab50f2c20105e90e847a23e5dea5f97a7ab6a7a0c9eb75e193eb90ea5453c53eb36d41
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
new file mode 100644
index 000000000000..12370642b88d
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django LDAP authentication backend"
+HOMEPAGE="https://pypi.org/project/django-auth-ldap/ https://bitbucket.org/psagers/django-auth-ldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]
+		>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]"
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/drf-yasg/Manifest b/dev-python/drf-yasg/Manifest
new file mode 100644
index 000000000000..e8f2902500b9
--- /dev/null
+++ b/dev-python/drf-yasg/Manifest
@@ -0,0 +1,3 @@
+DIST drf-yasg-1.14.0.tar.gz 1270930 BLAKE2B 11c075fecf1e0742765ebcab27ffda719867e4d49f5e6f337d2d048dea26e3fd1585f42a2bc58808395ff3ef2e1c5aae912d5ab547f91be5b3f0bc3a0ebae98e SHA512 283307cecfc0c8fe97a8742780184bd73b547f9cd4e28bafd35cb1447519f65a432f112627fc7f5e9560185014d0477a9bf507c1cb9afcbdc3f58a21a7dd351f
+EBUILD drf-yasg-1.14.0.ebuild 957 BLAKE2B 06d20c391a3fe65a2dd5d2bf4c3cd307f87c55cad20be6a6a8385a0c18f59d9731e56b166c018f075c2fe9c2d766a7a4d8ddb01beda5e33b8a9b2283f360beb2 SHA512 b2bfea296c5a9ccfd78967c64e85f5df7600e25756b3f3a9ab0dbba61ed1d088f86dcc587e8dacac87cbe6ffc0fe163cf6a1ee4202b163db485ac2f4a4ae5888
+MISC metadata.xml 363 BLAKE2B 7adee65506aa3e63d7eedb2ced7a91f3ebb34fd2654da96656b31242cb4017da34e9986246be218841eb0046beb590fe3381dbd49bbdd79eb4e965b27223f109 SHA512 1cb8c63d5549c77ec884f5d668e8270ab7f73097ab25d1fc19fea3150b3ed56d7fbfb899d5418c3343cbeed6bed219edb892d3a4b630e900ef00db19103b3f3c
diff --git a/dev-python/drf-yasg/drf-yasg-1.14.0.ebuild b/dev-python/drf-yasg/drf-yasg-1.14.0.ebuild
new file mode 100644
index 000000000000..8a923a2a9c52
--- /dev/null
+++ b/dev-python/drf-yasg/drf-yasg-1.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Automated generation of Swagger/OpenAPI 2.0 schemas from Django Rest framework"
+HOMEPAGE="https://github.com/axnsan12/drf-yasg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+validation"
+
+RDEPEND=">=dev-python/django-1.11.7[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.7.7[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/coreapi-2.3.3[${PYTHON_USEDEP}]
+	>=dev-python/coreschema-0.0.4[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.15.34[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	validation? ( >=dev-python/swagger-spec-validator-2.1.0[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/drf-yasg/metadata.xml b/dev-python/drf-yasg/metadata.xml
new file mode 100644
index 000000000000..d162bd623caf
--- /dev/null
+++ b/dev-python/drf-yasg/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<use>
+		<flag name="validation">
+			Enable swagger spec validation using swagger-spec-validator
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index d0f9a2cc9e93..6f0dc33c7392 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -3,5 +3,5 @@ DIST fido2-0.4.0.tar.gz 141714 BLAKE2B 3d57ef1598d2c84cea8a98e75cdef96b77807d4eb
 DIST fido2-0.5.0.tar.gz 161562 BLAKE2B 20d4f6c4e54366a26d5a56a84a6ff84bec0f0e22107aa612db721df8a5186a2129373ae609fb58a27008dc700b4b92d607fc2bf16aab7ac6bff8d9e7219204aa SHA512 fa83848e179b9208e2a701a3330faa1dde75e5e23133540eaec896145dbde376bc424a5e59865d3cf90c5765882e22530e96df2491101d2b5dcb22cfc4bcbb87
 EBUILD fido2-0.3.0.ebuild 820 BLAKE2B 5a50bac620a129267b34b051c0a4d310ea57829fa8b3dd7273e6e2a1309c6e773aa452184d12d7cbd7ff4351a4cabc0327e49eb55744479ba142acac5157e3b6 SHA512 f0a4f6967e6e88178b9aae95de79153b037bca6766ea89e9f6ab36eb6cb2fc4364f716eec4793637f96a045faecaf02fc7c97684b901d9012d56b576cc43e88f
 EBUILD fido2-0.4.0.ebuild 1107 BLAKE2B bb336bfa532dc089e7360b95db4a0b773bff7e1d1072ab1feeae983493c44adb9a7e4edeeeb36e603618c21b3530bbef71f21da1af061508c1caed04152c8f53 SHA512 8fb6bb025ae73ce657a7bde95b751ca97fef4da4e2eeaa37a6e2d3313cf64084c54ecebb7f62fcd4b6d065bdf3819eacf31cb85bb727969667c8283111443920
-EBUILD fido2-0.5.0.ebuild 1106 BLAKE2B e613eaa7a00cfd82838b5f850029591ac886ee277d4e522da1ff39c68d7cdd1d7dd4f224bbf7c64f252d46e2e92849d0d6a9da9eb77ee6670722bbf5e4d914f8 SHA512 9c7908459a16051e3fbdd85e12f433f2acc31222dcf74215277954914efe7c242b9731b462bbd16dec5321d560b21a2d71bfe81e93661dd3b5ca71b3eb1373bb
+EBUILD fido2-0.5.0.ebuild 1110 BLAKE2B 37181f46902ce517c629089cc8ccbcc0dc174119e0579b255c0c51142eae43b434ab094ba6efc379a4ede057f6735774f26833a27848721752e6a3775d1f7764 SHA512 40051c6acc3750aea30d5370cdd3de49cb1cdf7cd2133e20390f4f1bec708e844232d4500ad9acdf64043579a610145824d937f6444fa741ea857fa0e767f7be
 MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
diff --git a/dev-python/fido2/fido2-0.5.0.ebuild b/dev-python/fido2/fido2-0.5.0.ebuild
index 18a4bd557e0c..20a1b5019450 100644
--- a/dev-python/fido2/fido2-0.5.0.ebuild
+++ b/dev-python/fido2/fido2-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
 
 LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 8d01c8770eed..e2017531664e 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -3,8 +3,8 @@ DIST flake8-2.2.5.tar.gz 28333 BLAKE2B 016b5b05b7448dec762e7d5e06fad9d631351d02b
 DIST flake8-2.5.4.tar.gz 81663 BLAKE2B 89bd5965fe1f6862cadbfc7b614a819a13d4ab147994485542ba519d6151ab11d4b496066c74141020858f468050e7b6dc3d6ce3a89ddf809e9cdc6d130984ef SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28
 DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1d6ee635591628fefad43ee1116256ae7f240496d93941800212ea2479be73fb9ee9bd03c9a54ab70bbce452f SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
 DIST flake8-3.6.0.tar.gz 144684 BLAKE2B 3a6edf83860c6c6a59c150cde47b22eeb17b9e83cb23e4d8f747715b8867093a7f1d1e2bc55c9f9cf43b69463746026d839b0177f2abef746581563a670c3ce0 SHA512 f4377bc7806074a88f88b3652c3061583e576ee515b2b741cee9c6dc18f84f34a7807c93fda9dca3d8b006e379dcee60bb3ae20e6a2e62fd216a82a2b36f2eb5
-EBUILD flake8-2.1.0.ebuild 1073 BLAKE2B 1f90fcc6a57da202d9b8026f89c5657a85efb0e2a5fad78057362647ee384907208fa8de6624f5375739c0ec386959e2936fc985d100f7ae2dd40f150d2b918c SHA512 0f7cd9b30bf9b095506af3796ce2927d2b14572a9f42e34021a205c090388ef08a6ce091aaabd19441b32e18c0d43c94cc1fd274f80e104c465d1bde88b46f1a
-EBUILD flake8-2.2.5.ebuild 1099 BLAKE2B 95b243ac6b57a1876810d4189dfc2b70aecc993194b62e95a17d6e410cf1e3378adae7eaa7a4027ac55b0528e0315d74149d0e2512c55450801fa382715b46f1 SHA512 552e6145ec0ad5a64055722fd6c93019e4a3169e80ac57eccad3838fb9b9b32cb1a111307fa6e6f5e1e5331b10d958b9d269ccdb5a791d75588eb8f15777e571
+EBUILD flake8-2.1.0.ebuild 1076 BLAKE2B 331e2ca9fea257777fed28c0935bbd9a610be4c6dafc5c6e48c407458c752a4ee169a1cab02e1ddae26c3fabe7a05cce04613d30201aaa0d5312c3524cd13cf4 SHA512 65f8056638d708d9c87d796405bfd236795ca488d343ccbfcc64eccef4cb7a2c0fe8b108376eca83526bcd20ce63717140c34ca6a2ca3de000ad80ae35b0ea77
+EBUILD flake8-2.2.5.ebuild 1101 BLAKE2B 10abc6ca0ab941fe83941e9489c9a85b0b854e1a8d5f9a0634a81f9491a0a057c1b2acb8d8ec006759cc8905308b2afce097e50dd95573cd1911dc60d31956ca SHA512 bf6274e8c39b2979321678165c78e598c65ae34354f7a0bf4da6d8acd15d6ca40b8966daac04bbb18dfd6e863b2bd1e8d5ec4d59dc80edb30f5955850870c970
 EBUILD flake8-2.5.4.ebuild 1604 BLAKE2B 1e0c65296854971216aba308e2bd8d99760d44a0a3338d1f1fa6cb83a6db13e3696d06671cce0717575b0d71aeab328bf1745f4414a04f9cc33d23fd9c7d69c5 SHA512 6a56bb2adb6a82dde6f2afe9226119203b9df5b8c0a43a4ffb400dc75f6c2636d9289d78c8602d9cce83b22113c51e5a9de5d29bb0bc23d922e2ce29724a0e2d
 EBUILD flake8-3.5.0.ebuild 1637 BLAKE2B 250dba56f400fc9761907c2d70bfb251a2abdd820ea698d48f4898b405022c4f811da90336df9f81a5534ca82cb3bd19301cbc979780b720528ccee9c9a88c9a SHA512 1e0467aab3fb0738bf798f915cf6c4a024c0895998a4c27043a30161068d85b4adcbd33ad13fde458288f5439c3839444fb2122b3dbd6dc2348df71984abdb26
 EBUILD flake8-3.6.0.ebuild 1646 BLAKE2B b61ce7b2376c3abe6177c4f8dbf4b3658141720d05415e55f9f87fae374e2c434c610253a4d17b0d5ffa6b35708d245dc78d786d6baa9cf25f29b500caa87bcc SHA512 8e4203361704b7878d615cd8182eb743a9527aa7f6fa7566ada7207ffb08b6124b44c8162451a1105b0f68586347291427a19a1e5a403da1db8fa13b1e359b1e
diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.1.0.ebuild
index f526a8773e6d..5a0f93d75042 100644
--- a/dev-python/flake8/flake8-2.1.0.ebuild
+++ b/dev-python/flake8/flake8-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
 HOMEPAGE="https://bitbucket.org/tarek/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
index d6d365f53664..8ea3ba97b85c 100644
--- a/dev-python/flake8/flake8-2.2.5.ebuild
+++ b/dev-python/flake8/flake8-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
 HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/flask-paranoid/Manifest b/dev-python/flask-paranoid/Manifest
index fe605371179f..bf45d750acb6 100644
--- a/dev-python/flask-paranoid/Manifest
+++ b/dev-python/flask-paranoid/Manifest
@@ -1,7 +1,3 @@
-DIST Flask-Paranoid-0.1.0.tar.gz 2619 BLAKE2B d161f711a2b4b0164dbe6b85a8b650703f6154a23b271305a37fdfc5f938963a2135b3b20b66833d8a993175098cafebcdae70361405d59ec25e72030a03ce59 SHA512 435b679d7ad027d813b887bfa1211318aa122c6bded879dcb3e803535671e21f81e52fd5abb3b82c998d862441e6b5123290f4bb2da70a4dec391b05601eb639
-DIST Flask-Paranoid-0.2.0.tar.gz 2630 BLAKE2B d103651dee2560ff6dfd0014da5830848dafe92c7ad5857bc46fc88dd69ab37d4a9443f4682ce8e94b965de646406d4cfda2dda8719bdf767824bf9a2e20a1f9 SHA512 3a5c48815715d3188d12c779dd229cad5a97936832727d58277b0b717d0995ac1ea7cac6a8061a5bf656f8f976cb06b27654f6a4c06e2747a56f45ba92391f49
 DIST flask-paranoid-0.2.0.tar.gz 101084 BLAKE2B 5f1f92679da5f374699c8acc97300085840d47e57f48d935cba60e78782109f70651bb7f804410dbb241b48c96ec08498b8b2cc8c18573f14d0bc7972b746d19 SHA512 0d642999fa4d5b795c3dcecc586fc1600cdfceec4adb38bb87ca8be9825d9ddafabb07d98df573a89e61a44a0abd27cbbd21524237b0e23b337a7d5e32ddfdae
-EBUILD flask-paranoid-0.1.0.ebuild 525 BLAKE2B 21c5b0167a1c4dda1a47f596098b61ca58c029b0e875dc5554115ab4205071403315f27a995a348cae0ce7f5aa5869b11ec2f300f21e0fc4da45a6e73a97dd62 SHA512 b1185ba641172a4194f5b7881544782d7e799eb785e59438fcef13efc837341d158f0007b240bcf5bfca82a36633fd6704f5b031ea9018e2c3ed392ef2610666
-EBUILD flask-paranoid-0.2.0-r1.ebuild 651 BLAKE2B 8adf757a26e6d362693b8b0590034221f24b777f5987cbfa7cccc7ea2fccd6f02afe891bcfb0691734a0443342eb95de3a192aef62c2a83eecc60eb47687c228 SHA512 da9a33db190ac9116278441c1c977f9fb06be0d99232945b65177539c97dd58a4635f7fb32720a77bdaf3578e58da4f67ed78dc495d71dea0b1a203eaf0cc942
-EBUILD flask-paranoid-0.2.0.ebuild 799 BLAKE2B 77682966adce60052c097ff902e70b6435a643320f1acd85f7d85fa6f86a7cdfce736e4eb055029d8113d46d5c9039a2bcd5cf1e5d08ec0504237f091ad2b58c SHA512 7694f19973b33db2a0c1fb94b96972783b05019862fe9f238bea244df37dda064dfae1ee78f33b45eb6e183f0969e936cc1332a9ad166ea543dd5f76f3c491b2
+EBUILD flask-paranoid-0.2.0-r1.ebuild 646 BLAKE2B 17f176f46914e13153062b50a5bf630009d02adf0ea429ec22465bbeb7f1386b21fba9f2703ce50ae4aa5adf005b33e4dcaf2a12fd3044b2e2dd72feeafef6a4 SHA512 9b56f5d70a6f646826702ee24c9b9b60f116c0395bd9d0909a8531a32f641ddde7d9193ebcf65d1a9f14d4011e6c5ca7ac990e3a516665391b65e1ebdc576be0
 MISC metadata.xml 431 BLAKE2B a011627716653140fc147c2bc05f1c949b71225fd5d83b389371bdbf51e1fea614dbec9269b95dffca914c6e952e712d400f3d63ad38a8c4debd994194080cd4 SHA512 52469023be87cd14845fffb7290a1c0fbf087bd60759fe87ae2ead185664f7006d899494f1c0d6c29dce49900cffa27526241fa9ac715efe27d23e0bd5dbf415
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.1.0.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.1.0.ebuild
deleted file mode 100644
index 20a4cfd125df..000000000000
--- a/dev-python/flask-paranoid/flask-paranoid-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Flask-Paranoid"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Simple user session protection extension for Flask"
-HOMEPAGE="https://github.com/miguelgrinberg/flask-paranoid/"
-SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
index 25fe0e5e498c..ea57e7de83f5 100644
--- a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
+++ b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ LICENSE="BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.2.0.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.2.0.ebuild
deleted file mode 100644
index 5fedbe3b43ad..000000000000
--- a/dev-python/flask-paranoid/flask-paranoid-0.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Flask-Paranoid"
-MY_P=${MY_PN}-${PV}
-
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Simple user session protection extension for Flask"
-HOMEPAGE="https://github.com/miguelgrinberg/flask-paranoid/"
-SRC_URI="mirror://pypi/F/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/tox[${PYTHON_USEDEP}] )
-"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	TOXENV=$(echo ${PYTHON} | sed 's:[^py0-9]::g')
-	echo "This is the setting of PYTHON: ${TOXENV}; and some stuff"
-	tox || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index b44f91af14b1..50e53b15d40c 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -10,6 +10,6 @@ EBUILD fonttools-3.20.1.ebuild 801 BLAKE2B 111c4345dc971f388aacfafb8fe10e57ac2cc
 EBUILD fonttools-3.21.1.ebuild 813 BLAKE2B 7d50f4981fec9c2b725ae11989cb808f7b8ec2b0d5f93a67181cf7196f0c90e08582088e6e8a5ddd77fd1ee396a09e368cadbde5f6d6d47a871f0da3794c203e SHA512 97978de7990b309cea4026e22b5ac2731b4240e66c6fb358ef4a66326a31d691314c269bba341896fca8c621cc49d9042e5f1e126c44e5ee8379babec3564607
 EBUILD fonttools-3.24.0.ebuild 813 BLAKE2B 7d50f4981fec9c2b725ae11989cb808f7b8ec2b0d5f93a67181cf7196f0c90e08582088e6e8a5ddd77fd1ee396a09e368cadbde5f6d6d47a871f0da3794c203e SHA512 97978de7990b309cea4026e22b5ac2731b4240e66c6fb358ef4a66326a31d691314c269bba341896fca8c621cc49d9042e5f1e126c44e5ee8379babec3564607
 EBUILD fonttools-3.24.1.ebuild 819 BLAKE2B 3327bdd4ab04453596301759775fd0c67d4eb7b05369f3d285f37ae27b31563dbee1dc95fd435d94c9e2e0d214ca814f9caf08e0af5e19e1686ac453c70348f3 SHA512 07a3a4c6ed81a66923e1b7dc60cdd71d9350d910efeb8b60b0ac905899d5904336d7a16196239b94dcf3b8398e93da1f1953750f0256bbf69dec7963b62c62e0
-EBUILD fonttools-3.24.2.ebuild 811 BLAKE2B e4c5dfc73ba8a96129286a18c87df17487796fb96428b1065ce0635810dc54f6f72929716889f9d54d7550dafd539384411f5f9991a80b473f1002bd68cb8851 SHA512 0f35d9ed391a07526d3ae7cd5472327f9f174d8f013198caf61e85c493cf5e281c12b20f178eb3a3ae7a73a65b19213778bb3265c3a646b2ae1e990859a72a3b
+EBUILD fonttools-3.24.2.ebuild 810 BLAKE2B 6c25c0f4db0cda55841ee89acff31f9bee7927a0ba109d1d7aa004991d7981342d7bbe5d2b6ce1c313c0bfaa63641a6b933e667d7289336633ac382e9806cf1f SHA512 ec471d26cd94af455c1481bcd96478b4b9a2bdbcea9c9e7da727e25abb5dd0ad39dcf47848e4a76183b4d0cba9ce69ab8f306cd522bc7f805aa7fcf5c4adf675
 EBUILD fonttools-3.28.0.ebuild 913 BLAKE2B a142a5199cfe3d2d7e37cb543be1e87f45300a14b34291230db3cd0123c4628eba4cdbd62f9c798a214527c01afe25ac8a8731ccc29665352a144ba18c778daa SHA512 56a731db469587f1b48be4f7e812dba389000ef0daccef18e9618e7d55d835d2ffc2c350787d83a92be83dd581c2bf2f2e5d5918e09badc3bd0ab508164f1798
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.24.2.ebuild b/dev-python/fonttools/fonttools-3.24.2.ebuild
index cf0cb84a05f4..90dcc1ee592b 100644
--- a/dev-python/fonttools/fonttools-3.24.2.ebuild
+++ b/dev-python/fonttools/fonttools-3.24.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 8ab592a4c6f0..adb41a95531c 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -3,5 +3,5 @@ DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218
 DIST hyperlink-18.0.0.tar.gz 97625 BLAKE2B d189445c7375657614c38db9045d96789b78a2d4ebe67e23b897a450588fbe1e3916707bb67916eb893e93a716125e606ff8be27e63f3db4e63b8bda1436fa59 SHA512 21b5f88f7aaa3f2b0b60566fdb0fefdf6d42866060606dac181c8e3d357c76a5c23fa5dc982812af2b7d49dc1f9d623bd5bea89bf2cf31916c855bc4ae85589d
 EBUILD hyperlink-17.1.1.ebuild 753 BLAKE2B 61b2994479704ec998887e1cb7ec7f12caea553c774b75312ac121a5268b8ca673176a602ff77c9dcf4a01eaf53e90768cbe94908c5c5f596359dd6eb3108f47 SHA512 1c7b2b09cc674fa8c3bf71f2aa1af3f1463f6de9d2d486d9543bbb90d69846b91b3c606f8679d8097b622ebc6eed636dcfedd879770a9df172e962adcdf0043c
 EBUILD hyperlink-17.3.1.ebuild 777 BLAKE2B a21e08a88bb98add80782f3e0bee5a3555d42e325d05e262075100d732bf43f2a945b2b97a6bff37becc52b5ef5905a3ac8175008ceae573ff97ffba3ce63dc0 SHA512 137f7c7cc48d23ff84bc98202c7a4998ce03d4381f8a60dcc16362e9c8fe301dbb7ee9a424020af8019354c7c2645ccad2c9eb7ff15ed6dfe446065b882eff3b
-EBUILD hyperlink-18.0.0.ebuild 709 BLAKE2B 472c2d3e379fa761be0b2f5c59044f914e9f276a313170c28424db49b4983838279d75fe56b98a4c712ecbd5130fb63c6d93409beed182660f487f6d5ed23b8c SHA512 f8575aa2d7a7b954f9c5f32524c0a69faa64f95d3e5670d2ff3f6b2209f8d6711f8621b7f672c0aacca6912d756a0e0569bae3ae51d2ef78528ec1ef30174336
+EBUILD hyperlink-18.0.0.ebuild 722 BLAKE2B 78478f6d7b399dd90c4e641693eeb27033e3d4bcf523774c0d7668878e23f02e2239abed469b814d6e619b95700912a28604d0133e6d9c385e6c4c7f6e5187a0 SHA512 271b2a83b732c006f92cc7f9d36ba017cab68face2e22531d6f065847a34d0f31558e9a2d6ad2caf2bc9f8c1260b7b02d9d07c570580aa25f917f7c2032f15e8
 MISC metadata.xml 751 BLAKE2B b9e49354e3472ca16622fd269867df7f0c5f372afa5f93c36c2646f35e0fe1e1fcd6b25c66ef73e13e442019be449ea72b26fda807e3d220fa254c4d7a691f21 SHA512 7cd14daa771935591e7a130d9dbcd20630074d49ffd738d964b631798a0466392e0b669cc009f3c769614d704925699f2bc3239bd5e78ba0c2cd629dccd72591
diff --git a/dev-python/hyperlink/hyperlink-18.0.0.ebuild b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
index 91efd49bbde9..08b080aed792 100644
--- a/dev-python/hyperlink/hyperlink-18.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index f85cad75ef03..17a6b8992584 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,5 @@
 DIST incremental-16.10.1.tar.gz 16066 BLAKE2B 86bd85f9ea1ffe92a572b1744588f34f21e4bddc4aa80373dba47a59961183a77a338212500829440d216582ce15ab1412e9994f89486861297407f22eb989fa SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
 EBUILD incremental-16.10.1.ebuild 603 BLAKE2B 33e9d1714f0e9cdea94740a63c297cd889edd71bbc3353849298f4f2e6a82e522447931515c5ebfe2e3e179d2eedc3893edfa3918a61f8bbb146daa78579e4cc SHA512 19295dfb2b253ab2f233952c6eb38eabdd8b1d6d3cfb83953c1f21e1e306ced19050bf43a5ebff5b117b9965008f9320fb6840ee573056825201f59f97c2ca49
-EBUILD incremental-17.5.0.ebuild 631 BLAKE2B cf590c1d95010156b8f5b6612069ddfdfa826d67ba40f38a7a7713c12c22c4bdc1344268dca7d78c1ddc79e72e2f5e9bd28d6d56623c212e284853f1fd55490c SHA512 5846257bccdb6ab0d23120bca9645a2dd45583be46d79e6efce02ebff3de0663183eccb30da79e581c658cb6657628b6d8e58a181ebe792cf3064e70151d04f9
+EBUILD incremental-17.5.0.ebuild 644 BLAKE2B 272d3a19905b17c3766b71af06be87cfb1a98db4f443ad9883d803e5cc0b6be7cb0dc962f927a7dad048835c768be351dd4061295367eb1457b552b9e41617b6 SHA512 a252153a6bf6c7c33cd02437083f50e73e8e0986538c0d01f7f68b26266f25c29140d9d36421ba114da91e9fff8ef6b2e6f49df5413685c6d42414988505165a
 MISC metadata.xml 554 BLAKE2B ab26ba9e5a69a853b0c0a167dfad54de819a17ad44a47a9987e8cb632bf1551151a208500f37c96543d7f577e99d6d47b4157c97b71d7ae60e88cc086a1ef1ba SHA512 a3bd82ee309e301f175da663ecda74af803631324b0d1097082ad04e6bd9e2537208fea8ebf753f38341429b1d2bfffc887ced6b707655ec862541ff93e83c6b
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index b3d2eaf2b65e..508865510681 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 8189f3cc6103..ca62b14e52e3 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
 DIST jeepney-0.3.1.tar.gz 22271 BLAKE2B a8de58e4ef4c4d1874c8995e3726a4bfa26a8db4a63040658c4edfd1742fa1c22de52d8cbee4913b1973279938544481fe2c2aef3138dc0ef724f7a99a39c617 SHA512 ad1a2d220a7626a3bdadf6fba6a591d1b498a9f6bb34607860213efddf49bbe67a4dc2d504decd906c560c519302f1fa45b85ba348156e8bec288f525d502e82
-EBUILD jeepney-0.3.1.ebuild 1041 BLAKE2B 16c36ad2c2e2086ec4682a48d4d00eb572a2aee5d83236023e57f5816c5cb6c0053750701664cf52dc9b340e587e1e1190f8e067e9f0eaf3e0aebd8be4970b0c SHA512 a4ed7d484e4047007b609f8fe5a53e3e32bab810ba12ae53b1cf167ffb0cabc3b9d6eb5079270b3a394aa3eb73657c680d994b718722a29ae257562dbd987a9a
+EBUILD jeepney-0.3.1.ebuild 1074 BLAKE2B ecf7c009279c7f1b906d1f5c4a4d8e964c2fbd23b8f53b45d77c7c1874e8676182265da493e292a223883c6f03bbf5e570c422a339f67a9a509441f2dd244006 SHA512 630626a7428a37dac4287b0cc17a3858423e9b1a89e09fb52c632e3c1e77fb0cd93c969296658fecdc6b7a965fb04e4623b1c26571f135072f52755063f02149
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.3.1.ebuild b/dev-python/jeepney/jeepney-0.3.1.ebuild
index 92b469a0334b..e516ffd9fab0 100644
--- a/dev-python/jeepney/jeepney-0.3.1.ebuild
+++ b/dev-python/jeepney/jeepney-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 BDEPEND="
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index ae26fcf2aeb9..46359505da4b 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,8 +1,10 @@
 DIST keyring-12.2.1.tar.gz 42242 BLAKE2B b821f17a671e89a28bd2953456bd0406e4f7fd142f1abf2e1f752e8f74f072c8fa995b90de62ac34586dd50a4dab47dff3bbb19157d76bb2f93a61e176dc3188 SHA512 8806b4433bc9085ae133300e68bc614281beea70de547f75afafdf6de2ee1b436f3a4cd13d7684cb6e4d5aef0a2eb9119d9cebbaf239a9ee1997ece4a56a7371
 DIST keyring-13.2.1.tar.gz 43140 BLAKE2B 74272b93ff80a03615879a5f416ad6be1012f22862972a7f400609ea3fb984c45ed2ccb44eca30d253d0d39e0876f1ce25ab9aa6267a06a7c67a17aac27cd31e SHA512 3c15c3415ba4b657b041d2395536fc92ba656dc71f28669235f13a630946ad1b332d1f5b031a55776ce8a2120d3d2601462708f00ee105f46a27cf043c1bd906
 DIST keyring-15.0.0.tar.gz 42547 BLAKE2B b9200f61fcf227ce82ed05db15b8a03754a2d2f0ee7a32afe4a99a6bb4c511e311d7c529d5173756173622e225ae4fa2fcef6409b21dc3d8735b5e8fab73bd1a SHA512 58001d61bdd442196ec4891000cc532d1dd9b85b18d100d8dde38cf1cf733ef6d6541513d73435dfe41e9cd26c6e34332d518a06a7fbc498b1b8971df6640212
+DIST keyring-18.0.0.tar.gz 48509 BLAKE2B a83df471fd150c9a01dd3fe782b3ead54286c3913838951fd0beb2443d0fe5cfbc1cc2079ef46346346e4bfb0d62e1f782d75a89d85c281e8b3c53f9bf188eca SHA512 3863f2cd89131d7e927e55691b4eb4b7c2599af189525293d0948aef5215efbbbd74d45db3cd4885ba5b18a79f0fa0b0edc3783a020a6702f6a6fb7ed86b2cf2
 EBUILD keyring-12.2.1.ebuild 1017 BLAKE2B 568cc5619b1b2645c999d3175720469157ee2d55955b8364422a2bf72c8d4631c24e9bc71e0ed3db1ae625810e8a5cb0c33fe6ade88a4859b1e4b8447336fb4e SHA512 172ef757531fcc524676747080b0a383c11c54dfb48180aecc6d82dabed7f803766804703aa726a4755b4c5df108ce6babb56096ad4cd325d71a17a877af242e
 EBUILD keyring-13.2.1-r1.ebuild 1184 BLAKE2B 96c4fda0e3a375cca0bce279edf12f44f5fad2164936928d049f77e720b969062e4c829cb097094c6ae3e138ca1086c179249162c33f8d2a7743a1d454c7f51b SHA512 b0b840ce19a4080a4e6eb56b70ee98d173b7086808e70ab631c041396956c5fdf7cadc8a1d1cd456527984cffd7d0e79191225fd5823f154eec266eaa1c10b18
 EBUILD keyring-13.2.1.ebuild 1019 BLAKE2B bc4e761d749dbaded425683e054028ef234bcf7ed33722b0dcea89eec54f6a58dc6d065657df8af185795651ca1c5e6b01b23b2fb964aee8ae4554c771196f50 SHA512 ac5b4ce8872dcc73b36ba8429dee0af9282e3fda7ea7f33661809b033ccaff9e064562071402fa6e43bd8bffb07cb1dcbe08277eda1b15b96aa86da74b9ec8fd
 EBUILD keyring-15.0.0.ebuild 1190 BLAKE2B 5c41f74fe95dec4d8bda37ef215f77e921472d2a204e25631e47b56823f73c0d1f742ed9bbff8f2d2f36efc2c73bc9be940a889609cb5b7d28a9b24cf05da4a6 SHA512 c05684ea5b24771c121c74ccb3b526d555baee2f707a0e95a0b5d731ccf0602b647dc8a58ab0fb0bb0779561eb619f69342098298c719bd0894fe9ba1cf2c297
+EBUILD keyring-18.0.0.ebuild 1206 BLAKE2B c0dc73a01848272014ea98f38e02dfb45f272c126952f6f561356e15a6f20d596e70e388fef61db866e3277395542d10769fce65aff1e4a207484bb6385e6f2a SHA512 b3de38dc1b61139771ffc7fddef303be3c04f459d4af5358496c72dd381b35782f2682a11e25be52dd17912658cf9816db413d41122f8281b997359477eb568b
 MISC metadata.xml 773 BLAKE2B 0a0957f622a38547688b83092b5961f3fa8f3c7a71cb628c6e5525b0a95f37345b5de0cdb5f5a80ce30a96150c6409920dcc391e230d8fbc6ea385b055a30add SHA512 939015ee7c67aa097663ef547b0726f7c7fc95d659b5f71f414b503e61f28604c05a252a084b65044ee2fc331005c10b5c8af4b4b361527b4a42e061e88b5018
diff --git a/dev-python/keyring/keyring-18.0.0.ebuild b/dev-python/keyring/keyring-18.0.0.ebuild
new file mode 100644
index 000000000000..8dbccefd2219
--- /dev/null
+++ b/dev-python/keyring/keyring-18.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-3.7.4[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	# Skip an interactive test
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		--ignore ${PN}/tests/backends/test_kwallet.py \
+		|| die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 06f2604fdbee..5ed598726ee8 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,13 +2,13 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
-DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
+DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
 EBUILD lit-5.0.2.ebuild 904 BLAKE2B 74ccf4ce59c6aba63fec1f0dfed1e49bf751abf8cf61626f95534f46ecaece80b793481d7cf8115193007c9c13139018f28b6e4c86566d8481614229a84be5c6 SHA512 13a3ea3609045b3cba077e931b5ae52837c4510640bd5b6df7df6819166e069f3d4eef85ecd5dc1043868d7889539383f64c9f0655de0d88129e6b0d7a4f8986
 EBUILD lit-6.0.1.ebuild 1014 BLAKE2B 549c00ba1da9265ef26ea04d574d139f1fbab99f79ed60f270ff960f940df4507376fe31d48776241ecf4a4cb84f134abec61c000a27756ba057083527cd6607 SHA512 729a2b96a49758b18e59ec9df38ddff9890953283185cbae0abeef1cf4f11c2680485f26ffa70a85b326a389a3230e459700366b06f6bcee5a4be9854afeef62
 EBUILD lit-7.0.1.ebuild 1017 BLAKE2B f901810a470fdf95f71bb19e6be4a1321e7abe84054bb529541750dea272ffb33c4eda1e131d2b9984225f25d28036876b56d8bb0c9a76a623f7d678098b4932 SHA512 ddb2c555b404d838b4717506a3bdbd40fe5a8d1490175ff65c12601ab1805882b48eb585a1ea1ed761638469145d1e5ecd0696bb01c4ff3d83c5e817a99d5c9f
 EBUILD lit-7.0.9999.ebuild 963 BLAKE2B afea4754348b5b93f93ef1723974f218ccf92bcceb342ba5f453e8d82399358689b4bb30d04e65e63de761ccc92bd2c776d6233c618a12abaf4fda1a770974ff SHA512 dab5c3d116a590f677a9d3773d5652e7a676d26a4477ed10a4f8248f93297881ec1bd9cd6fbca6c06546d0926bdd5aedc9f478736550114bdb777c61ccaf5bca
-EBUILD lit-8.0.0_rc5.ebuild 1020 BLAKE2B 7c3cd9a7fa0682dfc62ae3be51e04bd65c2f38e1027b14eb452d8f7d73afda2b878e64097ed982a707a40d85979abea1747187d503c0567a18b30571b5321336 SHA512 af4806c74ee9f8cbfe0ac97f1f7bfa3fc8c78b283ab72f88c438dae96c010d9fd34b32a36cb09d325c9fdbd13fe8a87a0026926d606affec8c9e16557784bbc8
+EBUILD lit-8.0.0.ebuild 1017 BLAKE2B 5842735e86e51999d8c0bc2616a138392ecaf289518aea104f08c196ddc155cca5fc7b4b4f33253f63e3fd03a1318a44cdf1f60fe7110ecbe8e8e9dc5a368198 SHA512 625f3b917d6d9577985ab5bcd7f0d1dc6dc918ab2e44a1486bc872376d7601a933962d350c2708f93169eb0da59b1b336aeae59174a39b74b68c46b752b4df0c
 EBUILD lit-8.0.9999.ebuild 960 BLAKE2B 3c1be7024e1f32c6c1c73e03f6a909d1f16cbc0750a4dec454806dc39c2fadf32f006045cbf71272a0a35c471a68daa142e96683610573627d82b81fdbc7751c SHA512 d1d2099ef259dc024f91074b5fe5cc6f9d1fa834f8922823dad0b67c8cb92f454e9694aee0b325762ad6aac2ca1b47c497e25027c1c82a186bf937b56c2d95cf
 EBUILD lit-9999.ebuild 938 BLAKE2B fb5fe20c62d06e44e847f6e9f16429e9814d2872281295eb12ea25baf2448be889ec3bac37ec4350971b44c6785aafe9795fd68cbfda1b2cb299f41f28a254fd SHA512 a21a7a2935e8d8c82f319bf65e1b01e135448c2d342baea28b05451f4f9de938b52d3a8e63d544ec35cf4e7ae7bc9bf432eea3f4a44d044631c9ae7ea6fbfdcf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-8.0.0_rc5.ebuild b/dev-python/lit/lit-8.0.0.ebuild
index 2252897106f8..c03a771e46df 100644
--- a/dev-python/lit/lit-8.0.0_rc5.ebuild
+++ b/dev-python/lit/lit-8.0.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 multiprocessing
 MY_P=llvm-${PV/_/}.src
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 352854749ba2..a3babb737f04 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -3,8 +3,9 @@ AUX m2crypto-libressl-version-check.patch 5125 BLAKE2B 969595234bc845f5a5c31f0fb
 DIST M2Crypto-0.24.0.tar.gz 184457 BLAKE2B 15a11dc1b13359041875e8321d0159a1a393b7f85dfbd38d650721d8a2eaed2cc2199859c3e1e3c890033711e0b137f4c78b90f04681ff44a3356558b9f55aea SHA512 c23ae0f8ac790d4ef108a217a44e994341f6bbe4e12a7fef2518d8def82331246a145e19a2504b82b790a3ad4b467d2facc8a73bb7f1190b56441d8482c66aca
 DIST M2Crypto-0.27.0.tar.gz 1119288 BLAKE2B 90e227aef9a5b4c7f5ab9bd62fbe506ea0931a6c338c530adbeb1a8303a31cc7755d13003532fe0ee4005f1997db23bed2d03cd54224dc7d89a6f23882197800 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2
 DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598
-EBUILD m2crypto-0.24.0.ebuild 935 BLAKE2B d15257bc6f02af9dce4514f19e7b2e1ba29eb3e1091acb8f03caf2db32164fc87548f5b55e37e8d616b1fb3ddd19a43cd899aa248ef9300a910af644ab6b2e4b SHA512 39c75d9af3ed016a8c3e363350a4f37ef7c31b8867684f66189652127494f4a53aea5edf451005a3c6b901241797556ab237521f80f6ca9860b6b2a4a97b7dcf
+EBUILD m2crypto-0.24.0.ebuild 931 BLAKE2B 1432ae4df72dea3159ae0944e1dcd53d7e8c65146cec37c6dea9f88e72b8e97a4072f9093c87438dc6837d07058fc2adfc859a6462d2dc2cb71a875efe5bf618 SHA512 286f19ab8c176c57c775c0ea5ad4a800ca23155bd2b088071ea1f4a1cbd057352738e72a559565cc08ca37b0776c669150d8edda987e228fb78a864efca2aa6b
 EBUILD m2crypto-0.27.0-r2.ebuild 1361 BLAKE2B 85800c96f50f5f080eee9aa96523dae8f6ace906568b6fbfb1d04bfceedce813bd24eb315364909c0bdae164a4856e369fa64dd4b01f2f2e65eda6e5696b0833 SHA512 777df5b5eddf9cf1e4db99c680b3bf08a3a99c3100b701dc41b1c7943fdc8f6da5b212a9668ae3e3cf820c39cab24b5e034d8546c0a360351a51cefc1b841320
 EBUILD m2crypto-0.27.0.ebuild 1298 BLAKE2B 97104e95a890d7dd30a9ccbbe4328e09e3d99ab86736aa68dbafb3e2334174e9f2a64964351f7cee426b2433bb008b5bd816a454c30714aafc9ef0d8bbd8cb6a SHA512 a4ed82f6f69fa6edb4ac6449c4472f76c7ffd438711376cfe616b0cb0b3a06639d7f1ea31dfbdceef8d17847982997b0ed722df3d53193ad2471553b2bb3bb7a
 EBUILD m2crypto-0.31.0-r1.ebuild 1343 BLAKE2B 3841013b68a17cef27f7f22ad136ad734fe36f76eab57a4ba07c8a15c34b5ec354f3705c3cfa97e0befe357233f858110bf7d95c9bb560cf3bea9f437dcd15a3 SHA512 55950b02e614de392cd458dce92964a2dae8c573f5f4e0b78fc948b7b9d41c92fd3d4e097eb46aa0e81798e0312db05fd2ffc7d62daa4daad45bd417c7e1ea30
+EBUILD m2crypto-0.31.0-r2.ebuild 1330 BLAKE2B 4221a0c9eeea8ff18aeb192a256e2faa27b8060e4718916a1c2ca0123631ece5ead39463b895e38261b98e80da1b0c84fdbb078c686b29d63bd21df1ef16406d SHA512 d93f14be525f8dbfb06332d8fa202831ada32462b80268666664754541f5791e6abc78000ac59adc85971ede44aaed008e83aa0c65d5933dd645e3b4caa6d434
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.24.0.ebuild b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
index 07d6f143b4f6..6fa7deaa9ba1 100644
--- a/dev-python/m2crypto/m2crypto-0.24.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
new file mode 100644
index 000000000000..ce9ae0aabc25
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4..7})
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2.0.9
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-${PV}.patch"
+)
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	# https://bugs.gentoo.org/617946
+	# TODO: Fix cross-compiles
+	local -x SWIG_FEATURES=
+	case ${ABI} in
+		x32) SWIG_FEATURES="-D__ILP32__" ;;
+	esac
+	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 79461fe80094..3ffef991aa54 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -6,7 +6,7 @@ DIST m2r-0.1.14.tar.gz 15926 BLAKE2B 48d8961b6ebf66d494511f6bf755ae2d2de0740aa27
 DIST m2r-0.1.5.tar.gz 13202 BLAKE2B dcfc5ecdcb2c696c1eec8fe3eca4cd7e238f605c399b750286d9eb18ecbda9d80b608fb362a85959769253c5f5bca7e392ed5b61a7804b25cab5e7bfb5edf574 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84
 DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044175f4ecbf885b80019d62f5fe80579420af373ea3d62fffdcc62344d1035d901208719be1cfd56654a01 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7
 EBUILD m2r-0.1.12.ebuild 1220 BLAKE2B 782985c6a75f4f5749ba2c05fae107b0d160af5d6129daef80b060a7f59968ee6e7250913ee85a735c7dd598059722a682c9f04156a277d06566f8c782f927ab SHA512 770e059948c3ddab9c6fe61862fe6a5c71d15e8e404e52b87b3dca3cc4a85f00f0bdd219e82de8c4481e02ad20329007abb7690303dd25d4c423e3d5b1166340
-EBUILD m2r-0.1.14.ebuild 1269 BLAKE2B d7a6cda9c82ff13193af286595f69ffb703759d95e0fbc711e583931f4954b4a2588707aec6ef83eea4f4b250d7deaadf252139ad7f696ae1a36c5de62be756b SHA512 b179a40be312a01dc4d3b93c1e56e2b46ae25f7b2fca4022d6f6ed2b2c5c6ba3d090ddeb56eee1dfc54c809c8ec8d7896bdcde2f37c06e1966797ca81d32ed71
+EBUILD m2r-0.1.14.ebuild 1282 BLAKE2B 645d488db507af5707a67b7cb1ade91f8f9001e9ac6d2e4aea9d6f725b44266a6f6f50d2ccfb19ed4149d44c40d5a63a7f5545eb5998ae6663fd409d0bf71b1a SHA512 036421d23969bb6fa04cec3866c01be9fdd06bd6de4b7f35774008bc75c95626232fbe4153dddba537ba724cbf1e8422b89569d21cbdfd9314ca892176d4196c
 EBUILD m2r-0.1.5.ebuild 1273 BLAKE2B db1bde499f58a814e4d198c7329b071f97a8f657f8138851a2b419af4d9643bf2a7032dd3192c531abcc7ddf59e24d026abaae94ac1e022f3453dbec12b836e7 SHA512 06ad005f6d85f9400f74e8d3e8d38c0537cff9d7c4b35270802b334eb32df4d4608d1f0f0c134daa2fc814959b6ed607da519a4b2fa7841e4b416a9659d67f2b
 EBUILD m2r-0.1.6.ebuild 1273 BLAKE2B db1bde499f58a814e4d198c7329b071f97a8f657f8138851a2b419af4d9643bf2a7032dd3192c531abcc7ddf59e24d026abaae94ac1e022f3453dbec12b836e7 SHA512 06ad005f6d85f9400f74e8d3e8d38c0537cff9d7c4b35270802b334eb32df4d4608d1f0f0c134daa2fc814959b6ed607da519a4b2fa7841e4b416a9659d67f2b
 MISC metadata.xml 554 BLAKE2B d275cbf42dd1621fd0dce4fdb85cf0832e3160cf7468e729d39f33afae099b354ccb21e6de312888ddb6d2e97a487a02cd9d97dee033eee960d0ffbeda70c704 SHA512 ff9d0efa78e4931a4f0ed8097cfdb1d32fb1a99f825199fae42838ee534c045c30c440e9f8bdc41639adfa99efb672a587d11f84f1bc7215f8e59655e1dcaa49
diff --git a/dev-python/m2r/m2r-0.1.14.ebuild b/dev-python/m2r/m2r-0.1.14.ebuild
index 21107e515799..3b969a248c3d 100644
--- a/dev-python/m2r/m2r-0.1.14.ebuild
+++ b/dev-python/m2r/m2r-0.1.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 997073bf4e80..390d51064258 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -2,6 +2,6 @@ DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2ca
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-6.0.0.tar.gz 68178 BLAKE2B 64a389cfd3449c4711228fcd3092f6d7f62968aeaf0574fcce4bc3223da8b7633d0cbdd727cf4d56f536aa925dbcf78b6b8c3a2a3ba3ef8a0b677811367d087a SHA512 68ac1829a1a27d3f1de1f95c33a9c3f236fe80f597b9183707de0d9cd193ca5a662080e64c54c376ae59fd0a3a224ac62a9d39be4d0ba425103c4fd6e93e61ac
 EBUILD more-itertools-4.2.0-r1.ebuild 1054 BLAKE2B 365af190a89c382bf656cf635c5accb705b0b482d496b890a1bf363454d41d3db7d7e3044db3cd22e23635f1d98fcf02080506c2293849c86fad084d11a414c1 SHA512 e9e3c839fa11b532f7759119ce33e244a13b415ed750019b2d0d79927433e938ceb55d14a7fa89cfefbf93a10653fa70ed742edb02dda6a01d3b885acdad67e5
-EBUILD more-itertools-5.0.0.ebuild 992 BLAKE2B 4e857558be86e28a0c4f196c32afd6426ff9236ea8fd0e27f6d222145ac9cb1d07c7c5a440cd5450db44d81fa2ddc0e6e812832cd8a87858aaedf7838ebe27e7 SHA512 15c6850bca9ee1e504434f7254f14b2a857ec2d7d60194a136eb22b86ee9ff01f6d4583a6e4743caacfffaca3cb22606353158dd4ad12bc3e8b3ea67f32cc49f
-EBUILD more-itertools-6.0.0.ebuild 919 BLAKE2B 56434a62e3cb9d022d62d799184fda7092554c359af179945347ace456cddfc4e09c6440640e0a92fb008714657631a215ba6d1114d931b6fc17ea536d3b5798 SHA512 bb7e3385eb07405377c7f256df9c1d992030f0c37662609a56d90420134f6babfefbdb831e96e6cf7cfa71eb91818aa94d4e2d3fec6148d72971716cac2adc66
+EBUILD more-itertools-5.0.0.ebuild 999 BLAKE2B bc131529830522873488ad55b801adb049c462a5300e5c246dd46ad310bacaac659f3b9bfa4a6563bde050f8e44879afade9cc3134089f437bd12042f7e80179 SHA512 493927126226f50cd1659eeb4c9d884b79a1672c2bdb6e0057d722e6bcad0457066adc13e43e6a31a2c3a6e3d7d744cbfd87ba3832d84327193e86ff153757ec
+EBUILD more-itertools-6.0.0.ebuild 929 BLAKE2B f300d8cf244f84321e4936974c93212a3c214f8ce044fc7584722999d8405b090dad0fdbcd7b4b6b676a1dbc5b1e0677dce2012c3ea724abf984dea431743473 SHA512 3ef6b99b42c86c04d93d254365f96c43ad12ee17d3f1b6806c37009e772c51e4f421ab05918e6457f4d63a9437e6e360b3a8fd288c9bc7c96342ee980d570e8f
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-5.0.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
index a4f82f008ae7..7fb03d48ab89 100644
--- a/dev-python/more-itertools/more-itertools-5.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/more-itertools-6.0.0.ebuild b/dev-python/more-itertools/more-itertools-6.0.0.ebuild
index 1c297107e810..2253816c60f2 100644
--- a/dev-python/more-itertools/more-itertools-6.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-6.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
index d7891091b21b..4ce93ffad2ea 100644
--- a/dev-python/nose-show-skipped/Manifest
+++ b/dev-python/nose-show-skipped/Manifest
@@ -1,3 +1,3 @@
 DIST nose-show-skipped-0.1.tar.gz 1768 BLAKE2B d79272ac7fd065fe28b589b3234abf527911326d1fea1c23ba0840650d2741846b188788fa9cbeec4a56a78737ccaf8c781ff1f9ac97a5b1d1d79161ba3ab0dc SHA512 b6f3cbc8fdc6af7f6298ad54a5b06bd053d27197368eef1e006aff438d517dba549154eb3be35996b0bd1c291537729438f52709b76c507e20c496b6e504f5df
-EBUILD nose-show-skipped-0.1.ebuild 633 BLAKE2B 4662cd8d2cc32f4aba39de63eafde0f67c74d49b645c4df8fbb4ef850b4b5d5cd7a35f191d1a991e0d5fe4c8aa78ef6f946e7ca026a3525f823a277719e9b21a SHA512 5ee14bb695efc2ee03fd1f8f555fbf51d3604cbb03faf32e06287989ffa9153d9fb19b6d59547e792702150ee059b6f20f2e53fd1639e4fb40829a6adcd83246
+EBUILD nose-show-skipped-0.1.ebuild 629 BLAKE2B f9ceffa4cce7f57929afb4ced9a57639377c1252d1c4d27fc04ef8b2f2346ccc58468955125ba85638882d9f7eb2315ddbb609eb4cf18967b0197a8a279a25a4 SHA512 5c5b2db6da020f26c8444c8251a96ab39110679df53aaa034a3fae02fa630fcf8700c01f69eda494beaa6bd35f9c5217442d938fe180db2e4e2fe0a6161d6493
 MISC metadata.xml 521 BLAKE2B fe86fa52febb5f3de9c44e66437ce7c0f05d88dceb9708cf7f316d6e4002dbdc53496d2bf0f568fbc67a92f01a0f439b4e9f0b561cd49cf16e0591034b3bdecd SHA512 de78277716b856994885a2eb0d7906f3643e1b76ad263385063770581c8c11cdea081cdcd1724182ddef0c799438f5bf94b7de885b4a3f314df6efc935aae2a4
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
index e05014376fab..a4389011ac3e 100644
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 145e28722e39..350fb51c4aae 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
 EBUILD olefile-0.44.ebuild 673 BLAKE2B 0064dca7e792d7c31e961678463ea800e3eb80cc0872e81f5b1ee2a74aec8816638d79c86ce6890085c617566197734e0021efeeb1201bb4a6e50f0f4854a668 SHA512 48ec67dbb3d4c1edf906a2d80d0045271a82e4e671dcfb3751bca236a0bc45e7c391f76a69446444eef8166bce2e4205d8e4798234ef5c358cd67c5dcdbfbc97
-EBUILD olefile-0.46.ebuild 692 BLAKE2B 8c5f845e329b9b33e4c2ece6ba7ee5c64c2fb93793dde6693c780aa554c919d0116834165ee029580e1bc9a4bead5eb94287dc62b4602cd58393edaa978f35d0 SHA512 6a1756f93fd316856e9824db06786cecad5fa72b4d66c4b9a9b1f7bd6f5ea4ce09fae9ba1dfd4b1ade582ef79bd8f42f11964294ebebb298c90e2d959a4ba852
+EBUILD olefile-0.46.ebuild 691 BLAKE2B a6cdc2a56e1c0b8defa61d26834258fc8019437920cd1b504ff474c27973c20c8a753f942b9a4b22c60f35aea6a9f31edf0e5443d8729eabcc3662ff9b100bf1 SHA512 d9fe10621b50aed335a2cc625cbf23bbbc48fb6d88f0a3c6e44564edf7652139fcbd1bf23bbded2a875081db48f651a403a1a74d2224cd095474a72cd5974257
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index 7fc749c528b7..89ae6eb3a361 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 318091942ed6..2213ca7702c3 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -4,7 +4,7 @@ DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
 DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
-EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
+EBUILD pbr-0.8.2-r1.ebuild 2103 BLAKE2B 2d4fd9eb6ec4d191e31c72bc70bba9e6287dbcdbe98c4755b621763c9d2ba9cfa3ed65b80b35a12226378cc1f6e3a2539edaf9ee61e40aa2031ac426435dc980 SHA512 08c2d0457c5f496d4870e51729d09e902b248aeb27276a3046bbaf12892e9af55819102f75a1f103e8bfa660551b80d4cdc3b5b2c9527b78583db904ea87b1d5
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
 EBUILD pbr-3.1.1.ebuild 2828 BLAKE2B 7fc677aa10ce15627e6e6f6857f0d5b1fc336fe139e42b3ff1aa62d2d898eeb6a92a8e7c22e06e5f597025a4ad16e60dfdec60758b6b5f36569bdd67a39566c1 SHA512 58894ca83de7006ee6486d75ee1673c970ccb207d50c84332b215086468e3288b10a38245a92c8a6330f2a26fddd001b70a9d89b8144009459180474774c1cc1
 EBUILD pbr-4.1.1.ebuild 2601 BLAKE2B a2945d95e1ba37c28d86fdd0bff32f0a880c801eeddb2f3f70f6b21fbac7c0bb869021ccb389888c146f5920b7350af1d0c53d34784f9dd0e0934eb937ff1f55 SHA512 c71925bd2db17d18a625ea6510f589c8bf7df9f10031659f7a6c4a63432826639ba6a93c99be229b5f62933051fc00532d53bb0660f89e0d0c804b8bc7af44dc
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
index 08693bb11aed..c2bdd161e45f 100644
--- a/dev-python/pbr/pbr-0.8.2-r1.ebuild
+++ b/dev-python/pbr/pbr-0.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index 82dd2727d53d..28f912e699b0 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -2,8 +2,8 @@ DIST pep8-1.5.6.tar.gz 66944 BLAKE2B 5875895eb21c771d21cb1c415dc9f85737ae18ab10c
 DIST pep8-1.5.7.tar.gz 67302 BLAKE2B 714ecb7f21c457aca1a2465319c3f202d13b5cfe067418eb2e3e6f21b25dffbab891a05f5b145264e484c180b67e1fc8c4ad1cf47f1413ebeaff2bb858f9858e SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb
 DIST pep8-1.7.0.tar.gz 79704 BLAKE2B f2e3585bdb3732f9be7f77b1cbf065c0938c1847a5caeb493e3cd62e6a5e19713779a087ffdc9c627481fb10e13d3ed53b3bc368182c2442f24ad57d1d2e96d3 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.5.6.ebuild 911 BLAKE2B b5d3b0deb03dfdea2ebb7719101c0ea94376d21ead1ba4d85ad316bba68bd88ecca1c7268ea7b4b6658616471d6f554806da5132fe43c6031f99c0b6b2e12c4e SHA512 8835ff5174039423a5a9686235ef5675314eb001afd17accd1a87bdd8842d4de5a7136820654fa62d4b57ca0dd98d9d8f163d2f86f7415b84ac0ef06c094ac6b
-EBUILD pep8-1.5.7.ebuild 921 BLAKE2B 56723fa33931fc9936754d6f7675a656ae42e3d763664a829ed45311ee2971536dd3040162d444c1a616a31995b43f691c78e57a0f9c2fe7670e39edbe107e70 SHA512 29e7ac9f1b9468c99f591221710b798bd10405570b83b83b85e17294a29e5961f405f143e05839a134236b99c8c65626e4b1f43eef5f5dead597998e8988e5a2
-EBUILD pep8-1.7.0.ebuild 1096 BLAKE2B 1fa817a381117c4900615a1e805cc018d9fc336bc81e8182dc0886060cb544888406015f7382cf711a3212cd03c89ec27cf3771afc1185fa6f2fdb7276608673 SHA512 cdb41c5f4d774db5b2d7991691d258a6b59e898f623b95a90c63d74c1a5349f9b0ba697736a9eb4ef8ce62a587027f6b19ca11974508b40e9bb7cea6534db85c
+EBUILD pep8-1.5.6.ebuild 910 BLAKE2B f74f7c0cfac05ff5c1635d47f50493ee06797e18e34ec799ce605840465f5d15c68f18022b4aad20fa2a4ee34205d20d3d6f4df1ca6925b9ba8c1291420a3f1c SHA512 0a7024c7867d6d1ef01667e958b834a6a93a33eb81fd6a396f842bb1d9c0b0121f2520e9f3e2f1e967e174f63d64c1ba5bfbe2d3d427c67a70164a788ca244b6
+EBUILD pep8-1.5.7.ebuild 920 BLAKE2B 7c169a681745bea3275d03b7e5a8d3bf04e8a8a53ac8f58ceab35bb0667f5210558b73ad5e7d88113d364bdc9c1736224ee3e9c9a61b154c29a8c1c06bb8f3e2 SHA512 b5c2df4207ca9e8fe7e2a6bf8a5597f341af959f81982719766ec6d2e4e32d0e5035aee9db68d6ad463c2de4e2c67f1e22c5a72ca3997a555ccf5e3fbe083b49
+EBUILD pep8-1.7.0.ebuild 1095 BLAKE2B 3e08535f1656d35d2ba9626a5fcbb84e78b027c5abaa9e68f513bbb42754bdcea2ed6dc07f507ef555018c854df69090a24f4f9baf0591d0460839b63f90cf79 SHA512 f67120c494983c212442b29003998a34e395d2e9c3b4b878bd0f68d750081c506eab510f8c971d94f4f0515e335fb3ed05fffc9a2480820a72b705f67748b412
 EBUILD pep8-1.7.1.ebuild 1099 BLAKE2B f6a98c3e2eda4a2f87b15dd1d6cd0d023c13a4d6e979eba721a78a15a0e2ec921bb4fd4b89d05fc4775e7d46dbd22255fe190d9b6e72afa09695d81214c703b8 SHA512 37b4e55373155428ab093410a987ff53c1dbdb12ee9b4a8a61a32d8319ccf1e49755e4ae58c21664bddb0b245a5debe55d01a66f4f679630167eb57023a9456f
 MISC metadata.xml 373 BLAKE2B c13332bbd6ab86ea6a6c9d6cd0dadde195528493cc7984e31416b833906e692cbadd18f4185b6cdfce0e2847750ce05a12f70d29d4fa98d3932654b73aeaa9ca SHA512 0c3ea303192c4b56bd910168dbac81284231291053b5fbca4a5a0700cb40ae8646f1b201fddc76dfeab52979c4c5944a67a2b0c62cfdf5c020c23e09e034056c
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
index 426c944e44c7..e0aee1618d00 100644
--- a/dev-python/pep8/pep8-1.5.6.ebuild
+++ b/dev-python/pep8/pep8-1.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
index 105d51cbb5c7..69a2379d0ec0 100644
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ b/dev-python/pep8/pep8-1.5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/pep8-1.7.0.ebuild b/dev-python/pep8/pep8-1.7.0.ebuild
index 9bf32c58ef02..67cd99c4de70 100644
--- a/dev-python/pep8/pep8-1.7.0.ebuild
+++ b/dev-python/pep8/pep8-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index dce947ea7735..976098c7d104 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -9,5 +9,5 @@ DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
 EBUILD pillow-5.2.0.ebuild 2732 BLAKE2B b603fc71dfb8cd3421a4460a36a9abd5be1f121a83f85c941399ab6a44474fbdf0bf673d2a3200360788279edcbb3973e153966dc0734db8008d390c12b4029a SHA512 235588590a41de73863bba24c92be25d815cc40aade9aab8bc94ff9b8e507d5953ecd0dc3be0953abf7e91188073bea71f0fb4e1c53fc6bcc9009a67d30d182a
 EBUILD pillow-5.3.0.ebuild 2318 BLAKE2B 4e619ddc6b8ac66beb75809c67f9555080c136bfeba8d9cb1be67432ae72ea4b2e2b488f228d8629dc3b41a555bb28744daff0c94f9e842e1e7a4463c29b5a38 SHA512 aaeb62ce2d17833205a0c32a47778bbe1465e9b6d9fa70828d67bd718920f25e5000d06a1d911040a42b0269480a4845472f2156ab544a6ff2be16af2661bf25
-EBUILD pillow-5.4.1.ebuild 2777 BLAKE2B c39730350035dd69c196e901d8658e11a0faabadff5dd1c3714e9b6ed20ce51b2eff5b278ed822b78393ae40ed45c432151b1268634f2d9de4c70af86b07ad03 SHA512 217dc85851f3f80d7a236b7bf9601306fa6dff83a854ca82913fa6963b9cd87039fd54f91c3e54586732dd38d7c8aa0ea694c8334932d232c0432d75e3acfe35
+EBUILD pillow-5.4.1.ebuild 2776 BLAKE2B 16156cfc63f0657f08a7bb2d7f7843fbc5e7d2654b6d1a50dc00f2fe37868a82daff108f3dabb5b7aa50d47e4902817274f39ed3d0468833126889b5333f0d04 SHA512 84baa669544108cf19e96d243de22ba600d27797e1491f0e156f012a2d13fd4c590cdfb867c21ed0818c07f2020189e64aa05cc6e371d36823aae75a08bb2863
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
index 98e0b4930127..3131038e0703 100644
--- a/dev-python/pillow/pillow-5.4.1.ebuild
+++ b/dev-python/pillow/pillow-5.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index e0fc05768adf..3311fc35e506 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,6 +1,8 @@
 AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a53ac525bca24cd9c2282edb92168ba38e73c38bad9f5a8b24910a690105bb4f98888e174f8d7c2a285e6e42efb36a45499ed02e SHA512 1c582abe153d73bd71cdfefff4293f2c497a5818fe2ea7e0deffe71d0acb89ccde8e20aaa33acf3d47900743c548eecbf01db24b01abe35b5ed60ca20bf4a658
 DIST psycopg2-2.7.4.tar.gz 425331 BLAKE2B 9d256ea340e4bace53981596d9d42863ddc9c8c079579b0621d8043af34daade05b9cec5465c6b3990f537a4350d9cf60a43062a0aa34db1f39b336296b32d3f SHA512 e78db528a4d3b897e0d8d38755179082dacddfb2d10bda963fc3836548991eaa0d4c1b8f81b329b15f4e685046c39e6f2a352b6c47b1da42af3a262094233034
 DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb00142998a85f5a79678a96b521098a8d0bf75779ab7ecb082c6d374cbf41cc845dcba0e1413b98621f67f9b139135 SHA512 5bf85b6760871f904b6b570ea454f99b72cf97acf9cce10b63dc7b6b0b18913b50ad4f24c469d101c54de6ad6100f1cac3c58225076b5e584a677f5ab4170a93
+DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 EBUILD psycopg-2.7.4.ebuild 1557 BLAKE2B 31e58e68e36e51d3b3e59ef731debe70dc2c8f47bc5d773abe74eadab4b941cc1177626f423cf43546ec02228d1e45c3435ee22313570a02b2eacc347fd08d3b SHA512 dfa0479608709a00f15e5075ee8a5b5ef03ba9c80848d9cd14dedebb034d1c304fcf1037ba7cb629e9cebc1498f86a0779690579351dab8c9fb140e827cfbdea
 EBUILD psycopg-2.7.5.ebuild 1568 BLAKE2B aadbf7b22637151227f36add992b5b8cdebffcff15bb9e185304790237f0dcc18f4640d0019ab15b6405afe4b6f3f821e5025721d5d2e9df687105ec5ff51413 SHA512 36f52384fe13174d6cedac08ec629874c5c9d802245702bf7e20761e38631fcb65a1a6ca4f3bc1280f5d21df3eadba9e92a92d7ee891ac55451385d5f4d23bc0
+EBUILD psycopg-2.7.7.ebuild 1568 BLAKE2B 72a192cea3451f17f9470c67322c81d90ec878034ed4e3ce3f40e9a635fecaaa4190dd78ce3d9e3ed596fefcbeb3185797fc513cca602d9bad58394904ed3596 SHA512 3e30c295a00651e92436bef4b15d0146b3d98c0a6f0e01035ed093195718dd9e6c9a2c919abbc74256a83d4bfb04d5b3e071b6a673df1b2f7d6aac9b90775c5d
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7.ebuild
new file mode 100644
index 000000000000..66a3df040bf5
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.7.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/pygments-2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="test"
+
+# Avoid using mxdatetime: https://bugs.gentoo.org/452028
+PATCHES=( "${FILESDIR}"/psycopg-2.7.3-avoid-mxdatetime.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r doc/src/_build/html
+		dodoc doc/src/_build/text/*
+	fi
+
+	if use examples ; then
+	   dodoc -r examples
+	   docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index a4274b68b530..4c5a08279aa4 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -6,5 +6,5 @@ DIST pyfakefs-3.4.1.tar.gz 151662 BLAKE2B cbfdd7ab4c2936d484b5ff1e22852438c5c653
 DIST pyfakefs-3.4.3.tar.gz 156896 BLAKE2B 2450cb67dbb25d2029a113dd95c3d51e60ef66c6683a5898ea73800ce1269d628af9f8daa85195d5b473f18b7c3262f2f26fc9c17caf80ce2f5159c247ebea5b SHA512 aafcad5d801f625273239221c56e46229ff8ab622cfb474d92f8555cfff90279ad9a092c20878279454c59033ad23d53cfe877023ac5d20c5a67a610b62ba7f1
 EBUILD pyfakefs-3.3.ebuild 720 BLAKE2B a0c8f2aeb266a89cc6d16b63d6b71df91a718c649b3a1a3c7c9c139f8d54cfe9b980b593ec572754f36e8827a81bf7b243ad58b70d994ecd348e03d8678193a7 SHA512 ec406f3c89e67e3d9bc626e06cf78cd9b88f0d10df1a4e85a500ac026d3eb401f50782d44c6193cd859cfe7851cc61d337ae4b53d51c363574700cf611058b13
 EBUILD pyfakefs-3.4.1.ebuild 723 BLAKE2B afe4b02b8119759b73619ed4d7af26b0aa077d3f9c0d719dfd329638eec119bec522a2d370a34689c07b4fe3ab840659a38c70f9c78b84cb96438bd972035f92 SHA512 f3c652059b4ed40259bf1569c9772a03848786d7b93e2ae3601a68053ceae13efe4dd2c6bae72cc8c27fc4862d33f5f325ce23f24a82567e1321dd9ef1d45209
-EBUILD pyfakefs-3.4.3.ebuild 725 BLAKE2B 8cd8fa143eb42104625f76691d097e6c00f4760945eb1d72513fd67d9a2213d0240653bc43f0d91ed04ba1179538482c44162c021ef71158e282c83cd99eef11 SHA512 53ec91eb11db8498de382c9be70e5c1e6958be65ee43028948c5bc631e9213f04abe4c9fe51ad0069c5188d2b126497534c2f0cf7da3d68834e3b59ed3ce5fe6
+EBUILD pyfakefs-3.4.3.ebuild 724 BLAKE2B deca1fbea6d615e110311ca67eab00e6261f2e188d7944950d235a4a73ac42d75640aec81511777dd1db3fa39c45b2a79921a906e93fb7b63654e1b3d8f1f1c4 SHA512 6bb830b5132e1813df261b663fa7e9f6b50014083b7c70c72cffdc5b84cc65b61abf1b94e212c24cc1bc1951354dcfd8c900317977c0b911830e341908ebecde
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
index 3fb0d1696a6f..1633f95679d1 100644
--- a/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 277e69e86d5c..c55cc9fc3576 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,5 @@
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
-DIST pygit2-0.27.2.tar.gz 477237 BLAKE2B 68fc1e9d9456e4a9d6eaaf00963d02704282de2a9deb1af946ee0c7c69be22fc904b8e80fe243987a3dddb9a0e5365fdf5e336b9dca829dcd9843c2035db42c9 SHA512 f6578a3694babe7837a5ccc4c99e2fa1827b5f67815f2cac6f3b3d0498d94a0ffeb55d3c6e9c9417d47ecbf0ad9a10302e3b59ea0d2e9eec6d9da8426b10175b
 DIST pygit2-0.27.4.tar.gz 479157 BLAKE2B 5b650c7916127219ba18212f035793bb805adda570dd4a89cc7fcda8af581c7aa3916d2851117a5efe7b434dbe2e9ff103e37e69de5d158d0a58162b15f1e18b SHA512 046e8830d403d869418a8cf7f22549293e336fa1b8fc108489c3c2299316838724d1eebc8747005d594e1c6c3596aafa5192dd64a1f34e0a2d080c83214324da
 EBUILD pygit2-0.26.4.ebuild 626 BLAKE2B a077ae59833c4adb59a9a2c8eb7c37cc091478d31867e09cf3ae4949231b7f30c0dd605d47009fa40098a8b58277bdd74a744d46f5a38a08a5e2ed0e6e991cf6 SHA512 3c04ded6c6012968dfcf4a36e4c3ac5eec95cab7f558c0fc9574bc1a4ced5b93b1287291bdd84b36c8071ec2394593f70091978eed20091787ec2f53dee15a75
-EBUILD pygit2-0.27.2.ebuild 739 BLAKE2B a5c0508833bed48cccba3a63fd37f5c3f5d6e0e59773d2ff03f9b7a5f9c13dff9db506b0d505facc72db50ec589b43dc554b69f814ace442a565da3daa4ae236 SHA512 5c60050093502af5dfd107e94a892c06b3cacfeb9eec3c857fb2eabe4638f34f2dbc52b51b6bc13c9867a0caf57271f20795a518ac18318c1e65b2f523d3b100
 EBUILD pygit2-0.27.4.ebuild 790 BLAKE2B 269a8f8a624f4b9b8faf4e24df4afa95a8f73ae0aff6498d7472c06fa5f64947c22c2ee748c3ab80d5653a8bd5182a8ee9a4cfe8fc53de52af610e4a67d58222 SHA512 15872ee6f4298cea673fad6e4fe64d3d8e70102c62ae5032eb0525959c1952c53873add1285595b157e715277b4f07c7793538359efecf003c38987c47096e63
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.27.2.ebuild b/dev-python/pygit2/pygit2-0.27.2.ebuild
deleted file mode 100644
index b4668c6c371b..000000000000
--- a/dev-python/pygit2/pygit2-0.27.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	sed -i -e '/pycparser/s:<2.18::' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 4906e0ab1c58..cefc94c184f8 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,5 +1,5 @@
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
 EBUILD pygresql-5.0.4.ebuild 714 BLAKE2B 9365cf32ddb6a06926680bb38ecb93de0d1061e2955978b7d3adac5fbe4c0161e712ab73f577afe2aa0cadb16fd2c6432712b485c9bb30831778a431777a2415 SHA512 9a08e9e54ed38286f4ad3004baa36be5ca1f0b54dd0181ced529a301dd4aa7a6b42e9dc75ab1afec18c2849f1936670fd86b9a426dbc2e9bae507d85e5aea7b8
-EBUILD pygresql-5.0.6.ebuild 685 BLAKE2B 2796a98d19d8941e40bf58288bd956c33556abe45fea2840db4208fd99f6ad43b75e3303511c7544909edca69be797d8ff58f95ae8f6d092f058f5643732c3b2 SHA512 32606c0aa6dcf66f8d9f8582eada44f2e5fa1cc990784f236122a33ec826f744b9bb03720dc3d588ca47eab0f6266f9d262966c39acf265b37e47a3a51e3efa3
+EBUILD pygresql-5.0.6.ebuild 684 BLAKE2B 0d5777463d0296d1c8e938b8da7e37db2a1b3ef2480a37cadb767b00b01affa6260fdc3e02305454035207fac9127a1968c13d44f5ad7160a749deddc3d56302 SHA512 58d35cd6f598163524335a525cf22192d6f8dd407641a947513d04c92ec05cd66cdfc6e341cf60318a01529720d7e437ab42ae321e37dcd7b8af5c946d7ca280
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.6.ebuild b/dev-python/pygresql/pygresql-5.0.6.ebuild
index 1647a3dc50ca..c67bca03dbf2 100644
--- a/dev-python/pygresql/pygresql-5.0.6.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="${POSTGRES_DEP}"
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 4ee39c1c1227..50e377ac70d5 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,5 +1,5 @@
 DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
 DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
-EBUILD pyhamcrest-1.9.0-r1.ebuild 1311 BLAKE2B 8ed46f9c2d8c89e0cf8f5d6bed261464265eefb220f365e87d16f2b94253a355828fccb65741059a63f8d5e2605496dc12a64e9608da855929633bac071500ce SHA512 8c5ffc5913c279c3f9190e77530b4d4df6022572e404bada3d90ea306e88f9104bd1142d15becd68c5ead8463d6820913e87660f77fa195b0b45e9989a3e0092
+EBUILD pyhamcrest-1.9.0-r1.ebuild 1324 BLAKE2B d0bd2bad60407c2fb4a87f2d1355c9bccfd5bb00f1c795cf1fd4f2fda3818a72c82b4334688e93195744a9fbbce129ed2ade3c7a63d9a2e2dd129f85281d04c3 SHA512 5437cd45c5100711bd045c28a1e421893e7a5364cfcfb308c20d2dd68ecf287f9ba9096dcf80d81f23fd3e563570e2d32fcb32b6d50185c99e7490873a370c59
 EBUILD pyhamcrest-1.9.0.ebuild 1227 BLAKE2B 173ad0e42c44e083043203c40435865697bf5222e7bd4fe907db296fbea627aa06de8a99dd8842f259073ecedbd902a4bc7c9eaf7b74540e1afe53d85832612d SHA512 4bca028ef12f224a122978f6ca9ed259306b7817f5f6182cd462d366b944458bf2657ff7a25f2993582d69cd9e5780004b65702062c2f6cbe429f6c39eefb81d
 MISC metadata.xml 271 BLAKE2B c9035b9fb7a0fca1355aeda317feceecac5790bb6723360063b236d6633a040a594eea8f304c3b5bc8e918b1781f0e5e887ec15225d51a021592391195b7e8ff SHA512 89f447b79dadbb441c4c51527f486fcf7110b67c0a86c9fe6413c563463be57089faa1ddb36701080c368ff0a8442532bc774602e0120cd5466a4d7fb6bb6e0d
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 8364afe1d5e2..c87d6490028b 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sh ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~sh ~amd64-fbsd ~amd64-linux"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 4f8d6d6d4751..245b47c971a0 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,5 +1,3 @@
-DIST pyscard-1.9.5.tar.gz 146010 BLAKE2B 04569422bef66839ab1e8420b37741ebb5591732f1b88d75d8348465d3c7758febdc5722ac0329d5722d1609abe2aaa39ce507087fd551d760f9fd0f69b06d50 SHA512 a0c5cd4ccbe8437ffd37afcf95c71f7d1d6c3ae364063cf81907095625d2062da8e7335ebfd15d1f952e8a8d9395e990b351b1308ab07fa456a7ee10658db4f9
 DIST pyscard-1.9.7.tar.gz 144692 BLAKE2B 5a842b790e01ff5461c462d6fe2d7763a79725cd1bcb841c1aaa49f2b17decb251446adb908fa8b525b91f418a6df6a76ddf779a67b7e8547211993837aed2bd SHA512 339d6efd5fcaa361e30029e736d4e2e98e05acd701c39574b40960b4bcec4782ca9c1d6927cea0b3641c5e6a137d0b9fbd961b58422a4151cfbdfa067dcd4b4a
-EBUILD pyscard-1.9.5.ebuild 793 BLAKE2B 64de7dd70232d6b27de35a555bff5239adad16d9c5a5b1d4bf17c226a1855157c1e45cb7cb5ea5b28cec8bc606553ab5cefa9a8adcc59ef695d5dbad15244c67 SHA512 5417ac7b8d6a39937edbf0672ee967082c0244e2789e8ea7b9d77ceadb7d763020c206372a0150cda6da0b8dbfbe916324dfb442d1c14ee291cd96b7892c762f
-EBUILD pyscard-1.9.7.ebuild 766 BLAKE2B 309cfdc4b71def3aadeedf14b9d8aae4b0ae85b3106632a7dd0c541bbfd8836ea2ec3fef22342687dd65d32aebeeff882ee4caa6dfe8d3d904022ca39b013701 SHA512 50b1b62db9d2fd40c608a24aa431258a4c4182888cdae6c3d6a48395a0cc38492f9e6212bf981eab387c93ecc3825edfd6838722020f0e9070dd357ede10bded
+EBUILD pyscard-1.9.7.ebuild 765 BLAKE2B 2244dbfae488353a2dd78cf8c27589cee2a8816d5f9e66b064cca4a1ee02e9324a5faf692efeb69c8405176e98d1b335f3a964eb8b537eec00e8612c4f6aa59e SHA512 792407a34eba112cd3c24638c48704f48dd327f21e8b84ec68d0f7a396fe33d6751427f006bad8e004cc07bd5ad7d05f264d5aff3514210e64c35e714caddd53
 MISC metadata.xml 418 BLAKE2B 7c2e1919ef8f47007374f1f7854380d5258fe75f257be89c7e1ee6303424ef5cb2c8bcd4d6f36cd0218e46b53d9af309276bff6e5fb49eb31e645e3a14c3b719 SHA512 88cd5d13d515f02d3c53e62900afbb7ee5307d2073696f4a53358e7f3cf658dc3fa79465b25477c4dcfc165f8a06021e1ce5dbeaacfd932d8efab922cc2b32c4
diff --git a/dev-python/pyscard/pyscard-1.9.5.ebuild b/dev-python/pyscard/pyscard-1.9.5.ebuild
deleted file mode 100644
index 4cf0792d4dee..000000000000
--- a/dev-python/pyscard/pyscard-1.9.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Smart cards support in python"
-HOMEPAGE="https://pyscard.sourceforge.io/
-	https://github.com/LudovicRousseau/pyscard
-	https://pypi.org/project/pyscard/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="${PYTHON_DEP}
-	sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${PYTHON_DEP}
-	dev-lang/swig"
-
-# Fails
-RESTRICT=test
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "Gui support" dev-python/wxpython
-	optfeature "Support of remote readers with Pyro" dev-python/pyro
-}
diff --git a/dev-python/pyscard/pyscard-1.9.7.ebuild b/dev-python/pyscard/pyscard-1.9.7.ebuild
index 637aea76a4c9..11898e328e34 100644
--- a/dev-python/pyscard/pyscard-1.9.7.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="${PYTHON_DEP}
 	sys-apps/pcsc-lite"
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 2fe51498ebf2..ea60d36879a5 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -3,8 +3,8 @@ DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
 DIST pytest-4.3.1.tar.gz 917608 BLAKE2B 62fea17e481984489d640872aac4f18b7278688b499302f407fd618b6357e3cb18e995f6f0974ba16da51bae5e3337732d2e1a0a6cc65936f8936d3bc7981809 SHA512 5c76100b9efc9176803807a54ff25bfaba065fe3e8fea28b9b2f3ade289056d174e0cc4e1f399eba4ee8642e8990f43f5dc68b59cf55b7d81a43cd7cb363f542
-EBUILD pytest-3.10.1.ebuild 2215 BLAKE2B 310c20f41363ce7c46c6ebcd5a32cdadd1bc3d540a68f17e311018a12aa6e45cfd4d08b128aed7d32f0b2262639120fc45b304571ba3ce2f3c6ce0e6d8bfa057 SHA512 77c5bdcc8930b118017059421bf10adc5091fba9597fec5f225385380f24152c83e76ea29551a0a86be7a31a6c09287f0caa0413e0e6be63ec95ea92debbb8dd
+EBUILD pytest-3.10.1.ebuild 2452 BLAKE2B 73f33238f6252c0f7df0534b699193ef4cb10c43932ced0488009888defb141375bb38d80e52de04a6b3835c8f97de439adc383b9769278445ffbc850a983dfd SHA512 7ccc22902002576efa336d058ea3c85cbfab0da37951cb41b6f838ac999d7db7a972fa588a3b1f78d2f6497b228ed1b61aaba7ed4966885199708e37e4fc291e
 EBUILD pytest-3.2.2.ebuild 2112 BLAKE2B 5d60971f4ac0e85e21bba987a80e4124b99ddcb2fa92249127f379f1f6c6c9e1b5e59ac5bc6252eaf2fb286a2674e9deb25cb032e4ab3138be7ef9f990d29899 SHA512 b8c78dcb725d879ab6f6b7e3a24dc1305acc2569a2b02169f77b018d68806fe410c6094ae025bab43312ba79447fa1fe9ff6f6c1fdf7354b63fd6cfd9ecd84a7
 EBUILD pytest-3.4.2.ebuild 2521 BLAKE2B be3429b82dbdaa3d09d11cadc647e9c79b6829277ae6fd2097afbbc8bf7f8009090c7a73ef016a35560d34db4f79c4d2c10ec20db64957c8eb7a505761ffe054 SHA512 a135fdfce02a379826614edaad8e8c0c1e5fc29a5e30615f4aae7e646d78abe309e53edfd251d26c77a56420e6f8a759463e72557ef7c85f53d5e5823057a8e7
-EBUILD pytest-4.3.1.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
+EBUILD pytest-4.3.1.ebuild 2380 BLAKE2B 98dff50a4154982e2f7dfa63680faabff9a54ff4f9d665f3f43eb6c4234d184e59d4c7ebc334553847f431ee769ad03a5ec5a0c9563d45df9961a2eb343abd55 SHA512 826c086d27ef3a8765ca5cc3b43082453ae45ef291aaafea5dff5057b6998d8ae0705eec74cad3950b7f18da65536e2c37438c10577e9df5b11274e73b67c87b
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 97eacfe36376..5e0846138d99 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # When bumping, please check setup.py for the proper py version
@@ -24,7 +24,9 @@ PY_VER="1.5.0"
 RDEPEND="
 	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 )
+	$(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 )
+	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{4,5,6,7} pypy{,3} )
 	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
 	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-4.3.1.ebuild b/dev-python/pytest/pytest-4.3.1.ebuild
index ab4d81909734..75106fd33ffe 100644
--- a/dev-python/pytest/pytest-4.3.1.ebuild
+++ b/dev-python/pytest/pytest-4.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # When bumping, please check setup.py for the proper py version
@@ -24,7 +24,9 @@ PY_VER="1.5.0"
 RDEPEND="
 	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python2_7 )
+	$(python_gen_cond_dep '<dev-python/more-itertools-6.0.0[${PYTHON_USEDEP}]' python2_7 )
+	$(python_gen_cond_dep '>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]' python3_{4,5,6,7} pypy{,3} )
 	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
 	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
 	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index bdbf1ed6694b..7237854df6e0 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -1,5 +1,7 @@
 DIST sqlparse-0.2.3.tar.gz 60742 BLAKE2B 38d3f17d196d3a1d50ea75810b5bd3a890c6f4b12195621d571d62b8c40e2e2d13034deddd95288df37a15daba28153a5ca9221b78bfff1c0e3bc37eddca2dba SHA512 ec654e680f8ce423a89da92c4c74f85e652bebb19e9a40ab0b8067f61803897e49e1e6f8dd1ab454b1ed130974d76b4f973c799264fd4bf8a87f034ba9c44835
 DIST sqlparse-0.2.4.tar.gz 61614 BLAKE2B 2462fa5d77ca2c3028aa3539bedc3cb2d7abd35db3c736ffd8abad8626a33174787f0079453ec646739749c8860fce0f1c7d815e6a8485c24b851a40b5bf3b87 SHA512 abea0f084778976f2d1086006eaa88e1fc1d2580654d063b35557a44d9d9727b410a022e8ea06ae3b265f2829d49c48d347dddc61f2e56be9c3d6207104712b2
+DIST sqlparse-0.3.0.tar.gz 64072 BLAKE2B fbee74c7222fa50c5d627959d5c8652dcd85ab5b5b771e3c8375cadc6e009c2fb1adc3c2428e27d769c210e7976c350bfab367cb7aa44dd7b4183ad9722a4ca6 SHA512 596d25f5fa2c797fe5652e36e9633397e7867586ff0959f52d1ff861c16d0e7c73644daf03d74169dd20255e802b7369d4dace0a44a3d94c15bd67faa41df551
 EBUILD python-sqlparse-0.2.3.ebuild 1333 BLAKE2B d44fccde2d40af01692fc1d83156c879f7a51934754d79a53c81cd713dac9551f8e7ac367ad638265d2c2f7cb37bf8949e6794ad3a4c2a3943029935f65a0223 SHA512 144b388deaae1ba6dbd1481ca964c2c58531adc8c1f6b55d730fe071b1a7b4c229ab0edb244394554786928c0d2efe4c40c3bcf087212d88f26f443ad6b1c56a
 EBUILD python-sqlparse-0.2.4.ebuild 1333 BLAKE2B d44fccde2d40af01692fc1d83156c879f7a51934754d79a53c81cd713dac9551f8e7ac367ad638265d2c2f7cb37bf8949e6794ad3a4c2a3943029935f65a0223 SHA512 144b388deaae1ba6dbd1481ca964c2c58531adc8c1f6b55d730fe071b1a7b4c229ab0edb244394554786928c0d2efe4c40c3bcf087212d88f26f443ad6b1c56a
+EBUILD python-sqlparse-0.3.0.ebuild 1343 BLAKE2B 1e484f93d521ecf3bd72c59de788603c0d7b8198476340131292898840de04ffd351697693733138178243348db078379e19725052638e111c581fc5bd52f44c SHA512 c3b699cdfcb09f92420d4cec926ac926a8bc9d0b8ad024088921edd62083071bef9aaffc7baa4f645437d9792365e44680603321a154b9ba92eb6fddde3810f2
 MISC metadata.xml 453 BLAKE2B 2b04f47b565bbce71b1ddf27bedcd903f123751e7524ca62ea280b96788dbd14ae18513fda8eaf563d927c09dff7094b6a5c0d651c0530f2d3e07ee1d092c946 SHA512 5bb3c69c2dd5bc8ad2bc8c4a174be8627ed54ba0055bc153d36733f964ee289d71d0b392ec63127482a87f5f56fee9cf2900a2830a0ffbb733b1119be4abc0d3
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
new file mode 100644
index 000000000000..8d9e4eac466c
--- /dev/null
+++ b/dev-python/python-sqlparse/python-sqlparse-0.3.0.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_{4,5,6} pypy )
+
+inherit distutils-r1
+
+MY_PN="${PN##python-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A non-validating SQL parser module for Python"
+HOMEPAGE="https://github.com/andialbrecht/sqlparse"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD-2"
+IUSE="doc test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		)"
+# Required for running tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+S="${WORKDIR}"/${P#python-}
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	if python_is_python3; then
+		2to3 -w --no-diffs -n tests/ sqlparse/
+		py.test ./tests || die "testsuite failed ${EPYTHON}"
+	else
+		py.test tests || die "testsuite failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index 38dcfd4e9a41..473baf3f4fed 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,9 +1,7 @@
 DIST python2-pythondialog-3.3.0.tar.gz 1906527 BLAKE2B 67fbb2dbd2b9c5f5da4c74f5360b5c0753ac39d9472e6ac4d09ef01831a1d95a8fe9ccdfad80487452b2704e0fd237286d755e7f49188e388272c34ddbf47081 SHA512 65ce7f9305e20b0c5e0d4588a241e0f14907ecad64f8a6bb3899a2d6e0245fdd848a8c4fb1da3465f03810a1e408fa97c46d9ec082c4ebba0c04a41293a23ea8
 DIST python2-pythondialog-3.4.0.tar.gz 1487867 BLAKE2B 795af99391e7a3d5e9b0657116dba8fd85819261a9ac590e797d0144577d66261529515cf8421a4724b6eacd0b6c7ae20d030bc7eb22c56ef870294c6f2386d3 SHA512 f4ec3e3eeab9ee00146b4604a8f72c765fcc164a24def0f1a9cbf083123e55dbe371ce6d4790ad4c0b5ee6905a1877f9b8e90ca3443a780fa0965c9bcf4bf629
-DIST python3-pythondialog-3.2.2.tar.bz2 1412368 BLAKE2B 2c20347a09720c15c696795826e9d24034a0f85b16936ff145511d50830e116436b30868bcd53fbe425929709f7bede0a422257ba8231a9f2846d3f15b3a7709 SHA512 58b84c0dd7b71ec9d1e60c4802cfc8e6cc72f79b8b6accd387553c685a92367d242746065bac6cb1c9d501ac291d9307cb2bb6b26694e9f24a3c5d6637a5bb8e
 DIST python3-pythondialog-3.3.0.tar.bz2 1827891 BLAKE2B ef78832972cc2417ecedc797cb95ea10b1fcca4ff1ab2f7db74a9afaefddeedfee8303f2f4b9ff7230f3d2eea305e359f3854112abaefa2a4adf4c801de7ffe0 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f
 DIST python3-pythondialog-3.4.0.tar.bz2 1415324 BLAKE2B 1135df25b988dfaacd45a68dd918409e001719f92436e9e88fcf1a66e9ba70f03fdef1b86ebb80ca6a1c02006353ed3f9df998a5bfaacb9505d6e8a96a37d5d9 SHA512 a810128459133c4e416f4b04b8dd98b2230f046b8762e6b29c4e02e1458fa96029d37137a71cc01aee292106867a6f30026941ed1f727b7e48cbe976d96d7ed4
-EBUILD pythondialog-3.2.2.ebuild 887 BLAKE2B c4f781b01a4ab36b9dcca8f908c7227d481f25eb9cbe344874e9c605f30c879450a3c2e9153c04607f6730ffa9003bb8f9e76a61ca898721b1ac303ca721c342 SHA512 e08875187db07029da90bf2fdeadd4cfe2e351a290c2bb5ebcbc790340c9181951bc6e1a27329b039e714508370b67448c100639723ba55d1359e15c6f89a2d0
 EBUILD pythondialog-3.3.0-r200.ebuild 969 BLAKE2B 7f7c43fadf1ebb8626bff6d0123bbf9ec0b61a94de7d20c9a88da273ae328ed96ea9a80b91bc46b1894e8139c4533af4990b1555785157898b2477d4a0ea4c5e SHA512 7d974f0c872bd37f0e8f4720ecaed58526dd1a7d1e75ebba4118fe5b0a3606fcded45fa231940aa01a22f45d54b59f045335027cd64dda0a2bc7f0cf82e85765
 EBUILD pythondialog-3.3.0.ebuild 893 BLAKE2B ee783b2698e86dc24e504069dc15aa91bf64e53ef90c20298faef43c3c42d607a66f241c80e00cf1aa2f21ec515dcddecad536688e231cca7c7805ec04266882 SHA512 1087dbcc93a4a2b40ccc70a7774574ce143fea57c897fe81ed3a9083be62b8f5147a10c68c68dd0ad0689d9611b6bb665fe8e970f02b2cc7c15a34d883516d80
 EBUILD pythondialog-3.4.0-r200.ebuild 960 BLAKE2B 06a8394d7a6e15da2dc14366809b69d6e63265bc05b76a3fbc61a03fe164e2989097af29bfc7d67d6257c46c0801e9d6e235986aa21d4d92a0b800af35e5965c SHA512 e8516de81909af2f15d10896f5916b31cb634c745233bb51bff469be39774b9920c1412cc67c2974b0351cc0b491cc0fac5216f9ca2df524f24f5c676a56b6a7
diff --git a/dev-python/pythondialog/pythondialog-3.2.2.ebuild b/dev-python/pythondialog/pythondialog-3.2.2.ebuild
deleted file mode 100644
index 69af5d8f70ed..000000000000
--- a/dev-python/pythondialog/pythondialog-3.2.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-util/dialog"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -e "/^    'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 0cd02432f3a6..31998e408d90 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,3 @@
 DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
-EBUILD pyusb-1.0.2.ebuild 814 BLAKE2B fb86c5046b10efc9c1eee978c4ac5d034f6f033f49d159c44d421df16db7d55219ab5d8a07d8facd71efe0bd5fae2f0d92726edd6e992f6a9769a536434a03d3 SHA512 396eb25ef3ec71e40e0b7cd7622288107e2cce02800c820e97bab3b8ef64955eabc3fe3f3222a4b1f7006c4d7063e294639768ed2f131801f37cbdd67f3a7c7e
+EBUILD pyusb-1.0.2.ebuild 813 BLAKE2B 9c4b39429616e21190a32e3b2b0d76217cc6af0033a29d163b568083939e18a3daf78cb841846a891a8c0e76fe71684689554b1e16eea2fd9215566a47e5d71d SHA512 c34592642172615583a22be2ecc5baf978883abdb79d8317a5085e49b1c4b901618a97c7e5ca6928a80a0a4f81ed8c2fa302c917c517cd466a760a288360c9e9
 MISC metadata.xml 472 BLAKE2B bae31bb84443c5d215f931618d90cabbc11633d90a1dea5e29ade93e42671b4bf1cd037f235e9a58059d2571b0e9b32f0261508108bc6678544dc09f3293b8da SHA512 7db6620b2545b31d9dd3c3844f9d02d0403c266a931935ec8e5728bb936ed3ec1f5ec5fd5d7146668e4e17c9f8f1eb31affaaec90dc93e690864b574a7ddbc4c
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
index 2592f61f9dcb..ef49d8dde196 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/walac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE=""
 
 ### This version is compatible with both 0.X and 1.X versions of libusb
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 01a41a0ae4d2..24094be8b282 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,3 +1,5 @@
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-EBUILD qscintilla-python-2.10.8.ebuild 1553 BLAKE2B 210cad565973dfaecd9e2affebb750b112edef43551847206639228ff2f4d7be21b28e964cc3d4e5491c4cb7979774f7f86893f8cb8c7312755dcf647ba235af SHA512 a5f467336e07bff0b6bc6375e263169ff27febc274fdbc4d202667ed1e4a5bdf7aa6f8bf5adcb2574426a45650041bf606c041ae976d195c069c9084a97242b7
-MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
+DIST QScintilla_gpl-2.11.1.tar.gz 2932060 BLAKE2B 9f2f9fd89667cc04c95d0a36e4a615dcf3c1c11a5446e19a43104513894b76bc7478f2aed7e8c94ce413f940327deb09e51507bee1fa35c79c176e01e6b74767 SHA512 40b600aa8eec17bc99491a08aeaee72bf498a66f0257d310a8df2667de82805715b9c859885c092acfb03ba8f69433a6517d0d4bb324bf99bd9db461172c08d5
+EBUILD qscintilla-python-2.10.8.ebuild 1551 BLAKE2B bff3a35fec9120904fa4b3e9c5c731334a0d9bd61de51cfa582a0cf41a26d64602a682fe5fdc0f27d4c916b50418c71c1344cf3fe88d47ea05613886d3180c51 SHA512 b559358ecbb09e10250d64145b1629795bd0b57e228cbada6239199a8436a951e5dd298916be6d1904f1c99bc70ee04592b1b9cd300ca7f4adb1f42ffe340965
+EBUILD qscintilla-python-2.11.1.ebuild 1589 BLAKE2B cc76626366a52c3cae6ff587aa1c280dc029b40b5b0b5d692974c051aeb8eb50b5310a425043901c0536cf1356c7490d614c04e064748f77304aee460e1b6a1e SHA512 bb32a55bc307382ab0da99463944e47ce08b10909fe18c20168ce11f3c48f4b33a0d82cec720980dc31c05e0f7f29367a3ba19053f90ae42f92cc184441a9ed3
+MISC metadata.xml 776 BLAKE2B 63270d838d1a2bc0deddcf6ec6ff08a9cf0233720ba826a1b457b7369492ec4e292c16ef76b55ce37bf35e7d2497f2beb0c5d03bd23a84558829bd3e84c558e4 SHA512 08ee336155dd291545fc1579ffe8d9894ade3eb0f1d671d5df59933651ec3262239c3a15f32378fc5cedd3a40459e79c3c64a38b53fa95a6619572290bdd0367
diff --git a/dev-python/qscintilla-python/metadata.xml b/dev-python/qscintilla-python/metadata.xml
index 7054692c3439..3e46f747a5e4 100644
--- a/dev-python/qscintilla-python/metadata.xml
+++ b/dev-python/qscintilla-python/metadata.xml
@@ -14,8 +14,9 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/QScintilla/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/QScintilla/</doc>
 		<bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
-		<doc>http://pyqt.sourceforge.net/Docs/QScintilla2/</doc>
-		<remote-id type="sourceforge">pyqt</remote-id>
+		<remote-id type="pypi">QScintilla</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
index a03ddc26eb02..1b2bcb06dd65 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit python-r1 qmake-utils
 
 MY_P=QScintilla_gpl-${PV/_pre/.dev}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.1.ebuild
new file mode 100644
index 000000000000..dfe6ef7c314a
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit python-r1 qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_prepare() {
+	default
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			configure.py
+			--pyqt=PyQt5
+			--qmake="$(qt5_get_bindir)"/qmake
+			--sip-incdir="$(python_get_includedir)"
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain, build flags, and prevent stripping
+		eqmake5 -recursive
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		# parallel install fails because mk_distinfo.py runs too early
+		emake -j1 INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 830e9aabe1e3..ba89d001f2a3 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,5 +1,5 @@
 DIST SecretStorage-2.3.1.tar.gz 16073 BLAKE2B e4769e748ee39596c51012a6ac626dba2b019238a8237678c47d713c2af4b0e88b50d0068b5dbf3a405b9f7b14a7df64aabf751009dd21ab25de65ead2a79c38 SHA512 69a2c86a1abd904b7d71bbb59cead3b2588cf88d7f35cbaf64d18ff9aa9ed62ba9f79d0bebd10136aa8a0edb1ff8a1d1aff70cf8e519dc74303993ef0d564047
 DIST SecretStorage-3.1.0.tar.gz 17767 BLAKE2B e234a7f34b5ca2debfd04d4f3b4b4e2a1625aa346133e464bbc1f094381445e3d0c5460457c687f55f6682c6b6085a757edb23a6029fe5c2abf139278203f326 SHA512 a044009480b359aecb0c8782f04e4d02c3c1c0e682f72733896c98f386562c43766318963452d60028d0a92d02903130278cf26a5c206f5f0909e106bdb2d133
 EBUILD secretstorage-2.3.1.ebuild 688 BLAKE2B c3b9fb385b428b3c8552a888a0023f9ebcd694b34f560c8bc3f2936de5ea9a940b0e917896589a6059b55e2620929f08f726f9aa5801b93c2750c4fd5052732f SHA512 8e71eef0cc07a17f81b38c2d6e2f7b15541dfb5f5c5b4acbac7da6aaa7c1c36c5922600382ee248deba3020e9a65cf97071c937aafbf11e651bb339a1104bb11
-EBUILD secretstorage-3.1.0.ebuild 1031 BLAKE2B 70ce0127b2f93915802881592c01aff9fb1d323cc7cddff3cbe9e81b1b22c7d2d784a3f0ee6327378e202af350fef8516e64084bfd6de2a3a00d1fc06918917f SHA512 e2a4881b12380a4a128753fa36ffa2fdcacc1cd9b88fdd46aa4c2820e1f9f5542882418e83588a8d254df8147082a4b6af2b751d5fc3485de0d0196e415a58db
+EBUILD secretstorage-3.1.0.ebuild 1069 BLAKE2B 702c60c40f07c6196e45fe96bddce9049cec6f24ab4ef488dd36245a85592c8d743d7d7a8c1df6565687d00fb3df1be06d4f8b3c39daabfc710aa174420158b7 SHA512 1b7e96d396029f2e804279477b501b95c5c6e61882aee5a68fe871844d874f51ae86e62deba076aa7178d25dd4e1c5b008daef65db51d2568c2d911cb2e4fb48
 MISC metadata.xml 377 BLAKE2B 6401f07923ff58cc70bb0eb9d08efec05924c5b74102e1ff2e9eac0d1f2dafc1f4ef8e31f2434344ad25a6f2ee71061aa23c232d23214d91c4ce5c7de437da64 SHA512 56c6fc8a7b58a5ffa5e2d705567203cad260629bcf8581203be8ec2480a16603334e3298583c297a8e093881955fecd457b250af56bac05871476041d217bd95
diff --git a/dev-python/secretstorage/secretstorage-3.1.0.ebuild b/dev-python/secretstorage/secretstorage-3.1.0.ebuild
index 55915a6194af..d05e995ee3db 100644
--- a/dev-python/secretstorage/secretstorage-3.1.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 857696825a73..2dfaccd1bfda 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,8 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.14.tar.gz 1049688 BLAKE2B 8e68910f533d0f58bef1f20ec58579ce0166efaee2caef1c64d4e9878b0887040d9284a9fa5ee48d7a4f0949866d0b988b0d962303f0ace03a4ad48bd08eec5d SHA512 afde261331f38eac863d8cea0e343649f460f0b9a603d7fe91f14583904ea4b488bbd88d20fad5c985c43c6c1683fffee38676d94831ac8f2de40d9ed4d0423e
+DIST sip-4.19.15.tar.gz 1053921 BLAKE2B afe0f1c2faf839305d21da05a667e649c37ab42c95df86d237bbd8f39a6b8bb7224da547467311bf82a85ce8f0fafd8bb6dd7cbf6050f2b157773339438d6277 SHA512 9518a5e90d54758b13dd8752669d4deb175cea8d8cdf810deaf554cd157d32ab7e394d23c774993fac3b7c02d56445b80962457d59f5cda543917a0251816422
 EBUILD sip-4.19.13.ebuild 2856 BLAKE2B 992b5ea525fd276db4ddeda3b067bafcedd4a603b869c5a847951d6c70050015f78371c66bd60589f5d13411ae35b62cc9cc90d5d82f69a25fb9f5479a76ac71 SHA512 4e75fd5bdad8200a6ffe53de8163cd03cb66a72a22c517dffcaff160b371af8cebdfdd81acb6451c7b0e1697c060adaa6488689f82a6364a97110eddbdd18951
 EBUILD sip-4.19.14.ebuild 2428 BLAKE2B 9caeca45fcbd171794a03ad6dcbaba07fd187a3ccfb5f2120c97ba7ea8e6b1cf0d8e676902dd933c1582bd32d7105da27b598dbb86d67e04859e711b743e8a9d SHA512 43befcfad315a2f2d642ae587fe44e8a646bf528baa58b34873509a249d4459d38df905cf0126adb0cc67a64ab262b0ca4f933822ef3f8692451980a063a73a8
+EBUILD sip-4.19.15.ebuild 2428 BLAKE2B 9caeca45fcbd171794a03ad6dcbaba07fd187a3ccfb5f2120c97ba7ea8e6b1cf0d8e676902dd933c1582bd32d7105da27b598dbb86d67e04859e711b743e8a9d SHA512 43befcfad315a2f2d642ae587fe44e8a646bf528baa58b34873509a249d4459d38df905cf0126adb0cc67a64ab262b0ca4f933822ef3f8692451980a063a73a8
 MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/sip-4.19.15.ebuild b/dev-python/sip/sip-4.19.15.ebuild
new file mode 100644
index 000000000000..e694b38a121f
--- /dev/null
+++ b/dev-python/sip/sip-4.19.15.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+MY_P=sip-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/sip/${MY_P}.tar.gz"
+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/soappy/Manifest b/dev-python/soappy/Manifest
index 3258ccbdb0af..1776dc85b7f9 100644
--- a/dev-python/soappy/Manifest
+++ b/dev-python/soappy/Manifest
@@ -1,3 +1,3 @@
 DIST SOAPpy-0.12.22.zip 172855 BLAKE2B 119232713da3474c58c925a2652f5739f70903ce8204a3f999bc511df9387cfc33d9d812ea3735d04b37e7ce45d6c0f5a5a11c79849406c2d60fa6ca91afe61d SHA512 d75d0bf8e88c8ecae57f51a201f9ab6f24fc41856ee2093e7e2e73e5d8618c9a766a69140df28a24b6d8493b53555c09502684c6d2fd78e90a3c53bba52f388b
-EBUILD soappy-0.12.22.ebuild 1000 BLAKE2B 54863e9ba17c0991e30397ac5a7ae83c14a02799ee588eb52582d1867d85e3bc0a5cc799a7d04f93980d986b1854cdfa6747f87bdc92d1ae55899775d5cd50bf SHA512 7f5e6d78fd6c64267436e9a735cec4c2db9bdbb08af7dfe81e3bb448d5ccffb2ae8f5fea30f960362f7d322da9a63b9b127c551d92b6270e8be21f5a8fce2945
+EBUILD soappy-0.12.22.ebuild 1013 BLAKE2B 935960ec95aa535bed46bbcd79a9a5649408b060f92cb57864f2ece21bb5a1f308714a1b7d9e0b4a8b93c89c6e3afc94d29745865881150dcd1e9aeed290fa6b SHA512 9eed073631d94158836e03b845e62b5e5ad48b40cb12556fc26bf63f521945d6c5db1c02c205b65a222e182c4c4e446a73a2722d703e4709265b6968e375ebec
 MISC metadata.xml 363 BLAKE2B ef3fe590c0ee03d9316b5f70d2c4eef13be725830b11d2c5071c3678efe724b4572a52cf967844c5b194064ea464e40d6f4faec5fef804e07bf98ef9bc695711 SHA512 09455c1710a40712fec6cbe5680091f3186d755fbcc2c64ae4fe4c9dd50bcbcab681a2e9aefd6390c12c775b76bc76aa7a04a78a8ac23b281efc908d14285742
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index 40ab700736b4..3cdbe5adc915 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux"
 
 IUSE="examples ssl"
 
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index 8d146231cf13..6547fdd5bdac 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -3,5 +3,5 @@ DIST sphinx-bootstrap-theme-0.6.0.tar.gz 1232454 BLAKE2B 90fed63a388f71f1d74cc31
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
 EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 538 BLAKE2B 5dd5b20e7f382157d748baf695592c48643e97af2ed8557f565b799578b11356a1785e32cdd98b2dd1a6c29c4468c2111770d8262b84ecd5dd7f7501fde7b415 SHA512 deb99fd8023fe6c8a13f694735828654fd22977b8cd31a427f6b791a45ad6e53d0685761051111e8809547f24eb8ec403bfc5d6b403e2ec0a09795ef021798c1
 EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 542 BLAKE2B 865fd5d6a280bb83e979d8f761541e0d4062a7a53aa97ffb62a8cd2c8484bb161874a44ef21b3b3646bf643cbe2b2714eee1b308c0323bb36609d0a02cbfe7fa SHA512 e20fd1c014a31d6fcb66ae67570f173fcb037a8ab28ff486b37f65f33e859fd5b96d887489d0473c48872ab8a8517dc6f28f2699c774ff59f01f28e311a032a8
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 565 BLAKE2B 1a46e7c679ec39172e33e0b6a9c5a491c450f1238d9e68cedc938bc6dd872d682e0109dbaad7f2ba45a5ae6d4ca27ac1265b699f30108fe60bd3e77280d2937d SHA512 7e046ca24a59c937da04bac83be7be4de99aa5fecad37a198f5c8cfd45459fd4a7816bfd4224f99c870058b16c16851eec1d7d73a2cb66fe01cb00cfb2a72a60
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 571 BLAKE2B b323e914fe08b43e8c8a355a7625f398c289d8892d35f883f7085d3ee62f43eab31073ab67a64af27a830624946049835fb3251eec42a552183ea3d0ede06789 SHA512 27e473415259f3229aa9fef41bcaf14378daec1a418be0aaeb6c0459124d3fcbe8763493b209c8b43dfdc5bbb365f84d9625b1861921ec12a50e61a8c31e5559
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
index a43d7ca0142f..4b8586b5da16 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index f83dc22a44b0..3b3a84a92e1d 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-websupport-1.0.1.tar.gz 590480 BLAKE2B 1be40595094233ca2ddb1a367039320fe6655b1a6bbf251d7722b60efe0d0cfbe1cdb38455f47f4fb6810500e0e4923f5a9a74df4f79d1544261c4706a59e8fb SHA512 67807b2505e063639163b020f0e62469b0c2838c303516cce9a8d90181cc7b8a10d76532adb1267556d40f95966efc20ec9f8ee1a6731056bda827a6f97f40ec
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
-EBUILD sphinxcontrib-websupport-1.0.1-r1.ebuild 1161 BLAKE2B 6841ef437c0e54f5c01ef473178aa3e6af58c331d97343461e9ce5a8f52c2accaf9fca06154232a8d36db404b474b4de2cc2cafe0e0f9417c46a1799d1438d22 SHA512 92ed109f52211a8f0127ca1b82448b49221102a364d601ff31194c8b277ff0b85d7eb59034d74239f351ab16e5fe10e5022564e4608ccafb5b34165ebc49ed02
 EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1162 BLAKE2B ab6a8c0dea3d3674a6e51b3b160e2d576a4a8dca4f44c93828b233767b980c20b131ecba1a5e76528e3d9e6238b5dbc3fb315a85fad11da9b6e68f7fa67a813d SHA512 de451aaf3e957922e4a315f8c8eb866a8b7e32764f8dac57c8bf874dd07ae6c5712fae775a4f7c72c4459669f8aef1da38ce0a986df62385ad333f60e93cd0e8
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1-r1.ebuild
deleted file mode 100644
index 0cfb52983d55..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="http://www.sphinx-doc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-	>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		${PDEPEND}
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	"${EPYTHON}" -m pytest tests/ || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
new file mode 100644
index 000000000000..ac87318bce68
--- /dev/null
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -0,0 +1,3 @@
+DIST swagger-spec-validator-2.4.3.tar.gz 19636 BLAKE2B 3805aa8663d141898e5106ad98d9aa0c697e87a474c0446151b0a6210684c8a0afbfa7a54b44e9aa7c4257c5e9f8713139943774bcacb38105b21c4cfe46492f SHA512 d785f1d9f2664fcf4f62e2e2c2adf9e17d7844e6febda69bcb718efa5f951ddc0496c7e2804e4269750a15f5b5c7f6cc11fac0f99363f7eadab8cf1209d152db
+EBUILD swagger-spec-validator-2.4.3.ebuild 594 BLAKE2B 77682ec5f93d052369b181531e462196f446ad935095f188293e5f19d7a7151b43818b1ba6c1bb47c1e8ef3aa6c22e5d73703ea321dcd47ea6d685b6b35a6182 SHA512 4cec0d281a484a85a80d3a6d783dd2fb366562178fee3d45f5e48e949aedf5cb1848bb155560290a2e7e27dac40669f3a2ac59b9075ed1bb9cfdf5b8b6b97a4d
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/swagger-spec-validator/metadata.xml b/dev-python/swagger-spec-validator/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/dev-python/swagger-spec-validator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
new file mode 100644
index 000000000000..1901a52e0a88
--- /dev/null
+++ b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="validate Swagger specs  against Swagger 1.1 or 2.0 specification"
+HOMEPAGE="https://github.com/Yelp/swagger_spec_validator"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index ef5c7c72db8a..e633f573d65a 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,4 +1,4 @@
 AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a26b1b8fa795472622efea1afa6d5df717c10fbfbf106180d1f6d5f8822350d9605de41fc7db9e37a7b4c7b887df9 SHA512 c27c2dda320d2c16239eb498b2f59f85746745ce1875879a17f41235081983fd1015f0dfd182c6823b998f85aaf460486a3ac6d955be969487692ed50c5648aa
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
-EBUILD testpath-0.3.1.ebuild 1082 BLAKE2B 80a5c48258179db4fd6a45ea5a929840b3f3ae6bf8294820135131688bd28a4cace3102264822279ee86f5417ae8770767da26ceb5f7ada7b1789b6cb6a0e198 SHA512 db220db5afc6dafc49562707945e456f1dc04236e4f631e3af5f53df83721a2c590db737d2e4dd16b599001094c62793c4313cdb35b15560a1a0ffc79bce1d6f
+EBUILD testpath-0.3.1.ebuild 1084 BLAKE2B fb6f5a3d1a393423b8965e26b159e85be1b41634af09a33a64379ffb48cce0867f0bae1b563eb3478417101d9d96e37d960b3c60b1a3d9432982ff75643b8da2 SHA512 74365432aad9a4b7549626a71bddbcefc02a64b09896cab79fcafff6ecda764fd5ef1bce6dd7ea279e37b3e6f2f5e4e5c835bee8fb2a7efea5d562d0094be24f
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
index 14874dcf51ff..c879fc3fc78b 100644
--- a/dev-python/testpath/testpath-0.3.1.ebuild
+++ b/dev-python/testpath/testpath-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 760b4de31e7d..2a67b1814318 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -18,5 +18,5 @@ EBUILD twisted-16.6.0-r3.ebuild 5725 BLAKE2B 9a2e141acad54552c9829e85cadae44e620
 EBUILD twisted-17.1.0-r2.ebuild 5751 BLAKE2B 5239f81e689cf2be429c3b63e416de7ceb720c3f24e9ea95e3e830797c05fcfcd25925198ca8e4bd4c4c634e56c74af279008fc00358b09348eb8febd2b4dceb SHA512 4d9959e6183b5c5e6357958ef6d39c18194790b39f55fa85dd683dab620a4ae788ea9a95357ab2ed3665eff1eba13495556d92aa2628737e86bee30b5c551191
 EBUILD twisted-17.9.0.ebuild 6040 BLAKE2B 4b0f32e3625fe3e11fe8c0aa9d1042fbd82d445247b6e141df9ac169694daa94a3d2c74e2e56e09fa42b392c1aa7ef082cb27dcc5e4aabd3c898f1a644778348 SHA512 cc9a56891dd0abf1b8b468fc1c93a23c8cb5d04fd6ccefd714976fca211efb08d7eb4c25bdf64dd107605822ea5454602f45864c49dbc1846838e5ee7e5d7145
 EBUILD twisted-18.4.0.ebuild 5908 BLAKE2B 6591ec655032f44da6466ae85ae90de1247b93851f4d0087ccadca34cd16f6e1938940cc790b59b81782d8d77983b09db69b667ac5d1db52a700cc8591ae1f05 SHA512 07bb9eb0bfa661c90190bfeaf8887a4570bcba31e0e1b452c8d05f962e44b4d9e08a681c6cbcdadf2a2def6d0651d8560eb33bfa0f8b459a61a488c5c770df65
-EBUILD twisted-18.7.0.ebuild 5972 BLAKE2B 24d2791db98100eb024e3bedd18de111620a3a281a94f735b0cd2595c87e04584a202e227ebe22f9b6ebfc1067df3b26bf9ffa385c2433890cca509920bdc780 SHA512 b840467de823bf335fe356ec041a8cd3a2811b9abee36646daac1318f02c3d4183b6c89ed39c70a980e6aafa12ca02165d4f10710b03a11f99f6d456d6fb3c15
+EBUILD twisted-18.7.0.ebuild 5985 BLAKE2B fdb4d726bea7792127bd849e3cdae027b70e081d13e74387acfb33370a8d7243ce502baba36e6a733e4b34c5af844729605f7c7feb2d739e286180b661cfdf1b SHA512 00d53c99771abe3e03c07ff7e5b4c5daeec1447967d460bbe01b0d7435c984481e8ea9613578af784cd35f20aad7ce2c280b3d9a94c80ddaad2fb1af5fab8a4d
 MISC metadata.xml 1429 BLAKE2B f6bf7279da38a837c80fff9f9319d5c2d3893fb4a5a17d731b170153d1c4e10479b58a6576d84fa59ae653794aa017862a4fcb11bf1bc6ca85c374e3b9dc7cd5 SHA512 1ddcc6bb727f97eacb712badf834ceca15a4544e340090622774bc0e781f2ce1a20a96f8b5018535998e9865204697a25ab84eff87c480246fe14e39ef9411ed
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
index 6e23ebe62d4b..89733dde61ee 100644
--- a/dev-python/twisted/twisted-18.7.0.ebuild
+++ b/dev-python/twisted/twisted-18.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 
 # Dropped keywords due to new deps not keyworded
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~amd64-fbsd ~amd64-linux"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
index 13dab0ad1a06..cd8705c31d43 100644
--- a/dev-python/typing/Manifest
+++ b/dev-python/typing/Manifest
@@ -1,5 +1,5 @@
 DIST typing-3.6.2.tar.gz 78726 BLAKE2B 80adf3cab2c37ce36bd33d14e475ed07918ec80ebb5bc68a820abe06dc862fe6b38e1a90f9bb3d37420b311cb4a32af871ae2ff72807daa8c1a334b6cbbe4d2a SHA512 a975980e7ba6ec3e15c938336877071785bec7212443da079770348ab9441c8d918cd806e85ebea8af66a5d94f684566ea07b55e7623ab11e7d922c8c3dfe981
 DIST typing-3.6.4.tar.gz 71347 BLAKE2B dd49919595698347ce4b1004abd075409296acf11e10dd6ae0697d2bf94dc9d1cebedb2afe454be95eddb80fd0a60aebe14ddadc8df8de86545dd2ea05986c57 SHA512 f595e0fc395ba13a129ae45681faca7b199fd5c23e8f1573f49e2a6f162b7f2aef680306e76cbf50b978de9f047c674323219981e89c476474295bb8c02211ce
 EBUILD typing-3.6.2-r1.ebuild 758 BLAKE2B 7cae1173f907bcfa25710845633d62b7c3cc0a96e10f4a39c9fbf33bb0f544c7977f2d92a38b6ce87f37d81f9a5f57578ddc82b948435e56b957319b7b30325a SHA512 850a75ea991065142e13a09dd625bc03b112afdc1a1fde0a73f83d7685d049e2dc103e8eb5900f1f186759e8246fb64c267be62306601837fa07824096833895
-EBUILD typing-3.6.4-r1.ebuild 769 BLAKE2B 054711c2ae364ef0cb47630709869e94420289eb3befd571d88bfc6492a9a989102bb6abfd6c9b2e7c36187083d84d429a33254caac218fcecd8505bd769ff36 SHA512 701883a60400683793d4f88842df158b6b811719e64588f6c6e62a7e50da7cd9cd8d8e1c0a3e156a96e30e1563ae275e604f492b1f85bee722b3c4911ed7d4e3
+EBUILD typing-3.6.4-r1.ebuild 779 BLAKE2B 5061180c2c1c2a0e729898eafdc5118fa662f12cec9b231e4d68405730753bfc21542102e591cfbb9cf3991b21fc4eff1d3bee9bff43ae71e36de41b993ef16b SHA512 71fbca181f0f5c7cf3e18425068e8d193e4053bd7b5686587a7deddfb829c0c07f4d1ca194c9153a24bf16681ec16b2ed02ea0f04596fde8ae843e5bc02b8c60
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing/typing-3.6.4-r1.ebuild b/dev-python/typing/typing-3.6.4-r1.ebuild
index a2f4c6da829e..a26a46309d6d 100644
--- a/dev-python/typing/typing-3.6.4-r1.ebuild
+++ b/dev-python/typing/typing-3.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 3de5274e809e..c677b31176d0 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -2,5 +2,5 @@ AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c2
 DIST wstools-0.4.3.tar.gz 148878 BLAKE2B 96b1e9dc0310fb0fc5515a7c061f82897e2ecd1b6187167b57444394d1e64e8f63e5db011d77c80b5fe6df2f67fecffe82f861fb761190c6b3248346cd9f5b5c SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed
 DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
 EBUILD wstools-0.4.3.ebuild 593 BLAKE2B 98e5d6f79a1a2425d4ce2764f9e1739510d15f9bf8849516bb4b5278a783fc442b868911efbd56f353f9b80de727cbcd669f8280963a3f0e2454d602fb57c0e0 SHA512 046cff4817e5440376ec2f47c1be6191e63b5fb4e7dde9ce26d232b55f2070932f77cc493678cd9da6d5e8351970775cbfd175451d5d36686b9cd6709c11affe
-EBUILD wstools-0.4.5-r1.ebuild 809 BLAKE2B e4fa19cceb0e119d31622df62efb824d69a8e314fb9241334564e1146296c2b06e04ed5d07974ed7b54939f9738f033200a7dffe0bcef69788e9851245d02c31 SHA512 b0f78e88a0069c9d1f2afd3cbdf59b5bb33660efb3b9f405e867b3330c11c301bbf65b2c6479e73756241f1525e5fef53cda47426cf587517dcf0606cd3ea644
+EBUILD wstools-0.4.5-r1.ebuild 819 BLAKE2B 67ddfd6c54001e036ac327d02b112215e9d8ca3990a78365fd60a5c437aeff815ea3c9310ae60c3a3eac7ba2a26e552ac3f91d0625458c0b86b71f995fc9adec SHA512 139f8fb649377e144e370bb15a31b9445432afec0510112a63f42a8206dcb14530608872c7d9f26ec63129d17b645f237a0e2493606ef1bc511de881320d2e80
 MISC metadata.xml 376 BLAKE2B 4bee67bc37a09d4b34b1f67902a820f63563f87d9771eb462eb7f098955806e025196082a7e6c118e5ab0638c7ee70d1a63c8183f607d1ff9a26f1b0c16d5206 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
index ee485d999110..4d7a6f84833f 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-24 17:22:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-24 17:22:19 +0000
commit	aa3411e241a201d53a2689766fe419f2756819f3 (patch)
tree	cc19adfde0a10aab1ab566c8dfe3c1616e5cc390 /dev-python
parent	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (diff)