Sync with portage [Wed Sep 9 09:35:40 MSK 2020].

4 years ago · c4d4257f93
parent fa5b9b814c
commit c4d4257f93
301 changed files with 2831 additions and 1703 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
-MANIFEST Manifest.files.gz 29464 BLAKE2B ec8ae9bbe6ab554d61bb00781f17a32b67b2775cb1850fc13e0a198ee5b6fbbf22b684ff74b624c1e6586094f6720f4f6b1d0bf657e1d77a31b70daecc447c93 SHA512 5e2ee2b42fa869a349eff8aa148e1ae3d7224a093ec96d7aeae79292d60d9ea9bc02dc8ecbf7e16d82caba6338a2958ac279b03215e9655cc59cbe44d83960bd
+MANIFEST Manifest.files.gz 29476 BLAKE2B 0228bda27e697ea2acde054ea0119b92605a115a71cedf4ba72b635beba19e5e7d5e7e4d56788e45d6fb2c6c0c7540af36d62031eebe21c15d8cdb62a2854c23 SHA512 dc36a35fb45065a5bdaf049407f93479f4a378877daecfab6d1007f7bd89c74ece7767625de0dc4bda9cfc7cde31406be1ea3dbe105c53d31107201e62bc1211
-TIMESTAMP 2020-09-08T20:08:46Z
+TIMESTAMP 2020-09-09T06:08:43Z
 -----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9X5M5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9YcWtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC4dg/9FIEYZR96DzAdmLCypTHDcwhGZ2dCnPjepyn+aoRppQiBsDZORvm6/TEl
+klCOXBAAg0cu1R3bEq2FRJiVgLJalBbZl7YKLDZA6wr+uT59zxQSVjz0WV2HNmfi
-t6JuGMqxAeKgSljIJQvdp33OWrsI4nIzN5s5iiqkHkrtdn8gd5U6TjGGluJlbn3R
+7cd7vV3EjptlxDPPj8lYd9w/z377Oi+CrOwavf8WTpJz2AIPDQ2lNk8GlLEFiC6S
-OGKelGqboUlt/h9oUmJ4Pl2KsaRqpCq2DxxEGXwSpTTxoyAegtp/VHQAkA/zGlfx
+qkxMh1Lm7QHdsSspJ17r70KnkPj1wvCyN30PZ4HvCWxEO0JvDTGNQ0TS50vw6/OT
-ykQetRcborNREfvzvvU0k7UdhwDJyqXtPC/+tYK55VWnIadheI8mrLR/+pi3q7ER
+XN520+FNhBbn+dhzCR6xlB11PzKeGpAu07AHhr2g/gpv+FcMSJ9bNXt/qKyOfoHD
-EXOKL7lHpkYqbZhd2JWyupWYHhmn0cH9lZenXVo42a5I89r+Y0uLdTeqoQx6tf7f
+v7TE6eFruhebB6eTjXpVPz+iWMXQUwD9IK1oIeBdCwV8ySGzU5YMNrM67OGdctjL
-uUPU2n2q/l2eQ7jVcSCb3qOOpfN36a6vjAd/2yq4qyt3x3K6wKbcJ05AbMCk5Xv9
+LHDTKlHLJOO4fFiAmLjT9wvPCWTQblFVRFXYw9AN1d+eW/xdc+8iYkokpbj/0Gkl
-N4wqdLEYT/GtYSx8KGgOq9fJ/unaNG6A99pCZEb8ALd/QAyF8GgQfDPQfgd0nqV3
+Kw89xTmUO/93zpO4Rl5x/nkcaXxrg/EaqoxJXx5tQTIRA5ljzMDqfvxqMN72y6Oo
-jHp6mGFPc0vsye0Hr6iXHt838DKM4t8lGgd77cQyii8WhwNU08Cz+rvvBmjJnml9
+Bi0iqnlAMmwFO33pihCtZ+VajZruXhHbusyS/ok/FKgFq8Qe5Vr7hICZzlegrrqU
-p+oo3jaWYbosAAWHlXAxe4PljWjhYcOGtihg3ZCV6/ny1XQm0LOVaPnOQqtOvVn/
+aZEe+V8VylvBu7+GQj0HCnMyGySF03OWOx/yGp6ePw2Y7LPQ5i5LKQ0T2U8g/jJC
-xgMiqTF9n7aj3MqnERSZHqzMxBXe3W4l4CwNwi09N0TSxKCaJk3Mu0WFfMPB7pJi
+TPBlC7sOvLzE3/EBIoacwsfIIo4SHwIDCDUEp31jRV1MTANVMkvmrRyqOgiuhASu
-NTeVGLsjHhFENJPpX6LTgJZnCXndIWGT1yHs5kpcTPPHKfrZITI=
+iXM7oOQazSujpnrzAhlMZYkcZ0TUaG8O5yn0CrVMS5ZygcixntY=
-=a5Dg
+=ZVa/
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@ -1,6 +1,4 @@
 DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
 DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
 EBUILD acme-1.6.0.ebuild 1735 BLAKE2B 28009274945d1cb06c434a4a717f31a8783289b5b057bdbcce347c5b32c4f52cd8d88f1b20d4685b4def7455be19f49bb2f177fb9d586e65194aa14f4bff4dfd SHA512 6aea1eed8444f0b37001d6d2e715ff5467b07467f3a984ce08d91a47e25f9f8f65133e037ac4fd0183510ff4e61144aeb2e9ecf5ea2d05fbfcf412b4827913db
 EBUILD acme-1.7.0.ebuild 1735 BLAKE2B 28009274945d1cb06c434a4a717f31a8783289b5b057bdbcce347c5b32c4f52cd8d88f1b20d4685b4def7455be19f49bb2f177fb9d586e65194aa14f4bff4dfd SHA512 6aea1eed8444f0b37001d6d2e715ff5467b07467f3a984ce08d91a47e25f9f8f65133e037ac4fd0183510ff4e61144aeb2e9ecf5ea2d05fbfcf412b4827913db
 EBUILD acme-9999.ebuild 1737 BLAKE2B 0ff95a7344d44408e8075d0aa006a33ca276db92499ed404e549b960a23da8a63a0f6604251b0066666976e07eb809bd2cab05ee9fda3a64b1b423e1993c599a SHA512 1f850adad3937d447e9c03523ffcc8ec01551d1d35eabf26215c4ed0eaa81ca4285a0a2191b05655274a4132bef18be1b791ebd7f911f4481e33f621929cdca8
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
--- a/app-crypt/acme/acme-1.6.0.ebuild
+++ b/app-crypt/acme/acme-1.6.0.ebuild
@ -1,69 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=(python{3_6,3_7,3_8})
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
 	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 inherit distutils-r1
 DESCRIPTION="An implementation of the ACME protocol"
 HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
 	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
 "
 src_compile() {
 	python_foreach_impl run_in_build_dir default
 	distutils-r1_src_compile
 	if use doc ; then
 		cd docs || die
 		sphinx-build -b html -d _build/doctrees   . _build/html
 	fi
 }
 python_test() {
 	nosetests -w ${PN} || die
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,6 +1,4 @@
 DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
 DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
 EBUILD certbot-apache-1.6.0.ebuild 1072 BLAKE2B 1bf17482d560ed83a9b84b81c79b614b0ae57bd1d21bffc21209829514c604df9bc4732bf76b61251dc5a96903e26c47a498437d7c33982abfebbee674be82d9 SHA512 df69d3665659a2232bbc66a5e798468534826cb859c5b0b0e92c81da4c8d4ee019f8cac8a66ef7a23ff6c4bf60a1965ab343ab94df5049dc61f68d1f9666345b
 EBUILD certbot-apache-1.7.0.ebuild 1072 BLAKE2B 1bf17482d560ed83a9b84b81c79b614b0ae57bd1d21bffc21209829514c604df9bc4732bf76b61251dc5a96903e26c47a498437d7c33982abfebbee674be82d9 SHA512 df69d3665659a2232bbc66a5e798468534826cb859c5b0b0e92c81da4c8d4ee019f8cac8a66ef7a23ff6c4bf60a1965ab343ab94df5049dc61f68d1f9666345b
 EBUILD certbot-apache-9999.ebuild 1074 BLAKE2B 0983132ac6377f462fcaad0510241c4c3005a6d0ae8eda4dfd732ea54c23517ad7840199cbc8597526930a85bd9d97b79a1d00919bc8ef4c8b4d7f073339f15e SHA512 ed4de8e9eff1fa01e58f159a024e97e86f0c06841fb6de51e6d4fd60817f892ad04480cfcd5734cc37f5aec890ca0c8b7c06f1e562fd40e57bd1e37b0003c29d
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
--- a/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
@ -1,38 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=(python{3_6,3_7,3_8})
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
 	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 inherit distutils-r1
 DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
 HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND}
 	dev-python/pytest[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 python_test() {
 	esetup.py test || die
 }
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@ -1,6 +1,4 @@
 DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
 DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
 EBUILD certbot-nginx-1.6.0.ebuild 971 BLAKE2B 0eb84b5e406a9ec7787648921cd5f8ce8c96811f82c02c78b86cd7bb37576b0f10e09ab318512d62b96df1ad4b0d0f4d08b1ea3b590a2f0db16eb478e6c8d00b SHA512 99924175b91aa873c5438b58a4e7feb7e4d8d94a253c8093eb42574bc1019ef627ba183cb5f7334f25c5ee1206c74818b882eb46be859a7df34d786e56dc2d14
 EBUILD certbot-nginx-1.7.0.ebuild 971 BLAKE2B 0eb84b5e406a9ec7787648921cd5f8ce8c96811f82c02c78b86cd7bb37576b0f10e09ab318512d62b96df1ad4b0d0f4d08b1ea3b590a2f0db16eb478e6c8d00b SHA512 99924175b91aa873c5438b58a4e7feb7e4d8d94a253c8093eb42574bc1019ef627ba183cb5f7334f25c5ee1206c74818b882eb46be859a7df34d786e56dc2d14
 EBUILD certbot-nginx-9999.ebuild 973 BLAKE2B 99723e412b2282e6ecb4f74b9d9b8a694c8ccaa9e4f0c4e38efde37e3745e076ed53e1a178c234be7cfad3034daf53b1b4af1439da2e15eed311e3ef832dd4f8 SHA512 bf912fdbca7c54e3928ea9758d71da456b324eca5dd47eb0a4d912bebd90d6b8be13e4a31d22ef72c399c9cbd1ab97ee032084c9122fd2c0bb45611e25a6cc67
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
--- a/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
@ -1,33 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=(python{3_6,3_7,3_8})
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
 	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 inherit distutils-r1
 DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
 HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}"
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,6 +1,4 @@
 DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
 DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
 EBUILD certbot-1.6.0.ebuild 1446 BLAKE2B 7e57c0d4bfee4f0a445acf808ecdce10cc39b7515b73df1f30a382ce5190b35ce981b880c4bc7928f7e63db052808430967538c9a97cb2765f08e5f80f0befeb SHA512 66c1b49d4be612dad1f30b95dce20590d6965e3cbefeb50f982e97431db070e651dd8fe9bf3f7b794eebbc9fdccdd0b9bc9b51c5804741a18331c6d27bec4e63
 EBUILD certbot-1.7.0.ebuild 1446 BLAKE2B 7e57c0d4bfee4f0a445acf808ecdce10cc39b7515b73df1f30a382ce5190b35ce981b880c4bc7928f7e63db052808430967538c9a97cb2765f08e5f80f0befeb SHA512 66c1b49d4be612dad1f30b95dce20590d6965e3cbefeb50f982e97431db070e651dd8fe9bf3f7b794eebbc9fdccdd0b9bc9b51c5804741a18331c6d27bec4e63
 EBUILD certbot-9999.ebuild 1448 BLAKE2B 800c168ba8c51cddb5ba84372c4161673c1b276ce8ecd113550d2c24b008d368161e52b6771fe1d511c83ae65b18b7d92cd09d2eb0384e0aee1dbd5ae8ea91e5 SHA512 c435e77b29bf1cf8ad3c9637954544d9e433beefee63a3ebe5c5709e8d781d0fa33be3105d0617e583a7d3ac28334b1c605fa69a9f362e1e2940098a18760885
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
--- a/app-crypt/certbot/certbot-1.6.0.ebuild
+++ b/app-crypt/certbot/certbot-1.6.0.ebuild
@ -1,48 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=(python{3_6,3_7,3_8})
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 inherit distutils-r1
 DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
 HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	${CDEPEND}
 	>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}"
 distutils_enable_tests pytest
 python_prepare_all() {
 	# required as deps of deps can trigger this too...
 	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
 	distutils-r1_python_prepare_all
 }
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@ -1,8 +1,4 @@
 AUX hteditor-2.1.0-AR.patch 362 BLAKE2B 7698e475679e730f4e5642f1acfc802170810699209c6e68d6587075bf95502eaec18e618b065b4072178e9d4371628331af1d867495c7283380facc07594a24 SHA512 3b656378c025e94fa480b942ae9ce073b9af33a062ba9806d3baeb2b091df1a186eee87e58e1ddcb9823c97db4a68f0f69ee0584aa0b4bfb03f487bc28dcf7c4
 AUX hteditor-2.1.0-format-security.patch 1517 BLAKE2B 29ba4d308ac6b03b79f25c1aef38aac224ef936c0ebbb052e8a6238d863da34e575791bbbb6a430ff1e700f0c51f3ac27658646038f76c837a6fa2070d318bda SHA512 71b27c81d421d2ddee2e8ac6fe0d599678686880bebbd15464bee9ce4692f9e36dc1022f055ed6ff544985cdf1ccc496c1729ada193285b345597b5c186f5b5f
 AUX hteditor-2.1.0-gcc-10.patch 989 BLAKE2B f4678cfa1eccc741005d4a51d4c74f4d01c0f62594b1f138121758db26b24c4a588430a43f4cae5d9b6f4032236c4f6478b385542e060c37225859d9cd78ba93 SHA512 2fceb761e1ef4225917a66db2fabac1a38072e83ce0fdfa9bdc592d34f9f7870c2a0aae971a4ebe7baffb52203f6b7b906e57f672925fbaf0c8ca77fcebf1a2d
 AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.1_pre20161206.tar.gz 1082309 BLAKE2B 4fb00b0aa6115da3b561436f9f9905c48d93d6768bcf207931bb46840727c85fb5c9a1afda8ed805f71e9ce242161a2b95e26add02ff5aedc407df7f11c6ddec SHA512 33d681ee8c978568dd0d187d6846994362625d000c316baab10c237175fa6a47dc0e7b61cfd503c4dfad8a01d27af7fc87cbf20109087e1d9280048c898fa621
 EBUILD hteditor-2.1.1_pre20161206.ebuild 1064 BLAKE2B 4d4b1c02c3d0a0484dc0e12d32303f8977af7ac972b4b5df3147594c0a9cba6434f6745bb00eb7fe40e34de7d0c72f8d836c02902f857306c9af198dea5d53b3 SHA512 c36e1528a6e79f222ada5c97a8c0f49e4e338b597369ca768312efeaf33cb919d96fac1f7bf5477ccb0b4f25c29e0aff8f7f78817f8cc99496e77a7fd6bc2528
--- a/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
+++ b/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
@ -1,14 +0,0 @@
 https://bugs.gentoo.org/722040
 --- a/configure.ac
 +++ b/configure.ac
@@ -104,8 +104,8 @@ AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_YACC
 AM_PROG_LEX
 -AC_PATH_PROG(AR, ar)
 -AC_PATH_PROG(AR, gar)
 +AC_CHECK_TOOL(AR, ar)
 +AC_CHECK_TOOL(AR, gar)
 if test "x$AR" = "x"; then
 	   AC_MSG_ERROR([*** 'ar' and 'gar' missing, please install one of them or fix your \$PATH ***])
--- a/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch
+++ b/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch
@ -1,57 +0,0 @@
 https://bugs.gentoo.org/521018
 From 5839355d67ff822593190473a41512ca19e4280a Mon Sep 17 00:00:00 2001
 From: Anton Gladky <gladk@debian.org>
 Date: Wed, 18 Feb 2015 21:20:39 +0100
 Subject: [PATCH] Fix "format not a string" compilation failure
 Compilation with the flag -Werror=format-security fails with
 the message:
 error: format not a string literal and no format arguments
 This patch solves the issue.
 ---
 asm/x86dis.cc | 6 +++---
 htpal.cc      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 diff --git a/asm/x86dis.cc b/asm/x86dis.cc
 index 0830d9c..bb9028f 100644
 --- a/asm/x86dis.cc
 +++ b/asm/x86dis.cc
@@ -1218,15 +1218,15 @@ void x86dis::str_op(char *opstr, int *opstrlen, x86dis_insn *insn, x86_insn_op *
 		default: {assert(0);}
 		}
 		if (!insn->rexprefix) {
 -			sprintf(opstr, x86_regs[j][op->reg]);
 +			sprintf(opstr, "%s", x86_regs[j][op->reg]);
 		} else {
 -			sprintf(opstr, x86_64regs[j][op->reg]);
 +			sprintf(opstr, "%s", x86_64regs[j][op->reg]);
 		}
 		break;
 	}
 	case X86_OPTYPE_SEG:
 		if (x86_segs[op->seg]) {
 -			sprintf(opstr, x86_segs[op->seg]);
 +			sprintf(opstr, "%s", x86_segs[op->seg]);
 		}
 		break;
 	case X86_OPTYPE_CRX:
 diff --git a/htpal.cc b/htpal.cc
 index 03dea18..3d5f51e 100644
 --- a/htpal.cc
 +++ b/htpal.cc
