gentoo resync : 08.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
commit: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree: 2878053f3e7faed19a1f82c733d3bd29df69991e /dev-python
parent: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
85 files changed, 636 insertions, 420 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c169eab083cf..a21ad5f50f42 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c3f016a82fe5..2c84a88fe52d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,6 +1,6 @@
 DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
 DIST boto3-1.9.4.tar.gz 237313 BLAKE2B 20ab73dd02864b455a2bcc567b6303ef8b0503c4dd80efb442bf7ad8167329c938dcd41cbc61d4ab50fd02cbf8758c10aadb9b13d9c795330fe1faf9a1f7352b SHA512 7f0eb3b5537aed598d75a05474439819dee8c0030dd1eb685281e963ec465699ff9120394170f1ac7b53493de9b8702ec789863839eb3710ff3d60e2dfc1f1ac
-EBUILD boto3-1.9.122.ebuild 1225 BLAKE2B 2d8dc5ba2b83ab3def6d37821147ed6e6c42676cac7def1cdf5ddfe0396c178a42662282157bce19421c8a57f51ef074514d306d0fb77bfd61a8c419a51bcc98 SHA512 cbc7886265dfb947f020b72498118dc3af9c00b75e3d2744316c02d7fe09c380b87568a34dfb38521be5e1f444f1fe251bcdf14cdbb2138f92562090ec58abfc
+EBUILD boto3-1.9.122.ebuild 1223 BLAKE2B 524f6253ae78c1a0732c364ff5cb83ed3477ee896c12ce1c66a76ccd9fa2e555a8b77c0bc77bafe96f77c5f90cf8e1a577ed39c4ccb97defadf8c45cb7d0713f SHA512 f4e8bd983fc057112f035e7b9768604f23859d301bab10cc138ab98207270bf1da8c4f96464128d2deeb75d501d89d150731b504aa2ff39ac9ad5ea3076d537e
 EBUILD boto3-1.9.4-r1.ebuild 1223 BLAKE2B 524f6253ae78c1a0732c364ff5cb83ed3477ee896c12ce1c66a76ccd9fa2e555a8b77c0bc77bafe96f77c5f90cf8e1a577ed39c4ccb97defadf8c45cb7d0713f SHA512 f4e8bd983fc057112f035e7b9768604f23859d301bab10cc138ab98207270bf1da8c4f96464128d2deeb75d501d89d150731b504aa2ff39ac9ad5ea3076d537e
 EBUILD boto3-9999.ebuild 1225 BLAKE2B 2d8dc5ba2b83ab3def6d37821147ed6e6c42676cac7def1cdf5ddfe0396c178a42662282157bce19421c8a57f51ef074514d306d0fb77bfd61a8c419a51bcc98 SHA512 cbc7886265dfb947f020b72498118dc3af9c00b75e3d2744316c02d7fe09c380b87568a34dfb38521be5e1f444f1fe251bcdf14cdbb2138f92562090ec58abfc
 MISC metadata.xml 326 BLAKE2B 0ee2d830daa48d21aa34b2bec8f8b9d6ff03edaffc6bf8f5b47c05b5a83aa0947e22651dcf9ef4d8153b3b0f21913069a77bcfb7b25f55a67c147938bfd6c0a5 SHA512 0e38efcdc960343f3b92fdfca7d91719b2b3b66969cd100fd8e0d53eab876e062ffe2cfb370b605881631f1077861cd6e0aa1b103477933bfa949d297193e109
diff --git a/dev-python/boto3/boto3-1.9.122.ebuild b/dev-python/boto3/boto3-1.9.122.ebuild
index bb665fd73e2b..6b55746bd8cb 100644
--- a/dev-python/boto3/boto3-1.9.122.ebuild
+++ b/dev-python/boto3/boto3-1.9.122.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d8b50286eec1..a7fc48c2f60d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,7 +2,7 @@ AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e3
 DIST botocore-1.12.122.tar.gz 5492931 BLAKE2B 05371245cd0de404713f920d0651f9bbdcabe9508c5e27f692adc4cda7ac2f7fba24b2b95a26b788e4960b01553c1746f08b9db4f38e4629c5703fd6872893be SHA512 f92581ac6b8a46d4af8b55b391e6e75c452f83a4ffde6c940c9f85b2215a3eda44e8b2672f469769b4d9a0d7ac2823540f45c1822279b6264d016986f2b06c53
 DIST botocore-1.12.4.tar.gz 4800384 BLAKE2B 121019d3c33872fdd874ddba36ecc8612a6354068ce7b759cbe7f35a9787e84c34d3a71ef3fdd2d721d3c3973a7600e4398cb7cd2a3ba698464c15137845bdf3 SHA512 8d196984f5623df403a8a23a9b7e7061e59c0ca56103f89d749d6ad7d92168ccae267f85312f2949cee322776d7948f1ecfda3d9d2783e8ba92fde7a178e8cac
 DIST botocore-1.12.81.tar.gz 5383717 BLAKE2B 0bafd6038cf4a5d1fa4f0597024b09eca48ab95d071cccd09b1910ccf839719114166fab7d78bd2b30dec4b4993a0751d9504260636174df5f76f02495e79960 SHA512 d3be22af53a8c6dd55be3fa0b84a55cdce22d30d6e6f04b0bb69539b8107c86de6b5494079e3af40f9b5285ef10c21e69c85295e5cd7c6dc5ab5be91718a2ea9
-EBUILD botocore-1.12.122.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
+EBUILD botocore-1.12.122.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
 EBUILD botocore-1.12.4-r1.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
 EBUILD botocore-1.12.81.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
 EBUILD botocore-9999.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
diff --git a/dev-python/botocore/botocore-1.12.122.ebuild b/dev-python/botocore/botocore-1.12.122.ebuild
index f81c7d0b849a..dc9922d54ce5 100644
--- a/dev-python/botocore/botocore-1.12.122.ebuild
+++ b/dev-python/botocore/botocore-1.12.122.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 20b3e598178b..f62d26fa13d1 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -3,13 +3,15 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
 DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd6653013698aa67ee2f71555f09813a8136ef92d6dc51ca38fe085e7bedc5e01d1a32bbd0885e62bd91c2e482bebd SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1
 DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948
 DIST Cython-0.28.4.tar.gz 1880943 BLAKE2B a97314147294c95fa0bd6d3fa1a1315d81f8abb46a1f2196009c1ef6f0dd7f47f81a7b31ab81d1fd00e8de37878a18a22d225055181ee74ffe4cc8105d84cd75 SHA512 67d2da2d776fc02193cfe98c8942e93905ec5e30bf4e0f9d5c965d930a034936d4c29c8248fccefff5db6d4dee054ec854994bea63fa3f64ff65df7550997c29
+DIST Cython-0.29.10.tar.gz 2049468 BLAKE2B 1cfae1c5e2d7277d3ac25ab0ff5a7b4346242e6c01d0b7945491f4fb64e0c9b98c593efa41b790aa0437ae72275a0ba3b6fe8614c7efaadc6139823f0e453d71 SHA512 df8430bb89816df84abfc6d59bee8e50f4117e8e82b9c82a889afca390a42a1569a9b5dcde76f40e7c29d728489af34c6fe0cf359912f7b74ac0d014af2171c3
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
 DIST Cython-0.29.7.tar.gz 2047944 BLAKE2B 79a2dbbbeef2c87e523d1222c1e3b62a63273644a0295a08fed3909ef01f2167baf15c0344a64ec168820e21c5c99b0accc083c8dfcaca7f1c0cb8c4b23677cc SHA512 1c2fd2185d65445318118d917ff6f8b4b958b0a036bc3ce1587dcb8fa94ccc750901cece27e4d0d39c53db68c3a620edf2dcf9424d7a6df58a0275097b90fa6e
 DIST Cython-0.29.9.tar.gz 2049206 BLAKE2B d81cc4be6d99e8be025167700517880c3250feaf929f84a9de76e2c9f1ac5eb8018a7cb4609d95c01112e35ab54070eb373157004621d45db3c347ea2b585bb5 SHA512 17ac97eaa01e3c6cd9c7d597822ad25ef5cec2354055304a2999a0a0d969fa0513640470260cf0d88c8d9a7c331f02d1ebf144245a6c45de47e26e7fa73b0ae1
 EBUILD cython-0.25.2.ebuild 2136 BLAKE2B 9e80d1abbe44ecf401f9fa6f2c013e02373c294ca654272b3d44d2b39c7e42fb0e890efdf047eae693d3df9ab960b9778266c1bed7295adabf1ea6c858f448ef SHA512 ed871f7d255fbf7e112fcc67247264005f8c38cd4a9c8be0183e7f2edb6817cec0a47ab858133aa32f5042003fcbcec424ef7c6ef930e1e0060b0f2d73c1a0b2
 EBUILD cython-0.26.1.ebuild 2080 BLAKE2B 0d61c28232f347c0646c5585b3d868f0cd490affaafe70b3e3cefe14ca64dd734d36c4e74745acfe49eeb3f28ad8cf215c3059229c5e7059bf0fa5ef63600abe SHA512 1c1a079f24d7245201a069b757e1b490c7ffc8108cf72ae00cae8b128953a5b910aee4be6c1e78750dfab809b0c3a76214a21dd81785655453aba68f9298af40
 EBUILD cython-0.28.4.ebuild 2196 BLAKE2B 05f6e26da211e42cb46b6a182bc017077bd1e632b4c963cb4a0c48a64dde5926866a47195f235ddbf0143fdd35a588d4651181c1ab9443c67975a4abc0bab5ac SHA512 979bfda159eb6dc89cd7a790166926201f0e74ce8ac3f887a5a40a6ee023e5cf4e2fc9d803cc5e563fb32ba3f7ba9d4447fe47e38c5b7ce6f3292653d9f0f9fe
-EBUILD cython-0.29.4.ebuild 2163 BLAKE2B c91f6b96e8efa825c19d1cb2bb228ba3d5143847c7bed4b089ad5fdd4cda6e48667b2c392f64054b96ac50e43296bf69e842c2080e6e4c49569fbc74b174b75e SHA512 388f4f9b56a58235bb832ccc7fd321256112663f02c63d9708ece8263d712c8e6dc3a72bba25c660cdd2dc732686b94e7f4a5690dee9a3d50987c53b5ffad6ee
+EBUILD cython-0.29.10.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
+EBUILD cython-0.29.4.ebuild 2162 BLAKE2B 6e8d845a05d93dccbbebf6af2bb2ac3fb62701a314a8f545088350c5b71a17b8ee9f8c3018cebaec933bf996be2313d4ebe81ec874f31b10c63953662b994f02 SHA512 9cd4fa338f1c71147d73478cd4102fed7f1a7e7bb848122c34b965553309cf61d2d92e9667b0bf2cb31536f790de6388be55139bcc36b51501e84d05740c3e79
 EBUILD cython-0.29.7.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 EBUILD cython-0.29.9.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.10.ebuild b/dev-python/cython/cython-0.29.10.ebuild