@@ -307,7 +307,7 @@ void palette_entry::strvalue(char *buf32bytes)
 		text = "normal";
 	}
 	p = tag_make_color(p, 32, VCP(fg, bg));
 -	p += sprintf(p, text);
 +	p += sprintf(p, "%s", text);
 	p = tag_make_default_color(p, 32);
 	*p = 0;
 }
 -- 
 2.16.2
--- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch
+++ b/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch
@ -1,36 +0,0 @@
 Backport a subset of upstream c++11 fixes.
 --- a/htmacho.cc
 +++ b/htmacho.cc
@@ -146,7 +146,7 @@ void ht_macho::init(Bounds *b, File *f, format_viewer_if **ifs, ht_format_group
 				break;
 			case MACHO_CPU_TYPE_I386:
 				switch (c->flavor) {
 -				case -1:
 +				default:
 					createHostStruct(&c->state, MACHO_I386_THREAD_STATE_struct, image_endianess);
 					break;
 				}
 --- a/htmachohd.cc
 +++ b/htmachohd.cc
@@ -313,7 +313,7 @@ static ht_view *htmachoheader_init(Bounds *b, File *file, ht_format_group *group
 				switch (macho_shared->header.cputype) {
 				case MACHO_CPU_TYPE_I386:
 					switch (c->flavor) {
 -					case -1:
 +					default:
 						m->add_staticmask_ptable(macho_i386_thread_state, ofs+4*4/*4 32bit words in thread_header*/, isbigendian);
 						break;
 					}
 --- a/io/types.h
 +++ b/io/types.h
@@ -87,8 +87,8 @@ union htmsg_param {
 };
 struct htmsg {
 -	int msg;
 -	int type;
 +	unsigned int msg;
 +	unsigned int type;
 	htmsg_param data1;
 	htmsg_param data2;
 };
--- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch
+++ b/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch
@ -1,32 +0,0 @@
 https://bugs.gentoo.org/show_bug.cgi?id=620732
 Fixes build failure on gcc-7:
  htapp.cc: In function 'uint isqr(uint)':
  htapp.cc:3026:18: error: call of overloaded 'abs(uint)' is ambiguous
    while (abs(a - b) > 1) {
                    ^
 Picked upstream patch that fixes it:
 commit 3b62f2f7e49e024ec9d3c5ffc8ff9cd87a107af6
 Author: Sebastian Biallas <sb@biallas.net>
 Date:   Sun Nov 13 15:25:26 2016 +0100
    use unsigned variables
 diff --git a/htapp.cc b/htapp.cc
 index 53d8725..03236e2 100644
 --- a/htapp.cc
 +++ b/htapp.cc
@@ -3021,8 +3021,8 @@ void do_modal_resize()
 static uint isqr(uint u)
 {
 -	uint a = 2;
 -	uint b = u/a;
 +	int a = 2;
 +	int b = u/a;
 	while (abs(a - b) > 1) {
 		a = (a+b)/2;
 		b = u/a;
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/ddate/Manifest
+++ b/app-misc/ddate/Manifest
@ -2,5 +2,5 @@ AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec2575086845521
 DIST ddate-0.2.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
 DIST ddate-0.2.2_p20160627.tar.gz 8079 BLAKE2B 7885dd34762297df801f9fe5736d1409280646cc9295780f3fa6da0a06127fa455c96117883e1087b0390498de1b58ac31071434e6b9e30a0f6a15b2e4c6c279 SHA512 279e02e1846cc2f505466882828aa699eaa7206e0025575babdb33738b920291d65ac4082f58c77e6046e69c2604b05de67f5b9b3cbc64589ff28a27e2256eef
 EBUILD ddate-0.2.2.ebuild 514 BLAKE2B a8a35a87f6df49c2a907bce74ed184af0720308265bfee13e7d4fdf9c95ad2477530a1be92e98877e6c9b2d5d1fda1752f0df61216877204a7b583f7d2c66e5f SHA512 c75d4c255ce6455cbbc249b40c99fcfa5d358534b3485843a652e264048f5c4933cbbe9e148e3266252ad3e7598546fbfa2d5d0b263715746d3fe8e1a784e236
-EBUILD ddate-0.2.2_p20160627.ebuild 556 BLAKE2B 87a40721b3a3fd0d0d4d7f53fcbf686b8ae2fd31929e7bb97eb013c582d813c982ee57660ec6596c651ab65b0843da2df48d0e32f592bcde67ae9f2f345f3d0b SHA512 148fca981abb4006e21866ef2a03d9d86e1947548334c715260d8806eaaced6b4752301c75d3a284915c7327b1f62d44f483891f56974631abbd9bbd95150bf9
+EBUILD ddate-0.2.2_p20160627.ebuild 554 BLAKE2B 07d126a8ecd949c47393fb948f82ff3cc493d53dfcff5d78e4f364ced9220f04255d61424e40edf4b1ed8b5b7e5d39790d63551e98b2d0e76c517e22c5284388 SHA512 ff569fe612c055e9543c6d5f923d31a54fabacc86e415280f161230412a83bce56a93551382b6f416d12d735b90b41c9c7c7eb6e5d0720a2f72d79bc318f90a4
 MISC metadata.xml 592 BLAKE2B 61ca3e0a009926931b30da1413a9080ad3f147339990b70598c75f5a2521fb224dc8d326f3dfc5aeddc762d4e15d58941c2d37e93a437b73fe98d6af7d8e424f SHA512 3bf37c63caa2e55da6f44545dd78866df4e72b822e76a33a7d37a634a794d24b7375117432e84ed5b64f0177bc3d994ddd04052181c396d695e4d75a5bb7a009
--- a/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
+++ b/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
 HOMEPAGE="https://github.com/bo0ts/ddate"
 SRC_URI="https://github.com/bo0ts/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~x86"
 LICENSE="public-domain"
 SLOT="0"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -1,7 +1,9 @@
 DIST eix-0.34.4.tar.xz 628516 BLAKE2B 0c7cb4d7cd13d7715ba35cc0edd38e549fd1d1618bfdcacb272ee8325a844276a6df59a701ab2b4ecc693e5dad2d95c96c000e96eb8bce72709baf22f3fa490f SHA512 a96714fba8324529bf63de63f9eb11cc76da05e3d43c5eedad49079b6e3a1960376bd5d3bc116dba49bc7f694c7588741e518438936abd4b37edfe0a097ecd3d
 DIST eix-0.34.5.tar.xz 629276 BLAKE2B fe686512e5061bdbc8e499542972f2a3e65e672b111c8d4d8c22b093c65fcf02e4de8ad41805b69fe52c0d962f660c787a7a2639341cd8fd59d03c94c2601b79 SHA512 b11744ea36c0771e4959de4925b3d74df8c270633a21c82ff27f4c91cc5a9281a85a594f0d20d5eb5c3c15a6c08e74232030687cc85f588545216438dc4ff7d7
 DIST eix-0.34.6.tar.xz 629424 BLAKE2B bad7bc0e9d0bb3752c1e4df4e267e3782b43b15445d0a6cb9554bff6811556edcb244deeacef5189477bb4bbf37a200e687dfa15677117766378cdb5ec40d9f1 SHA512 b9cae0c3be4ede9563da4d4eda61e26c83de449c27d5048e6611164ee2513d0ad729cfa3622ef74c5b1a77d12ac2ea8f7e7ae029d7cf04efae31ef054375eb78
 DIST eix-0.34.7.tar.xz 629380 BLAKE2B 307a97550540a4d9edf25a825cba816b275f07d2df665286fd475aba008d6938cc67725b1067ce9b1cb7af19aabe6f057ad5bd8a0cfe1c75c5d831b1638870ef SHA512 14ceae8658d53524f8ffa8bfc54284da6c39b731d04f1fe4ae33fcb23899a9e3ed93211a3e9546857c7ee1cf0d1baaaf52ebd2f0a5183753fe77671abcffdc79
 EBUILD eix-0.34.4.ebuild 2576 BLAKE2B 746fd28cc0f30bb051721dd6b45868650af05fa624931a16999090da378033547b0ebfbd10c0704db68cae4df120540b2b2c63f361e3a3a44be6f08e27dbb802 SHA512 0fd779fc7effddc026db782ccbd5d891fdd954136ed7f1d9f10d7dde0d32b20042edcb1393698a79ae2b79d3fd7570c92009e7d76b29c66edae6efdf197b2020
 EBUILD eix-0.34.5.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
 EBUILD eix-0.34.6.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
 EBUILD eix-0.34.7.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
--- a/app-portage/eix/eix-0.34.7.ebuild
+++ b/app-portage/eix/eix-0.34.7.ebuild
@ -0,0 +1,102 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools bash-completion-r1 flag-o-matic tmpfiles
 DESCRIPTION="Search and query ebuilds"
 HOMEPAGE="https://github.com/vaeth/eix/"
 SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 BOTHDEPEND="nls? ( virtual/libintl )
 	sqlite? ( >=dev-db/sqlite-3:= )"
 RDEPEND="${BOTHDEPEND}
 	>=app-shells/push-2.0-r1
 	>=app-shells/quoter-3.0_p2-r1"
 DEPEND="${BOTHDEPEND}
 	app-arch/xz-utils
 	nls? ( sys-devel/gettext )"
 pkg_setup() {
 	# remove stale cache file to prevent collisions
 	local old_cache=${EROOT}/var/cache/${PN}
 	if [[ -f ${old_cache} ]]; then
 		rm "${old_cache}" || die
 	fi
 }
 src_prepare() {
 	default
 	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
 	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
 		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
 		-i src/eix-functions.sh.in || die
 	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
 		-i src/Makefile.am || die
 	eautoreconf
 }
 src_configure() {
 	local myconf=(
 		$(use_enable debug paranoic-asserts)
 		$(use_enable nls)
 		$(use_with doc extra-doc)
 		$(use_with sqlite)
 		--without-protobuf
 		# default configuration
 		$(use_with prefix always-accept-keywords)
 		--with-dep-default
 		--with-required-use-default
 		# paths
 		--with-portage-rootpath="${ROOTPATH}"
 		--with-eprefix-default="${EPREFIX}"
 		# build a single executable with symlinks
 		--disable-separate-binaries
 		--disable-separate-tools
 		# used purely to control/disrespect *FLAGS
 		--disable-debugging
 		--disable-new_dialect
 		--disable-optimization
 		--disable-strong-optimization
 		--disable-security
 		--disable-nopie-security
 		--disable-strong-security
 	)
 	econf "${myconf[@]}"
 }
 src_install() {
 	default
 	dobashcomp bash/eix
 	dotmpfiles tmpfiles.d/eix.conf
 	rm -r "${ED}"/usr/bin/eix-functions.sh || die
 }
 pkg_postinst() {
 	tmpfiles_process eix.conf
 	local obs=${EROOT}/var/cache/eix.previous
 	if [[ -f ${obs} ]]; then
 		ewarn "Found obsolete ${obs}, please remove it"
 	fi
 }
 pkg_postrm() {
 	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
 		rm -rf "${EROOT}/var/cache/${PN}" || die
 	fi
 }
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@ -1,7 +1,3 @@
-DIST hashtables-1.1.2.1.tar.gz 48553 BLAKE2B eff3d256a6e0bbf3ac31e6d26c43efce9bc06ba09d14b22a6a5bd1d0ea17b81912590739376a6912990501d33598e39e4f92818dceb8c89a8e57853dffbc4373 SHA512 87739d4021b705e40982e66925400eea38efd2f2a11dc46626f33d2a9c9287a5a323d93c82d6e8415aef0434350256fda80819a4bbb58ff2afee74ed755c266a
+DIST hashtables-1.2.4.1.tar.gz 58425 BLAKE2B 1e7d0e0f80e2e8ef17370f7019f802989c12eb7a7e340cfac44fa4138baa105985846262b0d5eeb1f59ee21d27a5036dce9c45623fecf6ecdf319ed8d4e36bc8 SHA512 e88fb8f9c8a51be31e5d07ca1fef3d1a05a347942878f84a500d8c224b1118a2be97f9a947f17834a8331f296f302eafeef34d1f151360361675ecf5204b38f6
-DIST hashtables-1.2.1.0.tar.gz 53706 BLAKE2B 5bc1d17fdf80f561fa7d6e9a9010025098579694356484bdaf41ebf6e5e2a03dd6983cb653eef553fb41be99aaa3ce11b2004efe62a585b0ec34f7c4fa12cefe SHA512 2c6cd17434402ff963a1b3357e58dfab3d4b60f5a2848b5433dcbbc1705d24707eacfc36af5dfb461ab03ce678c0736f3277292677e8ab297b306bd14e797e64
+EBUILD hashtables-1.2.4.1.ebuild 1574 BLAKE2B 025ec4927d92f9b0b71a6f69bb80bc977a85f0c3b20c2b765c675797c0ce8382097e31ea35a9648e7db81123cf666df5db230d9b66d2a5de339977085d7f9766 SHA512 660f7e436099477f5dd89aa3018c133b88994a03a135b93b96138620651256f1832cb48cee84db45ffef2826263e9691025d5e1cffae402ddd749d849c55d18f
 DIST hashtables-1.2.3.4.tar.gz 58458 BLAKE2B ea57de50f1bc02107b06ea57f215aa8b7bc97ae658a43e2e57481c097452ee5b9bf2b8d67e0656c7b94830cb7bd4ed7d2e8f3f5b1c3b2070fcc3f1ed1d5f7acc SHA512 4723540f930edd1d5fd5cf58eadf7ed24fcd7761b90f303d559bc617737ec30cee2e9571ecced61fd369a933ae95b4386e48b122b876e73d0ad4bb65df16b76e
 EBUILD hashtables-1.1.2.1.ebuild 1019 BLAKE2B fb932fe35e86072d2cbe49a4ac219e661d635b95d5ee0088d5a4f2a7e34d228fe151764d5c60f8f8ae28588c9a09da57a095b6a2e2704de9647475c1a2d6d55a SHA512 34f8250163ca55ed2f2eb00ab303813c0e6880f9ab49cada4b59c64ba94a89346c73901abaed9359f04549db5302af2cdc98c48a7c048c50b5d99c14e3bdd398
 EBUILD hashtables-1.2.1.0.ebuild 1063 BLAKE2B 8bbb8196c32a5447516c1a8dab7fcd65354e6f7af2ac93d2f2f1e212ffd3c61e704fcd7963453a42e5ca1fc19ac2ea900317fd1d229251fa405223844888afcb SHA512 aeed083a614f122ba7b14d84a287c7f1430749870653ad26458feef2d36ae69b483798b578ca068bd39f8d6cb11c5b2a504026f866d8f1e727deb1c850ef7c7a
 EBUILD hashtables-1.2.3.4.ebuild 1174 BLAKE2B 798de6418177e7694608acd1af95520456048c4aa652f5318f87d47dc9216e76f76a2b6dd5645728609909601eb5470fe3d37ae46422131b9809a60f92ab6b81 SHA512 2610ee3e2ea4f85868bd8c0fc3cf4cacce0adab3dc2a14a4001cdb547a49c84fa8a2b3af3e104b22c57e3b97c0161c204e37f23ef0ac106c2f7ded725fa0c944
 MISC metadata.xml 4981 BLAKE2B a269728be5d3dd0acc907f1b3d772092b8e648a6ca072da711068b9ac3f3e1caf55872b871d629be1170e9df1fa6f8e2d358be09417f0b58890a104f3243fb68 SHA512 42fc16c970cfd6187b3151700d85917ec25f2cba0e83caf2abd748048e9940e8befd9e3d3bc5d2ef7ff69c0a87d10544d27c429908b48db8cc114ad11d348fbf
--- a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
@ -1,35 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 # ebuild generated by hackport 0.3.4.9999
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 DESCRIPTION="Mutable hash tables in the ST monad"
 HOMEPAGE="https://github.com/gregorycollins/hashtables"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bounds-checking portable cpu_flags_x86_sse4_1 +unsafe-tricks"
 RDEPEND="dev-haskell/primitive:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
 	>=dev-lang/ghc-6.10.4:=
 	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
 "
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag bounds-checking bounds-checking) \
 		$(cabal_flag portable portable) \
 		$(cabal_flag cpu_flags_x86_sse4_1 sse41) \
 		$(cabal_flag unsafe-tricks unsafe-tricks)
 }
--- a/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild
@ -1,36 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 # ebuild generated by hackport 0.4.6.9999
 #hackport: flags: sse42:cpu_flags_x86_sse4_2
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 DESCRIPTION="Mutable hash tables in the ST monad"
 HOMEPAGE="https://github.com/gregorycollins/hashtables"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bounds-checking cpu_flags_x86_sse4_2 portable +unsafe-tricks"
 RDEPEND="dev-haskell/primitive:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
 "
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag bounds-checking bounds-checking) \
 		$(cabal_flag portable portable) \
 		$(cabal_flag cpu_flags_x86_sse4_2 sse42) \
 		$(cabal_flag unsafe-tricks unsafe-tricks)
 }
--- a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild
@ -3,10 +3,10 @@
 EAPI=7
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.6
 #hackport: flags: sse42:cpu_flags_x86_sse4_2
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 DESCRIPTION="Mutable hash tables in the ST monad"
@ -18,13 +18,19 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling portable +unsafe-tricks"
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+RDEPEND="dev-haskell/primitive:=[profile?]
 	dev-haskell/primitive:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
 	>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2
 	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
 		>=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16
 		>=dev-haskell/quickcheck-2.3.0.2
 		>=dev-haskell/test-framework-0.3.1 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2.6 <dev-haskell/test-framework-hunit-3
 		>=dev-haskell/test-framework-quickcheck2-0.2.6 <dev-haskell/test-framework-quickcheck2-0.4 )
 "
 src_configure() {
--- a/dev-haskell/io-streams/Manifest
+++ b/dev-haskell/io-streams/Manifest
@ -1,5 +1,5 @@
 DIST io-streams-1.3.6.0.tar.gz 61651 BLAKE2B d71a5ba3d264b98d3284470021fc1d9622700b37ef1a67142d12d4d6321233eb28ad5274925e08f9d0c251ee77e25e2187c811d197a9f7b68e33479d8ea602ab SHA512 9ef5a2daa43600796b48104771c71d698f40e29def536e785421b53a310683e7db202b254310a0a5f2d1fa507dcad27c25f328c64fffe796c06d4c0d98ca982d
-DIST io-streams-1.5.1.0.tar.gz 64044 BLAKE2B 9a1a4dce626f3a569f4a7866f93d5663e9e4e8b863d1c2332bffbeb2e4481e0a250c84b75ae375144a32473b62538dbd87b53dd0a08034daea855484660aa07a SHA512 01ddf89f09cba429ab600e55994cb6740d4fcdeb23ce85822098d39dbe530a74256d66ea52429798787d9d549db3cd99a5078362b333a7f49c4926e74e0b460c
+DIST io-streams-1.5.2.0.tar.gz 63812 BLAKE2B a555bc0bc365e4e2c28570da34e6c2891ff56a7460ec8a857285a22ea3a4a2b8975139c3024fd90ffec51386646d9ed632754971abef04fd2c358cba5e0a19c6 SHA512 2cb6c9cded0077f1501b0fba576b79e5ebf21ccc2711a91552ec46ef6d5e943e0c1255cdfda381aa8e4d7691b1e450956bedd2fbd4414b13ef7926b0cc3dc4c3
 EBUILD io-streams-1.3.6.0.ebuild 1713 BLAKE2B a447004066149aa2af3c04caaf18375884571a4b617fdb9e0b8e8b4cf1151abe29febc72a99676825db34758176844eef41a7ab86b0c132ddbfde5a3a51a95f2 SHA512 c6416ae501b123f6310305dc2a19d3f56359bc9d951310bf993b0c02f6785324875473662e0c4b811d79186d370c6eb88141fa1a35a9aa5e4af60c7ba981b3cc
-EBUILD io-streams-1.5.1.0-r1.ebuild 1875 BLAKE2B 9427186e55ea88bfcf51b2339dea9ce11473d2e123be2eda581d8622653492a22d9b90ce55eef75b76db3549745051b02446fcf7dfff8e7691a8b8bf45a47b8d SHA512 24b1db17449e1ddfbf2a36e834a2d264f8e29021b7dd9d535b9b02a248416d34663940a6622c8edf0f78ff0873831f2aef6aa994c2b0a4edbba8fa46a6984302
+EBUILD io-streams-1.5.2.0.ebuild 1863 BLAKE2B 7239468f7bb1b4523aadea960743b25ed33bc764e1ec16d167281a7ead27a30553b600bce45d179940dd1f4d4cc47fe2bbbfa73be1bef0ad7a81702a6ee2cef5 SHA512 1e7037f2b0c55ffd1529e89a53bee05b3716511dc7b513e761c8f53ef11b9f50a9c1fc680e23e3b282cf073d8cff80bb38f2715d2533a282a11d985107c5c387
-MISC metadata.xml 5034 BLAKE2B 515f93d8822e032ad27d2ffb5e4184724b243e5b0184c6433e4079a7197bc9790bf89fca700c407039a02e4dfd7992a102271d4d7b6adb22d54e9f1cf80fbaf0 SHA512 38f37bee11128d6b53680e8ece7b87dc98d43ddbb910bd3823c38a81de2d9b2746f9089bd5d3ebbbd9b9d19f7fcb759ef0c667ce17a240affe60f3a73de34325
+MISC metadata.xml 2707 BLAKE2B 7f0a861b73b99dd2b03082dc8eb4302491a087a86515ef1fac00e94ceb234bea85359c8cba2bb35895f78e94e68bad896f814a8add92e282faef8000d011af9f SHA512 9b7c8d5124b259fd742c9fbeaf3dee464742a7ab51c48aa00bc09f2795523e37c0d38a204513e5ae3c3ed8addad7b3ad8abcd03f6b1a56f581dff122a572d772
--- a/dev-haskell/io-streams/io-streams-1.5.1.0-r1.ebuild
+++ b/dev-haskell/io-streams/io-streams-1.5.1.0-r1.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: +nointeractivetests
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@ -16,18 +16,18 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+network +zlib"
-RESTRICT=test # one test case requires network access
+RESTRICT=test # requires network access
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
 	>=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
+	>=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
 	>=dev-haskell/primitive-0.2:=[profile?]
 	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
 	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
 	network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] )
 	zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
@ -37,18 +37,12 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
+		zlib? ( >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) )
 "
 src_prepare() {
 	default
 	cabal_chdeps \
 		'network            >= 2.3   && <3.1' 'network            >= 2.3' \
 		'primitive          >= 0.2   && <0.7' 'primitive          >= 0.2'
 }
 src_configure() {
 	haskell-cabal_src_configure \
-		--flag=nointeractivetests
+		$(cabal_flag network network) \
 		--flag=nointeractivetests \
 		$(cabal_flag zlib zlib)
 }
--- a/dev-haskell/io-streams/metadata.xml
+++ b/dev-haskell/io-streams/metadata.xml
@ -5,20 +5,24 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
 		<flag name="network">Include network support</flag>
 		<flag name="zlib">Include zlib support</flag>
 	</use>
 	<longdescription>
 		/Overview/
 		The io-streams library contains simple and easy-to-use primitives for I/O
 		using streams. Most users will want to import the top-level convenience
-		module "System.IO.Streams", which re-exports most of the library:
+		module &quot;System.IO.Streams&quot;, which re-exports most of the library:
 		@
-		import           "System.IO.Streams" (InputStream, OutputStream)
+		import           System.IO.Streams (InputStream, OutputStream)
-		import qualified "System.IO.Streams" as Streams
+		import qualified System.IO.Streams as Streams
 		@
 		For first-time users, @io-streams@ comes with an included tutorial, which can
-		be found in the "System.IO.Streams.Tutorial" module.
+		be found in the &quot;System.IO.Streams.Tutorial&quot; module.
 		/Features/
@ -27,13 +31,13 @@
 		@
 		\-\- read an item from an input stream
-		Streams.'System.IO.Streams.read' :: 'System.IO.Streams.InputStream' a -&gt; IO (Maybe a)
+		Streams.read :: InputStream a -&gt; IO (Maybe a)
 		\-\- push an item back to an input stream
-		Streams.'System.IO.Streams.unRead' :: a -&gt; 'System.IO.Streams.InputStream' a -&gt; IO ()
+		Streams.unRead :: a -&gt; InputStream a -&gt; IO ()
 		\-\- write to an output stream
-		Streams.'System.IO.Streams.write' :: Maybe a -&gt; 'System.IO.Streams.OutputStream' a -&gt; IO ()
+		Streams.write :: Maybe a -&gt; OutputStream a -&gt; IO ()
 		@
 		Streams can be transformed by composition and hooked together with provided combinators:
@ -46,19 +50,19 @@
 		Stream composition leaves the original stream accessible:
 		@
-		ghci&gt; input \&lt;- Streams.fromByteString \"long string\"
+		ghci&gt; input \&lt;- Streams.fromByteString \&quot;long string\&quot;
 		ghci&gt; wrapped \&lt;- Streams.takeBytes 4 input
 		ghci&gt; Streams.read wrapped
-		Just \"long\"
+		Just \&quot;long\&quot;
 		ghci&gt; Streams.read wrapped
 		Nothing
 		ghci&gt; Streams.read input
-		Just \" string\"
+		Just \&quot; string\&quot;
 		@
 		Simple types and operations in the IO monad mean straightforward and simple
 		exception handling and resource cleanup using Haskell standard library
-		facilities like 'Control.Exception.bracket'.
+		facilities like &#39;Control.Exception.bracket&#39;.
 		@io-streams@ comes with:
@ -73,66 +77,5 @@
 		* support for parsing from streams using @attoparsec@.
 		* support for spawning processes and communicating with them using streams.
 		/ChangeLog/
 		[@1.1.4.2@] Fixed a build error with network versions older than 2.4.
 		[@1.1.4.1@] @System.IO.Streams.Network@: scalability improvement: buffers
 		for socket reads are now allocated by system malloc rather than
 		by pinned pointers in GHC (currently pinned pointer allocation
 		takes a global lock).
 		[@1.1.4.0@] Widened @attoparsec@ and @text@ library dependencies to allow
 		the latest versions.
 		[@1.1.3.0@] Added @System.IO.Streams.ByteString.takeExactly@. Widened
 		@network@ dependency to include 2.3. Added a
 		@NoInteractiveTests@ flag to selectively disable some tests for
 		environments where spawning interactive processes is
 		impossible.
 		[@1.1.2.2@] Allowed newest versions of the @process@, @test-framework@,
 		and @text@ libraries.
 		[@1.1.2.1@] Fixed build error when compiled against attoparsec-0.10.0.x.
 		[@1.1.2.0@] Added @System.IO.Streams.Concurrent.makeChanPipe@, to create a
 		simple concurrent pipe between an @InputStream@/@OutputStream@
 		pair.
 		[@1.1.1.0@] Added @System.IO.Streams.Network.socketToStreamsWithBufferSize@,
 		allowing control over the size of the receive buffers used when
 		reading from sockets.
 		[@1.1.0.3@] Fixed an inconsistent version upper bound in the test suite.
 		[@1.1.0.2@] Fixed a typo in the tutorial.
 		[@1.1.0.1@] A couple of Haddock markup fixes.
 		[@1.1.0.0@] Reworked, simplified, and streamlined the internals of the
 		library. Exports from "System.IO.Streams.Internal" relying on
 		Sources and Sinks were deleted because they are no longer
 		necessary: Source(..), Sink(..), defaultPushback,
 		withDefaultPushback, nullSource, nullSink, singletonSource,
 		simpleSource, sourceToStream, sinkToStream, generatorToSource,
 		and consumerToSink.
 		[@1.0.2.2@] Fixed a bug in which \"takeBytes 0\" was erroneously requesting
 		input from the wrapped stream.
 		[@1.0.2.1@] Fixed a compile error on GHC 7.0.x.
 		[@1.0.2.0@] Added "System.IO.Streams.Process" (support for communicating
 		with system processes using streams), added new functions to
 		"System.IO.Streams.Handle" for converting @io-streams@ types to
 		'System.IO.Handle's. (Now you can pass streams from this
 		library to places that expect Handles and everything will
 		work.)
 		[@1.0.1.0@] Added 'System.IO.Streams.Combinators.ignoreEof'.
 		[@1.0.0.1@] Fixed some haddock markup.
 	</longdescription>
 </pkgmetadata>
--- a/dev-haskell/openssl-streams/Manifest
+++ b/dev-haskell/openssl-streams/Manifest
@ -1,5 +1,3 @@
-DIST openssl-streams-1.2.1.0.tar.gz 6266 BLAKE2B 2d7866b7667547f5c4f2c2873471c7ff9ac60ee89e9c791d816b46185bda456d4bdd13ce5894688ff56926b337d38208719f8c3d22cfd0606529732cfcec3235 SHA512 c429bdcbb4ce893d79941eccb849f7064fb88073423b4395e0f50795ddef699934c148549f800b551914c7983cb2b8fc988dccfb4e0363f422726c0cdeaa5018
+DIST openssl-streams-1.2.3.0.tar.gz 6304 BLAKE2B c957be3a5d45f8785220f1bf645ab49df17f3c21dc609810651bc345c9bf6e576cbbb3a35f46b9f979ed48b525caaf8bd6c75f1fc41a38407fa8948b2719f17b SHA512 86c5f9348af82ad0ac9e8103ee078c78647e61345ecf0c48b02749206147a82a3a798f681b9cd20ec866276aca75a3739965ca2b76a0b302da4792bf1fc4917e
-DIST openssl-streams-1.2.2.0.tar.gz 6376 BLAKE2B f0d0684c3ed5e13de4d4745d16cf6bccc75961e57d164cc3a5620d1de0b0cbb40acdf4819266c45ceacd4473bdd831ec9ca92aa086e01eab55408e2588f9a0eb SHA512 ff1262afd26c82e97ed0a8bc7237728b47341968e8c6fe4a2351780508241f1588d12b32709d9be3b385db14b9b56eee77676cacb1c0a6bf632a8f25bdb775eb
+EBUILD openssl-streams-1.2.3.0.ebuild 1049 BLAKE2B 579fc190ea6578619105a0dd466fe287378c97f1b479dce497be4fa26ae7ae0b830774009e37e81ae2093634048c034a588ed7a452a6452ccfa49354906b9bb2 SHA512 e728dd2a714fc5283662a6d92308eb6feabb8836a948643af606e5989e394fb63d8718cd8e3d458ad1382a035aac66cb18411f54ce2929715b6332ec2d7e9504
 EBUILD openssl-streams-1.2.1.0.ebuild 1013 BLAKE2B 6f805285b396966cc72d85d4dbe174906630cf36f7e08000bc664fbf13d7d42c64c0b3145dbd01291914028d4ddf96d7fc65ea530d17560910dc4e2c3589fdbf SHA512 83d209dc6bec5040195877a661c1ac1a517245d40f5381e1b1bff8d9e77a89b6e29b6f6e615d78ef8bdd564b3f09593f252467da0ca62b52296814351168ae79
 EBUILD openssl-streams-1.2.2.0.ebuild 1052 BLAKE2B 83dbf26341b3be4cad377a58d03d72191cdcf291910be4dc195eb55d3955ad97c2d8c2b629721a89620e23ee1c5affc0259d61a85f0c75da7f14a7688800fb2f SHA512 fdbea68fd8bec57ed4b17d0e33fac8acdd99397b609e3fb2f3d80d2fe6cbdbec7d38b68a8a5f2558b2e386163e7a2cd01f3291f6923968223196ead58a9034cd
 MISC metadata.xml 503 BLAKE2B cc36035993804b20d4025345b53ba02d1f42db25604c9a64846a724b9ce99c1f2e9857c4d22a31ad63c168b26d334c64422d15e281e1aec96c31b7499e4bf095 SHA512 7bfc0ffe8f358d7000cae786b34b009d7b18be733b4f905ced9c0d956e7f3dd9fb9ff1b6db64ba09b4188aadef49f0885532aeb581b187a26f596ac0c9cc096d
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
+++ b/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
@ -1,30 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 # ebuild generated by hackport 0.4.5.9999
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 DESCRIPTION="OpenSSL network support for io-streams"
 HOMEPAGE="https://hackage.haskell.org/package/openssl-streams"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
 	>=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
 	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.7:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
 		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
 "
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild
+++ b/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.6
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@ -21,7 +21,7 @@ RESTRICT=test # requires network access
 RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
 	>=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