new file mode 100644
index 000000000000..3bd1896df64d
--- /dev/null
+++ b/dev-python/cython/cython-0.29.10.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_prepare_all() {
+	# tests behavior that is illegal in Python 3.7+
+	# https://github.com/cython/cython/issues/2454
+	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/cython/cython-0.29.4.ebuild b/dev-python/cython/cython-0.29.4.ebuild
index 5e8e0344ab44..2a75daddeb8f 100644
--- a/dev-python/cython/cython-0.29.4.ebuild
+++ b/dev-python/cython/cython-0.29.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="doc emacs test"
 
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index adc5d79026b3..acb538d75c5e 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.7.7.tar.gz 62745 BLAKE2B 56e2ab0430a9b1fbc540b24d279bdab24f1bda2121031c48ace92b81b8a28371fe02a34e8f763b87a83325d522526faa577a85239f02d02fa0e86b928b152200 SHA512 4b17d2f663f8fde88bd67d8050e86c7a5adcf1890ce87c630ffa7f0107267b996234e707770ae56bfe9571335b320b70225d697f1cccc72ba29c765a422b0896
 DIST denonavr-0.7.8.tar.gz 62774 BLAKE2B d601c24f6825202de69401c0778e8e1b5010d1475ef69a78aefa9ad18d0bfbbe99cc1405606c1a9f01d937e9937c0f33dc2f54b69213869b017571706014b444 SHA512 c7fc9b47b2acbca32277f8601f8dd63435a7e31c614f8cde6e101f9230691c389f3b758a2217fec9fbf15869dd95ceb371f88c4dbf121b25478e2713cfc7a09b
-EBUILD denonavr-0.7.7.ebuild 741 BLAKE2B 129c4a678d34ba00d120ec0ece1de439f38c3456220623674aa5635436c880ee3b0087900467e7e15cc00d50dd2edbd9408b2e836000e1db0e3c07c5c4b656c9 SHA512 452739766312780a4465598a3970bdfb00a13aa8ac3999bc9eb80f44eb0ee118c0e22fbf723ef342b2a681b637a7b28ab8223da0cbe44741f7f4bba901d11e8e
+DIST denonavr-0.7.9.tar.gz 62838 BLAKE2B 59a036a1b2fdd48731741180b143f69d0fc78e30cfafb88c675eb4a30b079eb3955b1e2f76306809d183d10a9583dbb500962cbae352203c570861687c58b539 SHA512 2c9cd25bd38d9128602b0bf009d3d147059d712a3ead99514a257e71ea2a1c97d94c151d42840dcff55ababffce53a23fab33759cf7bbc8bb786fefb91dbe362
 EBUILD denonavr-0.7.8.ebuild 741 BLAKE2B 129c4a678d34ba00d120ec0ece1de439f38c3456220623674aa5635436c880ee3b0087900467e7e15cc00d50dd2edbd9408b2e836000e1db0e3c07c5c4b656c9 SHA512 452739766312780a4465598a3970bdfb00a13aa8ac3999bc9eb80f44eb0ee118c0e22fbf723ef342b2a681b637a7b28ab8223da0cbe44741f7f4bba901d11e8e
+EBUILD denonavr-0.7.9.ebuild 741 BLAKE2B 129c4a678d34ba00d120ec0ece1de439f38c3456220623674aa5635436c880ee3b0087900467e7e15cc00d50dd2edbd9408b2e836000e1db0e3c07c5c4b656c9 SHA512 452739766312780a4465598a3970bdfb00a13aa8ac3999bc9eb80f44eb0ee118c0e22fbf723ef342b2a681b637a7b28ab8223da0cbe44741f7f4bba901d11e8e
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.7.ebuild b/dev-python/denonavr/denonavr-0.7.9.ebuild
index 82e01eee1a36..82e01eee1a36 100644
--- a/dev-python/denonavr/denonavr-0.7.7.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.9.ebuild
diff --git a/dev-python/django-taggit-serializer/Manifest b/dev-python/django-taggit-serializer/Manifest
index dc033adc030b..e2f284828925 100644
--- a/dev-python/django-taggit-serializer/Manifest
+++ b/dev-python/django-taggit-serializer/Manifest
@@ -1,3 +1,3 @@
 DIST django-taggit-serializer-0.1.7.tar.gz 5589 BLAKE2B 2e9fceacd1eb1908848da99d7ec6b708f4c37f64c7ccde9e1082356e7695430c4c1f436a7d1a37200a249d2736adb848c1ce4fe26f63a6b1748080b62c1215dd SHA512 90a3e39cda13826bfcdd0a6f262108112d261bc5e03f8ed973c0af0e1a6d8efd80e1e0926682754df4efdb697cea5453df39de70b0067c02bc452a8462ab2574
-EBUILD django-taggit-serializer-0.1.7.ebuild 519 BLAKE2B 6a4a0af8ab567b2f2ec8fcc2fd787f5d729344791de5ed2e8b26465261aeceaee02abab1482dc728f0935148aa2d7edcf2fae2c145be39314590f2673f5b0675 SHA512 b75d8eedb9c2bd485fdc6efc93372ed5e499bc7e6468122d2b14ae1d4c6057a1f1bf5bd7d81c42701cfb509c20cc81386eebf3fd3349446adccb4bce877999cd
+EBUILD django-taggit-serializer-0.1.7.ebuild 520 BLAKE2B 11ae94490562f697051cb5d9d59fb4ae8e602d8ed74d248acfc2e6a8c6c7aff435cc6ece978074a8498ae4eb4543ac7002409e61e0dc80969873b951e6886971 SHA512 06d16171967cf396f78e0b4d5dcc87bd213013fd01ca7b129b349e32767a22d3ae200fade09edcfa43c93fd52b0a1b9768f3f938d2aa59687fda4d416297be84
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild b/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
index 75b27a5389aa..c45ffbc95471 100644
--- a/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
+++ b/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019Gentoo Authors
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index f4ee7f67df4d..273404de9c51 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,9 +1,15 @@
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 DIST Django-1.11.20.tar.gz 7846576 BLAKE2B 11423edda7f2f08cc894957da65c746c99ce7ce5399ff236972cce627e347cbc4a43c7ff75282318fac2ac8f65fc4db691ac9fe8e04059b0de4f1bfe31278382 SHA512 5a0fff6c9b90a08e98dee6d4d090047adb900a8f6a061f98e685e8998bfe3d97fe7a90aa7d4d2feae67026fb6e4441393d50cb5ab295604ed362a080b987f062
+DIST Django-1.11.21.tar.gz 7847136 BLAKE2B 940734dc980901cb13fd90ef38815556d41e94a9fb1ac3a0e36e786b4a8df549ec2bce8a114ffbff1133a066ee8423c7beaccc7c774985df0aa1def1ebab58c1 SHA512 c91a1189b6b8fbbb1470f870b09c1c553e860d3b8c0977240399524a830d5403929f14b4e4b689354080748aab1c70587ad56e265f4ac0b3bdc2714d01adbbc4
 DIST Django-2.1.8.tar.gz 8613572 BLAKE2B 543e41f1b4031b624f903f075e95af7e010510f4c265aebd35a5f6b3f074703b3a4b54bc7f2a9752e717ac99d20c42d6e34e556ca619a531cf8c66622ce1419a SHA512 f84fcdf919091a9db6289f25da601ce447382f79118a99f8f316b2479a9325d629f725edb4618300f76e23bd68ae45ff4c6b6576988f109d1a7ba715c73327c3
+DIST Django-2.1.9.tar.gz 8608747 BLAKE2B d5ef1aacc30067dfe5369655eb23ea67788f22edcf8ba070944c0fb4fdf2fc3628a364d480a3d47bae0339255fb66a3bc27f11eb5f07280812ab5f57b4367c64 SHA512 1f6ad122012d898da52ce44465700d2492ef9002d5c327b25e3edfe2116b8a1143feab79751a581029664311452d52d96fe116d8817edb0ef7d7dbddfc0a5ec7
 DIST Django-2.2.1.tar.gz 8973889 BLAKE2B 890ab092807a587dbaba69fb6da7a4c53c8e976d3a4c29003549d72dd69c374640df280885a62845dda0d00f432e398747b9ed652aebbd7e3434c07e71d9a80f SHA512 661ed7352847d2167f8d3410b476cb585a269ef5d3afe0cb59cf0c9a2ea22f0572f12825368bc222f33f8c6d4c71767adade97e25b69f5a619795ccb670773e2
+DIST Django-2.2.2.tar.gz 8841523 BLAKE2B fc498c19caed7fc8766b015df3049ce325886ebcebf02a1f6618c13ea9d12dea56ad65b860f3b0dee0b6532d97e754bb8cca2c3f0a375c630c28d52a2fd62a2e SHA512 87e0a7b2d0e6d6149c746a7cd5547351ba002c6eaedac160e72544b429d41b133da5c36256a07155b7b4743969e9ff4c3ac890c9925db428117f68a67104df0f
 EBUILD django-1.11.20.ebuild 3223 BLAKE2B 441caed238c7d06ef1000fef060ba4050b8e0e85a024d405114ce1677a858fdc7015b10d16ee7abd8455a2c76a4449c0f2f4bde343f9b04eaf86afc860eaa7dd SHA512 b86aa3a16dc88b81b7e9822c545d4c2e63129294d5eb3e395719e963c83695e4939d6e5a4edda70ea8fddd4c587fbcc6965ada2394e97ad5bd0bf3211e152f96
+EBUILD django-1.11.21.ebuild 3225 BLAKE2B 6db1cd33981a12b4ae1d0d7ffd59d836b9f06627b99ac4a9d222cf9b0b91cc80f13b4e01ea5fac2e34a2bede091ae3f0bf3ab397fc30dd671de541c162191a1f SHA512 b4db931e809982faa4502e1832a669e8f6c97ca6c21b80626cfe2e9db9d155ffee7e306e20ed3f3d24dc552e68130215f5395724571abee689086f5c0b6787fb
 EBUILD django-2.1.8.ebuild 2481 BLAKE2B 25ae3441ef0e80a1b9a16df1a315180cdb9cb475231e6328457be807dfa0e5d944dd20d80da6de742dc4d4f91bf779ef63944bae2720203214e409cc4910d2cf SHA512 83b8407d681a9eecad1b6e70db357029024d059133ebd48d9e35488e2895ee4f298baecca2e5b4f683a74258b4844ebec9fb2a342325ffc6f98d17dc28fbcddf
+EBUILD django-2.1.9.ebuild 2483 BLAKE2B 22bb56f9fc8637973dbe0b59348df886100af5d9f6b99b36bbedd3e3a9b2f1ee35f777ac07e4cc53ad14ac60481416e65f910447d70f6b1c15a600f942798e43 SHA512 e6521060728d533a6548fd4a0747764340e71c01b8449707ae61a0721d310c92bd85a6e38809100687a7b303dd6518d7db86126f4172d5788b254b99e3226534
 EBUILD django-2.2.1.ebuild 2572 BLAKE2B e3f592efeb79b23a379cee946cd9f3c3a4ebad23ca3de3f8b7e4e7b92a607c922680cbe0b7d246e111258fd06cd82bb93f26c741e2619443ada3259099d041bf SHA512 ea6bc4f6a1176dcac2221a49ce66dbf36f91cfad927f06fc520f08f450f4ad98dc1563d22d4afe177ce7e112b9b491da395ee3a785b9e836760cbc3fc9ff4a77
+EBUILD django-2.2.2.ebuild 2574 BLAKE2B f0388c060f2bd381b0fcf5cd701abaee16e79e9baca4b75c8d2b0987df737a7cb5ab7559265bd2924575d97ea1ccb97b9697d7fe94eb41a72b01ef8b2be2ea55 SHA512 5b7aff2a04931d65740652cf967effd310b5be60be63d373cafd71621d2630d32cacbf979859f05ce9bfc6e320a73805cf7a4f60e8df0e80e9331a4e1f6394a3
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.11.21.ebuild b/dev-python/django/django-1.11.21.ebuild
new file mode 100644
index 000000000000..4ca57d0835a1
--- /dev/null
+++ b/dev-python/django/django-1.11.21.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-2.1.9.ebuild b/dev-python/django/django-2.1.9.ebuild
new file mode 100644
index 000000000000..fa8668065c0d
--- /dev/null
+++ b/dev-python/django/django-2.1.9.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-2.2.2.ebuild b/dev-python/django/django-2.2.2.ebuild
new file mode 100644
index 000000000000..6c6406c92f9b
--- /dev/null
+++ b/dev-python/django/django-2.2.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-sqlparse[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index c335a811033f..ed2d6a3bffea 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -9,5 +9,5 @@ EBUILD docker-py-2.7.0.ebuild 1512 BLAKE2B 3816813d7a0259d7a4342ca575590ea4fd395
 EBUILD docker-py-3.5.1.ebuild 1382 BLAKE2B 1a72c74b83392be048bd4d0ac7198ebf206ead9ec2effe04cc4bac4e5191be6c4e1d69a474b19468ab172f438b12968ea1265ab18847a4b382d26b7c6b26fb85 SHA512 b9db4951ed806bd410d025a3e848a9250d30486ce16d5ad87af3e554fad0eaf802613c979f5973d975601d804501cdf2fdaaec511325fa014d5a8589dc0b881f
 EBUILD docker-py-3.6.0.ebuild 1424 BLAKE2B 0aa4a503cdf0dfaf3a317a4499b9505fe4479c0ed76aa7c018d39d05a8f20ed3cb40b2a2edbf7d5f1654073739e03302c89a398174cfa872d01625cabfa99356 SHA512 86c16d4bd30b7eaecd727c240154f5d529478251a75fc40d9a1caee1c69958c8e6b6a7fdc3ea2e3156ebae95b03e62939e3607f520900b43f9b4be645198b182
 EBUILD docker-py-3.7.0.ebuild 1426 BLAKE2B 54e7659153510592ea0a600a66e2dd961fb04596727d74b61bc679c89d4d1949ad444748ce24ffcb7cd7c916c26ec55a64547551e375911192f85a311abc82c9 SHA512 368e67f47da94ecbb9d522599d2e53a39340a1e34bfc48604e728b5c51c5864882b0dc9b7986329810a38c614d13f5fafa3e36bfe294a97e4015c20419a39ad6
-EBUILD docker-py-3.7.1.ebuild 1426 BLAKE2B 54e7659153510592ea0a600a66e2dd961fb04596727d74b61bc679c89d4d1949ad444748ce24ffcb7cd7c916c26ec55a64547551e375911192f85a311abc82c9 SHA512 368e67f47da94ecbb9d522599d2e53a39340a1e34bfc48604e728b5c51c5864882b0dc9b7986329810a38c614d13f5fafa3e36bfe294a97e4015c20419a39ad6
+EBUILD docker-py-3.7.1.ebuild 1425 BLAKE2B f51c0bc038dfce1ea5f4901c3163802d30977af6591a7906f12379b87255b52eed9811a21f8433d026d576ec56314becde7514ae4310f3df77be05acadf0582d SHA512 5a257dd1de90d8c737f1700f205cfee7ed317b59a3e73f2eae14f4591736703980dc061a90b5cff67dbf747d03a2899f01c03b8a6f1c6de5755c91d5038de938
 MISC metadata.xml 402 BLAKE2B 449733b9057dfcde3dd0ff82df6a9cf870d1138d3c721a39174a71f54a359422cb3411f513f68662b1c840480c4aa253f8fe77a2afe1020e82c4e7c81dc4d691 SHA512 13bee9843188ebf018e25e2a738fd0ecc10ddb3508bbbe3e47048a9ec714196498ea71044a57a20b4c649eacd0672b956d20a3e5487047723cbda9047ca214cd
diff --git a/dev-python/docker-py/docker-py-3.7.1.ebuild b/dev-python/docker-py/docker-py-3.7.1.ebuild
index 2573b1681c68..a007f6c0e15b 100644
--- a/dev-python/docker-py/docker-py-3.7.1.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 4621dc9f47a1..115dd0982fcd 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -3,6 +3,6 @@ DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b9
 DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
 EBUILD docutils-glep-0.4-r1.ebuild 1153 BLAKE2B 1db9e9c166a235e4da1e5eddbc767f10d9381283b20169a47fff45d1d2ed39c382412f71929e23b49966c97803cefc67bbde254e2f0cbea0cb24beb7ecb5b235 SHA512 7a40e104bb60ef53a9c3c6df65d6a58331b5d1f671b759e42faee518dad584692997b063b8cee47a0db3988dba08b51177ed7c29cf924c94fa9ebb468d0b48e6
 EBUILD docutils-glep-1.1.ebuild 834 BLAKE2B b489e6691c62e197b4e2728fe05436a7c753a48a1dabe70a46b7a0007d324fcf94b2785d7cdef01dd411029bd10f1b0aca2f5cad8faecdc6b71f8bdd08441776 SHA512 d92f970556aa3c6fb264d36eb1520b00195c6d9fa12837bfbcb49f5ed52f2fa41697fb853b008fd3a2e5b0a5241562f02da93df3cbb4cf151d0fd41c6223d69f
-EBUILD docutils-glep-1.2.ebuild 843 BLAKE2B 7ac03898d5801779ff289088c61c3431fa0307867583e0429bf1e6bc512f0acec9abad604b4ae6ee2ee5ba4f7b6e3912d88056c8cf7f0b861657c98a577c20c6 SHA512 ddbb1853bd1ed2f56074d5bc9391ebd1dae28de5c6672388751927ffab7449a11903131f78448b8c946d0b3e9ecff88e1748b3d4d8c60cdef543916f455c01a0
+EBUILD docutils-glep-1.2.ebuild 837 BLAKE2B 3b2498da9b55c9358929bf8e9d0bb63960ff3cfbb74cd092e194119b85f5b249c76d9b5066f10ef4f2257462ee669b47fd20f31ddaafb7d35b76530f8af2e725 SHA512 8ac2d0abac43d8c893c637ced2afdce787f5801cb9fffced7559bd4f2515a80aec0e7868633be0958ad7963c92eb11307418c00222707618ddfa58df438a1644
 EBUILD docutils-glep-9999.ebuild 570 BLAKE2B cb654f71ce1c806d6a99796f7e8384d9c9e9c4b71c9a2a50cc900e5c9b7dac6774f5698f929fef77ea883bc75c219f6ad0e5273a98a6dafae4222c1398b75dcb SHA512 b4542db1a99d274ec73f9ec9d46e0bc4490091d7dcaff07173b401f28e1371f6a80356e33e0158fa1785d5ab949e05c7e7a0822b76e0a5eba437dc22ddd1c5f3
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index cc7630dcaa83..aaec82c88005 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/e4u/Manifest b/dev-python/e4u/Manifest
index 1170071ff01e..fd072fbd9b26 100644
--- a/dev-python/e4u/Manifest
+++ b/dev-python/e4u/Manifest
@@ -1,5 +1,5 @@
 AUX change-emoji4unicode-url.patch 1573 BLAKE2B 3808bf3b3529cdb3df518b5c4bf6ab035ed9bbd03fa87acc252790d23f08760eb96465169557bb751384e70b5949e7974db1fde2f06c1e40480116aa4e6019a4 SHA512 580d02f1af794aaedaa534f80b39e197d60ed964762a8f0122993c0fa6198beed73824e7b8a2714a1de900a70d757afd00b4e3980d9aebad5cab09c4ff013437
 AUX initialize-e4u-tests.patch 247 BLAKE2B 984fd17e09ba494a7af4a54490c23fde6a436975a2ed04527a5fc9ee83993588e3a110645b42cde9df773c9f0cd58c9e33b66cf38840dce8116318bd3e391631 SHA512 a7794b024ff0ef47faa5f5ced9e30fd3161531b744ab0368090d84f7b2fff651eb5b1c90b75e2e6858ade6c875008a8f74900ec4ae931e6ce84ac7464dee1f66
 DIST e4u-0.1rc5.tar.gz 51001 BLAKE2B 32f8b1a32d0f1b51eb97169f0375cf725571c2c7df8cab7414483c997bc7e501c19339d2fbe287718cd50afc2451bc9e9a39d2b42b242657d9a52931f89cfa0e SHA512 d19085a767275c91e807517d714955c123e2dbe3c3904240e09ba115298474067f60393ab613af3eb1af8a09964b157acfc6d69dcaccc4493b014a9bc51e3662
-EBUILD e4u-0.1_rc5-r1.ebuild 859 BLAKE2B dd3875836ec576016e77432b2813867cc48af3a7a9ea48b5ce8c73b6547133db66d5624d2e50d6792374773d7ece05778110f199b20a2a99dd4c528e0892de83 SHA512 0f4c55fb9772636a74918339bce1f1156fde9e07091aab45e6c9294174d357bb85376a35a3f66142496bd63a60ff34acb2b1566377a40885bcf7a9f87d07b553
+EBUILD e4u-0.1_rc5-r1.ebuild 858 BLAKE2B e46db7daeaaad87b5f80101c0d388f543299bf5eae0293271be13e713caec92d8f6897472252c5e23704a6ff29a9525222e8bce5e88354092003f8662ed02ee2 SHA512 060dcce55f1c82471f25c0586b09c3d2936c83ae82e9b2b4bb2e35d89c6d09bf647bcc0a077f9db3be76ca9e59140214cbeda45fc2f4cf2462dbeeaef2a660b9
 MISC metadata.xml 728 BLAKE2B df21a956ca12a239654af8886880833482950fef29e5bce8532229a218cf6ff6cf442e66e8c12dd739eedb21696f288a4e714d94d4a90f1f02bb57e20153b90a SHA512 0c98742721f00b7ce92f660aa4d5760b1e8b22436577df6aae110f5e521e2be5e019cb958c17ab22f31c7c099af4d5328f8b612325fe538131c18f90d453fdd5
diff --git a/dev-python/e4u/e4u-0.1_rc5-r1.ebuild b/dev-python/e4u/e4u-0.1_rc5-r1.ebuild
index 909c2a90bc66..fb1a511d5cd5 100644
--- a/dev-python/e4u/e4u-0.1_rc5-r1.ebuild
+++ b/dev-python/e4u/e4u-0.1_rc5-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A library for handling unicode emoji and carrier's emoji"
 HOMEPAGE="https://github.com/lambdalisue/e4u"
 SRC_URI="https://github.com/lambdalisue/e4u/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-python/gitlabform/Manifest b/dev-python/gitlabform/Manifest
index 6a3f64489ecd..c30931b0b50a 100644
--- a/dev-python/gitlabform/Manifest
+++ b/dev-python/gitlabform/Manifest
@@ -1,5 +1,7 @@
 DIST gitlabform-1.0.7.tar.gz 19416 BLAKE2B f7b71de93a2fb524bcdb0a4899d82bfbae1f0dab2d263483539d9d18b5d46af04e0099dd9d1ff6ea0b00e5fb966541bba595f5a19846480ec1704450b0023972 SHA512 a3ee818aef6f792a1295eef0d3edd43eb7a46360ed2155fc459ee60dc3ea28b5b15fd0fd2a9c9ccd38deb385f8e37767202c23c2b885a5c2d6325faa5071443b
 DIST gitlabform-1.3.0.tar.gz 20066 BLAKE2B b4a158ac91140e1b26b75a85bf79b0978ffccf6095477b7238b93d14205ff6ce0c9dece951999bcdf938cb2470e2e24d48ecc2c307d31c7edb5214c90a95821d SHA512 9ded533fc9bb4cb910d3e46620afa6ab237db94678ddb045a526ce4e02da8f0dd2f4458597aa8a5732cc89bb1494db5f3179074c3103f862e47566af93c6a5ab
+DIST gitlabform-1.5.0.tar.gz 20583 BLAKE2B 670046f0dd8e366a7fd3cb34ee0df61a83b201c10b2859d69a9ae1e82878f6cd42214c1c816da02fd33262533db58aaf07cbe056802cd1ae72a3b5afd4796a51 SHA512 93985c542b6879eebc7b28c7b842252ee6464d526193999d8611e78e48189883b6e6a64a1f7d2a5079f40ed5814dc9b39200eac68dfe16039ae4c2ff7b2c06da
 EBUILD gitlabform-1.0.7.ebuild 846 BLAKE2B 135af1aa618f1b8ab949b98c572c6c01f77123f01cea30a1cb5aa11fa2a84faa6b9407bffbaaf4d642c30aa4714cfa871cd4d4c43371bdf54ca30e7e5da80396 SHA512 abe06bb3769270d9d434116bf04c2a75e07aa10d50a13e9b4389bd273cc19b675f3b09c84d67b8b6684628f013dd826aab5263eda95e57467ed9784211a61a88
 EBUILD gitlabform-1.3.0.ebuild 846 BLAKE2B 135af1aa618f1b8ab949b98c572c6c01f77123f01cea30a1cb5aa11fa2a84faa6b9407bffbaaf4d642c30aa4714cfa871cd4d4c43371bdf54ca30e7e5da80396 SHA512 abe06bb3769270d9d434116bf04c2a75e07aa10d50a13e9b4389bd273cc19b675f3b09c84d67b8b6684628f013dd826aab5263eda95e57467ed9784211a61a88
+EBUILD gitlabform-1.5.0.ebuild 891 BLAKE2B 2237115330d9537d16fc01869903977e2fad83d5c7b95dee92d28809d12457ec8028a755970ade8b70daa675f12b5636102033f5a844a591052f0206988bc8e6 SHA512 e78d107f88fcbd1aeecf0cff50d3ee5664db696d8ea8984a647ce9d573aa49bba5cdb9520465a6aad5ccd2bccaec3c6a4367c8cebd8fd236d9d6dad02cd0b279
 MISC metadata.xml 300 BLAKE2B 8f67fcdb13c36ed0169762cba3ac1cb5bd5d090f784f8a535e34f9d62774790dcdecf18f93a70829c6d70ba22b3061e7c9764afe34755474302c0df85eb16cde SHA512 0f23dd252dc9da695e45a9ad35d01029b71d658e9802f46744a65dd21195a95d3af5987721de65f198a8c7c5bbdfcccbd48216c674d25fa24aa581552b426126
diff --git a/dev-python/gitlabform/gitlabform-1.5.0.ebuild b/dev-python/gitlabform/gitlabform-1.5.0.ebuild
new file mode 100644
index 000000000000..b149c4c4945f
--- /dev/null
+++ b/dev-python/gitlabform/gitlabform-1.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy configuration as code tool for GitLab using config in plain YAML"
+HOMEPAGE="https://github.com/egnyte/gitlabform"
+SRC_URI="https://github.com/egnyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "/pypandoc/d" -e "/long_description/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index 208c10f54678..3f663b3f1ac1 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -5,5 +5,5 @@ DIST ipaddress-1.0.22.tar.gz 33051 BLAKE2B ae9145a275d373f07ad3996b9c06007259cde
 EBUILD ipaddress-1.0.14.ebuild 617 BLAKE2B 77e3ecef32c54642bc2e5ffeea21ea424118a86eea0cff1256b2515e7781ce7cb0c619e462753dfc92160b55ae6ddcd30576cdca424176734774e0d20872b8ba SHA512 7b21d5cd33817248dcf66651222695cd198009682bda5ed82c0013593557fa85daf7677218c58c1a635e035f4adec9ee093dfc719389f7aa6d0517156b06f08e
 EBUILD ipaddress-1.0.18.ebuild 656 BLAKE2B 6391c57a20088a880d68452cdb1bdbcd81750328444b6383119f359a92ee3c9855965ed472d939c05772ab0e7599d507565d59b84be4a18f667ab6b74b340975 SHA512 78f7b945c912c19172352c9134f7fa9896e925803a3bd8d0145b51e90bf8a1600ebf8e0bbb9418538968b84f03cc909e58ce28c6787ab24ad5f87203f5145290
 EBUILD ipaddress-1.0.19.ebuild 669 BLAKE2B 5a2533360d461f56ead14f2ebe99684c27c4dbf359bb0fda9d3f3cddf1337b71d132ade9f27406c9243d393e85a0861ff6996fd3bee0e9a8f647d18de68d9d43 SHA512 ec4ee4f51587b10b024e345897f433c225bdf6e2da75a7f8ab63916b2bf02e44eedf9ece7bd4ddf643925aa56a4a5d84deae34ce4d836000e7ed50299277506a
-EBUILD ipaddress-1.0.22.ebuild 735 BLAKE2B d824f6c5db19f4072bea3d824ec027668dd8c9855f3e65ee10f1524c152c2846601d6b916617d2dc6699cd78f9d161abfda9e06c8b2a9cb0b058d01d9fb853b5 SHA512 f90351e6b193cd7e8434ecd2c0539b940ee837b6f4a0c91cd5b89b7f8d37b8a42addc39a37984c20901a90e8dc761d96b01aebff367a921136a0cb3eea3cac1a
+EBUILD ipaddress-1.0.22.ebuild 734 BLAKE2B 87069a6935b479707fd934eb69c21153a00dd6a3281eefe2c653c4fe4c350dbaab71510a2456e136f67118e96fe9e192a170b274ea68271f991c651eb11752d9 SHA512 e70f0f2562652a8990152106d9d8b6128e01fc8b16d44df62270e224409d3c56292ecc9fccbb911254116a618257edbd03f18cc5f9221078dae6c69e2f267be2
 MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
diff --git a/dev-python/ipaddress/ipaddress-1.0.22.ebuild b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
index 4a4a24c0537c..05ba6915fce5 100644
--- a/dev-python/ipaddress/ipaddress-1.0.22.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index bbf3249f247b..f21a5bc028b8 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,7 +1,3 @@
 DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
-DIST jinja-2.10.tar.gz 267508 BLAKE2B 3872a073bd3954a079aee74fb2f23815f75559a88a8ab6d849cc9855e158d096a1ac62c219ae7f48a54d082c3073e83749c8536439248c80494e882f6a18995f SHA512 bdfd3c4d01b39827c128cbd7f6ebc0ad1434748be41c5037ba1b23156eea1d28f805ffe2a051b4e9b5b38938615c35c8876095b0bf0bed2c139cf5ea49ae2420
-DIST jinja-2.9.5.tar.gz 486763 BLAKE2B 680b8d58056b180295b52998a573da2fe86ac8b117a942e647626aef16d42c7af89a0ba7f5ab098fcdb29bd18940e316144fea1882e15d71f67bda945b4a6ab8 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121
-EBUILD jinja-2.10.1.ebuild 1646 BLAKE2B d2eb73bab2dce7041bdc9124e38eb45351da9ce1e22361b4bbd97723f69878af4979a1cbaa60d5a703b455a5cf471c7afa895b59a5190bceaae13b5901804fb5 SHA512 f32df86711c6daebffbe74b1bc0671301c53749b6a93da06a959c36c7087a2b5ebb6459248df0d188212eacf9ddb66928ede1c3266bddebc7a7d43cbf033d9df
-EBUILD jinja-2.10.ebuild 1644 BLAKE2B 5337458f20455b9fb20d96a207ff87aa29fb8b418de76e4f9d953cf61b79137ff780dcf41fbec99a15b19350142653cfe9f61fd3dcb0ff46fcb92deade13f140 SHA512 508948d814e81917f8575a1b5d83c78f0636fb2350acc2f5909d07bb09eb544c3952d994cd82f6788d20184454e69bb1cab18b63c8ebc0839486af2dba63ce55
-EBUILD jinja-2.9.5.ebuild 1735 BLAKE2B 25d70d81701a93dd526eb0797c7b30bf737692e23182e03305e2adcbdb96ff980a6665aa00eeb1fea856ec3415becc7781e00c38ca6026553e5238bd3ca8a05d SHA512 8ad076186716fc63577f992000629cb546e0bed4bb378f51cc881059be529b4764e66f62c19c66d8a046c4386a63df50ff628f07d2d0697b1795af9572d6e17b
+EBUILD jinja-2.10.1.ebuild 1644 BLAKE2B 64929923a46778ad70687835f703032a6918b2e23c4be2a76a5941f6da79235466ed19864f9f304deff60a7b9346b629e46a9dabde9566007216e2b64c902728 SHA512 74a203f145bc7d46d5fef67a2f65155738b06a1baa1e111fdd3bd4fb6a8a4924ed4088878a24372128cc94c9febe656494aef5e7eed6ac37b36d3b996850366d
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.1.ebuild b/dev-python/jinja/jinja-2.10.1.ebuild
index a101e331f803..006d1411b253 100644
--- a/dev-python/jinja/jinja-2.10.1.ebuild
+++ b/dev-python/jinja/jinja-2.10.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jinja/jinja-2.10.ebuild b/dev-python/jinja/jinja-2.10.ebuild
deleted file mode 100644
index d35036ab8cc8..000000000000
--- a/dev-python/jinja/jinja-2.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
-
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# XXX: handle Babel better?
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins ext/Vim/*
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-2.9.5.ebuild b/dev-python/jinja/jinja-2.9.5.ebuild
deleted file mode 100644
index 50b294a3b61a..000000000000
--- a/dev-python/jinja/jinja-2.9.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
-
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# XXX: handle Babel better?
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins ext/Vim/*
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index c84d9e829282..f1b60d57c9b4 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -4,6 +4,6 @@ DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf479
 DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
 EBUILD msgpack-0.4.8.ebuild 764 BLAKE2B 9a5e5880ef71e89506c316880316f56518eed8a3e4abf21c4553235d39801d9506cfbc5cd55a5eaccbaee2d0ed904ab5897aaea4515b7e2679d8d7fe23cc0471 SHA512 c9b4bf69484031066719ed6c2c9db56826c8ec560fe3525332cb20b76c9110fac26d100f5069705ec2f2b5f29999737cde4d8bfc7df2cd12f2bf82a38f48559c
 EBUILD msgpack-0.5.1.ebuild 763 BLAKE2B efa206b2e0c07a00a3e42c03d5d82b3812c7f5273916863bc3e22a14445df5ad0ee8be023d44b323dbf8a29150c7ee2da9eeb0dfb5613602e80e5971f7a979ee SHA512 57a1785ca05eec1a783638552b463a87c102bed67cfe7cfdab37a9b0a95a2d5e5f60665e8c0df44ff932d43e1b5a07276076e1d6a93e6b41ee4fa43dfebc92fe
-EBUILD msgpack-0.5.6.ebuild 1052 BLAKE2B b27200d6ca629b2cf9f332d822c00c4b9e58945a2d1badb54f6e00dde80bb87e5b15b5dd63053ffde9051653efaeceffdab4ce0e4497a825f0af52619ac6ca93 SHA512 b53e7f4eda98a6a19c58fa9c8c9bff46f72ba58277d7d78290dae815c412205e11661d441a99bfeecf80742484a6121b23db97cd276b682e730d73ac1ae6bda1
+EBUILD msgpack-0.5.6.ebuild 1050 BLAKE2B 5b08843794479319c13728680a18f0a7b19802341cde65ca8f20e4257a1ab4d49e09821e9400a09589c2b0e1d109d3362b4f82257b435d2af4b6396a5c32580a SHA512 a6949d11720ec919d65ef8266248adceed37c2417f4d64c0009de598aa2fc2e493275924d1586bf0ec83a215ad76299b4bf80eb858e8dab24e5fcbae040feb5e
 EBUILD msgpack-0.6.1.ebuild 1059 BLAKE2B c491ff8283bcbfa389db530623971a6f89c7f0ac7354ca9c65acb2a0fc537c41ce6f45036e7b8af9eb96825da453650b6bd38779b9b68f4816cb07e8b85eecf3 SHA512 6b83b84ce6aa1fa56a7cceb86ae287075905bc30a7d0b33637e75ccfd851a2645a32df4ee3ec03bb95a388166a2c9c4fcb9656c5b09789fb1f43124b99b9dfca
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
index 9f7a775db5d0..3d069eb9c6a3 100644
--- a/dev-python/msgpack/msgpack-0.5.6.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="+native-extensions test"
 
 DEPEND="
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index 927a7155d334..f604a1d84b81 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,7 +1,4 @@
 AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
-AUX tests.patch 1727 BLAKE2B 4715320acd97346342aed76f41b684469043e04ffbb6c6516da4b9df14b78369aafd38eb167358113cbfd673041ca93b00890af64a0a64a08658fe2b4eaf3ed5 SHA512 dfd7f07575cf0816ac1072757e5ee64d696fda020ec7baaa492f97309a55f8c8758f87b1aa75752550beb2fc83a953b2937b746f8672ecd1370d283c20a4c21e
-DIST mygpoclient-1.7.tar.gz 36423 BLAKE2B 6331eff9d095a705cb805a8984f530b418d8f8f61dcb239fd3dba4236c8f376dcb329747887c4f22f66ca657525c3333ea260d5e2d2093a37d33dea43d2ca93d SHA512 618c94cea37f427fbef333a7cecade12fadda33bd727814b4ce904e74aae65d4ba85d7d09578b9e5b6b9fb0b2f6fe0f73abbd7f60d66b3d9b51dabb554169e9f
 DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
-EBUILD mygpoclient-1.7-r1.ebuild 1116 BLAKE2B 0f4b9eb116f842dc63b6d2f6bbf43b06ade103ec326770dce078cebc77234dc68b4125f190d6808ac302cfc72ba2a29a716d12625025ebbd0ac47f2ea6964b6f SHA512 b8e022f08d66dd44be870791ec9eb357aea89208913cd923d582d1f934eb9e449328e038550df53ca3f43356cbe1ab8856e003127b2a390d71a7348d58569373
-EBUILD mygpoclient-1.8.ebuild 1147 BLAKE2B 00af85fb48de979dd3d80a416130aa9c82be5f387afb7756f68442f5d1280f0a9136c2fb0bf6c942a341831551211ef98c25e66e5a6552e90be5d1626043684f SHA512 02a6cb6f9209f96c0156fb46f1ae441b0ae43c85d7460c0456fae7cb7dd933f9b216d241e1a3f7ceb9695e9556922a52cbd6aaf5eaed9b24f51268835ff709be
+EBUILD mygpoclient-1.8.ebuild 1146 BLAKE2B a512aedf5b7de5d02bddf37f6275f765bb0edb16e255fd54bb11f454de8d7fd1cd232b1126d3256c3f030dafbfa3b5a1c31134402637a1772499965ab334cb9a SHA512 9674780f73fcf02aec81cfe9250b798df7cd7d6bc551a3a1fdde69077505cf83237095815d07e13e7a084d664655a6b2c1e61c317fba987899374c27557a773c
 MISC metadata.xml 346 BLAKE2B f7a2d7e94b509007e77797724c67413616c4833eab04227f65088bc01cee098da763738c810adcfd0be1b13de261240b24d80ca2940925a847df4638709cfa1e SHA512 83fb6ffd70d907e1fd4be3ba91e781cf9131a980338b2fe66874fecde7673bd40df0005b34f5f52c2a7ec88e4b3e92ef2417d293474c1b51ecd06ff4ee6edf2f
diff --git a/dev-python/mygpoclient/files/tests.patch b/dev-python/mygpoclient/files/tests.patch
deleted file mode 100644
index 041cee501a00..000000000000
--- a/dev-python/mygpoclient/files/tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur mygpoclient-1.7.orig/mygpoclient/locator_test.py mygpoclient-1.7/mygpoclient/locator_test.py
---- mygpoclient-1.7.orig/mygpoclient/locator_test.py	2013-02-08 19:39:32.000000000 +0800
-+++ mygpoclient-1.7/mygpoclient/locator_test.py	2013-03-09 23:33:37.137651841 +0800
-@@ -16,7 +16,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- from mygpoclient import locator
--import unittest
-+import unittest, sys
- 
- class Test_Exceptions(unittest.TestCase):
-     def setUp(self):
-@@ -54,18 +54,21 @@
-                 podcast='http://example.org/episodes.rss',
-                 device_id='gpodder')
-     
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
-     def test_device_settings_uri_exception(self):
-         """Test if using no parameter for a device Setting raises a ValueError"""
-         self.assertRaises(ValueError,
-                           self.locator.settings_uri, type='device',
-                           scope_param1=None, scope_param2=None)
-         
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")    
-     def test_podcast_settings_uri_exception(self):
-         """Test if using no parameter for a podcast Setting raises a ValueError"""
-         self.assertRaises(ValueError,
-                           self.locator.settings_uri, type='podcast',
-                           scope_param1=None, scope_param2=None)
-         
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")    
-     def test_episode_settings_uri_exception(self):
-         """Test if only using one parameter for a episode Setting raises a ValueError"""
-         self.assertRaises(ValueError,
diff --git a/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild b/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
deleted file mode 100644
index e91e9b673f70..000000000000
--- a/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A gpodder.net client library"
-HOMEPAGE="https://github.com/gpodder/mygpoclient
-	https://mygpoclient.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/simplejson"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/minimock
-	)"
-
-PATCHES=( "${FILESDIR}"/tests.patch )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# Disable tests requring network connection.
-	rm -f mygpoclient/http_test.py
-}
-
-python_test() {
-	if [[ "${EPYTHON:0:4}" == "pypy" ]]; then
-		nosetests --cover-erase --with-coverage --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
-	else
-		nosetests --cover-erase --with-coverage --with-doctest --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-	rm -f $(find "${D}" -name "*_test.py")
-}
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
index 2c425dd78548..5ca600a21490 100644
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 5f87f2c1432d..ea9638e804d5 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,3 +1,3 @@
 DIST nose2-0.6.5.tar.gz 134808 BLAKE2B 5f094d537ff7c48b7bfaf139b4c96a93875013ca5663d1e5b3feec543e7efd55335488321bcdd5752529cb36685dd28c91bd29665aed9e5f58fef837e5e2944b SHA512 fc84aa19d486ff1441dd43666182212e4a05b3be054f3c8967e36e624c08ee6eb10b01bba45b5f5dbbd38cfd057d53877e0bc0d9aba59b842688a5d4ec944b40
-EBUILD nose2-0.6.5.ebuild 943 BLAKE2B ba08aae02819aa687d2aa1291b361f98fd9ca4ebecea2e54697e455655b7262d1300fb28c7d20bbaf7e7b6b078a5e2034590758b4c874f449a980285578e3873 SHA512 56a47e819b969c8601894fcc2ca5a8be77cb9e87837eff02170cc5f5934403d13f307cb66d8c34fbece189c4196236a3ac93be89be7b413bcbc50e60156ab96a
+EBUILD nose2-0.6.5.ebuild 942 BLAKE2B bf5a88b98c0807c34a5aba0e4a7905f0905d2f081e955f824993fcde0935864a75107ce6cc0dca061f9c9903cafda1eae0ce642040d78a8832b0701361d1d256 SHA512 9c0ccf948ea72af4eda1b9c3c5728132f0d8e06bf9543146f5c0560dc2da25083e74b6af3d7ad21bdeb64f190603ea991bcc857f1012ae36130b3371a66dcb31
 MISC metadata.xml 219 BLAKE2B d029050891ce875c82037bc06584e6ac7cf5332227737dcb08449ff842d361f1f373d90fe5628b6305d8b372fdec3e66adf1fb6d7b3856bc444e0a899f7d0c5b SHA512 f7f050059c8022343085629b71dc33b31c18acac3ba51fefb5ef64c8bb0933a11fae700f12033c3e757f86c17fc41eed75d5e7c4394ca4cd9bd5aa2641c93150
diff --git a/dev-python/nose2/nose2-0.6.5.ebuild b/dev-python/nose2/nose2-0.6.5.ebuild
index 53f0a9cfcae7..4e7c882e5f4c 100644
--- a/dev-python/nose2/nose2-0.6.5.ebuild
+++ b/dev-python/nose2/nose2-0.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 CDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 31c38dc344f4..6b0e026e76c6 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -35,7 +35,7 @@ DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
 EBUILD numpy-1.10.4.ebuild 4088 BLAKE2B 2df8e688b7b0f34de4b5f2e13763bed5c545e29bcd6800e4d3ca7abbe08674857c888a38d679c5cd815a94901cdfaafa721bdfd928b602461cb37acd599320ad SHA512 e5018be8bcfdd2bb962bffc293962beb10c578a056c29a782c010f4e1313cd88fc73daa4fb8b558a68d90801ac07e3e41d68e2fcbade49046b0317310b872136
 EBUILD numpy-1.13.3.ebuild 4635 BLAKE2B a695ee94fb1ee5c3488f5e49518291fdb7ed52cb527e6e91d7faccd636834ce1b158feb84a3cb1a6dce0e62c77bc85195dacb7eaca233d2e9a45911dd3b781ea SHA512 675a4040a4e705f5a258810d71c0870e1e637dd7e253126c7a650e8a00bdee94fff4b914eb4a7926ab6fdddb1c09ecc799bcf1ab471f7416f5c96ab6382bfe5c
-EBUILD numpy-1.14.5.ebuild 4055 BLAKE2B 9f127429ea609f4ea4602113559fb02431c765d825c55441309a90281456b978d2d27293539c7f05e9691c231926ebe16c90c9244ee8d6ebb6075602364565b7 SHA512 25391a5483e9fc916724a76460ed01ebc910b47fc77ba15ccc7635c87a6ef02c33112514bb0a2fd3d817e9b0118621e7fdbb147bfca9cf45336463ce6a68624e
+EBUILD numpy-1.14.5.ebuild 4051 BLAKE2B 28efd4ad6c7c117c186bbe77288ca6cf60545ce854d730e2cc57e96265ab46f7a924aefdc46752b3954a3c3cbf0eb2301c1263235adf873bd3a8618b06bf6400 SHA512 65fa07023ac08bbd8bb2be0d193f7c803643c62c1ceb88d9b34b2f16c42184de4b7f769c91ae9982442357609467098a6b5a55a9bb000284eaab5d36644e6521
 EBUILD numpy-1.15.4.ebuild 3861 BLAKE2B 158d3c146dc393b324e14819f071d0f032a80eb0a2f2da1e157f845892d148bfe1ba2b2d79c3b74d329780fafc0cd2cefbc33e36831a1d76ebb64e66e79f9026 SHA512 879e5d68b90dca3a73d949372b78ab4180acb8a2d81174b7a11c9e13e5ae169c62bf39f51e337e6ca575c8d80aa3d43a9eb53f51ad51842166594625f6624bec
 EBUILD numpy-1.16.1.ebuild 3881 BLAKE2B eb76a0d12403d7e33ac3753bd1b818163a17ad80435dfc3151d491a6aff0e0bc39e2e806e1ae34aed96d8bffa1a2a506e05d152e0d86bdafeee0518bc4cd1bf8 SHA512 f5035c7204544b167e6442c429a076c9dd749a1548b6ba5289bacf1b8d106ac0e2f95631cdb487a37bfb51382542c133a96e7f5c849014b73664ef0a5be19415
 EBUILD numpy-1.8.2.ebuild 3936 BLAKE2B 85d42317419d26345f4d0884b45d5395ab10f63b3609073c7f4e085e05e55a2c317290a0e86a8d62d1498d6780d20fd17deaf8d348cbe69378a7d2a493b9bdbe SHA512 23bdf79bd29250f66242e1a4d1190fb086936d202bab37901e7510f778dcb9238c2da4e5545708a0ae46ed6d84ee867fc7936ae96ba3fb961c1fa38a20fb9e4f
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index 1000b909ef39..e43fe9a2e538 100644
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 
 RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 91ff5b11c1f3..2d16e2df7256 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 671 BLAKE2B 77909af03a2ba6ef299fad02513404657ab95dbf2befeeacef276cd68d350977da3ffaeb1573a62690be5ff6a944d3fc19e8a544e73dbaaff6ec9f261c9525e4 SHA512 5ae0bc6bb1689eac5efd4484d91aea838ee40bcc7d29bbc49271f776e669ffd301aa3cdf82edf064fe40d9387d69f3d37543c7f6b3e841623788d45869b6e17b
-EBUILD olefile-0.46.ebuild 686 BLAKE2B b54e99e996a20a02dc5f126c0afa83243ee802a408e7522682f50ab9e2ca80efeb5a9346dc459a529c069a74867a807b864c46c32f9fd624cdc27e091141875b SHA512 78dcc9a9d717a5464307fca3202e377fb4c24539b590420b44d121be1a888907c9609648c5046fa9003b320e77490d9857823f45582b0d3313a8dc979582983a
+EBUILD olefile-0.46.ebuild 684 BLAKE2B f19da88abcb5a22915794c1fcf77a5afcb288ec055a2588b5a548489badb42d9283aa806385ec059973c48472c3fc21069316face1b9fd0bb3cf229671972485 SHA512 03be7cf6aa33954cfa6fe4f640f67656fe6fa289f1964e36b9c0cb2851ef5cf25473caa7d1b74e9ee12f654acac1521ac2598a8627bae6751839a121c3f77b43
 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 bbdd0c31fa95..10972e2cd7cd 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/pillow/Manifest b/dev-python/pillow/Manifest
index 5753b49b9532..0e98a996b92d 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,13 +1,10 @@
 AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70
-AUX pillow-5.2.0-fix-lib-paths.patch 675 BLAKE2B 88c552a5b4db246bd63297ebc9f002aa4ed541cc9521e8f651194609d4040e22375149f1d5ce0957e8d4b69ceb5a5cc425894f7c40ba86db4204de4888528f06 SHA512 7ac1e4611e81cc80fd37dbf348fda1ca2707ca9b28c95c328614b91167ae70e477afd1730a585a2834d31d5826ac68d9816c9ecd227670b81af4e7dea238eef3
 AUX pillow-5.4.1-pkg-config.patch 790 BLAKE2B 702af0f1901834f13f4731fbc78989ee56c1b1dc6bc65227aeb55c9074b2318462ff1447597b75a269107ccf223363054b310ede3771448e813589b71a220eed SHA512 a53a5ed25c18f1c5a8db01dde5d2c51dd34387d66c4cdbdb624454d0a2a19f4e09a771490114744de0299231d95ed02360223db5c227cdc540752a1c60bccc92
 AUX pillow-5.4.1-toolchain-paths.patch 516 BLAKE2B e794866ebfb5db41cba72def4690721f2f1254d16932a89f8ef5f28095a07df3a928aa7fc90c96e5a57983e8421369fd7495fa30a677831761801a639f22a91b SHA512 48bc736101fae55bf7da666e7b82c05c9a0a549f6892f8dbedb64d6db8a9bcfae34950847189209ab3acbbc5c357633a0102fd298f12590e678c7ad1b2dbffde
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
-DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
 DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa SHA512 c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5
 EBUILD pillow-3.4.2-r1.ebuild 2493 BLAKE2B 01326658c00545bcd6162167e735c4805b3b4ceb159a24f2b76c993edba56bfee27ea51b5bcd3db401f07f3ec794286042f603bc03e9a4c41934fd0073ddcd43 SHA512 88c6758dbd10f8c9e5ad8637c3bd14cabf8c66d9ea8fafa5e7d824d460c1eb4e2ca209832018acfc654c17550199df6fddbc14fc3b44c725dfe0690a70ed520f
-EBUILD pillow-5.2.0.ebuild 2730 BLAKE2B 66971c9af9b80aec5c5ae0350ff662f5713d0c710d157e002e717c9a40241c41480549f81c2a73490601003d95f9106e4131d940acfdf847dae6fc7066ddb4ab SHA512 7a7eb96105c19d993fc94c4f7fcbd1b514322ed5f360438c78a668483625bbbc0ebeabfbff74a44ba10646302f889807958075fb2d215a81b230fa4ecea5508f
-EBUILD pillow-5.4.1.ebuild 2772 BLAKE2B 1d30c0e4ce03b07c85809a92ed4e38660269dc2bf3b0948fc90a1e914575c2e03deacdee8dc4f409e6afa5c91268184a1bf1f63a0c1b7066f9e99f4562fd7fde SHA512 82944ed9e754a04b8507e606b7bb7933d045f9f59eedf7129fadbdf9aa2933920105f9f733f28132a45d29aa751ac6c27d27b606fecd2ed7f463e64a9428b72f
+EBUILD pillow-5.4.1.ebuild 2770 BLAKE2B e3a3b8f2ae0ff3aca9e881f6355651125cb3d606a0332d614d68be02cb8f5a81a4ce002d1676f9ece74bc8a120076ed9e2f9b741ae30996da6e4d1de85975f1b SHA512 bbf551cadcd03fde029c19678b47267c0558b42e0c7b93a64c634f5ddd576c05bea04b26e568bb3d632d0c18505eec4f4a1d0e797f9a66caed2de8e8d8dcba3a
 EBUILD pillow-6.0.0.ebuild 2773 BLAKE2B 9332930703d43e2600618b3ecf24471a52288348ea1067c2508948cdb2addbc22ee37ca077e2c5773e8335949ed0331dea1ecd57b43e9152abb70c9ab48af3a0 SHA512 89cb0af57b9fd3347a88418b65943d5c2569598bd4a2fa822c3fef9a2a538150506581342124080fb5a64f52f331aac65662947c0d514de6840e3c48cf4ce8a6
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch b/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch
deleted file mode 100644
index b73681831a6f..000000000000
--- a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 761d552c..c4a55092 100755
---- a/setup.py
-+++ b/setup.py
-@@ -435,6 +435,11 @@ class pil_build_ext(build_ext):
-                 _add_directory(include_dirs,
-                                os.path.join(best_path, 'include'))
- 
-+        # The logic above fails in many cases (such as pypy builds) and we fix
-+        # it here by making sure we look in standard places first.
-+        library_dirs = ['/usr/lib64', '/usr/lib'] + library_dirs
-+        include_dirs = ['/usr/include'] + include_dirs
-+
-         #
-         # insert new dirs *before* default libs, to avoid conflicts
-         # between Python PYD stub libs and real libraries
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
deleted file mode 100644
index 3eb0933a358f..000000000000
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="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 )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		<dev-python/pytest-3.10[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch"
-)
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable zlib)
-	)
-}
-
-python_compile() {
-	# Pillow monkeypatches distutils to achieve parallel compilation. This
-	# conflicts with distutils' builtin parallel computation (since py35)
-	# and make builds hang. To avoid that, we set MAX_CONCURRENCY=1 to
-	# disable monkeypatching. Can be removed when/if
-	# https://github.com/python-pillow/Pillow/pull/3272 is merged.
-	MAX_CONCURRENCY=1 distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	virtx pytest -vx Tests/test_*.py -p no:relaxed
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
index cb21964b2e22..66b869574641 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/psutil/Manifest b/dev-python/psutil/Manifest
index db227a32f531..3cf80045d979 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -9,7 +9,7 @@ EBUILD psutil-5.4.1.ebuild 780 BLAKE2B a7f057f879d789cb729f832ca0116b0ce573d8a8d
 EBUILD psutil-5.4.3.ebuild 808 BLAKE2B 57449207dda0dee16d1adfe47de968ac0fa0ea950468472c1dc5bf2979f22fae055768b59c738b1f0a18eea84fdbe91e8dfb895712c44b0da3c9d435e74afe80 SHA512 e5a320d4c71c45a3428d1d3aa8ef13b06c06e99da5d637b9a48e2bf4c377f42f07a6bf8932c4705ecb202cf0d0797d9dcd391da0c0d9922831d595c1089c5c4e
 EBUILD psutil-5.4.7.ebuild 916 BLAKE2B 1222075bf9ddbcfcf2974d16febbeba61796fc5e328c684690484b8953f70b3605426f6981380561189fc63fef8f1a160eddaa544ab02f3535f4b5375773b9b9 SHA512 e1d7de9fd50a3f3e007eff5c8409b05024800f0bc27e1a40cb19d29b5df6b2bb06a8af638fb7c791975536cd204897f0739289ba18706527c693322945038e2e
 EBUILD psutil-5.4.8.ebuild 930 BLAKE2B 2f48bb0f662f1b7536b5ffd242d4c4d2e4ea9878d76aba0008125bd820e0c9dea28b01c4056c44afcf74a51a4d999b971d7a74d64d60d1ac36cd29ba28075fb4 SHA512 0fc2d19616f39b9aaf71a07b9a0ec203c33433bf74b7336bc48f2925715921a2ae4b3a84a3760c9e37fe5e3bf3f44551f1615d74e67c45098e66f662d9ce8792
-EBUILD psutil-5.5.0.ebuild 921 BLAKE2B c5e9b2a67249d73c467bbb8bb61cccc18c6c06964082d6cce5996e0655031cba8481e382eb4d5eb312d5d73c6615f15c3d11f6ec364fc3e5f4e08150db85bb09 SHA512 6fe1ec7e79f32cc7f926dcffbc5229b54fb3eeeea9680367c180db2e785b4154626235f9aaffab55d06c34df6f1fbf16dda7f34f31258dd0913f4e750f6acb86
+EBUILD psutil-5.5.0.ebuild 920 BLAKE2B 97de12ba3404f717d434e1334748907d4f38ef4ec435548a014b7f92ffc543ffa6b0c4a80b062335dec2ce91404630b40fb1d79405985c4c76e9c6b0374d975d SHA512 0bb750ed130221d9adca593537cb892ef576aa2149b91cc760bbe0415887310aa9eca59a615868d26b08cdd1d8adf5ebc9ed7910b574edd8fb633beccbd485e1
 EBUILD psutil-5.6.0.ebuild 923 BLAKE2B 8c43ea83ea387c5b727b2a5a14b1a433aebb772199f0de3c2d6c5e9cb427386017dd56bbfe8c4eb0b2c326a985686d2747a06c1c0d67c5d90673dd9b05c8d51f SHA512 327a51b9325ff6f8bce24d4accc24c5374f4be4e14c9e1e23d29f0faf98afb7166f6eb62c6d03add6b65b7045431fad8a6e3f83af425a3dded192707d7995b25
 EBUILD psutil-5.6.1.ebuild 929 BLAKE2B 6b560a26f0d6728e21ac5e24e9505dc7fac2adddfde1d7bcbd1f476d9da582dafdaecc935b2adb1b503c246d0ad766c88fab65c120367f231d60a3a4283dec42 SHA512 e07aea82d9e4e8eaa0bab475333df6e048d9faddef3640ba044db0a34f958c75b1f02f00c8168bf545877f92afa7423bf67582544296a2a01df02fadaf72ed8c
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.5.0.ebuild b/dev-python/psutil/psutil-5.5.0.ebuild
index 6a0b56a9a154..c2adbc1521fa 100644
--- a/dev-python/psutil/psutil-5.5.0.ebuild
+++ b/dev-python/psutil/psutil-5.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index 694c27246db6..673a7c2c84e1 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -1,9 +1,9 @@
-DIST pyTenable-0.3.14.tar.gz 101836 BLAKE2B 276c35cddf1f1b7d96f2e5f7d1e16244d4884abbc5b84e3902db2c98edb906a5805354b5c9482ab24598c6ba83ba9e7ec4cb62bed2a76a38c749c229438ad43b SHA512 66c0217730b51733ce691efcb8f6750de810c2a256397cd445f6d1ddff36e3e32c0afd2860d0d2ef38b2c0b181555eac5d2c0eb8c22226b1c61ce3b31177984f
 DIST pyTenable-0.3.18.tar.gz 115304 BLAKE2B 5f25afc4de6a7ee59c0049b7f91a88b9bc6b2a9ae7fa83d64be0d62eab40898c4591fec9924d7425399cea0a36e6332da41567caeb4ac55129dea4fe32991d1f SHA512 7ce4b284a89dbb5d0c98fa2ee12038c2ac5b524b5bf76af4232966db79f3714417a4f1068e9831c16077d692a366fc6a7bd78cc9c47c3420c879ad376cb59015
 DIST pyTenable-0.3.19.tar.gz 117429 BLAKE2B 08d6c1e4a718425221013fbfd981f5893cbc7f6c3f09fa22bec1b7aa39019ac6167a06ba35e0bc449803d0f513b44cb1a7731abc87f9c70ac7082837130d3eac SHA512 d79e37be7b28c4cf8b987c77cc527a0697f0045fb3d07b497ed3a2fd926b7dcfda9f94cf891cdd61c84175757dbfad0f62b179e11cf72935845ea2537687af53
+DIST pyTenable-0.3.20.tar.gz 117381 BLAKE2B 7d2259ffdd16a2eb5a536e13a09920f67316f336712f07ea2b797016caaa14ab05686b75349aa99e0b794e922b87cfbb58806511c05a65a43d6e5adb27133ad4 SHA512 5e610fe3c450de6614d3e3483bf1c8e866f497b1d4bdeefed2854f23ded4707981750a0a3f3571f8bda6cf93b129e62f0bad6d55cd0dc58339dfa2429f57d9ea
 DIST pyTenable-0.3.7.tar.gz 76638 BLAKE2B 8ff586e4a77bc4005769e6565622756b798398aac9e8e2335653c1ccc5f9c0525ab9e1261b939c848126b1fa71dcca8ea7887d82972f1d881c7b21e5f61de0b5 SHA512 c1f5d7a916cc79a754160fd056b661bad15ec60d64ab08b91345c2646f0e8047ba629d73b39a4d70d87ad7b1c624d55744cbbe0eb78f6e9df32e50a5c85c38b4
-EBUILD pyTenable-0.3.14.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
 EBUILD pyTenable-0.3.18.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
 EBUILD pyTenable-0.3.19.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
+EBUILD pyTenable-0.3.20.ebuild 777 BLAKE2B ff72963111f05e8bc9bba409a4beaabfc7090d9f6e22b201123253f1dfdd7ceb1599faf9504a9e2601b9e9bae63d22e4d6115ead71274b0f3db09618ad06f996 SHA512 522d86e35bc7b38e179fbe839730472f5c4d53472365993cd4ca1dc619a5e69d99fdc7bf00ece88f2a92e8827462a5532b1bc5bc39d938acde443f87324e42b3
 EBUILD pyTenable-0.3.7.ebuild 678 BLAKE2B 63274d27fa3aad1e82c8aca7fea64ae65acfe670c7546965717fbdec694511e96b789d4a5cd4aa06b23b09c960bb8ed87d859916e13e6378cdbfc294c2d448de SHA512 05c6d303474a25f30dd974616fc0e8977977a1ad498a1b6a9b010717864ef6c2def5c5ffeea05df41acaa5e75d476acbed3f1241913b3b63958dff49a3d9ec6a
 MISC metadata.xml 529 BLAKE2B eccd96c558e42e1d453f21c6ce85fdda19c47a9bebd5803cc1f789f311726ff02a41d6da592ad1202a6c970413745a5e272dafa7efb6c2abdbe5361c0d7544b0 SHA512 9c8094a71191ceda8919499eca6c8cebcbb3db0bc668b5d2cc414b1ed0798ad1431fa9e102358deee6eeadd5a11c610d2bd90ade8ace0d4451b4d87ac66a5ae1
diff --git a/dev-python/pyTenable/pyTenable-0.3.14.ebuild b/dev-python/pyTenable/pyTenable-0.3.20.ebuild
index 6aa15ef4bd9c..6aa15ef4bd9c 100644
--- a/dev-python/pyTenable/pyTenable-0.3.14.ebuild
+++ b/dev-python/pyTenable/pyTenable-0.3.20.ebuild
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 7b61dbcd1395..de6f2bffff68 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -2,6 +2,6 @@ AUX pygame_sdl2-6.99.12.4-mixer.patch 1513 BLAKE2B fa0134e7e4c458caf720169bdb655
 DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
 DIST pygame_sdl2-for-renpy-6.99.6.tar.bz2 133501 BLAKE2B 6d23b9bad3fad1b508525bdc7b18dbf0801d7c7e36e15b843104e763b5946c79e22663bf705e071b35c8b4742e3f8e59bfaa0345dc95b18f91b9dd186e6d4df6 SHA512 de1a40f7e8acdb46a7e0b13250c7fffdf848bd44c07408928aab6214afbc741aa77e1e8314d9049324328d9ffc645cafe077a468457a721f36e49f98e5217d53
 EBUILD pygame_sdl2-6.99.12.4-r1.ebuild 917 BLAKE2B a4adfd1c5d45af36f7f215cd7c8343fb47bc7d2dd212f26466289d989779274a6e530e61ffe97916e02406c1fc6ae8261f4092e4e06d6a04e2aec80b0b0e2078 SHA512 c1199dd62a0ffe7e09b58f1ca14a28e9a53cb71340beb1faad1cde4fc37ac8857d205f4a1823d0a8a131ca87f667690ffdf3c50edc97916be9e42ffff9b57dd8
-EBUILD pygame_sdl2-6.99.12.4-r2.ebuild 997 BLAKE2B 3441c35728da4023a2c814a4c82e0b5955608764f740bedcc63a22c3e32112f793d84968a56a46e3e4410c337e1aee90464b244085074dffa366121c2f1cd14f SHA512 70bda9acded801f03cbdf69579f67a4afc3fbb9a152bf59adf8d6554f357b817c601194ab66f05d980f71d40371a06fa89122dee6b69176ff163bcb55c99ffed
+EBUILD pygame_sdl2-6.99.12.4-r2.ebuild 996 BLAKE2B cfb7018979a679d9f7f37d524238709f4c01686cb4a32ad9f0d2bd629363c2ed457f6a47d7f42aa23a0ac21974429231582dd5f2df26e067e56c0d50b2a67d60 SHA512 a2f449c05d32bdf88a8ed299db9a1a04d02df484774f33002573750a8ba991d22788327bf57f488e5f9b8d53a2c6ce4d50f6fe2275d697991e4b255a165d6688
 EBUILD pygame_sdl2-6.99.6-r2.ebuild 731 BLAKE2B 396464cf4ecffb8ed6d289b923c53b2cb9ab23ecb3e24dd7f95fc2c340af2d92b4fea7dcb0efbd869d4938442044f734cb26e53c1fd7fdbf5812ab269092a01b SHA512 e7490cb3bd973f474e0380bfc51c32dad8ac1726f145158eac6ea447dd7109cd85d4aeb93f43523c7ae983cdba9acf24f2a78c253c6facf6e7a308d24255cd1a
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
index 8f6ab7706900..b7f2878ab3e8 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index bf1d0269cdeb..e2ca12a77fdf 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -4,5 +4,5 @@ DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23
 DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
 EBUILD pygments-2.2.0-r1.ebuild 1617 BLAKE2B 12203987ca08ccd71d28d8bbfcf1a5bbd4a91f2c9ba2418f6cef611b1735e4a42815d63d731b8d42b5bf6e0104f9078662bef9e03394e62a190a5a954dd5ba98 SHA512 a5a31baec8484f8a30aa29207f6f7ed5ab3dd9819510915a396a624426305d2128fb593e611bb984d18a8a6471a1c151341492d7a5f8d15436fb0854dd4c41ca
 EBUILD pygments-2.2.0.ebuild 1768 BLAKE2B 09ad9ac25d4879a54c59ea4dbdbc2699229d2bb150d81a4ab6a8ce6ec567ede12c5f2a341ca69532459c8510324612da1d4a77b2e7bf2132f7b09084b5b1bac7 SHA512 cf4bf9e7785589231cdc8c31e5ec86714b99c65bb8c71dd0c6defbc2e75d3be6f84429562c727e75e3d5a0149f13c300e442aec19d255c00c57a3312dc111186
-EBUILD pygments-2.3.1.ebuild 1434 BLAKE2B 2cba0db1c7f2e382ed645ccc63f5d71dd1cf158cf2fb86932c89151eec2b911359213fee534175d82878d607df82d517f0a31a00f9573097e1d1d974d7068b84 SHA512 9b5e9ee99553424cb1dc2aa60bc15e6e3f4b5f50b00904636f62ef4ce38af8a80d784c631e6ba9c732f6367afd82ee3d54d2b0dcd3b88ba35be37a3b8c850847
+EBUILD pygments-2.3.1.ebuild 1432 BLAKE2B 559c78518805b1a66687cc53ae858f4143ef355647c116b339b4ec188ccf440723c57051022f6d198b7bcdec33c1d206f6055c899628046ec181b448b3d67ef5 SHA512 7753e8558e0252be0204815372fef692c046da229ed019a3c700ae592628d457913ee2ea02a81b61eac1b96bedb6a1a9277ab28f64ac0acfc01f782d3a2b0d06
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
index af22fcf8f760..69c57625ade6 100644
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ b/dev-python/pygments/pygments-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 717ad3e0abd7..04aacc1942d6 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -4,5 +4,5 @@ DIST PyICU-2.3.1.tar.gz 214761 BLAKE2B 6571f1c10b6fa15b0b6fde76c16b2e1a1fa99af83
 DIST PyICU-2.3.tar.gz 214710 BLAKE2B ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c SHA512 2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94
 EBUILD pyicu-2.0.2.ebuild 798 BLAKE2B b014a5d1e6f71ba326121adf1456622a6d0747725a799dea851b5dbcb6be25b0e20164f7c6d39ea760004578969b636c25c37d4b853bde377484dc7a3634e36f SHA512 4f76c7e878bffd3976c8e2395208ec065b80b7c36fa35a159ae5d8d09db97c0fec23c91e804fdbca7561401e80e8de5a6bdd5f587a456b2da5f45b47067bc669
 EBUILD pyicu-2.3.1.ebuild 759 BLAKE2B c61cb5f74a3d86f9dd7e3a854684a272ec74a4c11f8c407ee566a3c1563ad2c127a1d37cd26516b94f96faffba65998ce2d86143168149f582d65b670be310fb SHA512 10c0654ae29ab091b0e496010b13a82f1960094a789d9d6d0cbc161e84cb0540afa4d3b90e50f01866044895d62cc20b6191cc6b019ed4d1257127cdb45f4b8a
-EBUILD pyicu-2.3.ebuild 821 BLAKE2B 67d8621c6f96db9580ecd62123fd2c41ef127b6042856d473a2d2ae911a6d9126f4adace4ddb2d32abd71332c0f0fa4f1fbfaf94eb6299c823f598ad9b89dc62 SHA512 c67f7bd407977b46b83bc2f0c76db926a1dc87da9035f4c666185464574c6e6b8bf61b08e362fc13f4b0349089c81e302253b722215c579a9e49e9af31f38ab6
+EBUILD pyicu-2.3.ebuild 819 BLAKE2B 515c58af1ef7bfcd3ae5de622a049e2f1b6cabaf1c04bcc4cd8a330bde58b97c4ad0a802fdd943fe165db0c1857730129054e46ec4b7a3bc8cedab4323275c21 SHA512 2445fdb32c039d546b1d4e2822a1036685a5d4a3e234677ccc32a3d7786fc772b2f7fb370b273e1753d0de04e867555eb970b7b3ff7529cb14fa079ecd3e5303
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.3.ebuild b/dev-python/pyicu/pyicu-2.3.ebuild
index 20c7f98b97f7..199c0b31f877 100644
--- a/dev-python/pyicu/pyicu-2.3.ebuild
+++ b/dev-python/pyicu/pyicu-2.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
new file mode 100644
index 000000000000..5830142d0627
--- /dev/null
+++ b/dev-python/pymilter/Manifest
@@ -0,0 +1,3 @@
+DIST pymilter-1.0.4.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
+EBUILD pymilter-1.0.4.ebuild 490 BLAKE2B b3e3b18819975ddec6b43f5b629e1098f8c9fcf7a938b76dd519de2e2b773ed9f6ae4b13d3d7cd3125ff0142619bf2ed2af71f979d6c3349fbd1fc644c708b7b SHA512 1f540da720f2be1032ae6a5a0b6752202a2a34fc8bb71ca824d2adb663dcd8ca193dc6a18e124afc5a19d1a07f7f91f546dd8b301cea32c6c4eccb5a6f359af9
+MISC metadata.xml 745 BLAKE2B 20fb9f28930e8252bcbf5e678a4c53bdbdaf2dd0ae2d06a1ecabb993c1f172fb462419377b5a44d57d2e71a15b41676beee93c371a6b58642b5db02dbed868d2 SHA512 03a63f23eea33c7ea8d0de9b121b7edea4dc96199cc390a5488085865ed41272d7e599ff3f5043cdfe7582c3ed0dab7afb3d2bc6b173620390a118a282f5e800
diff --git a/dev-python/pymilter/metadata.xml b/dev-python/pymilter/metadata.xml
new file mode 100644
index 000000000000..c653356fd77b
--- /dev/null
+++ b/dev-python/pymilter/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+		<description>Proxy Maintainer</description>
+	</maintainer>
+	<longdescription>
+		A python extension module to enable python scripts to attach
+		to sendmail’s libmilter functionality. Additional python
+		modules provide for navigating and modifying MIME parts, and
+		sending DSNs or doing CBVs.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sdgathman/pymilter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pymilter/pymilter-1.0.4.ebuild b/dev-python/pymilter/pymilter-1.0.4.ebuild
new file mode 100644
index 000000000000..3a205f24df6b
--- /dev/null
+++ b/dev-python/pymilter/pymilter-1.0.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to sendmail milter API"
+HOMEPAGE="https://github.com/sdgathman/pymilter"
+SRC_URI="https://github.com/sdgathman/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${P}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die
+}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index e9a3b3865b79..7ff7ad7b6bc1 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -3,5 +3,5 @@ DIST pyquery-1.2.13.tar.gz 44032 BLAKE2B df257c6116b3f8804627a0b4a6556445c644410
 DIST pyquery-1.4.0.tar.gz 45215 BLAKE2B cb748c09524f6cc6b22c9712370da754495c31b159a44f02e9b5f00e4e94295d7259d224e63066297e6efd74f0b43a508a56d1df4f4150727cd261b959402e9a SHA512 523bc058fc93332b13840a7249bce5a449b0029f6434043a739a2f24abdd89efb314da8795f1b2be2d7e4464a8e4bdf6b061d768b895d0dd1630f44ee341f37f
 EBUILD pyquery-1.2.13-r1.ebuild 1339 BLAKE2B c5492d641308e94af0b5dbfb6035341981f3cbdfa12e960557f9cc12acc6719b970fed6761ad06f328720fea3312c7f9c8b8d617997116d0953e86e4fa465db7 SHA512 e2725456271a1fb5d86d936042f0b154d1bafa2af8d73bc7969ce968530aa368091e9045ef45e61b3dd2be843389b89bf978e411c246bd03a7f20088a45de613
 EBUILD pyquery-1.2.13.ebuild 1325 BLAKE2B 1ea72a6a86acd207a7238719282d9ead17c3b39419f35befe5cfbc885ebc5e66215277fe17287aee8e0ee52841db59d70f99aa5d81741cbbf0bcdfb2df2932a2 SHA512 bb4259bf5eadcbe0c1a9f0e41b1ac6bceccab979ab9da2f8668630d9e257f01baa65e985fadcdd3d186ccdd4c2855c20990825cd18b155bce7f67f4c4360d66d
-EBUILD pyquery-1.4.0.ebuild 1195 BLAKE2B 1bf7118a30402bf31ce84e469167c620ce382f86d33cd7f3ac3de834c38812b1fa6607f70636f5d2dfb337af77a3156665c20983dd1e5ba0176458c72aeecdb1 SHA512 fdb389aa487205fdaadcf850cba1d94e284c8de3e45deb8b724cc0907edec4261382a17757d453a805d4f68cc21778d1c54541b37a3d9d660b30959af728ba75
+EBUILD pyquery-1.4.0.ebuild 1194 BLAKE2B 156e3cde4f87d7bf14382873a122a5b15fa2b0b8aa7784f078612734d818c44f5fd20b3e2d8b62ba729d6a2de0a9920815f8a77956e1014db9b940fd4a82d3b9 SHA512 2b25e8bc3e824b99b540d591452637a2b5d5e681d249b85c34a70136b4c1d6cfd45c088beb19b72c2b773b54aa8c6ac1e44dbf106d76d42c7de74c4931f6f118
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
index 81bed23deccf..47e5f4649ae9 100644
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 6f337eeb2d7e..4575e3a947cb 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -7,5 +7,5 @@ DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c1
 EBUILD pytest-3.10.1.ebuild 2442 BLAKE2B 510febc15eb52b5e5c6b66c1849ae23911a88340172027a3c92dabe68de9e49bad4dd10265b9bfaace126b8ef61b9b9dfbe758c264d75c900ab5852dd30a9443 SHA512 ba012c44d8ec1981f36bd95c0ea17570bf64ed28ba51194be772be382adb2b1e239b2556a8549794deda4916ee94dbbe3cddd6aafc13f3d5607f2c8ba59bd5cf
 EBUILD pytest-3.4.2.ebuild 2521 BLAKE2B 7948419947d7d350f32457db8f35068f8aa1cd468a8009ce9079cb3141c78cf306cb3516dcdab00960d0507179503f45d3fac381acdbf306a8fcbb8edfc62d79 SHA512 a5ab31e0ba04e0ff0aba3c98ad1b961eb061e85092cc9b852569584b82a7d0cc9d3868f30904554abcf72f30515ce599ee9a396cc928abe2d14c9fb94df24f2b
 EBUILD pytest-4.4.2.ebuild 2103 BLAKE2B c24c03dea08c082154dca26b9a5d7027efcfb87a9b027fbd3397f087e3a64dc1676e49b8586572b65fe2ee61643639a3d123d6b6564a113fb6b1bc50a5b97d82 SHA512 1536b43aca2fb115f3f198b87591a191ff289540ca622e645f18e4583ed76e1a2893ac3d58ab4397426b7e21bfb5d140ed5ca4b34fd3797432e6ed53cd42a46f
-EBUILD pytest-4.5.0.ebuild 2047 BLAKE2B 09f24e2cdf05ed5b5be25e6a108f44be4eb6365cf0f0617bfcdab7362059db7aa599022a602b991e63775ab1a829c031e2344e1b3a30138c6e714de226607b7d SHA512 1a15183a7e14c2a0217ddf63180fd07056617cf387e23308ca74dbceb28685ea932dc5d5d091d1358efd9f4141ba3a317f6031503c97c58c299fd706f40e9bed
+EBUILD pytest-4.5.0.ebuild 2054 BLAKE2B 4421866033a8df11789934608511a116c06faa5aa1a2e50f450e4f13882657f65b5ad00ab4e3903da2bdbdc03a5852f668df16d68993aa85cbe68a83f3edfe97 SHA512 334e9e67905b4a5c934f4f43fd38b555547583a3321f95e51c4046e03f22b00052fa958d8e6360af437937ceccbd672fb7b8a337ed3bcfc4668065a2f132ff84
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index 3c2b86bcd9c2..aea581bd1ca7 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
index 4a4bc97f7192..054f4d74b5ce 100644
--- a/dev-python/python-axolotl-curve25519/Manifest
+++ b/dev-python/python-axolotl-curve25519/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-curve25519-0.4.1-2.tar.gz 100957 BLAKE2B cda4fb7ad7c78df7465a952e2b5f3c6616849876bc1c8b72dde08042a655c2b86233329d311f6bee1bfc6d2b32926968aafc7e6204320209c2c1bd008f1aa361 SHA512 cbc7c6caa47a9a811640c247a1be727d7b1b68bcdb4c5336e02b4d1eaf9fd2c57b7438b0da466a379a1c0f3f146756b9b7eea3c9b7945ce88478d4bf0b8a1e0d
-EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 570 BLAKE2B 274b7ac61e659a97ccf8614d593b71aa1e8097ba2e27b73d707405b02f0e03cbf4815f7c1d9e54d804e644f5214b785434be8690d43e29b479d89f12e9b16d27 SHA512 8018bf918b1506f5b17df33ac83238a12b1716315be3b9e420ff7781df88d9c56b47d0d2edd59080c0e20ec6894527a8ada134dcea62b0e3d3d142341592b048
+EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 569 BLAKE2B 54c65a347f3f575088867ef8a73039a9e35ed5fc8608c5e6c6841fbb73db52af95badf2ef0e39fb4ff0cc5bf25dbe862fa2522d502b76521fdc8e179756fe9b6 SHA512 25965a4f4b3448832c7819a573e38122385bacd848ed27b0fa81ef3921cc8328d6d94dfd7246bae688cbc9f9f375a5275ce76663b498fde825fe76528d3ad89b
 MISC metadata.xml 877 BLAKE2B 5b32a6d7f8e3a2592800c3805a4d24a18f67b922b4cac977d6cfdd065265c23054468c9bcc96ad433027849381fe4bded34a43ce2d13a0316f833d19d79f03d9 SHA512 a8b07c45bb17e8782b6b9e6fa6f909a1d84296969d8df6c6b66fc4f62a370446b1c59e9fef5ab877ce727b637c0af6620ce34982fab15c36cc112df1d38a9fc9
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
index 3fe76911765c..f2ef8bf17feb 100644
--- a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
+++ b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/tgalal/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_P
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 3634fdbb903c..7da0d10774e7 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,5 +1,5 @@
 DIST python-axolotl-0.1.42.tar.gz 53869 BLAKE2B 045d19b38478404b19717daee431a4fc36d187dc511d42ee950b37ef257d98aaee8ba42633888d596265c0d64bfc33f2da9307d45feb4189ec04c03d69687108 SHA512 db9e1cfab87d690619a672b1782942a18b12b17af555959c17bcc3e2581e9c689c57becc0ea884a1129df9dace17684ba03de38b81f8c8c65cab27962ebdb6c5
 DIST python-axolotl-0.2.3.tar.gz 52139 BLAKE2B 8539f4ff6d9d7e57965cdbbd510f499cf344490091fe56b013d1ab60986092ac8a7a76248624993692077020043ea21c1d9448ecf9b76a698b43da4e014f37ab SHA512 1a10dc9df2f95d19b49909d4d136b5266aae19e24ac84f8b263ae7d4de18f77353c737616ac0648b600e05699a90d348f95c6c1659849986becefb4a0277fc80
-EBUILD python-axolotl-0.1.42-r1.ebuild 677 BLAKE2B 976d2b5f03f5325e838d418ffc0b71e119b560eeb7d0928d40d4c54314080a2bf884e22168f1619490f4b90c7bf4e3b9679fa05fcf68bb650b2679fbc0e1e90f SHA512 c9589aaaf25abe0d810496ff41fbd55a34b3cf63d60c81ccca6fbd561c305c2608122eea8782a7e626610dc1f1492466900ec1a00b590a4848544bde1ab5a7ea
+EBUILD python-axolotl-0.1.42-r1.ebuild 676 BLAKE2B 323244d130ba6136af1de66f0f701b93214004408d38370f12dfe1d35247a3175f4d66d168c6ebdca687fc5b7edd23c0d8f9a2644ff4dc1a1655e488e5ee87f0 SHA512 3cfc880bd2e8c031ced89a6ed8b0d8b6b67ea381211e3ad3225ca971da944b97aea06dec08ca9d22e24fd197709a77682765ccc24ac2dbc8d3f4b4ab9411afce
 EBUILD python-axolotl-0.2.3.ebuild 678 BLAKE2B 2805568d113a0c17f6fb0359e7c7e4e2d47ecd0479c040c813b3384f886f1a5f2e2fbbb4a3d53a5414ac6839756aee666887650bcb346e1996b5bc474ad8dab9 SHA512 085a6ccb8893f2158e2291141641e377660bc88ac829c5af3b52550326c5b6efc379f602aefac6454fbfb3e058605a47e1cce23702b4b1f34992d7fb851a0db7
 MISC metadata.xml 734 BLAKE2B 86bb0a6b6c1c45e41917d6ed44a49d6b72acb3de3a466417967b3b7295543af235d958ecc1057b9ae666a96152f9d56e2520d48fef45216024662e9eef07eedb SHA512 b779e5edf07f64d7ec266051a76ea3f3011808811f542c43582d85221e988bd7dbc97581ff59d7b115830a7e4d101306dda24d39f24acaccb3f4f54884e6b3ef
diff --git a/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild b/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild
index 4851091fe5fa..bd16db7b5302 100644
--- a/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild
+++ b/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-backoff/Manifest b/dev-python/python-backoff/Manifest
index 9b55683a7c76..8423cc3db1e9 100644
--- a/dev-python/python-backoff/Manifest
+++ b/dev-python/python-backoff/Manifest
@@ -1,3 +1,3 @@
 DIST backoff-1.6.0.tar.gz 10474 BLAKE2B 64e4b4a9cb8a1ac5a888aae78f50111400bb57f46bb0c123ecfeb4d660393a9786945d83b838599479e70244f2aa9b667428be2f0d57958b084ed8a045d0ea7d SHA512 a9bb5477d8a84397df61bd3904ad0914c5b214e46da9b55a2286ca8a81508184483e99a6703551dfcd1147e3e656396171ab7133f9e0cf2bff1bc17e6da49444
-EBUILD python-backoff-1.6.0.ebuild 588 BLAKE2B c17fb321560e1c1bebf4edcddd082bb38ee30dfd44102354668fd03557a793608896d39de71714bfc742649a5b32ff603a4482d517fba94cda4b8729ca623557 SHA512 babca539d53bbc8bb6c93485bdb6f7c8f62a47b48bd6d194cc263f8f2e16fef69a752c02917e3f7f93ea933964a63499a67c029565e627ce838e05f0af50e015
+EBUILD python-backoff-1.6.0.ebuild 587 BLAKE2B bf449c5c63d3cb7e14ac5019eb40d98eac0e272164094797e5a02dfc6bf67979bc94e66e79c046c1fb9cc4bcd603a46996e903a6708d1ad7ca87797d25ad40da SHA512 b55f0b3838dee49875d3546b42e0f4072564bafabd15fb79a0eca2e285934c208509add3dfa01ae30406d0ffc574243f767d10e7d829a3c472c74fd90266b9d4
 MISC metadata.xml 340 BLAKE2B a920195ff15b57c43e2ada5474cec497fa16c1914dea631b88c5e84942c5dd7a5d22d80dd2a162dc347153563274fe5e25d34dca0a9f0a3d22e12b0057e8ef22 SHA512 7dff40ae5c42b76769febb0b76b7e44b605daf77c0bd4cb1446e2e7f3414a6a539dc24a523970e90ef9695ec87982f12ccdde4f63c625895667d4880e27933e8
diff --git a/dev-python/python-backoff/python-backoff-1.6.0.ebuild b/dev-python/python-backoff/python-backoff-1.6.0.ebuild
index 5a17bc1815ad..a79914430125 100644
--- a/dev-python/python-backoff/python-backoff-1.6.0.ebuild
+++ b/dev-python/python-backoff/python-backoff-1.6.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/litl/backoff https://pypi.org/project/backoff/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index ac1bd1d45a4e..ef06befc8f58 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,7 +1,9 @@
 DIST python-ironicclient-1.17.0.tar.gz 206742 BLAKE2B 8fb92acb02e146916dfebd677ac1c179e78b0c16af80fe59361de6def1435d58466a1b9aef9798a05e0ed2ddc30e860e7da7579c2e6a336ff5f220d41b93b51e SHA512 3a1594d499dbfb508a87e87459308cdeb3eac9987116c8a7a250c5751fc1d4785056033e521ec5d99514a2b6c84362e7576dfec9c4941970422cf2757262c651
 DIST python-ironicclient-2.2.1.tar.gz 220436 BLAKE2B b36a5d0b2c297f52a121aa96007ce03556199d7d6139198e39114f2931fd7004bdf76fc5eca369247975bb9eb6d853a2fb4be133976de0ddfeb5767ead6c3c1a SHA512 1827dba991c59cea8a43dd11d0f8f0f1dd6ae41a7f1f28d9d200bac61ae9a4901ac280107fa91a95ebf24072634eadee2e0140f5e1cf5962496f34997815aa04
 DIST python-ironicclient-2.7.1.tar.gz 246190 BLAKE2B c31a439d9175a1915e34988e6e22fe2f05c722925928e30316a3f87023e393a8ee98ca1dbcca19760c009b28c7815478648259865316fac493e1c674cf70fce5 SHA512 654fa4f20b258094d4b05c34f059fa06f12638a210283b6821f6be5acf54bd15a03c73960a7a94d14635a1361370976d86e6b233bd1868c89d9aa82fc1fe7a8f
+DIST python-ironicclient-2.7.2.tar.gz 246413 BLAKE2B 28c71f619baa539a2d82b8aa1e2462de092a385f0b6efd88fa3f5c676aab5603b1060e671b7fd93c2f69a83e6ce4c065fe0492483dd93cdf0af6633403775cab SHA512 6a41ccc0e811fae571652837244ed7f23ec9a7ccf512a71519315406abe7fe0117013765c4d6c1e3c75daa21346b1f94881a32217b3a5829bf473d0b18470c0e
 EBUILD python-ironicclient-1.17.0.ebuild 2774 BLAKE2B 4d0240a4ab59e5d5fde2b742fa248e42b957c362ba5d7cf5df227ca5a7b5d9e619b4393e0639d590956bd9b65a65cb96ae8e78a9e0ee09d8e5c0f9ffa0b6758d SHA512 0dd1f3272a03b0439e358d2754006e9e28acd768d24c7a17da60616b8017a891bc735f2483861ecd703fcb8da813f436a452c9cb89f7ddecdbe199d097ad7848
 EBUILD python-ironicclient-2.2.1.ebuild 2581 BLAKE2B dea76f384d32da7eff18471a10559785636a99976fe8a733ce3cd2fc3ee97359200173fec199956a5518873939c833f5bcd4a7856902bf92665f52b7a8562b1c SHA512 c61ab7e9d98a0d2b2b314146cd549ef85c9d1e05b2d2d4f23f677d9fff52b8c7d77e977a4c8dd198090c0ba59152d060ecac98318c7a8fb4b3f2944cc4648da9
 EBUILD python-ironicclient-2.7.1.ebuild 2387 BLAKE2B c05eaeea4b9f56297be738adc77a25812f39ab83c95f70be5810888ccd9255365f8b41686ab3d0f74156519bbfa0048e9afb45e1fd77110790c22578a5bb3eea SHA512 ccf2fca5de70a59cb877c35e61fbff550c9cd641f5fc20c33f88b9945cb7f8966e8a12e4a649d0a196140cee2977ae10c55091ae6cadc1b193606492be1bda66
+EBUILD python-ironicclient-2.7.2.ebuild 2387 BLAKE2B c05eaeea4b9f56297be738adc77a25812f39ab83c95f70be5810888ccd9255365f8b41686ab3d0f74156519bbfa0048e9afb45e1fd77110790c22578a5bb3eea SHA512 ccf2fca5de70a59cb877c35e61fbff550c9cd641f5fc20c33f88b9945cb7f8966e8a12e4a649d0a196140cee2977ae10c55091ae6cadc1b193606492be1bda66
 MISC metadata.xml 462 BLAKE2B cda46aaa523a8b818fb5e2dd53bc4db023da327cace7f21db32939249266f7cda27e09718d41701fdd03a2e9ab7c131c147d379525c8036ea2564b799fb90b4e SHA512 8e3b7de241be41bf1af0431ba75d275c5295f197b1c80174d52bc1f38c413300c9a267eedd7034f01200ddced7ddd0143942ebb4a496665ca1105551fb411453
diff --git a/dev-python/python-ironicclient/python-ironicclient-2.7.2.ebuild b/dev-python/python-ironicclient/python-ironicclient-2.7.2.ebuild
new file mode 100644
index 000000000000..580c14e0457a
--- /dev/null
+++ b/dev-python/python-ironicclient/python-ironicclient-2.7.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Ironic API"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+CRDEPEND="
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+		!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^tempest/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index caa16451f840..d8000a09a937 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -4,5 +4,5 @@ DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052
 DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
 EBUILD pyyaml-3.12.ebuild 1068 BLAKE2B 75d565e4f368a85bcdc8f7a0b505c0969edaa8835480d09acd58e3a714c9502b085f419851d5bd15bc773f359a355101179fdedeee4d8468dc4adb0c5d5ca2c0 SHA512 7c839298eeca6ac9ca443cfa7e15e6cb1151789985391eb6b0eb81ec40c0e48dacd5c1ab0c7aef541f96312efb67b48e7cbb201c68278fb38a84dd7c272ce661
 EBUILD pyyaml-3.13.ebuild 1070 BLAKE2B bf3e7dbc8fcfbbf12bb5282ee012c9c1c83197f5573351181965efdc75a022f5b065181b975680240016b6c84f6259528e7010dd6645152b6f9b35bf66ea17fd SHA512 803c12130e4996bb868d71d8fef7819ae1f6f4aa44818bc68d6599c0e7a49b551c368d62370544811535c9bbe2126f3f190e1974148a727dad3a5adb52aaf79c
-EBUILD pyyaml-5.1.ebuild 1158 BLAKE2B cf3796c5f5b7be00826c56d59bb641e63d44aa1d4b315be44944ae753c2318eb7bd497e0e9211e511fec8342726709b00fb9755b6b9989d53cfb483a8f6dce72 SHA512 ec6d704959496033b2c6407021758d30191f2e624eb264c094623af6de267c0ea8823d4f2df1a08a9c8aed8c6e3e8b3a3fa8795e8e79bbc373dc2c6d08077eae
+EBUILD pyyaml-5.1.ebuild 1155 BLAKE2B 13f052887f359d7fea7d493fa87327637170f5d13d1ba69b80835afe684ec201c27281f4ece65072dc40dfbd9ff36655dd8fcc432d31371b6020ceb7281789cb SHA512 22a4490594842c6a424d4552cfa6ce006a658416c7649de11e2342206f893c8fc29202558bddc7dbde786243fc5ea063632d8dff3527297bc186e67dab0367f9
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index b0343bb7d8e2..dfc468fac980 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index c15d2f92dbdb..aae6b127b20b 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -5,5 +5,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
 EBUILD reportlab-3.3.0-r2.ebuild 1654 BLAKE2B 75324010068f8d97897151151776bfef87401dfa7859fa7b825d59b667843dde3e5e514e4039893534f7c5a6af5c38a937ab18ad48629c43f7f9a67c28671646 SHA512 a80631147edfc37e13fe28dfb03953e343ce26dfaa8769eda29809c0cdd0c5c39e51e3605e682a15a957268a6a80156e6edef5f9a2eac4949a642fdce8b260d1
-EBUILD reportlab-3.5.13-r1.ebuild 1526 BLAKE2B 1206706873e9036bc25df3226a973e4dadfd437e9691ac0825ae77019ad0a4c2c7c9a777d3b339c6793e504b27c416054570012e56cac8fe2cf4c8905c7be1dd SHA512 04e4dfdb6a565eff076006c68b08cf35708b87024e5585920fe0fefce606d51b02fa252d094fe3eb57e16360303773f011fc36d13f24e1177e6a58e8ac08073f
+EBUILD reportlab-3.5.13-r1.ebuild 1524 BLAKE2B 7535f150f42242d62361bd2fe180af4eff52cc38c64568f2078ffe15e864bb4e1d8734f0922782e9aada8eebb4e99d9b0af46db7993455c5a8aa0ca6e8a5c656 SHA512 e2244aea8aaf03c52c6cf268af8cc935d4122c32cabc1c82f6cc567cc0a8b277171b2d45f7701f11b33cf27f3869de1cfb05fa9353f6552358b894568ad8c5dd
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index 976d22338f89..d44002faf06b 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index f513317432e6..0c3bc033687f 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -2,5 +2,5 @@ AUX s3transfer-0.1.13-tests.patch 753 BLAKE2B 7b168d35c9287eade9b9e1ca0393c625f7
 DIST s3transfer-0.1.13.tar.gz 103335 BLAKE2B bbc6e76647a9b531f0ef70912ddd17a186a5bbe4ecc9ed21de4674cdc20d39150be3212065bcdf6145c0721644c59d157fd528b79039bb091d750f28085bb476 SHA512 90aca5cacefa19cb8cb21b7b82c5f3383bc0478503557de9c2277db2f39d98f6e11ad74bf56ec84a1fc8c4a920337b0bcb34bfcf509a49f347144b7f13afb37c
 DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
 EBUILD s3transfer-0.1.13-r1.ebuild 944 BLAKE2B 350913de6efa9e25c743b41900391d9fc3135c78aaddaa702e0579a9cd5119202ba788cfe0fc66a808475f5dbcde8a6c4f2f4e22e14f8f70d4abe767827851d1 SHA512 6a2bcb722657f4c5f3ebf08b59366645bb1f7236acb1881dc6525a2b7aefb31b6d4959a85bf0620ce26ad1fbf81219b6c01f990322736c96a03ed6d6fc55995e
-EBUILD s3transfer-0.2.0.ebuild 890 BLAKE2B 1134c78b75c8fc4b9c841213e54a4c9499875433fb267e97cce54bded9be69e480d897cc0becff8cafe888a998966d67880e35dc0d5f71c4efee0a0f918466a9 SHA512 2bd9e55c010705a0a06379ef491840c0fba0de08e06d21337e65dff8970ec86979d3fe6e170fe462f9fd0f4d1968d87baa46b506c83edf93d7b5ab151ec9082f
+EBUILD s3transfer-0.2.0.ebuild 888 BLAKE2B ef6182a1695f199f1ad2833aa52d337287fec13407343d71ce9f18a3cb212402a4b990e539298d2c372ba46381b16981e2b8ac9c8877d669e181ff6c7954f5fd SHA512 22d8796942ce3be9197a372588d7272d0e0ffe4880fc6a64d701278b21732f6115652ae28a98f32d09e7a5c59f469f5b8db611f4b6ffd07e53a5ba52a54fc641
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/s3transfer-0.2.0.ebuild b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
index d48af8926036..f7b87cfd423d 100644
--- a/dev-python/s3transfer/s3transfer-0.2.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 68b462ca2326..5cd445a0cab1 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -4,6 +4,6 @@ DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937
 DIST setuptools_scm-3.3.1.tar.gz 40183 BLAKE2B 417cb000c3edba7da8e92b8fb5b1d906d2ef0170eecc4c0b9d2ea490ef6bad4cbf5ca172bee0fc536c83605d361604c728bf4097f520ef8e62ee2d4f004e3db1 SHA512 cd8f3d1e97743097791001197c18a2c8336b9e499a543ec5d1ab6e9b613ef1417b59e34c329507a73c2626506ee892ccaee74dddc5c0950ff71c0bdfba954dc3
 EBUILD setuptools_scm-1.15.6-r1.ebuild 1354 BLAKE2B 3edb6f41ae5e11e6eafce2795b49776206340b1f8c637cd33a661a21c41c3fb1acf9d50c6e502e9630d29287fe83b53a022ba909795d25d39e41d52708545dfa SHA512 e43291aa02e92328970431c641492e46b40b9c0619384c4acd15d8bb1ed6368a54b774049ffca2dbd6ce56abe1f0440e4f6e22d5ccc959644864928c41d18b12
 EBUILD setuptools_scm-1.15.7.ebuild 1478 BLAKE2B 06655a6e5a4337ba5bc488d0e4751fde18fc8b130b83f06813452e2a929e4ec4b5283e81fb2a8d16f0697cafb0b7be4c1664fdfcfdb0f967f1a6c000bfe88d04 SHA512 226ffc6926f636a954eddbe8833cb4c41124c0ea880849047f080bb04b4dd25a77fc6dbc1263ea58b8894f82d529dca7af30f646378caee51e02dd282874e8c0
-EBUILD setuptools_scm-3.2.0.ebuild 1315 BLAKE2B 567b3673ce8d21436cfc24eab1ec351cc2d0686cec0d109c86b7542137fc647ff8ee834458f95b0ccd3874e83ce6e11ccbb8b737d745d516d0963259debcb15f SHA512 aeaf940ddefdaf28f713c43e5e3c0e9fad9b9cdcbce5fb741008165fdbe5a4bcd825f69f923f9d02ff277013df829be6441c2ee9d1893b25be2cfea5a4fafcc2
+EBUILD setuptools_scm-3.2.0.ebuild 1310 BLAKE2B 16a7d01895574fc70136760567606f1138438c434b5126cc008ffd573d193e8d9eebc0e8c0febcfb7f347504eddea76cc4381b1a467a68dba67703e7b2c752e0 SHA512 8aa0e55742d055b48bf23bd1b908ff63ce670891c92d99b0db4a65c474e67b0516468527a3346cf9a967c61cf405a4cd2f6f8302c782f8ff8814032fe3425b51
 EBUILD setuptools_scm-3.3.1.ebuild 1318 BLAKE2B 5e628c70571b727c27ae06c1537fcf890d06a24ad5998077c095bdc3ca41ce9a5e123f4a5e31908b11aa688167ac95dec0fae5ae38d34d44eed4b76b0ef321be SHA512 b608962363a546fdd2db76f688449bc2dc407b5cbcc5287adaeeee7842590c388c6e79af3f1273e254c823b7aee8acd646b244ad480f837cdd57c786a83cae9f
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
index 1bf03fdf621c..3480b706c616 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
index 5cab04e2035a..cbdba337ae7e 100644
--- a/dev-python/sshtunnel/Manifest
+++ b/dev-python/sshtunnel/Manifest
@@ -1,3 +1,4 @@
 DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c921f51367cac0cb0ef36be6251f687b53b1df6072d1e32456a5c0fa5ec6d2fd8e5d4874977a641a6c9ba81ac57c SHA512 c228fe79cf5172c950777a40b27ababd42a31b7aad8a8472d55a2b3babf5aa4c5308799bb271f33f0e943c309eb9adedee321045a03324cb5e30a385178751ca
 EBUILD sshtunnel-0.1.4-r1.ebuild 744 BLAKE2B ce41e1c0d8a3e086e1a381952393cef0454640dbd7fe9f7146e21f61eef577e8906702a471e3329928b0fd5dcfbecf09ca605d6f8a951d8103a8de0bcd37bc93 SHA512 70cce80f38a3c12d8a4bca2bfad147f720a18b691acb64764cf602815090bb0b91d4f5f82624c273e69a5bd8f46bf6b91b13ca40cdfe92aa46e1e47a58dc991d
+EBUILD sshtunnel-0.1.4-r2.ebuild 528 BLAKE2B 63fd349251102461dda25ecdc8b533b6688a583278c6595a4c5f1f24499b382af412a3c86ff5e6ba6f3ea82d1427b315e8755ccae1c3b61369f2ae04d588a286 SHA512 9a4ba2bfc5b863737a823558cbaa5371a37fe8c6aad9d4a1f347abfdd4ae14cec965bea2b33f88c467eed2ec05ef724b2b462714f7da5bc6d18416815e019ce9
 MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
new file mode 100644
index 000000000000..a4575517e241
--- /dev/null
+++ b/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python SSH tunnels"
+HOMEPAGE="https://pypi.python.org/pypi/sshtunnel"
+SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# https://bugs.gentoo.org/683774
+RESTRICT="test"
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index c320f373453a..af98d8625534 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -6,5 +6,5 @@ DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40
 EBUILD urllib3-1.22.ebuild 1750 BLAKE2B 053a1a4590e26d363c8a7b76fb2bc69f16a2d20e7532e44b5b6f15f0a1cb3e4594318ee1d3cc3f28014fd0f4f077d0a056448e720a6ca0f596412aa411436081 SHA512 a8cbb45a3aefbe76aa0119d2a67aed90ed95769c68e296da7aed7a2d85b53c42c4235c8439608351da6eeb03a2f97c25bd25ce1be78efa1aaf91c4fc4954ba38
 EBUILD urllib3-1.23.ebuild 1906 BLAKE2B d3e2981f3133db3ac25739a5740c278ccd238d6a926265be96da15b200341f50bf138cf685b0d28735bbdc9328d45b237a8a45dde63f920b2075f05db421b6e9 SHA512 a38a14962ac9ffd7e86397545974721aff6c745da4d25ef07a99d0c4effb670b9d95f74b3efbfb8fd7624cc118621d99c26de2d9fec691f8f2d4b6d92221df62
 EBUILD urllib3-1.24.1.ebuild 1819 BLAKE2B b1d16553a388611486ade62774bffbf471eeb3336e4a4c7d42b2e1721239081b2cca61c48eb91291a387d24619763b13bc8ed08faa8461b0e53a4e61309d51ea SHA512 8b7aec6288e77c410e4ce47c983f1033a120610478d4ea95e0f813c314ab8f917211ff77abe419bd9bff21b8c884b86963a17a77aeec407462c66c526b9c9158
-EBUILD urllib3-1.24.2.ebuild 1814 BLAKE2B 2f124b96049df7a8c9f0cae1637689aa6412d7103566dd5784ede69aec0df4726600bfff1dda9c7b13c5628c33b9d48fc1b9f6394685eef03b2e81597cbba224 SHA512 6aed5290f3754a77a7e2f42dd492672c4bf4a05a4f1af95d3e0a213ffda25af2063af689995b25127bf6176b1814706ea4dc468760e8de1a491d0d653276323c
+EBUILD urllib3-1.24.2.ebuild 1810 BLAKE2B d472e9b15f0c088ace378b46a469c477aa1e39ef1447afbcdb63103d705de18007499bce06a56d31a3b8963a909e00d615e45953cb906932a63d3c6f558fa46f SHA512 e883a425a81369d5cb3db9636d0474eea463ed080540e917ac48d55e2a16cd367a78e9b99b05286a254ba9678e64780383d8b71c66fb834026b0eca401464531
 MISC metadata.xml 376 BLAKE2B 2e9ba1b23bd9ab2770d23ce9bdf21f4083f46184c22d1dc0bd449b6605c24a2ef0168e1503327b549ba55e81b7bb52fe5f73fa375f06f3c64fabfac6cf5a9d77 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index 7682ae685c2d..aa9836ae9095 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 #RESTRICT="test"
 
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 5c37c59953fa..0c21c5fe8093 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,4 @@
 DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
 EBUILD wcwidth-0.1.7-r1.ebuild 680 BLAKE2B dd84d57b1d6facb4f00628adae6f299386a26022985b41445e9ceead3fcd1ae9638788f92f8b717cc8978e111dfefc633036c7ee941ce3e083633c1a508606ab SHA512 9827e9fc4ecca0fc8c688ca3fa400bf624199ed42cebcf29c9a775842b6036c9b9748b84ef9c82ea559a6dc557dc107e59cb49eb3d0bb79399405af9ec63d8d2
-EBUILD wcwidth-0.1.7-r2.ebuild 691 BLAKE2B 10fba9bba7cc1e3b94671d9a159127d11f12b207be0885d2dc0b6bbb15fc881fa94a35c758e8bfb6227f0df0928757b7db3242731a76b69bff97c4b61541de15 SHA512 f61aa89b57e6599989706d4c9458256038ccf456393b90fe2651e10ce9f4b9abd9cf81760021cfcff08fbd3fa2ff944ba939e2dc9fa314c8a401d358f9cb894b
+EBUILD wcwidth-0.1.7-r2.ebuild 698 BLAKE2B 361b4311dc2ca5473fe31529ffb9ef994b8db4ae684cd7e484f5816928b4c48e31fda9df166804f58cfb77f4af8a183304b12d910d61348a0b7bf9587c54545e SHA512 3bc5d7bf7269d0712be82cbc226b4e02f3b73d3f5f7e3184e6501ed32bc5d4e2f9f0308a2a6f2d61de31122002e85f513804522bea65e391ab0caaaed7a1ecf0
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
index 81af73f089b6..467f92b6c78c 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
commit	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree	2878053f3e7faed19a1f82c733d3bd29df69991e /dev-python
parent	2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)