-	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.1:=[profile?]
+	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@ -1,3 +1,5 @@
 DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
 DIST boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz 41705 BLAKE2B 89644ecf64e5a5df718fa4f873d21e281c777c893af5a8f71c8a1913270ca6c67dc36113e5d219540bb04c7f9e26be22f7e778bd9bdce230df8c0edf3a707612 SHA512 249b0bd0048c53c74d2b50f1b7caf84b0ac0823679bb6adaade095a2ff26586f14f58cee960610d99dbc38c8196cbdb99143815b14d10b7f13a12f96d309e302
 EBUILD boxfort-0.0.1_pre20200110.ebuild 946 BLAKE2B 955d51f99410c6fad234b3809d39dcf4ddcfb9767926a0d10faa29d3617ca268f74a17186cfead644abe7c299e33ada7df528921e8e93800d4e223e647370bdb SHA512 e9d41bc6d42a6aafe88143bc18ab77a2951edf9da7979a8df27e84b3e55bf3ad88db4fd11a41d64ccb6f69d166b34048fcd2d9472903648fd0af93016cf4d069
 EBUILD boxfort-0.0.1_pre20200902.ebuild 939 BLAKE2B 133fc0a9e9dd6e125344511b1e33433bbf54213557963cc673113298f7a08228d98ffd607e5a68224ee772c23cd680b329cc1bbf6d3ce1dec7e647a67f363733 SHA512 78ba5c0ca379d97e40bfd0b34649b125de6dedcdd32b3e355e922222463e27a58ddf45950c5db1299e35b525eec85ab48661d485a96a94e935267d13a04f44aa
 MISC metadata.xml 462 BLAKE2B 36e684c3f60dbb9b8a300c2ac9e93aa2ecae94578ac292601f926d371462ffdded78318860f37407a3c4bb4753f173b298f73e8863b4eaa1e873aefab9053546 SHA512 be917138f28a526bd0bea7f17b719a93de749a923bf7fe380ac06db3ae7abc23ceac0a97504f2ca22a19f99bc0f53dac5a524e1025faa8edafcf0452ef5230ad
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
@ -0,0 +1,44 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 inherit meson python-any-r1
 BOXFORT_COMMIT="ac0507b3f45fe58100b528baeb8ca04270b4a8ff"
 DESCRIPTION="Convenient & cross-platform sandboxing C library"
 HOMEPAGE="https://github.com/Snaipe/BoxFort"
 SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="test? (
 		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
 	)"
 BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
 python_check_deps() {
 	use test && has_version "dev-util/cram[${PYTHON_USEDEP}]"
 }
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 src_configure() {
 	local emesonargs=(
 		-Dsamples=$(usex test true false)
 		-Dtests=$(usex test true false)
 	)
 	meson_src_configure
 }
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@ -4,6 +4,9 @@ AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f
 AUX elfutils-0.179-CC-in-tests.patch 1506 BLAKE2B d2eb6acae1af4d4f370e8653ea65a8ae834bfc531c8cf77d3571e940b29ce08be45e93ff565b69eb43a913ace3e6537bba3358ae32ffa81d727d5b94f9ab371d SHA512 bf1a91219006813a5b8d63cc8735b0956187c097cbdae015a984a6c9fe11343d45315a8df779aad37b7c71c403f13351ebd9a08de06243437cffd8903c5aa7a7
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.180-readelf.patch 1210 BLAKE2B 68003ea8ad853f5c548c2e3f2005f5b258e5bfa52710522afa79fbfec9c45c3d91bc2089b002c3799f92a0ef7748ff2a2cee5c1886c838da89ffabd3b9246b02 SHA512 cac478c4b1e258830fc33b6c9c5cf265bf216026f5cd2d74ba2f331db76f8bdad93aa3b3dba1a0a57263d06c87a839376a59c5519359d781a6de0cc418ef1f0c
 AUX elfutils-0.181-CC-in-tests-p2.patch 1390 BLAKE2B 1e790582925769ddf2346a6b3da3fadf6eda102e109b4e70ade0893ffe33a589748e0fce9f5256d8c121c790986e46ea9bbfee467c7324c466db04dabd88b7f0 SHA512 dac276c66eba5332f952791d5021b9d61d3d5c14e073db4f559a5cf496de8337915aceaec8906b0f7734739e4d5d56714c1ca9288809c80f0f5e71e6218019cd
 DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25
 DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
 EBUILD elfutils-0.180.ebuild 2422 BLAKE2B 40571def8e77f4d077623ad2b0c4a600b4bc70f14702facb099958a4260cc638e3ac19ecc73b043d531c3cee873fca1ad254e0c5d3bc3ba1e003edf27f786b6e SHA512 82614e2da77c393a36fa9a1a0a121743acc3db4f2d2c66521c214d3adf80c27f945403f86ac7861e87dc2b2c2ad7ac9c0a0d79662c4ce3ec29ed245f9845dc9e
 EBUILD elfutils-0.181.ebuild 2438 BLAKE2B e7d1c9b836eaa961143ebd87445029974adc463985501d708fcfb0af20c90fe5f5badfa38340796a4dd17a19b727bc8187a96ba4387f0407e4db687935bd063f SHA512 6d426f5c3925d87b9942ce49cfcc6699ea13966d8093c48387039b03da2932cd868ff4401c3d6f41a852470651cbdbe880083d9cf52445dc340c580fe56d802b
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
--- a/dev-libs/elfutils/elfutils-0.181.ebuild
+++ b/dev-libs/elfutils/elfutils-0.181.ebuild
@ -0,0 +1,86 @@
 # Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic multilib-minimal toolchain-funcs
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="http://elfutils.org/"
 SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
 	!dev-libs/libelf"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
 "
 BDEPEND="nls? ( sys-devel/gettext )
 	>=sys-devel/flex-2.5.4a
 	sys-devel/m4"
 RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
 	"${FILESDIR}"/${PN}-0.177-disable-large.patch
 	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
 	"${FILESDIR}"/${PN}-0.179-CC-in-tests.patch
 	"${FILESDIR}"/${PN}-0.181-CC-in-tests-p2.patch
 )
 src_prepare() {
 	default
 	if ! use static-libs; then
 		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
 	fi
 	# https://sourceware.org/PR23914
 	sed -i 's:-Werror::' */Makefile.in || die
 }
 src_configure() {
 	use test && append-flags -g #407135
 	# Symbol aliases are implemented as asm statements.
 	# Will require porting: https://gcc.gnu.org/PR48200
 	filter-flags '-flto*'
 	multilib-minimal_src_configure
 }
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable nls) \
 		$(use_enable threads thread-safety) \
 		$(use_enable valgrind) \
 		--disable-debuginfod \
 		--program-prefix="eu-" \
 		--with-zlib \
 		$(use_with bzip2 bzlib) \
 		$(use_with lzma)
 }
 multilib_src_test() {
 	# CC is a workaround for tests using ${CC-gcc}
 	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
 		LC_ALL="C" \
 		CC="$(tc-getCC)" \
 		emake check VERBOSE=1
 }
 multilib_src_install_all() {
 	einstalldocs
 	dodoc NOTES
 	# These build quick, and are needed for most tests, so don't
 	# disable their building when the USE flag is disabled.
 	if ! use utils; then
 		rm -rf "${ED}"/usr/bin || die
 	fi
 }
--- a/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch
+++ b/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch
@ -0,0 +1,34 @@
 --- a/tests/run-test-includes.sh
 +++ b/tests/run-test-includes.sh
@@ -3,24 +3,24 @@
 . $srcdir/test-subr.sh
 echo '#include "libelf.h"' \
 -  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
 +  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
 echo '#include "gelf.h"' \
 -  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
 +  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
 echo '#include "dwarf.h"' \
 -  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
 +  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
         -I ${abs_srcdir}/../libdw -xc -
 echo '#include "libdw.h"' \
 -  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
 +  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
         -I ${abs_srcdir}/../libdw -xc -
 echo '#include "libdwfl.h"' \
 -  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
 +  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
     -I ${abs_srcdir}/../libdw -I ${abs_srcdir}/../libdwfl -xc -
 echo '#include "libdwelf.h"' \
 -  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
 +  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
     -I ${abs_srcdir}/../libdw -I ${abs_srcdir}/../libdwelf -xc -
 echo '#include "libasm.h"' \
 -  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
 +  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
     -I ${abs_srcdir}/../libasm -xc -
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@ -1,5 +1,5 @@
 DIST beautifulsoup4-4.8.2.tar.gz 298650 BLAKE2B 6826abf793efa63be89d844bc25bdb105413196bfab21c18f3816fd59a7a771459bf2c7ee209b75b0c88dfa14da8f4625c948889acfb48502e2260ccca229675 SHA512 aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2
 DIST beautifulsoup4-4.9.1.tar.gz 374759 BLAKE2B 43f5dc296bd0c4967036fcb70889f988c0dfc9d8713f8bbab423c9089e87960323392458b3abb9b2332acff286efbbb308a5c77058462c15f8dfe9056f0304c3 SHA512 a1fe9cbfe8616d2ff25cc836769ff02d51ed86b06ca9a37366867b145440b7f64b866346600ed74820f0407c8e70eaac3d58700766a99b5ff7433cb736a57b3c
 EBUILD beautifulsoup-4.8.2.ebuild 868 BLAKE2B d835b9cbd772d58f124ead4a7195f9b54820ab111c936e38d6c112d3037ab799cf8489d691f9be03785e516998ee7fe3f180989d99208a81022f678f5ef21428 SHA512 8a9f1b0a898560a83597b1ff09a9b84f779483b28da91ce2204104c653f8588f7d4292cb681352dfa8b15b33fa6e6cf5ac0a519f0957157e17019610b4bc668e
-EBUILD beautifulsoup-4.9.1.ebuild 873 BLAKE2B 7653e2add6dc81cd5d78e02721a65bf1ffca1d06f3d237c9d1cba08c51229e0c93b9cec2fe422006f192e32198ef5ae2da5b00fdbd850291e35de615e343b30a SHA512 28c8d0f7cc910d02fcdb3813d969d6e90e99a7d4e04dece0223654121d503238e2732afa965fd73e3e1c3eee71018bf25bb2cd69b410beaa5a3efcc8d353f1cd
+EBUILD beautifulsoup-4.9.1.ebuild 865 BLAKE2B 56ad3bad060f06f8c8c5a423756737103788c45f0989e8ec3b6b73d3a5e3d2f9cdc8d45e488a518ea018fa24b04cff0ac670a1c25cd81a8cfed7845b6cbfea5e SHA512 4d7262aefafc557a8f5a82312043aa2128cff129032fba20a17b25363e2047cebd6c73423c16375a0690ad829aaa60fee13a0fba83022e00f2244e469e850028
 MISC metadata.xml 744 BLAKE2B 93987e4adb8dc5dea9b897940cae80d431b29d693bd1fea9d242de75174b1fd86afaecc6a5fb5e4ad06576caa559a918d09da28d253147f2683703d911435f76 SHA512 f56ab7ff03d21187e38f292b24396eccfd53622c84f5f489bd1e515393dbf85b75bbdfe26a6875352b16dcbf16f89cd9a051dfe44dbca8786efecd7db914f789
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@ -3,6 +3,6 @@ DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46d
 DIST cheroot-8.4.2.tar.gz 107264 BLAKE2B d28d602ebd442ad5d85dfb2f4618b279e733cfca9d3c516ad1fbefcd318449155819549f6b929713d51d44fbaa9a7db383af81ea65271c6646a9245e521b3178 SHA512 d0b807969d491e0b3423453d27acfbe51147f6786c0b2c8a1b4774589e3e82b027277bf0ddd5ff406f31e0ac7d9dfbd6c2f02efe6911889986e72e9f16b8e62f
 DIST cheroot-8.4.4.tar.gz 107753 BLAKE2B 4e5d9c3a101876d76696a2e6e3c191f199810e734e25cdc07aac69c102eb28b90033c6fa749569e140c01dbd08a4b06f067b4f47d34ef483d48731c6372ee5eb SHA512 18e2c198a537abd740a868fc4055c1e1e0501392c5518ec345669d02511dac2d59aa2abe2670ffb1800c5aae7032b11445488ecf7fd63d02d5923ed08b82f216
 EBUILD cheroot-8.3.0-r1.ebuild 1409 BLAKE2B bb5c42a3682198b4fd398d4a4bded944caa79b0e17721d49266e368297bba90a216ae10dc7653fd2cb1fb58fc61ff53623a407e55dc8600c4a8f04daa130be48 SHA512 ff73d49cb031988681ec77508c52cab9138b6a38d5eddc98c3f1e0d752a75870793391677f575ece594be53aa7b4d72f482139cd0f291ed52023e2cc743f20ef
-EBUILD cheroot-8.4.2.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
+EBUILD cheroot-8.4.2.ebuild 1527 BLAKE2B aebf3d6a33ae6371dcd046669b320ed26139f37a91b3fcec6bec217e992b74fec739e4809ccf02f1161df829f12850238f10e0277554f246ff2f6323f06d7d1b SHA512 f4b4be5490dbd7b112ee3a6163c7fe9f0d61202b42dc2935fe44f24c6643aaa5ecc70f06cc2bc0af583d18c123b6d258c2e4d568635c387b3e9724b8f3bcf9ab
 EBUILD cheroot-8.4.4.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
 MISC metadata.xml 471 BLAKE2B e623692550af72f63a0df84767bfadcf9ee16beafc4f467cc6bd83d7a0deca6a66d73f9041e3e37a967a4d7451eebe0d9f7974e43ce90b2dac24134ed7aa6496 SHA512 19c39b453a668408550b250a96af25ea12c8a46285070aa4a1b1d7c3e6b4ee36ac287ead410e6b798d4fa607543d58c5cc8bec0f00992206d2a231de983b5976
--- a/dev-python/cheroot/cheroot-8.4.2.ebuild
+++ b/dev-python/cheroot/cheroot-8.4.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@ -6,5 +6,5 @@ DIST coverage-5.2.1.tar.gz 694076 BLAKE2B 0aaf9b5668c2fac1220c377d5b841341b534bd
 EBUILD coverage-4.5.2.ebuild 1237 BLAKE2B e34bf2b12ce2f78f0882e690ed2d8fb9dccc805a3ba05ffbb25e5a69e9590fbf5706800b0b5fdcb055e0044afa92feb6b7903b23f85343d8b5d56ad724a4145a SHA512 24f1e3624cbf90d7debff9fe521cda8c4ee9cc368377cfa7d1143768ea7f674f534a3c94201e5f3154b0fc5499e953b53b79958bd5aa0e40d0e424ce6f28f02c
 EBUILD coverage-4.5.4.ebuild 1787 BLAKE2B b644cd4091377f15566c9bc3979410910429cede262de4d941e48c1bd68db7cdb5d7840cb71fa9454d6289db66b69772b2519b5ae2a82ce129ab2a54136d1528 SHA512 a52843da254fdf9632bb3461bcae4f58c5e7537577510aa8f4e0ca8bf7cd236376cbb707b01b3933670dc686d4a4c433115116e42e6c63f66336c2d6234a5486
 EBUILD coverage-5.1.ebuild 1882 BLAKE2B 654f744159702478c1570a0f3bad15db7dc5f377442c30e256c650da68e80bd071b06a3a96453965916254fd88747a5d023d5f4f8f83ff35d2a9644e66687e55 SHA512 cb43a7226368f4266ebe0ef1a001508c054aa3d4655a1d6f51e669e5dc49c67df1ec583664ded59e7a13191b132c510002dc5099ced9d347ecd91364703a7a5e
-EBUILD coverage-5.2.1.ebuild 1895 BLAKE2B 621d86445c08050b0a34d2abf9be5424416a17c3790a33cfa521f6e47687ac51f4c300ee010ade0e45579afd60594d483b57531db47833db17f633e0884f0352 SHA512 794886840002875aad0e85440d228691ef4ff9d3deff67376132df56daa6cf891749d7455c7e5855f1b59160f2cc033ba32b6941a8dd0152794157802feb48c3
+EBUILD coverage-5.2.1.ebuild 1894 BLAKE2B 26266d5c771988139724f94dfc8879a64ecc03450854ddb24c20d13d69cfbc5acbfbb07494d0d0b8d263adda844b4059e68cf187249ca1148a73ab6348bd9db2 SHA512 bb95f68d05a5a676abeadae746a0436a036e8cb3019a501d9199bc64cb0c820097992fb449774f3f4a47523c909006efbefa31009949a05f4863cddaa5b240b2
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
--- a/dev-python/coverage/coverage-5.2.1.ebuild
+++ b/dev-python/coverage/coverage-5.2.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@ -5,6 +5,6 @@ DIST cryptography_vectors-2.9.tar.gz 35140661 BLAKE2B 870245659f6a64566f823116d8
 DIST cryptography_vectors-3.0.tar.gz 35156155 BLAKE2B 987fa88873bb3ec9745a150906e868c1aea14bb9e618c5c65348deb4e8618f89b15a8d70ea6ed0760649505f5649dd2fbf1e40fadad193faf3a92922ed234025 SHA512 a24c6f25c0acf79cea534fc86d61d9697c004a18204043457cf1a955751e8313893c63258f82ada523a9608b7ec0e5a7a7047ddcbd20e0c55d7c6392bc61c24f
 DIST cryptography_vectors-3.1.tar.gz 35163687 BLAKE2B c381781950bf5399c15fe329fc28cf35933936a2130bbf18909f31f1bbd764a69a8816327e968d3810790b8404e3ae5af25b3d390da3015533f5c52f8a0cd0cf SHA512 094076a26ba4cae1bf0408844abbb9b3a5634f97657e4627e10b8a7c7424b69574fd9d719d5c258aa02244bee8b395f09c51af79350971072b2f9719446743c1
 EBUILD cryptography-2.9.ebuild 2048 BLAKE2B 13d5aa1de69c55a08312a302f96069f1a76e78cdd998b0255539656e425f7956788ab2c2b5e776434fff3deeabeb2d9e7c3152acfc42b78910a91bf50aae7947 SHA512 8fd34e0c4009ed7f276a5f562d9b6df1bb782c5ddd8ea73e1240e414ebc7f6fc352217b5cf4a721b87b1b390ba7695f1459c19c58cee797ab1886fd9d523d693
-EBUILD cryptography-3.0.ebuild 1968 BLAKE2B da1ea5be9d78dc8ba42f9824f4f231e038a73c47c3bbfba2b0f8cfdd7dbfc5c1503fb8b8bbac4eef02b945d3a722fc77a8293471c378d008569181954d11c754 SHA512 0453f407e632f30d26f5e13390015613c984ed6afb8856bf9057fe1cde1e856641862d396dfb225a579e04d36d49a28f78e69e279ac51519c3d98a197389952b
+EBUILD cryptography-3.0.ebuild 1966 BLAKE2B 19de6b0a30d6c2b289f4001b534ce92c9bf9e67d5e7d359a1f8269692120c61a150ce7c98351381b46adf1c78ad6caf56e926c815b645e97f1b3a05be7349dd0 SHA512 48b396b2d1f0d46ba77df2a347bdb2d36ec9df3174cc59f289cf044ee3337b585e68bbebf8f81c24a08d4e1d3c0185dfcb93a98f30423d4bb4f41b143ff28c13
 EBUILD cryptography-3.1.ebuild 1975 BLAKE2B 7ca209841370310dd20201e7d4e63a52e1eef2ec0ec8419dfe900610ffd24fb5a8bc519d73f1477dece54b9bd8ce60e883ec5ca1534846fa0449a5f6d7ada61f SHA512 e3abd81f6a6279f02393a965c8df6880332be7654f6a7d5a38ec5f25974f820d10ebcc950c235428f28c220e03ed684e8348d5288b5f35f8c8f628909e503b9b
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
--- a/dev-python/cryptography/cryptography-3.0.ebuild
+++ b/dev-python/cryptography/cryptography-3.0.ebuild
@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@ -1,5 +1,5 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
 DIST ctypesgen-1.0.2.tar.gz 119413 BLAKE2B 27bc387ccbcd62cd164aef544129ead58248272251d2e2737f7fd65f22b92def3b62845a92dab4e1ba3faf030a002b4f2a67bfb0492ffb6298ddba9d7a2ba0f3 SHA512 d5168f72a04878d64b43c096f84f2a32663d481d7ac37f78d706f11aa09b68fe267af476885232a8c64be0f33dec20937e11bbfdef6231ecef1b19eae592d638
 EBUILD ctypesgen-0_p72-r1.ebuild 798 BLAKE2B 46552f34043b363b6969306405caee564b7e5cc7e19554a35cc186665341a5635727bd408a65f6794477288f1f1625dec65ab7f3f0872570825b73da98cc42e6 SHA512 d0e8d35eeea35b4cff80bbe9836611064b4cd5f43a850c21ea6c92b9e6c571ecc29d1df272dd8d9754db46c57a160a5fac887dafd48ab8b58c61581d2fd1d9a6
-EBUILD ctypesgen-1.0.2.ebuild 748 BLAKE2B b7a23e2d1669dc2c6597ceb82d0cd3f33c3f36c166856f3d34c89f07ddbc2482ca5562594be804d7687bd020383e336d7ec1c6165aed3e2503806dfbe1817e01 SHA512 3f838e108bb774bf35d67dd77e08642e61d7a61e8294d212682b2db38f049091a8a68b1c24d3b7092d50edec5d61532e87ba5bf5a1c7608096819efbaeda1d15
+EBUILD ctypesgen-1.0.2.ebuild 747 BLAKE2B 9e03e6be22f505faea0004e135179505da186a8345dbbf10ea9368489fe879d965f85170bded0e4e9b8270fb09e2b63d14ffdb972250c676b9b9a3be6b35fc20 SHA512 79fa7aa103df418a62ac278e35ef804e57e4189805c854b11cc29c96ffb6a0df48a346398b179e536d2d5089fad927af5285f0c6cc408b0d4935c960a11fa4e2
 MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
--- a/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/davidjamesca/ctypesgen/archive/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 DEPEND=""
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@ -2,5 +2,5 @@ AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc
 DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
 DIST dulwich-0.20.5.tar.gz 384166 BLAKE2B f11ef1467a7f850666a850c42871b2bb798cdad54b4ad5a7d6fef8171cb5378982537574f9d2c783e2c9e7357624eec4c617c0b014d789d9f40f5bdfd56d8b39 SHA512 88c546fdc6cb4fbde1ebab5160e1f226259d85c934bee456c8a93b14f4c292550e685696fd25c27635f3342f82b0c67572059fb90e3e9b339aa0d11b9e010c25
 EBUILD dulwich-0.19.15.ebuild 1701 BLAKE2B 181fac6e54d4dfa2d34bb8ced0e1eb5d037c85fdc0ffc0c51fe395e90b626dc3a98fe47e6a59ec904b6c5d8d1827a5c5000cac0de94dddf0d6f51bb50694fbaf SHA512 8cf6577504fdbcfb4045ea633c8a990a7be0af26a4b80b400435f72e668b284494ef89d74a60fb0478bad255cb3bc730b7f3958a7b9a18cd5f23d11150d00c18
-EBUILD dulwich-0.20.5.ebuild 1555 BLAKE2B 6b26219ff99b9c4926679fb4cfda6109350dba96798d17ed8e3be4e4ebecf9292c9f1535c262d6772030fd0f3ccc7adb7fec6e963bb6ed1a564d3b2cfeda7215 SHA512 74ffff22a945dbdc46ce4d20fece16062dcd8cf100336ad34b8293d7e2c3527f0e142a0da38151483fc07b022327b3a6372a9cc1e08d37fe7ecc109750f6b016
+EBUILD dulwich-0.20.5.ebuild 1554 BLAKE2B 714df67098706f0f46ea2b805a1fdac840052535b97b58fc4a304b2f56c5ebe4b9145343bec682518ce7b816d708b59dfe4817666db41103953d44f3c3013584 SHA512 7932159af406a934e320f22ee3f82b06db069f457daebfaded96b3a2654187a5af2c7e62cf19900f4dcf0696c892c19e28aba2943dbc9f5fddb469531a283054
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
--- a/dev-python/dulwich/dulwich-0.20.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@ -3,5 +3,5 @@ AUX feedparser-6.0.0_beta1-py39.patch 2768 BLAKE2B 26966964d788891224adf67f0afe6
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
 DIST feedparser-6.0.0b1.tar.gz 250065 BLAKE2B 54e955f011af0755e0f627caa1491be15a073984d5c7c2b4edd6e9dcd6054e19b5c77cea9741d0bf7af151f9c79b22739c12db94619373f195e024df65b1cff1 SHA512 580e02bd77dcba547eb8295f958c6d30e55c62bd7fdbe25eda7687d0654b9342edf82ab637902175fc90b86a8ae9cbae8ba2c7c9a83009d25ab5c007c37cf02d
 EBUILD feedparser-5.2.1.ebuild 1194 BLAKE2B 8fa165bdf23171244f6d0fb6fdf2cb296c06515296150cee3a871ad09c9825a476802d176935f7eb459d130f7c0c43a4a4774ac8d913004bc63c960db25dbb6b SHA512 90b24aa7ffd61794fa22a9d530f7ade3aec69cc8f330a9f1979f6ff302aa2a6c94b5897e0e05ae7671b86dbceea9b63f540e221bc3d739d366192ae45dee77a4
-EBUILD feedparser-6.0.0_beta1.ebuild 944 BLAKE2B 9bab175ae3c514e51827cb2196181ea149d3a61c3e49995217faab9fc5fe64f6d24c3d9b83dc3f72f1833c2b9b21cac372220c959dcef2f4bbf90f11a77f1ae5 SHA512 620a56526e001d096e3d5a4ae22fbcf42ad54b3e5047ad803ec0c5ba5f6fc1d91df0130283fa5661f069dde333178031335c4605ef7fae980b441e86f6a9cfa5
+EBUILD feedparser-6.0.0_beta1.ebuild 943 BLAKE2B 2d46575f4117ea5bc003e97df9489dd465225d5ea56f145ce7b65a38fc2dc1c79e0d501e6a00776f8faa4437efebc95ff68d53c5178dc835ff10719f6a320767 SHA512 a850032ccf94a70be1ecadb2cb2db303a063ea3382bc759262ff242b20aeceb79ddb4b28eb6b4d06b0d38e0b27b5a75b8d3dea9969c5e8b103c7d23aea5d0a39
 MISC metadata.xml 442 BLAKE2B a561722b8e5ad877d3a1b0503f159b7933a2bb45673420b20f840dd876881a0fd8fc3eedb3b0c3aecb76b044c770ef42cdbcf3f210e71e400dfb002eb4742251 SHA512 20cef7a9f4d1bb89e11748a8b5ab31136b85f68d15ecec018f1f0872b721a2d53f3aa3ab06a1b97e3f79588656e327feb87f90a0e75f4adc5e879c9f0fd36017
--- a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@ -1,5 +1,5 @@
 DIST flaky-3.6.1.tar.gz 29501 BLAKE2B 57d8c1ed9f271688f8a6f2acf25456058b3a67c86ea7aac8c32fd52221d294b5226461b9260677e3ed94af84ff9993a02e79f0d6b01f05daee2992efd8ad03b8 SHA512 f14fbd9259759f3b6f18a7dc16e00717ce54392a10cd9b3225636e33c904e69c6b01398bfce96d7273a40b6c2cca897a05ad386a4d8a83bffee12fab322f9b32
 DIST flaky-3.7.0.tar.gz 29591 BLAKE2B 747fbda71055bba937abf3e7b97691c1f4b222f085069d1815d5a9eba669464d2ed5d6dcf1842ae82f1970de5cd5e3aea5b12476bfa2d9282549ad0cc62901e9 SHA512 b399f6e1323d6ca341803ac6f1eb318bf24dc37182d0b49b89bb81b9466dd36271ad6dbb9f48ea6fa4760ee631f1482bb6f49c64f4d4520c40634089c1b64f9a
 EBUILD flaky-3.6.1.ebuild 1277 BLAKE2B bd89281a3810254e08e56744046a9ef6380d8c339ca0c7e15292f157251653ceb5722354b0851e1b5c9cbe05c4c9d168fc5a396183861e969e0cc171dfe8ac0d SHA512 39005d51822b0ed1d0c9568197e4d6eee774b47e6c8ea8aec34ab7f899c7130a14d3cbb422ee2f3180b21be4280df749cc7f7c90a3be8feda7edd465a744460f
-EBUILD flaky-3.7.0.ebuild 1293 BLAKE2B 46d449d2fb11638adb1d1206088add2be53454931f9b687520aa9aa53be1bb3d53270b65f1e590020b42c4d9e78c2d5f234f105ca61995ff6aeea72446eec6d0 SHA512 3fd98fa61d65dc0c0625b94383f9c0d42eb61f36a9cb7f3fcdf314fe7af488a1647cc52516043a8bb0935d0ccb941c535d61a686d106974b7854924dcc9aa69d
+EBUILD flaky-3.7.0.ebuild 1284 BLAKE2B b973a11f6050b6a40d09b72c26a1b6a1aa7587085ffbfbf64f5d78ec64e014074b680273b98c97e09a169440578f2ed0a22f6ec6c2f4c25edae5ba93a6893cc7 SHA512 ab70702cd3c0fa6519b6f434124e14cd3049ff33f4688973c262b33b8b1d3781958e38507138953d3dbd2b51173764b50929766640d611a515d9ba67945bace5
 MISC metadata.xml 394 BLAKE2B 53dd53a5d469ac917564b6e476bd9dc3ad0db1d5deae6070233427dc2429e233bc9ee800fce0ec5c1a00eeb399d942287e2bb7acb2267abc8fc0541a08596b4c SHA512 cf363a14b16277e1bd3af50ae9827103ea16f901489b7b2d8729729e98dc09e0a05f91298e82054e5a58d042b0beeb844a80ee5a4ca2e28e9852fa7f5b7fc652
--- a/dev-python/flaky/flaky-3.7.0.ebuild
+++ b/dev-python/flaky/flaky-3.7.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@ -1,5 +1,5 @@
 DIST hyperlink-19.0.0.tar.gz 99099 BLAKE2B 1213bbc404ebf04f178e3f8b986c343f64cd6a75202942d1cfaeab640d1523388beaafcd2662f414c9fb1eb87f746f3edeb5b5e395b9fc0acb7e82697f45f7a2 SHA512 5d5723bc0bd0c381edd3a9ef7bab3ba9ad4252027d5a4afa61e6cfff3e5b8457994b6dd36ecc356e638d41f797fe3367a3010249e0e77bee6e9e94336c1e7c2e
 DIST hyperlink-20.0.1.tar.gz 140291 BLAKE2B ee8c741d4cb87e4a577e1c9a45614f5f47e086f27b60a75897b66684ab5927da73ccaba47b16b770f0277a52351cc732cf74762e29c83644c220ed59c67a18d0 SHA512 f935c09d35baf8a8a3c8d4dc6aaf64135d13dda4636187f5d47f3fe4de675498efa29cd93d802c0912db2fa371d0e58213767b1c3c42e5a14bb837ea96a72193
 EBUILD hyperlink-19.0.0.ebuild 568 BLAKE2B 50b5ab528343078e69ae3dbf0135f34b74a660618090fe7cb215535f32a4f348bd98c57baf63f972a0469318cceddce108361314e6a767cf7645a7afda564f44 SHA512 122381a0f3253cfc5e0e6511d71114e8552767d39b6b5d09ccdcedb1f56337948ea0af20f7b74b7681f415e5e68670b17c712e10e936746207c0ef165866d710
-EBUILD hyperlink-20.0.1.ebuild 677 BLAKE2B 28d902f6edcca4981eba3bd89ff2aafc48ef387df3b7719eaeb8002bd196c6f3b5048e1245dd09fd1297ce7d1b82bff014ae291c0be32f34ca1549c8065886c0 SHA512 dce462587b573a0233fc2a327cf207c9d9919da80f854752a987b93c050f05c1cac93db831868eca352fdbd42fdc4b9c7fbb3f8760173c310e6fb715304ace40
+EBUILD hyperlink-20.0.1.ebuild 668 BLAKE2B 9f518497d436bb1532b5ad5e83bf07832cf4b4b71c7b9f54788face3df46483ffcfad558c863b256997b3a59548d4b908021c6872ce07720f677080435bb3378 SHA512 cb0edd11afd2afe5676596645d995ed82580e7ec32e6efc35757301cf699e710f4e4ce18449aa37991b9c09b83d67a6cd3f4587e471bb2dadd90fd3fe4c3e598
 MISC metadata.xml 697 BLAKE2B c5362a0a1a73b8f1d2675539ceb6c13199ac14dc6365b46f268799dbac155b03a0dab0e9302e61e6ca5ce5f2e7ae58be9806f8664c117c430bb52732bf8db927 SHA512 3811b8d737d1531e1355622dd939430085e5e672bdfe36450893f46b84441fd009ba60eb46a9cef4472688070a007e1c78b2b67794eb7d5b2ef8acff2bd801f8
--- a/dev-python/hyperlink/hyperlink-20.0.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-20.0.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	dev-python/idna[${PYTHON_USEDEP}]"
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@ -1,4 +1,4 @@
 AUX jaraco-context-3.0.0-useless-deps.patch 2133 BLAKE2B 8db1fea20763661a3d6786536de6ed956a1e3f2952a96f7242b5735f2ed782496dcc662259921e4eb2967655da4f94ad7262f282caf3bf15428c704f4a38890c SHA512 16608605a401fbd002714043da0a7a28fc770f8972a808d71da19733fe1992f7f1f27f1d87462900c980bd14ba4c493349e5802f735e795a2e2c3d7012d2773f
 DIST jaraco.context-3.0.0.tar.gz 12901 BLAKE2B b0a18d8799de211c9827a708302798372dff06767fbac08f4bff8ed48e1dde4cca8d3896a3c4dccd186efdc4d80ffe2b972a05e8f351ec53dcd0c7dec45cfcea SHA512 fd48a9af65edea3212c194758ba1a8fc2d7efc35f7eaec959a7f327ad46d1bf15f295af29d62726f813d35baaeaff35bc3fcd6e27a0e0f272232772e1cb87c17
-EBUILD jaraco-context-3.0.0.ebuild 1122 BLAKE2B 7c52d1532ccff0b303988f86c61e22cc194851eb4d96cdf0e81a30a5a3faf166ceeccd7555368c43bd443781918b98cb41a92df91907ce84ad776e010ae20cc6 SHA512 e9dabf3036916d9ec75b5e51e149be77e4da09bfa82f270d420611137cee1e0a2d971ab79006b5c7efe676f01fb30b8998ab613e1d3e1bc8e1a5b61d0f5b20e2
+EBUILD jaraco-context-3.0.0.ebuild 1120 BLAKE2B 859748898ad1fb0d34839d422598bdf22fb8326a0f2110963d5f4cca57a6e56dfa8dca4be2fb15b4c082ae0d2aaff970ac5300f3f4f43c34e9058100c054da94 SHA512 2db253a251c9e5b12d838e4d80e24dde95e4097dc22438beb592a5f4b784ec28d159dfe64059f2482222503b7df6c0e21d0ce6cf5735f17f0ae7ce1886f55fe4
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
--- a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 RDEPEND="
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@ -3,7 +3,7 @@ DIST keyring-21.3.0.tar.gz 73120 BLAKE2B 6124e29e4dfa0b4c1f4ad3c1262c282935f860c
 DIST keyring-21.3.1.tar.gz 73553 BLAKE2B 75824dc1ce757501ed286a2dc5c49c644df0fd3278f7344bf42c8e687f51b2c488e038377e776b13f0d97b3f60d940467248689d8f1572811a15400a14d85529 SHA512 6a95d602eed052378c78fe3d8134eeaccd5fd13051ecda32710061c2b9348ebbfc350dc004ef41df94df28006ead4bbefe3bc968bdabd136acf27c469a87ee7a
 DIST keyring-21.4.0.tar.gz 73591 BLAKE2B ad8fe71a6a8bd3180b01ce3ca0372f9d1dc493d3eb58ced707d1869284d21ceaffaab314c1304b58461d771fa1a4a5981ec8fbcfaf333d602bdef7985d8799eb SHA512 149f1706296c830605d0ff2eddacf3d531c3d80f694465785d83e2af1d55a49204a2112db840522d4de10cd012073cafe571638e2c39a2f61c308821fe5ec901
 EBUILD keyring-21.2.1.ebuild 1266 BLAKE2B df8ce389ede1d4715c06f4cfe36cc131f74698d9f1a90bee267ae3f329b1710582578f78d3035b5199326e3589e3dea4f2e26c63e3e58fe36c977e65b6ec05b2 SHA512 7c692f813a322a04f957766dbb2703cb0202e2fd0cf34b15bcb6b82202ffd8e7d12bd58ba06be64934ff4dca596216644788c1cce03b07c7fbdc501df7bf0be5
-EBUILD keyring-21.3.0.ebuild 1281 BLAKE2B 1e2e062a47177c8928df23e48fdb99917e51e7da008a1483fc83b09fa9a98b95f489a879db37b6de17a7365a6ef121a20ba3507fecbe32a5d346f3aa84fd4537 SHA512 c7916d84182970017e8a5a955ee260661f09ad75202a53b0e73cc3b306496eea5646157596c5b2e1a0cf4c37fe3eab9a3f90ca179b77472e619271bb546945fb
+EBUILD keyring-21.3.0.ebuild 1273 BLAKE2B 6edd2f19198f9dac1950043b0149e5b69cb8aa1fd718c843d5ec0199d4ac82f50f12a97744f5506d2b6d58eb26e8b33502e3d1d149885169cf862ea34e53b4b2 SHA512 5a3a91255b0dc31176a1833bdd2f150ebcf7f762f580d0b7e7887252266290d920142232100839cd8296486fc7fd2a2d8a210c343128bafa5df6947b1a9d26bc
 EBUILD keyring-21.3.1.ebuild 1164 BLAKE2B 8b30b9f248e9517db0d4831b6d0d05744ca6d4b2862bc8066bd0ec9811b05d3f3bda31056064416057b9cc17a442d6140c0e348bad302f021d255fe27a50a964 SHA512 3828e321691678d215dc54ce441f7b9a36c4760cca8b7989abfed7d91f6914a49373bd163e7d05ff7bfcb7e73594ec050a4c9dff05f7a7222043cf91a8a86b0b
 EBUILD keyring-21.4.0.ebuild 1164 BLAKE2B 8b30b9f248e9517db0d4831b6d0d05744ca6d4b2862bc8066bd0ec9811b05d3f3bda31056064416057b9cc17a442d6140c0e348bad302f021d255fe27a50a964 SHA512 3828e321691678d215dc54ce441f7b9a36c4760cca8b7989abfed7d91f6914a49373bd163e7d05ff7bfcb7e73594ec050a4c9dff05f7a7222043cf91a8a86b0b
 MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
--- a/dev-python/keyring/keyring-21.3.0.ebuild
+++ b/dev-python/keyring/keyring-21.3.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 RDEPEND="
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@ -1,7 +1,9 @@
 DIST pandas-1.0.5.tar.gz 5007108 BLAKE2B 6aff9602f8b1642af1dca70c7c596f2978bfef8ca9bc782d55aeeab85d3768289849ccd0150291c33cab3442d38cedada91fb846abaade1b3905098edb06c06e SHA512 bb9e3ed9988f7b878ac6f9d7c6c054b119acfc4b960ae42ea92436979ef2098289123cac32b176753942a1edb3b6bd35c4eaf05112a25fbf8a89078fd76a2646
 DIST pandas-1.1.0.tar.gz 5211071 BLAKE2B 538e7579384dceb29f1761e00181fda4f07556ee15723a127966e47c317babead19b364943808d11f03007d5a48da3b28bf8fd9e5c1f40bb3285604307bff267 SHA512 496344967e6061ed451edfe2057d0b63d7277cdce0e12e2e2ce558aef2c23fa5d85daae239fcf88820196add3a928734f31af2734866da7b0385f363607e2885
 DIST pandas-1.1.1.tar.gz 5213685 BLAKE2B 6604c7def761f8eef4596a9ad6c1afe1f59fdd6181f9cdc9edfa97939a9e668e745ebc0abd8664eda4f864be54740d46e4aa10f32728306b897e397bd6e1f682 SHA512 db93e66956d832da594f04aaa5cb895ea22f66acd0e97ad76f22153f9e872e46845dad5b952b54463ec8ef3e2a73a766eea8d53e980a5508e3a3346429a07999
 DIST pandas-1.1.2.tar.gz 5220166 BLAKE2B 3351bf0e539335b7f13dd6e6590309989c3bd5d36c0fd188808be14a147b828f1a3a14007fc499e2b5f580072b02de8587885629a8ffb1fc70b2577fbd034001 SHA512 a81e9f82b866cc48eaf55c288610b150fe3fa6ba6100c0b13516eb0ce4b569397127b85161e53454d0b2b24f276aa9806baa007a521623aad2345e7b7168cbb5
 EBUILD pandas-1.0.5.ebuild 5707 BLAKE2B f51de871b42925692d18001d4ec66d06570f8006d1695b131f84ae8697775468166317bcbf4d66d7c618f21c6d5ab394c968998302778efd41ac5963de030c92 SHA512 87afde84b724bc221efb829e7b660c38f9f0e88aca3ce9b1737cf204aec9a4795a43e3d3332837cd3937693951b797667918632224fb9ede2c714d6353999f3d
 EBUILD pandas-1.1.0.ebuild 5750 BLAKE2B 6d812e8874b3a2e064285a64bc6e3869702f344b49b5e5955fb4de284b5d84d77ff8c486050874fbfb0f9ae7048c9ae32413d7857ed92b2624b4374584670c3d SHA512 acae3a0f51c032b373083a5fef660f801d106bd1a4f75916b4691ed6f11541b01a29d17f144e33cef43127d5a43eaab3c0d1f2771fe5e3352339a5607c2d8ed7
 EBUILD pandas-1.1.1.ebuild 5947 BLAKE2B 361810b2a9dba5c75e0feede3e5ce93bf9f9485b7a2b038e3dddaf089a776ca31aba0000cfb2607525a1dfb793d583c50aeeac64e0c2f7f57edc9a97fce2db98 SHA512 21fa836ee46caa4fdafa9717d55da3335d2b4b39acce204d59f547cbf32986d79cb35d0097fc914e64cc871ca361b69160b860b7d01bdb3c9dd21d898602b2bd
 EBUILD pandas-1.1.2.ebuild 5947 BLAKE2B 361810b2a9dba5c75e0feede3e5ce93bf9f9485b7a2b038e3dddaf089a776ca31aba0000cfb2607525a1dfb793d583c50aeeac64e0c2f7f57edc9a97fce2db98 SHA512 21fa836ee46caa4fdafa9717d55da3335d2b4b39acce204d59f547cbf32986d79cb35d0097fc914e64cc871ca361b69160b860b7d01bdb3c9dd21d898602b2bd
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
--- a/dev-python/pandas/pandas-1.1.2.ebuild
+++ b/dev-python/pandas/pandas-1.1.2.ebuild
@ -0,0 +1,181 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 VIRTUALX_REQUIRED="manual"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
 DESCRIPTION="Powerful data structures for data analysis and statistics"
 HOMEPAGE="https://pandas.pydata.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
 S="${WORKDIR}/${P/_/}"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 RECOMMENDED_DEPEND="
 	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
 "
 # TODO: add pandas-gbq to the tree
 OPTIONAL_DEPEND="
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	|| (
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 	)
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	|| (
 		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 	)
 	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
 	dev-python/s3fs[${PYTHON_USEDEP}]
 	dev-python/statsmodels[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
 	' python3_{6,7})
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
 			x11-misc/xclip
 			x11-misc/xsel
 		)
 	)
 "
 COMMON_DEPEND="
 	>dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-python/cython-0.29.20-r1[${PYTHON_USEDEP}]
 	doc? (
 		${VIRTUALX_DEPEND}
 		app-text/pandoc
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/nbsphinx[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
 		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/rpy[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
 	test? (
 		${VIRTUALX_DEPEND}
 		${RECOMMENDED_DEPEND}
 		${OPTIONAL_DEPEND}
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/openpyxl[${PYTHON_USEDEP}]
 		dev-python/pymysql[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		dev-python/psycopg:2[${PYTHON_USEDEP}]
 		dev-python/xlsxwriter[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		x11-misc/xsel
 	)
 "
 # dev-python/statsmodels invokes a circular dep
 #  hence rm from doc? ( ), again
 RDEPEND="${COMMON_DEPEND}
 	!minimal? ( ${RECOMMENDED_DEPEND} )
 	full-support? ( ${OPTIONAL_DEPEND} )
 "
 python_prepare_all() {
 	# Prevent un-needed download during build
 	sed -e "/^              'sphinx.ext.intersphinx',/d" \
 		-i doc/source/conf.py || die
 	# requires package installed
 	sed -e 's:test_register_entrypoint:_&:' \
 		-i pandas/tests/plotting/test_backend.py || die
 	sed -e '/extra_compile_args =/s:"-Werror"::' \
 		-i setup.py || die
 	distutils-r1_python_prepare_all
 }
 python_compile_all() {
 	# To build docs the need be located in $BUILD_DIR,
 	# else PYTHONPATH points to unusable modules.
 	if use doc; then
 		cd "${BUILD_DIR}"/lib || die
 		cp -ar "${S}"/doc . && cd doc || die
 		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
 	fi
 }
 src_test() {
 	virtx distutils-r1_src_test
 }
 python_test() {
 	local -x LC_ALL=C.UTF-8
 	pushd  "${BUILD_DIR}"/lib > /dev/null || die
 	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
 	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
 		-m "not single" || die "Tests failed with ${EPYTHON}"
 	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
 		-exec rm -r {} + || die
 	popd > /dev/null || die
 }
 python_install_all() {
 	if use doc; then
 		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
 		einfo "An initial build of docs is absent of references to statsmodels"
 		einfo "due to circular dependency. To have them included, emerge"
 		einfo "statsmodels next and re-emerge pandas with USE doc"
 	fi
 	distutils-r1_python_install_all
 }
 pkg_postinst() {
 	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
 	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
 	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
 	optfeature "for msgpack compression using blosc" dev-python/blosc
 	optfeature "necessary for Amazon S3 access" dev-python/s3fs
 	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
 	optfeature "Plotting support" dev-python/matplotlib
 	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
 	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
 	optfeature "miscellaneous statistical functions" sci-libs/scipy
 	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@ -3,5 +3,5 @@ DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a
 DIST parso-0.8.0.tar.gz 392579 BLAKE2B b816a9f54aca54fbb8df772d1f6501d55fccef91d3c9bfcddc9f069e1b5a15dee7742bf37dbfd07f26253247a29a42303c4034608c6c9991c97e55acac77b69d SHA512 fe9d1c46cb128d6af9c45f333e49475da795c1ed67572891f4daf08af620814b9db18469be11f771869e0f44acea9446e1419067e1b72affc1cb669a277d6a2c
 EBUILD parso-0.7.0.ebuild 745 BLAKE2B 46e9ec6bcb841cc3455ddf4d88168eeaa3eb75af8a52b8781390fdff83fbc0cfaebac1256b71d29481bd07250f0e75c7bc7da84c9e09c47c6b204a3f18d0bee2 SHA512 42c314ed631e7a57fcfb3759699d277f6d9821e8ddbc64a7d63e9a0aaafc1e6f6033df4f2de595c2bf7f781ef96eb77eac75b94a419d3f88cb367b58d8f0e95f
 EBUILD parso-0.7.1.ebuild 562 BLAKE2B c94515e599b4fdb6c249910f317fb514726c117c5492ad6bff82cf4ea20d264a63faf53073db078d33d12d7a4ae62f4f53a1944123148bd2c7afbdc086238400 SHA512 5f262af6404fd9256431fbb2c8009aa9a80e0acb139ee8c4d822d6dc8d66a48c21ed675f26ad7e0db7a144f8e37991274030e36739ed763c7e74f1859ce50906
-EBUILD parso-0.8.0.ebuild 552 BLAKE2B 5deb6f54cac8603aae1447e63ce9b7d4d7c7e2ae26f385ce2b90987adfe9f3613c0b4249f51cd88179ccd48f10a40abc46a90d25cf70cde962156d67f7ae0c4e SHA512 660631d957d0fd51b295c4a8831e0cc8735b1259326dd84d84254b7f6c05b16cb4c77ff01f524b88a90da012d748f92174aa67ebf43568d19b72731e92359800
+EBUILD parso-0.8.0.ebuild 548 BLAKE2B 4243ba3804a5ce72bc9597ccbc33160e76ef908c5d327fc4365c26b3a7e516b7561dffe8a3a5db41e76cc5c9304848a9cb16ec2e4bc340ed9b210a3159b63639 SHA512 edfc8aa30585fc2d36e7dd0dd4f96567c7c107dfb737bc64a147a8a8abc6310a94b114a562700df4541df2af710f3e814281a3ad8841873be8e58971c00ef210
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
--- a/dev-python/parso/parso-0.8.0.ebuild
+++ b/dev-python/parso/parso-0.8.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@ -1,5 +1,5 @@
 DIST Paste-3.4.1.tar.gz 633491 BLAKE2B be599b9385ecad754fc431a936ccd78ee088825c88040986ddd4ccb3ca81342d642a23699ca7ef9338be5360703ce5d5a2d966ff9e405744b286fa3fe69bce41 SHA512 90b6bd33e83fde70691be6206ad1de653603900b88fade79f6960df22bb84c6e82c9b6f4ddc11406f4e206273a2b5591b81ca034f8f42a3e993b85b16d07e3f0
 DIST Paste-3.4.3.tar.gz 630569 BLAKE2B fa81b60ad048a2c999d4e57992f5a5603680bf7505f13a8618a55425b388ef906ceb2e118821d689905a20e7ec2b31d27a6aecd704f529540db6c4436f30268c SHA512 0869a3330a74cc14f88fb5ce24183328ec38fed1fc5cd669b428f09ee2fcafc770e95c2f4dc8de86dfce4d66861bad26c9502cccb81966c519ca4593ada094b1
 EBUILD paste-3.4.1.ebuild 1094 BLAKE2B 42c35e023b4d38e2645cf89004712660142cd5860f2f65d3ee37745662dc7d4d991525a7e15c6d1068b934ad4de5cc73f3e9d1a60bc9e99e5fce64598135540a SHA512 0621ce3e077a240b7fe1f3d16e49c5ffad728502a8c3279fcea1cb53ceaa7a1575034ae41ac65a0a44145714fe9a95396f2c7539151fb9ac13243829724bab78
-EBUILD paste-3.4.3.ebuild 1103 BLAKE2B c5ad50193533d210fac4623a9de9cc8b558116e355feab4a6a495b09e7a757c09d2dce160f3079a1fba8843b1866443692ac5fd1dbcfbc058528b7e3133a79f4 SHA512 8ecf848ad049463f59557961afd799f6094b7a9f00ad765432ed89566af3739a977043ad1cf6f06bb447631ed904f3b08772154b05cf14d392ce930784240aac
+EBUILD paste-3.4.3.ebuild 1094 BLAKE2B 42c35e023b4d38e2645cf89004712660142cd5860f2f65d3ee37745662dc7d4d991525a7e15c6d1068b934ad4de5cc73f3e9d1a60bc9e99e5fce64598135540a SHA512 0621ce3e077a240b7fe1f3d16e49c5ffad728502a8c3279fcea1cb53ceaa7a1575034ae41ac65a0a44145714fe9a95396f2c7539151fb9ac13243829724bab78
 MISC metadata.xml 627 BLAKE2B 544d8a892fba33e583c08d31ff232d71c71397981b5d51f721545e9d1dae4342b68741d656d8eba8988f57eb9a6990adc2827c4f2f4a7b9262fa2be9bd9740be SHA512 a49e8e5ce28d107c97b02b00e7c0b3c260c780fc4ac7d80ea3e8163cd5a8fb44756470ad2603b0d9db312e5cd36b0039eae61dddc0339618ef0c6ee675f1ef58
--- a/dev-python/paste/paste-3.4.3.ebuild
+++ b/dev-python/paste/paste-3.4.3.ebuild
@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@ -2,5 +2,5 @@ AUX path-py-12.0.2-py38.patch 602 BLAKE2B 5a836612a8fb6e85595973eedcc39720cf59b5
 DIST path-14.0.1.tar.gz 73830 BLAKE2B 7528f90708423802dbb177309b1a608bf8dd6b8b1563fcf3904a805830b1c53b76866ec8055bb8d4afda4adb88209b789aed90a33916e450748866479cad1889 SHA512 195abf3e70f3e82566653c8a1154047a8ab82b98eda09a2ae38ba8989e382fd3225fb5c772b827be54a3eafa696829afda2a0198d1bef7ee369e6dc40b0bf11c
 DIST path-15.0.0.tar.gz 73642 BLAKE2B 186b77b6571dd878a5b64b575289bb5ee549145ccd0c7b858f99c9e3772cf98f2cc7ff5da759e7fa660296abc49c053a388ad95466c51adccce2162c682c6566 SHA512 e41684c576b959e27258f60c0d8b69719c38a5a7a04d9646089aea91227781573368a08f01230dca831732ae687741d22caf52efd9a481378b8d4e77627fe3a5
 EBUILD path-py-14.0.1.ebuild 1416 BLAKE2B 855c9725a45b11734fd99bd03f5b2ecb20ca3a4aaac623380eb6121dd5302f5715b2c4e33d4136780d5b70a0d798597fb2a42d4320f7f39562ebb4eb508af5f9 SHA512 8395bb60da8df801e43581bdcd9a5b247f166e141032ee26e29714079becf7977f8f3ae713a6ff7092ec9d6980d521a6133c9c337f779e87a8313f93530ee037
-EBUILD path-py-15.0.0.ebuild 1262 BLAKE2B 4f28d50595c907835ec0f24ebaf2699b954308183e0f4ca24f069a0bd739bbe6f172921d86898bc9e0e595d5c98a6d9bd7b1f825ea6ca92ee50415f8b55fe6e6 SHA512 4993373b5a187b5b23324e6841c4a6a337edf255ab7d96b9fd9d8b614aa3f06cd3eb2700acd97353cf3e77b470aee5bd105165103dc92d5f804aeebba46640cb
+EBUILD path-py-15.0.0.ebuild 1253 BLAKE2B e67759daea90401a8b89abdfdf0434f1a140bc43d6e7b9c448c43c390237c01be3fc097cf5285eb6ba35076b2f1542180c0ff280e44c5becf8f088c91c1575a3 SHA512 dca9e206803c8e3b34d38e05d2fe35b7ec647b0a3ec771adb4fdea67164660f317c949e3f53876a8e66f02c22fff008a69d584e7adfb2de7076eb5a0c9f9ebf8
 MISC metadata.xml 401 BLAKE2B 5a8d84aaf65dc91b75cd7222e333e75f9bd6654ce4f9d55c91a8d28b141c5fc982b8c8a6a0b3b4f1c04fcf05fa56b13725062233961f323383110ace44089da6 SHA512 415b7917fd35598bd39c03ec7ede5e0e13266927b73647a995abb62d56004039aacebaeade95be39a265ef3944c35f3c61145cdb2100e563d8125753547bb729
--- a/dev-python/path-py/path-py-15.0.0.ebuild
+++ b/dev-python/path-py/path-py-15.0.0.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
--- a/dev-python/pushbullet-py/Manifest
+++ b/dev-python/pushbullet-py/Manifest
@ -1,3 +1,3 @@
 DIST pushbullet.py-0.11.0.tar.gz 21653 BLAKE2B a6c9b6f4958ce35b63ea4043d1d4f8691885bd0aa2927af541f2080a0b0b65a7df979a497967f3adceab8ad2382448a4c6a02d1184c9d72a18d91844eb970722 SHA512 b236f30b99e5bb79eff183529716c1c8f83cfd2526fdf50d86041eb6d3fcd6670d0c4dce407ae6e50aea0fa96d6a5527af980148f0c71ef758c480f972ad9659
-EBUILD pushbullet-py-0.11.0-r1.ebuild 1141 BLAKE2B 8cd7760e7d8191d6851d6ba7d0e50c5a622ba11c3b41b4f3b70afef7d60d7c773dcb8f4ba7a95f89eb35ec47094b67fb5a6cf408a822d13adc3308e89a1b5394 SHA512 c4c4bec26bd661aa8be271b22d9f74560175e492e6bdfe5a259a2c17d4abe73ad41acdd8f56bfcc0b9aa0ce6e124f641228b5361f12cbbb0d8c3140ceefd7663
+EBUILD pushbullet-py-0.11.0-r1.ebuild 1144 BLAKE2B cc9364728bc0d5dddc69e5c8e3ff9a4806e33dd4e6bdc5c2c93cd90845ff64e67e8796b053201ea7226ff2c131c2265bd49c2dd1bffe57f60fe68d4b52b28ee5 SHA512 7a39703152b250512fceb7b6d5bfab63f6cd0a622af34fa13d5bc905f9a1cceb5119bab1c112f75a7c4a3a43855b2c2928b18152aa7e75977d707e0fe7fea9e0
 MISC metadata.xml 459 BLAKE2B 86e83479fde9503defd709e67ea6ba81e5dd9430e1e1b4ea6545f332979173fab9a2392528007638531c58ec205f2d45ca9817f21981b4ebd94f0f81596bde71 SHA512 cda083520abafb4b81b0691234a2bc2bbdf75f4bef69943e5243492a8d8916f9924eae5f06288a6f636ef7bf36477e198dc6a33a04e55a9fd2376a03999f91a2
--- a/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
+++ b/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
 PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 inherit distutils-r1
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@ -3,5 +3,5 @@ AUX py-1.8.0-pytest-4.patch 20364 BLAKE2B 8fe8f3b659ef6f586d3de299dcc2e986fec0ed
 DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
 DIST py-1.9.0.tar.gz 210098 BLAKE2B d7f9b22ebaedd12534198912c1fa0be80f42e97751701442e060e1c244b06ab82239fe78a3cc7119fa4df5d87ecfd97bfb2568744693d3ffe9824ae1d73e59f9 SHA512 965b2adfe1b13177629ccfcdf6d0a13460683ca7a01d585163deb1af15d926fc86680d9e51660f6cbb8569f822a4d54ce281c029e363d244ddf67e33b102ad0a
 EBUILD py-1.8.0.ebuild 1708 BLAKE2B bf4579b20c2b98910f611fa6c12ae64083e1e274a1062aff8ba528697a16b536e91189cee78ef9add278ff90005dbc7b638f599fe012a6263e1431c05473ca13 SHA512 65bee22f4d16768e8403cf46fa90e93347e29b9850b5a966a437693b2aa26be42140562d6f38a6bab501cd957835293bb0aa88caf5dc64ca68bb06f46770871f
-EBUILD py-1.9.0.ebuild 1286 BLAKE2B 8095c6eb7431fd1048b4702a7da5992d435f8c7567acc6620fd4b2992a1ba49c63ad2e9ee860849f068f98101cd81a8a42020d94ba44b3bb802a035e5ee7d83b SHA512 549d83dab2f00efa486e71f83fe0250ba7d8e8eca0966d599542af97a6528250c960bdb722c43e4a3104ccc8d3015d5b7ae9ebdad571fe8d243c30b305cc2566
+EBUILD py-1.9.0.ebuild 1277 BLAKE2B 94c8716883077800ecefdd89af820072932c296f7dac23c2caae81d6230717bd0af0f0863c7423347dd2e3efd5be5855e176fc6894c96bf9f91cfc920c704f0d SHA512 c609ba52aa45702fbfb45fe353f8af62c9f5eda34bb33c3ddc09609d96fd2eada2868f38381570eb21edf8bb6871bcf333326af2dac1dbc73284a9248e6993f8
 MISC metadata.xml 340 BLAKE2B 110b7f7cc26818661b98f60f589a782c0a9ed827fb43a89eef8cd7096045b1cc168410d9525641d4a78dee9709679d4d9ee7c38680caef5f37a73f1e726007cd SHA512 ce65db3c076a27acc6af28c1adecf61bfd7d10872612994fd616c72e91264be87460823055182e3b60f6931f22386d3a9f541ddd16c902fd8e02a6a345e65f5c
--- a/dev-python/py/py-1.9.0.ebuild
+++ b/dev-python/py/py-1.9.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@ -1,5 +1,5 @@
 DIST pytest-forked-1.2.0.tar.gz 9533 BLAKE2B f9762fd34ffa05eb0abe143388c9608563b0b3d8d5f8c6cbb2e5e36271f4625f10e573042e66d5be5f7f9e124cb5171e570e0d59f2bc1100d2d88ee54c9b4e9b SHA512 d7ed2c36213cfb81988e84e370e0504add77fdb79d31aed4d7aabb73943042f860b4a3ca6c9aad7de5b11234631b1e0f66eb067fcb46079d2cc4ba53ef0cabfb
 DIST pytest-forked-1.3.0.tar.gz 9850 BLAKE2B cbe44d87052c5a3bc58934ac17153401810004aaa38b53ff3100384535cb2ea0fa99dada706113f324fa0a135ddbd9b97488319b4a9554d912388c341b62943c SHA512 25d639aa43380155d7744f1d05a95e0144f5fe7dea42ff3c2bba3803a07d73b5eb008525469330c5dda14800fe4b611241691be197132f31f88f66930c3ecac0
 EBUILD pytest-forked-1.2.0.ebuild 963 BLAKE2B 6ecd1551fefff7b4584e8dbd6f954ec8e7ac765bbcb4c34b19951ce762d4b7f1e6b2c633ecde9d6003b70b1f8a82e5f472559ec7432b2163326dd0b6d9a18d95 SHA512 353abc3083c5f29dfb17804ab8ddcd3257ac87069064c4d0ca8675d7fc7447b22246a3155eaf3d3b2fd71e0c67ec458662351b3d6b21cfac4441c8ed8062e35b
-EBUILD pytest-forked-1.3.0.ebuild 1021 BLAKE2B 132ba53140d3c90da38fe0c8d5f54f1417ffc117720b521f34b431ce20feaef749ff4cafc5ae7562e187d40d65ba572a961dda60adc7302cf52a0a5ba16b6eb5 SHA512 e2bbe90623acb29d77077c28b73e10f33b23abfb21c691ce3c8e316923cbf563ec055a6b89cc2a0c457842a55b171b56599a80c66e32783212f0381541af186e
+EBUILD pytest-forked-1.3.0.ebuild 1012 BLAKE2B fb76ebdeff8850963908f9079daec5d088dc58546f1401168056c09e33d5cbe69d2fd41c5901b09f1bb936eb49fe0bd26982b0ff9712d74156247ae032ef96d6 SHA512 a9fa563fe0542f8308d25c081ed08ff5b2a73b35684acb615a6ac1c59efbc338eebbe709d674b305c14fb6d4e44d6e8e7473078d8f8e8b5c565ed0f03869d22e
 MISC metadata.xml 404 BLAKE2B f53cbdb55297b417dc11e904b9bb22d7576ee7df9fa2f5ac80968c31dd9580ffb908bdf1c5ee966b910d8642971410bde39800fb38a01545f5e361f512389a65 SHA512 f6dc614da0c972e76e4ccb2f2141e7da63ac6b6899108b57f3374ec0296652345b97882dab1bf958aaa23046a1070c11889fe3fbc6eecb111bb2bc420620bfff
--- a/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@ -5,7 +5,7 @@ DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a
 DIST pytest-xdist-2.0.0.tar.gz 65663 BLAKE2B 01f4154ae77c0ca67bef9cc0c36f9e3aea03ea554ba45ababb53647720795eae85e6c884eee6cd14037d566dc7bc46f49496aaaecfaaa31322b045339e6c01e8 SHA512 ad1e22ec6963e16f3f1408f0ed39c2945da8f8d2b332b29c36151bc1245e1b9ab532315d8315c22f93f249a64ab508fd78bccd5390be7315d962dd2382f63e0d
 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
 EBUILD pytest-xdist-1.33.0.ebuild 1056 BLAKE2B 94e4bdef998cbe0fb49237c364223aa761247ebea7970720491113aaa11aaf65b8afa4cf11bae2be7ad6a980bd060bbc18ef0484c2803f67dec76fb192963b28 SHA512 64703fa61cd35fd69970c3574b38fda94fe534ab59949092d5da6551e9093596f00c0a0f896d862077f250eb8e934bc6a74c120c41c33b2a23aa2657abf8fc24
-EBUILD pytest-xdist-1.34.0.ebuild 1087 BLAKE2B 3c34ddabce31ea834e64d0d36343c57e623c6ba5993599db23e4cdbb6548c8aea84e5f2700f2bb05924ca3600d44bc5c93aaee0d4c96ef2463631c503f30760b SHA512 b5fba8ca40bdee2869a879b8309d8cac32cdfe8fabae205e543609299d1e83ca07ae9843a4f8affc3ef628eee394f7b8aebb7ab2eabc34755f121bb908da51fb
+EBUILD pytest-xdist-1.34.0.ebuild 1079 BLAKE2B 1820d596a247be18e633c0b1b344e3308868c5f30e5dbce843e55bf6205a8ebfd908968399708621adb038e2a591ce46442259e26c9ce44e8c7ed2b5c8b1b9cd SHA512 47e03af86ce46f3046ec8e9657bc5d908be52b9e746c68b1bbb01dc175782f4d9436956ab4f66c42ad162b50e5cec935a3257c2d511b883c28905a721a7a35c4
 EBUILD pytest-xdist-2.0.0.ebuild 974 BLAKE2B 787263f04153aa40ab2aaaa4387a88cf25eae00d5df9cde0540a5eb852e08413cd49bdfc0806206dc1c606dd2a319a060adea0f614049491d139b3210ed8bcab SHA512 0373a088d378678d4edfc9cff2e1ae2f3531e52c923c691436119af4c9efc87e7e2e445cbd5d2ed462bd00d67004ca492b5714975791879b58950c4c205ac429
 EBUILD pytest-xdist-2.1.0.ebuild 981 BLAKE2B a045f87ed0cb6327e537c0333bdc1a44c4073eec64f912643dfea9fb442778b314c3f3865ea84474493f6e2f52f05b5482d03dd932ad91e684fce8624be11149 SHA512 6edc1e05d9b7a6b8093c2ee71342dab41410382f0d715994965c8c11edf6dff0e5cf4bc1b9e4fd89076c78e47436581444a9b179a50bb84c7406bb271aaf7fe8
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
--- a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/sgmllib3k/Manifest
+++ b/dev-python/sgmllib3k/Manifest
@ -1,3 +1,3 @@
 DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
-EBUILD sgmllib3k-1.0.0.ebuild 444 BLAKE2B e1234122587687c82c20128eca184dd7e29564bf0fd609090cb54ff1f644e6ab1210ed63fa24a21f17db0dcc8cbd1b58c0b22e4ae4d23cfa38fffaeb2e0bf022 SHA512 54a00a05f09fd23d3da2e1c06bdbde135a2ecba6b25de9308266f6d77f775d5764f640d1a855062c441aacf3515479d43871927fa00218a2e1eb94b7d5ff9515
+EBUILD sgmllib3k-1.0.0.ebuild 443 BLAKE2B 11ced383c2767ea36a5d0f682098cfe05f073a0141b1bb90f04706c8c5f849772d81dfdb3af93b96e0ca55a2d0ebaebee29b507bb918ef2c293f9679c086782c SHA512 4c2407d4f7803ad07c276ba3ffb109957a9434be9c01c343aa7055ff99758224a66c8c86ecdeeb23017d58417f3d3ac7168263415160de456b261ce4b3a20975
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@ -1,5 +1,5 @@
 DIST tblib-1.6.0.tar.gz 31450 BLAKE2B a1efccab5c6363c166ef73e8e03750d1f47993684fda662065f9705d115347cf4b2ed3438ef375e3d14a0dbc35ceb234c8357ee33d2ac9e3a94b66bec3670b3a SHA512 3b11b94f341499f648c182e7a9b6c648b5312a18b3f23bf7e5d554052db4ffb7c4a4faa097bc2426b4159e28f0578c6b369ff4d02eb7711726b5359242216d35
 DIST tblib-1.7.0.tar.gz 33074 BLAKE2B e05b94b9a36efde4d3fe76e9b72502674554e84e49916ea585de4f6cf9e898d1544535b1a8935fe15ffc100fcbf2b5d4f9edfdcf0ce5c86d479f2f412d3ea83f SHA512 10dcff18a1da386d9dd6bae35608f4a2d3bc8f87c15fcf49d886f98d95a6defd348ef0dc5637e03f4c553a933a0ecb4c215cf15b1e78fca58fea10052f9fb4e9
 EBUILD tblib-1.6.0.ebuild 548 BLAKE2B b5cc563baa22a6e78b60c55c6f64d8ec87173c97a439f1c49454385a79857e3221035b1fc2e15211c932b16fd546212e37ff58525650796714197d459dd9e775 SHA512 2f8c68a8ec6205586a7a9e0bfbc0bea2cd3f187a78219e2f6877596054e48c2fd766be266bb591cd697e872e0c8d2cedd2f0db60a991f2e82e11ae3ed57aca1c
-EBUILD tblib-1.7.0.ebuild 556 BLAKE2B 09003f4b734347c8233b915a2ba8c376ad39499d49d8d781ce896215eaca1701ecb3937c5de965263bb38904dfb68bfca108590c9ba1ef63c5052590d540c9b5 SHA512 99c91505c6e42af638441b13bedadcf81434f215335c6a49a30f7e299656208d165719d7005e1fbc070ea12a8068b0f7f840de5ccaee29925424db1debae9378
+EBUILD tblib-1.7.0.ebuild 553 BLAKE2B 10ad1ca319e48d4881d7b2c9938eef7ae39da25160b45ad0de47129a085415921cd0d6da7c69e8c1ec4125aed5b33a6c5c087a61b02cd5cf1e44ad64a3d228e1 SHA512 158042a7c8cf4f759db56e1ddb06684a86be2c6c4f9c6ecb8b871215a8595919b14a33fa853822c266f10b67d2e153881168901aad3bf363619628ac1007ea75
 MISC metadata.xml 405 BLAKE2B a9cb9a48ed88b8e80a16761949fcf8973512ec76687eeec4285f65bcfa1b60a92159aead88f4fe9facb2cc2e20bc3e0577c68f862e3bdc296b428918bde3db00 SHA512 b4616a156c1c52141dbfa07452a2f8a22828d8c2a2be6d857079a6246cfe4c773f379c3932d5156f7ce6e9606e8443971089223af87f6d725c7aaa2027a4b994
--- a/dev-python/tblib/tblib-1.7.0.ebuild
+++ b/dev-python/tblib/tblib-1.7.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@ -3,6 +3,6 @@ DIST tox-3.17.1.tar.gz 294492 BLAKE2B 1a2ed9a26ad366a1ae7343289b45a338a8d2a58c1b
 DIST tox-3.19.0.tar.gz 296499 BLAKE2B cad41c7791108ecdf6efc7bca99623c66d1d8ffbb2b06688eb84e575f14958ba2b497e0035ccc331fc8e0ce667824cba2c8dd37488ac48b3c16902c7b546074b SHA512 7a542282dc2fdef7ab8aff04372aeeeaad54b83bd7f1022c1c60465604d67a5984abcea7d409b8593b646192407c78cb88422aa4dfd11fb2a2d9da520aeafb39
 DIST tox-3.20.0.tar.gz 297432 BLAKE2B 279a6d407c4a490309843ba30e62fe2f0c6ace63af2dfd5b5c2fc8ee6ab784b99da56e9d7d76cd0170f85432bef500c31b824fee32558f7f21d4491385d13b4a SHA512 eb8e55eb3c232356cdb3e1477399ef055df497f1276f0b5c5423f30c780e2619067d1e44c2d6702016e63f96a76d04d0c5e7b6c6f1faa1a98f1dcc5b1cbeae39
 EBUILD tox-3.17.1.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
-EBUILD tox-3.19.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
+EBUILD tox-3.19.0.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
 EBUILD tox-3.20.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
--- a/dev-python/tox/tox-3.19.0.ebuild
+++ b/dev-python/tox/tox-3.19.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@ -1,6 +1,6 @@
 DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d9243308592519ecd2c38f60d6b621fd7362dd87bdd0759a39f25c19cc3cc889e9a8376dc658ed565ca7e19fc68cd SHA512 4023988cef757f43a6f59f7eddc8f40246cbca4994cea91dbb4a788385c0706f376f4c0fd5c8c47146c10eb8c52be2c9d4855b7bea0a5036162c55447aac95d7
 DIST tqdm-4.48.2.tar.gz 148978 BLAKE2B 2423a3d23b86ec6b535a2157d0fbaea6921f95873fb2507a08ff57de0fdcf8fcbfb030210393f5410437ee9977da3ad2011f07a866b3f91a057e338082325976 SHA512 849e4dad4bd0819b328e906af8a8f7acf2ebfd559c9ae3ebf822bc64c1b1a5c96e44b9b69d3dedf6387c44cf9eed559f1377ea29f71fadfc8f056c52685425e9
 EBUILD tqdm-4.47.0.ebuild 1324 BLAKE2B 2b8486f5732dab05928a461aae1d86f1ba63eab9cb9546b39243a7de9db6a4ad5bcadbac19cdb2614329848816cdb47f1dd25d6bc2ac870c8dbc68cac406ae43 SHA512 5a8e146ac5df40e3289afbb8af6dfa3501951278dd470a2cccdfaee4bd683445296f0c1311aafa4dc316e45af15529fdc922875fa0c4b29a1bd0ae4692c6cb30
-EBUILD tqdm-4.48.2.ebuild 1332 BLAKE2B dee2de91c08d69b94b0918389669970cde86b12f61c54a4bdd5260960e6d24047d2dd355d8937ea0c53cababb85a983288a6b576cf143108f5a437f4c18a9716 SHA512 5ea2d7ef53c758a13d19f815455fc04041695d62aa75c7446591c5974a7636b0a73dc413547f2f665365bc58f0122f4cea0b1f14c5694d583ff0667160383b92
+EBUILD tqdm-4.48.2.ebuild 1324 BLAKE2B 2b8486f5732dab05928a461aae1d86f1ba63eab9cb9546b39243a7de9db6a4ad5bcadbac19cdb2614329848816cdb47f1dd25d6bc2ac870c8dbc68cac406ae43 SHA512 5a8e146ac5df40e3289afbb8af6dfa3501951278dd470a2cccdfaee4bd683445296f0c1311aafa4dc316e45af15529fdc922875fa0c4b29a1bd0ae4692c6cb30
 EBUILD tqdm-9999.ebuild 1326 BLAKE2B 984897423b7a16d82725c544ff1efa1984545d9438ce8e857eb9f0170cbbc18337c18d7d4af30dbe9a462948bef89c6bea81c74ee2590e4f3955d308649f5086 SHA512 a16afed262e1155ad2eff7ea87b4974d4632bb62ec42761902f9648509093857fd28e7878816f9f8bef2245643453feacc0a0d50454baaf5ea8e7e42538928ef
 MISC metadata.xml 827 BLAKE2B 58d9989c380867ec71e25ccd9bb5818de73112978d422a30bae0230ae1b87af04e3e999d6dc5480303b0caea284ec1387497371d5698e63c65bd07b5ecd8c07e SHA512 a1a68e4bad52c71f46664563338b2ea5273d603a914bee55ce427f23ac6bd29a452a0a6dc8375ce9f4bd77f2b9386972cfb6719aced4964d9b9793cd0aa2e270
--- a/dev-python/tqdm/tqdm-4.48.2.ebuild
+++ b/dev-python/tqdm/tqdm-4.48.2.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 fi
 DESCRIPTION="Add a progress meter to your loops in a second"
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@ -11,6 +11,6 @@ DIST ujson-3.1.0.tar.gz 7128419 BLAKE2B 544afb68e23fe942a6bb241f6948998d61a42d61
 DIST ujson-3.2.0.tar.gz 7128952 BLAKE2B 7e4c409eb8e87d542d37595439ded5c85e934e87a18987e18dce5ab0aebd5f9431b8a2c12ebaa467da928c3158d03325a40a9ae65230e39c93106d65b098c407 SHA512 8915e17acbd9650964dc9ae4f8a89021af921fac8f77f5456fdb8c0d6ceaa02767891d070c515c926deef76efb210a969c573e387ae62c15b2c8be761f6adb70
 EBUILD ujson-1.35-r1.ebuild 918 BLAKE2B b6924b75688ae427d726f11bb6acc73ea26cd5554a4d4c505c44e17aaa149be62673aa5c47677caf42c3e03b47f730c6abf37a44e6e51e3baae3212929fb44ad SHA512 5085de8190dac63d4e951d7fca160de6b1d68708ea6f1293f193f1dc93a34a48e5b9193d7e683535e2ea4a06c5cc3cfec3ef085ca8ca03179b2b5cfa3d8fc448
 EBUILD ujson-3.0.0.ebuild 631 BLAKE2B 88b9cbbced507463e6aee7342f0d76b5468edabf2f009d7852cf153025b6749679cc339812f32465a34879df11428f7f3aeb3ab6baf2aa78a57798e015055ed5 SHA512 390ec9c2d42d22f229463fcf3659e96bc025cd0eb6dde344e4e45c85a9fd9828adb07903a98d6b20fdf9c4a834b13cbbc4c9b991da7958e30eb9eb8defa89450
-EBUILD ujson-3.1.0.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
+EBUILD ujson-3.1.0.ebuild 583 BLAKE2B 37bc5a98c5e8fa348177255ae571d320ca247794eeca5d55b2b88d1a104d87aee32b90178a0cbcf61e8e3be55c5e9501e1279c51b3b7f37da324d7470f044394 SHA512 91b25f5311c437ced258f23724660d1b77ad39ea3671d7c0326f1ae0c8cd486c29af5e56870ab0907e5d5137c5a60e4b27211a02c7a1e03ac96313194eb54ca4
 EBUILD ujson-3.2.0.ebuild 585 BLAKE2B f045597ecb0e5505804161e10b1b43ab2d1fe8942e4d98e219dc6ce6e5ef270db2a3a8ee3458fc3fc3315ab545018086e40bef54af6af4ce8441ec9a75e650b1 SHA512 75d47578b8abfe2ff26273cfd8f7472338e3d55cbb011762f5a15f6a2abc52ee1b53a50fbb420850a831709e25731d90c73f539e86bcdb1ce6458a5f21453815
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
--- a/dev-python/ujson/ujson-3.1.0.ebuild
+++ b/dev-python/ujson/ujson-3.1.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@ -1,5 +1,5 @@
 DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
 DIST vcrpy-4.1.0.tar.gz 330122 BLAKE2B a7a2516d4dfcc01da801fb8685ea3b56f50ce474d35477ae36785ea1bfbae113bd3c18fb3faadb13fc81c37fa1d282a84bc60fdd27f4fc4a1f3e952312d7bc5f SHA512 7ad5517cd52f6f31448db9b608d8a7b274741727487ede21b7f80e4060e3ddbb34c731166f67ae7136c86a8d3e7fd23128e035a148f18f771066bfa71319624f
 EBUILD vcrpy-4.0.2.ebuild 1385 BLAKE2B ae7515f0660eb331f2ac40f7644a5438bb1c2170c3444b4866935b70514b81f8481c58e010988196dfe7c718be84f1759865c88a7c19aeba5343594b10a44644 SHA512 7458a9a48a4d11f01eb4058450070716e5d96c11b6260fb426ced67cfdf944a699a9a1ee79bba467fc6628860737ab2a77e616416a40d5ec2f603d3e548dd6a5
-EBUILD vcrpy-4.1.0.ebuild 1393 BLAKE2B a6470456c465894972edffdce4e89823153dee2cbb7d8bc033cc4536ae95ff169c24f140290f3a0c1b8d82565809c5208af61675b0340a844fffdaf926c0fd3f SHA512 09704e8002f65ad1bee470f333fd3a2e995dd0d90b97b62d24f2b51ac3fa9818565ae47e28f6c335b5fc4f3ae250b3367a1394110f5c5b79fcd95b3426167fb1
+EBUILD vcrpy-4.1.0.ebuild 1385 BLAKE2B ae7515f0660eb331f2ac40f7644a5438bb1c2170c3444b4866935b70514b81f8481c58e010988196dfe7c718be84f1759865c88a7c19aeba5343594b10a44644 SHA512 7458a9a48a4d11f01eb4058450070716e5d96c11b6260fb426ced67cfdf944a699a9a1ee79bba467fc6628860737ab2a77e616416a40d5ec2f603d3e548dd6a5
 MISC metadata.xml 387 BLAKE2B 09c086ca73a9932b1ac06f46f7c7ef216db357fe831fd6d8f996acedcf24a636420752130597318f4cc0a8d11a584d2162a892ca412403d1bbf15cdd86a1fbaa SHA512 09ba6aaf53089115dc98031b4dba4d526864b6d38ba7950fc3fccd9c2b1a0e14702f5235b3923a41300fabd4152e06eae22e20e86b54795bee453a184bd8828e
--- a/dev-python/vcrpy/vcrpy-4.1.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.1.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@ -1,5 +1,7 @@
 DIST sexp_processor-4.12.0.gem 54784 BLAKE2B bdbb349a85fbd1c7750db3dcd22d9b792eb17605d5157c969d083a8fca404b1af3db1e2bfdcf76a6b7f392043996d246686dfa73117b9efacec529896d5a8e35 SHA512 d1e1ae7cf13b0b8c2e6786aad1bdeda25697d88abec86fc9415bb76d4e9e98097d2fecf16ceddbc80d1d447064bfa73beec5eaa5270ef38ce224c4bdbcdede3a
 DIST sexp_processor-4.15.0.gem 56320 BLAKE2B 8624b7fe28f4aa9447f42cf4f8c5b424088ca2c1628f3e785f746ceb60725449812205dc657ea856c5bead616ac18d689330315fdb44e92447ee3a89740557d1 SHA512 f7877ca59191ab39848c6d3b0cf9625c2e1c180784cd757c00a7cea67aa6eee5549ab5630641f4044c875a1aaadc89b8237f8adadc961ed86c5379cb72db33c3
 DIST sexp_processor-4.15.1.gem 56320 BLAKE2B 1f75dd7dbe39b3684ffcbfb607c961e9406ec16373ad24ccdf37d4bd8369a240b8fdfc16f6e7437dda06605c26b2f4b507a14bcf680b91e12bd7827539f54e53 SHA512 e2ae9f5e8f61c1a703f14c692cd171ceb9acda5839417589051ffcb818584ff65a6a86279f3d6f2b9ad8c97ce842d946b57be810e5887effd4c606b6fdf1d984
 EBUILD sexp_processor-4.12.0.ebuild 789 BLAKE2B 88432cd4143f4c316280c7b2bfad605b18c039a6371ce8604ea91442a3d6b51578d213aadaad315d759d7028fe16c9cc8f7428c7ae064eaf15972985ed2f67b8 SHA512 b92a563f9ebca2c7b6214bb1c8170274f299ead76f41e1fd57939e75de3d79646db6279adecc84da66d5191debe44996dc91314c6e206231aaefdca3becfcfb2
 EBUILD sexp_processor-4.15.0.ebuild 754 BLAKE2B cd27bfa6b69694a31bd53bb91eca78d3ce4936209f43ad2a41ce9cbe38ef798cf65d3ce5dcecfa26121be900ad1e7a3925ce6313f5b64693d73efad5146f8717 SHA512 3161bc6bb013fd69074005ead4f6b70e7b0fe2c47043f048b4ea09f584e37e248027f8d5c8aa2a2a88396a602b80ac375f111a0105b6cbd2a1b968a8f45b52ab
 EBUILD sexp_processor-4.15.1.ebuild 754 BLAKE2B cd27bfa6b69694a31bd53bb91eca78d3ce4936209f43ad2a41ce9cbe38ef798cf65d3ce5dcecfa26121be900ad1e7a3925ce6313f5b64693d73efad5146f8717 SHA512 3161bc6bb013fd69074005ead4f6b70e7b0fe2c47043f048b4ea09f584e37e248027f8d5c8aa2a2a88396a602b80ac375f111a0105b6cbd2a1b968a8f45b52ab
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
@ -0,0 +1,28 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
 inherit ruby-fakegem
 DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
 HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "
 	test? (
 		>=dev-ruby/minitest-5.5
 	)"
 each_ruby_test() {
 	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
 }
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@ -1,3 +1,4 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
 EBUILD cram-0.7-r1.ebuild 555 BLAKE2B cf4380728e7aceeb7e2a52e2e2d5102b289e44cc88f721b4eac45a7ebbb4019c47e64b71021da025e7beaf3ba350d7866b06a1dafad3eb0a61811580ca138133 SHA512 c5a46597469d3578dc34359b491935a02a5dd401d8cb84bdf27d7c07dfc276041a3b083c89fbd50eac6d2a1e1e31cae12febcc5837ee27819263210620f25c21
 EBUILD cram-0.7.ebuild 554 BLAKE2B b11475873e0c1cd559b2c00add897090be0df365c5fd3d34252f04e03b662c514b1ed94ee3e22f1fc6e9632a38571a90fa2bee12781140c24730511518523adb SHA512 03338800aa66add5162a030f4cb8a7d8a4e1d911c421197784540d1f7761233c2d048feb850668e050714ef87a16f675242dac1ed651129d18f470c6580eb63c
 MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
--- a/dev-util/cram/cram-0.7-r1.ebuild
+++ b/dev-util/cram/cram-0.7-r1.ebuild
@ -0,0 +1,21 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 DESCRIPTION="Functional testing framework for command line applications"
 HOMEPAGE="https://bitheap.org/cram/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
 python_test() {
 	distutils_install_for_testing
 	"${EPYTHON}" "${TEST_DIR}"/scripts/cram tests || die "Tests fail with ${EPYTHON}"
 }
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@ -1,8 +1,9 @@
 AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45e0e4ff4049d6b8d6cf44375f88c752a0130e4229a5ccf83a414db8f91504f4ef828d3a7d3d94a5eee78a9e90f SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd
 AUX systemtap-4.0-AR.patch 193 BLAKE2B 270a00dcba6cc982fb60075e00bbc3f7d6e23b77f8b595f4f84eae25519452d53a355571f0ce0515c187591796e245b9e683458842c0e9eac06e205b0f3cb3f5 SHA512 b59a56cf64ade81df11b629f9f1eeba8d8aedb5e3984bd0c8b8217ca76cbbb5aaba2120b8ee3ab83c300cbdc674e5c6e7999537371cd76794a2ace65a7a8b19e
 DIST systemtap-2.4.tar.gz 2664988 BLAKE2B 194ad2489482eb926188fde700f43a35301214cf062ebd4d101776f09a23cbaf502f592ce0eecb297d1ffe9bf0ecf103c29b55a8a1afa84b56b9b5a0a4dd0cfd SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c
 DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb18b6a9da030adca94405880fb52ff6ddbb62b01ae7acafa03e39a1ef5f0a7c3659300518412d8eee0c57d01b433 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 EBUILD systemtap-2.4-r1.ebuild 1981 BLAKE2B b1453aba34d1b350506996289c0a73d40c44693a63b3c712a8c171b2f0c6e275c2299e0bc1e8f6b3b201a2591ee3bcbdf383c186f20a2fb430b86be483eee57c SHA512 2bd1b737d6290477bcf342b106a0a7d0e7f30faecbdf0bbecca5ada7791408de14e3125c86e858ead803b8d400034921b96a85471568ab8891453a715ac08b89
 EBUILD systemtap-3.1-r1.ebuild 2159 BLAKE2B cd9b29ffa2a66dd891621c86ab59acc5e91b716772db9ce08ac03177301b932f85e41036151a62eec86987e1eaf27fbba860a9cafd93b3d558c3ae8371b21fd0 SHA512 aed426fc39006ab3758fa657b9e8613b07a0bd92f6cef4cdf393cc4f2c66fd553e55da45450b4ff3d00dabdf592008763fc6bd94373e966371b3e26c66cf7fb6
-EBUILD systemtap-4.0-r1.ebuild 2684 BLAKE2B d343218cdea02079d4af276455c4e445fa74895b3d848ab0913d7ca077fdd21c6951129cb093957cfffadb2a28feb721aedc39fd17f862594d54dda8b35b20d5 SHA512 865ce4d905779903566aa382e00e07a792a2c0e3c5c943e9035a89f0e7d1d5f105cf45a820653d34107ed68ec773012e2eea2c5eaaf07516b69a7310095972f3
+EBUILD systemtap-4.0-r1.ebuild 2718 BLAKE2B 91d339b14668b8d8bbd2e3d8cb3b414735f1b3cb677160cbf2e14ac3da25b13ea77c4fdd1d873efdfb9b47be462b5caa7b9494ae9c61f869e37e38a42ac4d8e8 SHA512 534c02ebbf088e0f8dc7b5ed094c12905d2421e495d85fcc920675c89fbf4d2012b33882a0a223e14cc5c76b6ca29540fd44d3aa592b27ab0b3173bffad1d1b5
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
--- a/dev-util/systemtap/files/systemtap-4.0-AR.patch
+++ b/dev-util/systemtap/files/systemtap-4.0-AR.patch
@ -0,0 +1,11 @@
 https://bugs.gentoo.org/720710
 --- a/configure.ac
 +++ b/configure.ac
@@ -22,6 +22,7 @@ AC_PROG_LN_S
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_CPP
 +AM_PROG_AR
 AM_PROG_CC_C_O
 AC_PROG_RANLIB
 AC_OBJEXT
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@ -48,6 +48,7 @@ DOCS="AUTHORS HACKING NEWS README"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-ia64.patch
 	"${FILESDIR}"/${PN}-4.0-AR.patch
 )
 pkg_setup() {
--- a/Show More
+++ b/Show More