Updating liguros repo

81 files changed, 67 insertions, 878 deletions

diff --git a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
index 40d7ca4e3fdb..f27747bc8736 100644
--- a/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 98d71550d542..e61b858df983 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,3 +1,2 @@
-DIST kiwisolver-1.2.0.tar.gz 54244 BLAKE2B 42590c2cbb78b3c2ed568373616e772326bf5a0e133396d9e9cf6468132ec88b45d40f68f51baff7bc22ca261567ebab81cf2585009657bd2a59df4e97c33f1f SHA512 05541ff46cc64b9958d714452138dc7bb343e6cc9308408a3f8cf25242e9640af37f8bfd22a7038e8ca70a895f57bdb983346259bce22b1630ac10b974d00a0e
 DIST kiwisolver-1.3.0.tar.gz 86440 BLAKE2B 931a230909a7778aac3bc93fb24538c7b9e0a3cf1dea33fcf374fd6576d56b80a50597d14c6431f659326222c8810416897fcc9ce2725ca5341891f65aedc5b2 SHA512 64bb475f86e6f409318c5030cd2874bf060c26bf6c1ea62bfb96c1ae27f7326fcd6fc575cbdad7351808d18ae9b9f6664eb312019d432cd6a4c0b8af4fa317b6
 DIST kiwisolver-1.3.1.tar.gz 86948 BLAKE2B 4e03547842e831424aef5be880021aea8d0fef372900bcb9b55f2367fc89f728250b936702fd737807579be34e4ff7489d5669f5113e95612352a293d9f883ea SHA512 0f5c1e516c334d358b8679313035dd45386381965853005271c73e3f4421fb27e3ca5a43b4f2dc85d693f4151427dae9b34d372fe72fcc1a186abd85a54a225a
diff --git a/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
deleted file mode 100644
index 255a911f3c0f..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi"
-SRC_URI="https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/kiwi-${PV}
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.0.ebuild
index 14dc603fb831..255a911f3c0f 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.0.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/kiwi-${PV}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/lxml-4.6.2.ebuild b/dev-python/lxml/lxml-4.6.2.ebuild
index 490f4523fef7..41f055250553 100644
--- a/dev-python/lxml/lxml-4.6.2.ebuild
+++ b/dev-python/lxml/lxml-4.6.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index a3e75715ec06..9a84033b5b95 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,2 +1 @@
-DIST mysql-connector-python-8.0.21.tar.gz 12069002 BLAKE2B db4e7672f0daace08c88e52560db66629d5eb9d9903b76e616bed7ef4a21d80139a65ac24d47d16f9fa5e978f3acb262292c72933f0c348d9494cd51f96f1654 SHA512 d73efd99774450bbf729ddbb19b80d09b8db151715d12b76e40497bf1d9ff658e0ad1e22dc9a73dd5f6736f7c075f94808a2f28b1c975aaa380bbb92cf4e7184
 DIST mysql-connector-python-8.0.22.tar.gz 12081967 BLAKE2B fc6b724ec2eb47a92294f7316093d4a4d2f4925981adeb07b305e946a047dbdaedd96c6ff9a07426fd56185f467cf6473bc84e0896d2e8fde70a188af16e9df2 SHA512 07f380922c18f9ade38f95d8e107fe8f90b8a7901fb9a36bbdfdb2b29f9cb79b0b6387a608e89bf90e9344c635d47184c750a206beacb2c9cc7615d6a7df2c29
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.21.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.21.ebuild
deleted file mode 100644
index 3f762b21cdda..000000000000
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.21.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Python client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
-
-KEYWORDS="amd64 arm x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples test"
-
-BDEPEND=">=dev-libs/protobuf-3.6.1"
-
-RDEPEND="
-	>=dev-db/mysql-connector-c-8.0
-	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-"
-# tests/mysqld.py does not like MariaDB version strings.
-# See the regex MySQLServerBase._get_version.
-DEPEND="${RDEPEND} test? ( dev-db/mysql[server(+)] )"
-
-# Tests currently fail.
-# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
-RESTRICT="test"
-
-DOCS=( README.txt CHANGES.txt README.rst )
-
-python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
-}
-
-# Yeah, this is really broken, but the extension will only build this way during "install"
-python_install() {
-	distutils-r1_python_install \
-		--with-mysql-capi="${EPREFIX}/usr" \
-		--with-protobuf-include-dir="${EPREFIX}/usr/include/google/protobuf/" \
-		--with-protobuf-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-protoc="${EPREFIX}/usr/bin/protoc"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.22.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.22.ebuild
index 81e29bc21eed..7e1b3f04e7d8 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.22.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.22.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Python client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
 SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
 
-KEYWORDS="~amd64 arm x86"
+KEYWORDS="amd64 arm x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples test"
diff --git a/dev-python/nest_asyncio/Manifest b/dev-python/nest_asyncio/Manifest
index c7846cd7b19f..41d9ac0e8ed4 100644
--- a/dev-python/nest_asyncio/Manifest
+++ b/dev-python/nest_asyncio/Manifest
@@ -1,3 +1,2 @@
-DIST nest_asyncio-1.4.0.tar.gz 7053 BLAKE2B e9bdfa53f8a94ddbfd87b638962b5281aa3e8830c75a019d66d8275eb107aa7268d7f5aa24782d648a5fcfbfc4e1040abf2f2f0ca5678a513a95111d293eb055 SHA512 6a5130938baabafba30c4d5435276d33aa5df5e52a84e5646de55ab64bc01d3b69340b725b74dbe3dd158d5fba8db1470a322bdcdc3b75aa1a121076e3553a06
 DIST nest_asyncio-1.4.2.tar.gz 5991 BLAKE2B 8a7feba9d506002ffa6658188fc1a20e2ac55f6661c2be37be678c6930e906235cdd94b5e359428555d8b9400a810a3483e07b3118b49757464fb9e8195a4cdf SHA512 00581b5dbecd085f2f4534dceb04b894973939c6e209bfae1f4b13b5c608bcf403f590af9694c6973e06dc325a5c7b8dc278f8b83eb5ca125a96074e0046984e
 DIST nest_asyncio-1.4.3.tar.gz 5996 BLAKE2B 399086236427fca6073b95ee898c9bb9ebbc984e36219b9f5bdcaff4d670a51985e1e3ca7597faf8b20ea3cb1610f5ad3fc12a30fe2207dadcd7d784c50679a7 SHA512 8d8e3384238c685211f4ae4e3a5c2d6bb0712880abe71b25287eabaee19deb3d669e6e4f2eead3d76825b460025e0cc4f8dc04197d140503b32563142c4ab596
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.4.0.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.4.0.ebuild
deleted file mode 100644
index 09892f0b2035..000000000000
--- a/dev-python/nest_asyncio/nest_asyncio-1.4.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Patch asyncio to allow nested event loops"
-HOMEPAGE="https://github.com/erdewit/nest_asyncio"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.4.2.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.4.2.ebuild
index 58d7b8768020..09892f0b2035 100644
--- a/dev-python/nest_asyncio/nest_asyncio-1.4.2.ebuild
+++ b/dev-python/nest_asyncio/nest_asyncio-1.4.2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/os-resource-classes/Manifest b/dev-python/os-resource-classes/Manifest
index ead1589a60df..a1ba05aa8404 100644
--- a/dev-python/os-resource-classes/Manifest
+++ b/dev-python/os-resource-classes/Manifest
@@ -1,2 +1 @@
-DIST os-resource-classes-0.5.0.tar.gz 15949 BLAKE2B 7cef19c63a27723fdf0037224205c9df545f24c2ada020d196928707945a7acbca7619a98ca6e9585edb92b1ebb7259ea5c9811ae6d1daf18a90a92ce60661ce SHA512 112548db1daf0c31fe4304cac3834d588e531102620f0e55f648cca81724eddddc05acce4cdf3fd468b38a44dbbecea43152903c1df3a809103a7f1b947b9cd7
 DIST os-resource-classes-1.0.0.tar.gz 15524 BLAKE2B 6388f192be5bdc75b64a19cf20ebaf3f3db3d448f90004e321e0cf53d53b37646625643aee519d443cc0043fda2e536b3f75d1c1a83dd31eff08c7a54a50f467 SHA512 a5daef5a53e7a164bbe863af9a27e2a5ce92b490099769e7e545a059e80bbd0c74f1ec28afe1622820686b0614e5bc6e748598454d6b380891eb8a0b20333e37
diff --git a/dev-python/os-resource-classes/os-resource-classes-0.5.0.ebuild b/dev-python/os-resource-classes/os-resource-classes-0.5.0.ebuild
deleted file mode 100644
index 93794e8fdd9e..000000000000
--- a/dev-python/os-resource-classes/os-resource-classes-0.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A list of standardized resource classes for OpenStack."
-HOMEPAGE="https://github.com/openstack/os-resource-classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-resource-classes/os-resource-classes-1.0.0.ebuild b/dev-python/os-resource-classes/os-resource-classes-1.0.0.ebuild
index eacea49663c2..07f239184ce7 100644
--- a/dev-python/os-resource-classes/os-resource-classes-1.0.0.ebuild
+++ b/dev-python/os-resource-classes/os-resource-classes-1.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=">=dev-python/pbr-5.0.0[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
index 20a978bf65ff..79f299572504 100644
--- a/dev-python/os-traits/Manifest
+++ b/dev-python/os-traits/Manifest
@@ -1,2 +1 @@
-DIST os-traits-2.3.0.tar.gz 25968 BLAKE2B 9c749ca63f7d67e979a732fbc5de3285ec2635a6ca92fae26f8801e9d9f3dcd1a09b3eacb10162a5e53be932ddc48a8f379a17c8cfb3dbe6114339c35d943111 SHA512 0dd7379dded33a89e1163fb929cc50016474912817f99f048abf325cedd9369d155cf8ecfdcd868ec1bf124c0a44f9926daeffa68877bf723f78a15f6c091e90
 DIST os-traits-2.4.0.tar.gz 25523 BLAKE2B 4b80ea28b748d69f9ddc510a2c4766f06bfe85544c86c6771d323f8a58e3244033d4bf79c0b525be1a46b39402f19f6dd2e83bef5fcec06e52cd0a3c0708f69d SHA512 ac6cfc58f3f77d44fb252be0c00afbd147ec0da0cca395c76b5ba31d3626a7118273713935f793c9ed9a2230062c9a3e9384867795aa83318cfa2c91fb15fa55
diff --git a/dev-python/os-traits/os-traits-2.3.0.ebuild b/dev-python/os-traits/os-traits-2.3.0.ebuild
deleted file mode 100644
index f06da0deb74d..000000000000
--- a/dev-python/os-traits/os-traits-2.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="os-traits is a library containing standardized trait strings."
-HOMEPAGE="https://github.com/openstack/os-traits"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-traits/os-traits-2.4.0.ebuild b/dev-python/os-traits/os-traits-2.4.0.ebuild
index 8394fa002fb1..a70630f72671 100644
--- a/dev-python/os-traits/os-traits-2.4.0.ebuild
+++ b/dev-python/os-traits/os-traits-2.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=">=dev-python/pbr-5.4.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/os-win/os-win-5.1.0.ebuild b/dev-python/os-win/os-win-5.1.0.ebuild
index 43930b6d9530..7903901bbd70 100644
--- a/dev-python/os-win/os-win-5.1.0.ebuild
+++ b/dev-python/os-win/os-win-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild b/dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild
index 65310c08f5f6..6df3cf5b1db8 100644
--- a/dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild
+++ b/dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild b/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
deleted file mode 100644
index 776f5fde5b6c..000000000000
--- a/dev-python/os-xenapi/os-xenapi-0.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="XenAPI library for OpenStack projects"
-HOMEPAGE="https://github.com/openstack/os-xenapi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 5924d100dafa..e7e68ab645d2 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,2 +1 @@
-DIST oslo-cache-2.3.0.tar.gz 57209 BLAKE2B aa34c4deb0206c86181e629b1ccedaa3b0b7a503f4648b9ffb23dcba84c98658017a720701176776652a2a58447c54662314dd4853ec6ccf6c2acebb4b559325 SHA512 c3ad9c326fa71985d4546bd20bcb8aa9508808c8eae2a9e3dac1c014d148bfa8f5a847eb2ca8d1a204cce07b6d640f9541491dd41c7c6169e993e408786358af
 DIST oslo-cache-2.6.1.tar.gz 60918 BLAKE2B 89def6f66ccb68e8725571b4f9fcc8a98c8b18dbb23186b1ed3cc09ae02eb786608c744f6ea7022fd3a832d206fe75916f74f2c000125c853993dc95f13da8f3 SHA512 20696d9a9feda9368fc261ccc124ab825b85373b2716110dcab7101346467dbf4d9e8a48b689a76ca837a8c4e97d03476b3573623ac57602f5d0e558110dd551
diff --git a/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild b/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
deleted file mode 100644
index dca5a558f282..000000000000
--- a/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Caching around dogpile.cache"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-cache/oslo-cache-2.6.1.ebuild b/dev-python/oslo-cache/oslo-cache-2.6.1.ebuild
index d793b2009dbb..506639878d26 100644
--- a/dev-python/oslo-cache/oslo-cache-2.6.1.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-2.6.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 17323d85f3f6..bf2d526aa209 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,2 +1 @@
-DIST oslo.db-8.1.0.tar.gz 171252 BLAKE2B dbf6f580d95ce06f0ab4a50cf289765a2fa55459c56b89f079cbe93b319c1ebdd4287c47a7b69e0bff1ff91149f2dc9c7b8d90769f17cca26f42a2d0a69e46d6 SHA512 3070561990c630a26c936f787be1cacc7747b915bf01178624047551891c9e44b3d17a8d818bfac259d7083a8bbadba1859ade4a15821c00316bdb3860056208
 DIST oslo.db-8.4.0.tar.gz 172209 BLAKE2B f1f72347ec8c8b2ca452c54fdf9a843d0d31ebbb1356c39cd494dbacbab28e899d63568214fa73f14a8d838c4ce4137d19ee4fd6133344a17f584346775c3013 SHA512 7a64554de2b97ed3edbf4de81bd47a3bab0429c0b7f5708238c5b920010464236cca4a170a591890112706c2968b0cf1885563782c3a1925fb5767569ac1ccd6
diff --git a/dev-python/oslo-db/oslo-db-8.1.0.ebuild b/dev-python/oslo-db/oslo-db-8.1.0.ebuild
deleted file mode 100644
index 671f2ce8d202..000000000000
--- a/dev-python/oslo-db/oslo-db-8.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/alembic-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^testresources/d' requirements.txt || die
-	sed -i '/^testscenarios/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-db/oslo-db-8.4.0.ebuild b/dev-python/oslo-db/oslo-db-8.4.0.ebuild
index 0decbcbb3b6e..b6d2dde03636 100644
--- a/dev-python/oslo-db/oslo-db-8.4.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-8.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.db-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite mysql postgres"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-python/oslo-middleware/oslo-middleware-4.1.1.ebuild b/dev-python/oslo-middleware/oslo-middleware-4.1.1.ebuild
index 38065d74fd09..35a2e63daf84 100644
--- a/dev-python/oslo-middleware/oslo-middleware-4.1.1.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-4.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.middleware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 RESTRICT=""
 
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 3fb0f3198a44..4ee71aa3ea4c 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,2 +1 @@
-DIST oslo.policy-3.1.1.tar.gz 95063 BLAKE2B 2173ab727bceb53f8a4d4babb3b4a8de47b6398ea842cff097be21446a1aef0b77bd1b4a89dadc1e48acc9f0355d378e65f8288ff559e970d3ea1da6f2163e8f SHA512 3021433d4e4dd496ee7aafdcce60e3cdc4a9a8fe64724babfb146a077c91dfe0300500c199e7e7664f89dc2430fbab47700e767db64a5d9c931d8838cdc9ee65
 DIST oslo.policy-3.5.0.tar.gz 103988 BLAKE2B d78ce2cdc2b25c532c3207775430c32d1ae9e999df4cd918dfbce147a897fc9a4d46e7006bee0908b4d83cef2e2f71b2fb230aa56eeeae6302d61a435f5449ff SHA512 7d670aded9ac6ddc5360c60182f60cd75f3dec3d6d1bd9fc0d17794cd17349d8fff5e2bc8bc7df85d6bbbabad5373c824772e3d6006add69387d3663475fdb1a
diff --git a/dev-python/oslo-policy/oslo-policy-3.1.1.ebuild b/dev-python/oslo-policy/oslo-policy-3.1.1.ebuild
deleted file mode 100644
index 528e7090e804..000000000000
--- a/dev-python/oslo-policy/oslo-policy-3.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.40.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.policy-${PV}"
diff --git a/dev-python/oslo-policy/oslo-policy-3.5.0.ebuild b/dev-python/oslo-policy/oslo-policy-3.5.0.ebuild
index 60dc841d83ef..b8a5c0b473da 100644
--- a/dev-python/oslo-policy/oslo-policy-3.5.0.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-3.5.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.policy-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-privsep/oslo-privsep-2.4.0.ebuild b/dev-python/oslo-privsep/oslo-privsep-2.4.0.ebuild
index a31a77960062..2666ca470505 100644
--- a/dev-python/oslo-privsep/oslo-privsep-2.4.0.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-2.4.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.privsep-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index 6289080cf66a..0dd38c49c1b4 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,2 +1 @@
-DIST oslo.reports-1.29.2.tar.gz 49597 BLAKE2B 4c5f76fce7075fa1b9dece5a617d2a198d04386ba03513070b700a5794baeab18e9266012b8f10d232d5063eadf8467f0169e670fbd6dbe7e2838e34cbed4bb0 SHA512 92ba14a445ae0a12454c8861f43bcb2aed9f07373008b0246dd10a6a650ac22be8e239365441e6b192d11d09506dd51a4c2e4a6fb54560fa46175b0f085c4fb3
 DIST oslo.reports-2.2.0.tar.gz 50532 BLAKE2B 0c04cc328b445a5b1d0e275d07a2ec11b635b1b91612dca7b9ce1adfc66ae10ae6c245eb5babdd1c3acbe4c3d9200120fe1e99d1dfbba84d55f2dd0cc4fdc0b1 SHA512 dd8224a1789318572bcd3e0394c01a0c65f8a1b48afcf6a5dbf6503f310bb3f48457b9c0e9315620d8935156bd29efa30d9c1e0368480484776178875f84840d
diff --git a/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild b/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
deleted file mode 100644
index fc2141f789d9..000000000000
--- a/dev-python/oslo-reports/oslo-reports-1.29.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="generified reports for openstack"
-HOMEPAGE="https://docs.openstack.org/developer/oslo.reports"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
-S="${WORKDIR}/oslo.reports-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-reports/oslo-reports-2.2.0.ebuild b/dev-python/oslo-reports/oslo-reports-2.2.0.ebuild
index 6e07cbbbf715..2369a743e854 100644
--- a/dev-python/oslo-reports/oslo-reports-2.2.0.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-2.2.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.reports-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild
index edc88f0f5913..20e6d33aace7 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-6.2.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.rootwrap-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-service/oslo-service-2.4.0.ebuild b/dev-python/oslo-service/oslo-service-2.4.0.ebuild
index 1e23e60821a9..e78675afe5c9 100644
--- a/dev-python/oslo-service/oslo-service-2.4.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-2.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index dbd560d29990..245690678ea3 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,2 +1 @@
-DIST oslo-upgradecheck-1.0.1.tar.gz 15636 BLAKE2B 1247658ae351e11b3320415cd66bb5831bd018bced2e0440dc882d4c945dc81111544b063fb78e4b812d50c21ef7bde3eee30f8f12724d00077a32a05bb308c2 SHA512 92a8cfe51e4ddcdd7a1e8cab7296e7702a1389cbc9df17d0c5da133b21413efb5a650495d1b3bd2e2a58c376dd8c844e96ae20d2d56d387c29de635918a96d30
 DIST oslo-upgradecheck-1.1.1.tar.gz 15096 BLAKE2B 7aac69c8078d8f6e89c16801fc61bf9d44811b2333ed67d4f2b8a9e432dd8ecb1f90010b796965e838267991a16c0f5b19f25afc98cbb6458906e3af656f91da SHA512 89b7fca8a95195081e83b336d3e55a9c67802ff3b88fbb5849afa7c7424212c03c3a96a916a6a62bcab18ac002f73ab7a4dcc92859e6bcc9b4002798756040b2
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
deleted file mode 100644
index 1017c070a5d3..000000000000
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild
index ad3a148c871b..9b4a6cffab4c 100644
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 7275d8875db2..e3a62567e51c 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,3 +1,2 @@
 DIST oslo.vmware-2.32.2.tar.gz 334130 BLAKE2B ba1fcec92812613fc202afd8d5eab3c4de65f2451bf17dbae383dd6176a0fda73d1661c1d066e3c9fa24686562c46b0b8927f359632d8f2f94c9d3d185ef802d SHA512 2f18f38590221a14e876607ccb9b8d1b5f25cca1e714c3256980b1f818ac1a1d2f9d3f1418bee7289b1efe01bfff1ae17f76663eb4a96a90e4d17a05dc39e91f
-DIST oslo.vmware-3.3.1.tar.gz 334352 BLAKE2B 54fecc7ea66aa36091938ae47f4cf9c59eba9ae06644ee77d7a1caff11d59c4a2da2ed93c908735b9e8478e9bfcfde5db49a16134f78d898026cf447a4251d1e SHA512 db816da1c472ae861a3a28e17bf87c70fcb41c8f982bc461ce9e9c1c5607b84e5a72321f5f4761c6646c3b72335e450872f872d90980030d8f014e1f1d08ec46
 DIST oslo.vmware-3.7.0.tar.gz 334704 BLAKE2B f3dd399a1cc53904070f687e1d16915097ed78147270e32c3ce71ff7621c19229a5ad1ff345bafa794567a41d83bfa613f87e07ee08f04b90b62d403be0cba63 SHA512 e9a1b0303b7208fd8071ba5c2a677ec09568cd837489d329667f9e4eb93b5aa56490fa1cda9b7927f6ee071c5b44f302742f80bfeab9812d38c3c6376b5d117f
diff --git a/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild b/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild
deleted file mode 100644
index 59171965d5cd..000000000000
--- a/dev-python/oslo-vmware/oslo-vmware-3.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/oslo.vmware/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.vmware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-"
-python_prepare() {
-	sed -i '/^suds-jurko/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-vmware/oslo-vmware-3.7.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-3.7.0.ebuild
index efb41d2702c8..2ed788852e99 100644
--- a/dev-python/oslo-vmware/oslo-vmware-3.7.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-3.7.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.vmware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index 62d0280bb068..fe55890110f9 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,3 +1,2 @@
 DIST ovsdbapp-0.17.2.tar.gz 82830 BLAKE2B a9c7661685aeb215f79b9c14fb7069019ae3641217fd2234db44f4d7bada9c9533919a104ec5a0f05843edae2b71e86edab11e545973e626ea657eea852e0682 SHA512 0d7a5d5c0ea0456a2bdf51b39b864253b52d1699b32a301a549b80568fef63d516158dcb6772cfb97b88d56e840a070f5cc2569acaa414bcab4a65be673a66eb
-DIST ovsdbapp-1.1.0.tar.gz 82886 BLAKE2B 631658eefad233776bdbd8bc409e9f9b78274827465730af8fa99a5d5669f183555827eb59b1cce93c17e218bc7a9a56699d9fa816cbe1f5793cabf13105529a SHA512 b976ccbdad3e5b101f4c1d48ff41dc5654aa777a1f37b52b45f9344915236161745fc9faabd495a138e555c6cdc48ec6414884c4fba37627c6491ca2b9750a6c
 DIST ovsdbapp-1.5.0.tar.gz 88970 BLAKE2B 8ec73d73b159e7e45aa057d24a58388057e50ea006d8cb15be739a39471d0d6fed1542e0bcceed8e9daae67eb3c0b543a8131955a246832ef4e0480950f4f4d6 SHA512 d98ca56dc63aee22315b4181b9d3084e82d611489da7764cc44c14f805dcd874bd7aa72f6e1cb4f44234a118accb77d7412479b5f2224312c7105f56fdbac991
diff --git a/dev-python/ovsdbapp/ovsdbapp-1.1.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-1.1.0.ebuild
deleted file mode 100644
index b3e1ed3ea8d1..000000000000
--- a/dev-python/ovsdbapp/ovsdbapp-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for creating OVSDB applications"
-HOMEPAGE="https://bugs.launchpad.net/ovsdbapp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovsdbapp/ovsdbapp-1.5.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-1.5.0.ebuild
index 35b66a5cd63b..67f7367c4977 100644
--- a/dev-python/ovsdbapp/ovsdbapp-1.5.0.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-1.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index b888f5d2a33e..52842b223892 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,2 +1 @@
-DIST pandocfilters-1.4.2.tar.gz 14229 BLAKE2B 8d061435fc4368fe34f30d7ba7aa06a2b8f3bf94a94661aa120d3b0e9a3042e64bfb8f81a8731470417e436f52342b3a63ab4bb3144349ec9aa983cea9c5d4a4 SHA512 5e5c0fb18f163430e87750b88d38a5f0fa618b90c84bf08e6f295df3ddd46c1bbf35ec51514af8d6699c7dfc9f0b3ee9edd0484deeb05e5efb3b26e650b5ee1b
 DIST pandocfilters-1.4.3.tar.gz 16586 BLAKE2B 975000f96475e8338a54d8a96793a8bcfbf62c5251897a01c185a6708ff7c47f2a1bee617e4e25d3854e7de1d078769bbd887527beb20ebb7e06f0c4da59126c SHA512 9c7ae1329c103ff2baae3488edfcbfaba183bc94146b29e413e7e83ba2ff2dee69823138bf213f5c81a8b0097c2d9329bd05620b10c646662a9617aae7a528a9
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
deleted file mode 100644
index 264220946e1f..000000000000
--- a/dev-python/pandocfilters/pandocfilters-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utilities for writing pandoc filters in python"
-HOMEPAGE="https://github.com/jgm/pandocfilters"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
index 523f06bb55ee..dc067e8ccfbf 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
index 22fd67b7b7df..df96926f2864 100644
--- a/dev-python/pika/Manifest
+++ b/dev-python/pika/Manifest
@@ -1 +1 @@
-DIST pika-0.13.0.tar.gz 103730 BLAKE2B c78139ac7a60bd324619792b177c96793c8c645d58bd6962f7061d5dfca2f621b6199ebb4b2d3fbc7367324f18d3e766266b43db9afafdd8e64c2eec6069f175 SHA512 f555142c8f466ebdbc46a24278794754186176832841723cb0d5d6ff69ee9a946dca8a7ae3280a96b5da8cb2d3066e11a58771583edecf7990749c8857a7ed42
+DIST pika-1.1.0.tar.gz 139407 BLAKE2B 2a2bb71d7f1222ca06dd6202a26e502f1e1e1977651e4fb405a938d493e4f525904568fb57ad5eea0f5117f02c7fa9f1b1c971d7d911d0d62a24b161b2cb2ef5 SHA512 15eab619cffe5b6d62a65a66730b03ee3de24978268afd82f608a96b96cc29695159e228dbbbc21c06f4c02a9591c73a686d9d283ceaa725f53782c3460140a7
diff --git a/dev-python/pika/metadata.xml b/dev-python/pika/metadata.xml
index 25ba292bbb3e..96347a7f3d2d 100644
--- a/dev-python/pika/metadata.xml
+++ b/dev-python/pika/metadata.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>Pika is a pure-Python implementation of the AMQP 0-9-1 protocol that tries to stay fairly independent of the underlying network support library. Pika was developed primarily for use with RabbitMQ, but should also work with other AMQP 0-9-1 brokers.</longdescription>
-  <upstream>
-    <remote-id type="pypi">pika</remote-id>
-    <remote-id type="github">pika/pika</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		Pika is a pure-Python implementation of the AMQP 0-9-1 protocol that tries to stay fairly independent of the underlying network support library. Pika was developed primarily for use with RabbitMQ, but should also work with other AMQP 0-9-1 brokers.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pika</remote-id>
+		<remote-id type="github">pika/pika</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pika/pika-0.13.0.ebuild b/dev-python/pika/pika-1.1.0.ebuild
index 51aebf7c1a06..2a957c3a53ed 100644
--- a/dev-python/pika/pika-0.13.0.ebuild
+++ b/dev-python/pika/pika-1.1.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
 
@@ -12,8 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND=""
 RDEPEND=""
diff --git a/dev-python/pillow/pillow-8.0.1.ebuild b/dev-python/pillow/pillow-8.0.1.ebuild
index b8ea7c0ad5c4..a0f64d2cdbec 100644
--- a/dev-python/pillow/pillow-8.0.1.ebuild
+++ b/dev-python/pillow/pillow-8.0.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pmw/metadata.xml b/dev-python/pmw/metadata.xml
index 7f7b87fb76f3..05811c8bbe6c 100644
--- a/dev-python/pmw/metadata.xml
+++ b/dev-python/pmw/metadata.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pmw</remote-id>
-    <remote-id type="sourceforge">pmw</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pmw</remote-id>
+		<remote-id type="sourceforge">pmw</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/pycadf/pycadf-3.1.1.ebuild b/dev-python/pycadf/pycadf-3.1.1.ebuild
index 6adffe03ca2a..a0de0f1d01ef 100644
--- a/dev-python/pycadf/pycadf-3.1.1.ebuild
+++ b/dev-python/pycadf/pycadf-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 70d8cff9845e..0123be1ab9c6 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1,2 +1 @@
-DIST pysaml2-4.6.5.tar.gz 319131 BLAKE2B d2b78d00cc5e65717bae267fbe88c781d4583996025eb4a9602030215f842a29b625ba41905e867d887e4564bbacdb1251170af46e5f00cc0f9d202c7741418d SHA512 da9cd23f9bef37da1079bba539f91df6a79190fcf8ab20b4c025fd8eae9b147799623dcc1376acfb6ff06c8566a58d478f8da7765195fe058d54007a2ebe79bb
 DIST pysaml2-6.1.0.tar.gz 325101 BLAKE2B 254d1c57e03f13346db89ee18a885d03ce55ed6eec5649d5c764ed6bf97ff20e2a0715e5678409125737acf8fda464c331a17ebe422cc96518bdd3825cf8db05 SHA512 4b3f942a352e6e9ad8df9d3c41269d00dda9f4a71286a4030556d35e5e3946c214fa5c2942f529b1f1ee4dfc30a4d388dffa204f6bdc7614f65b8a3a37ea5ff9
diff --git a/dev-python/pysaml2/pysaml2-4.6.5-r1.ebuild b/dev-python/pysaml2/pysaml2-4.6.5-r1.ebuild
deleted file mode 100644
index dbaaa15f84f3..000000000000
--- a/dev-python/pysaml2/pysaml2-4.6.5-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
-HOMEPAGE="https://github.com/rohe/pysaml2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-PATCHES=(
-)
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/cryptography-1.4[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/cve-2020-5390.patch" )
-
-python_prepare_all() {
-	# Work-around for bug 675824
-	# With older setuptools, version = file:... is not supported, see Note 1 in:
-	#   https://setuptools.readthedocs.io/en/latest/setuptools.html#metadata
-	# In such cases, hardcode the version
-	has_version ">=dev-python/setuptools-39.2.0" || \
-		sed --in-place "s/^version = file:.*\$/version = ${PV}/" setup.cfg
-	##
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pysaml2/pysaml2-6.1.0.ebuild b/dev-python/pysaml2/pysaml2-6.1.0.ebuild
index e37cc3e20c57..a593f28cf601 100644
--- a/dev-python/pysaml2/pysaml2-6.1.0.ebuild
+++ b/dev-python/pysaml2/pysaml2-6.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/cryptography-1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 97c153e45c2a..2b90172fb09c 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,2 +1 @@
-DIST pytest-django-3.10.0.gh.tar.gz 68995 BLAKE2B dcc9ddceda88c32dab559c065feb347582e72ec5fcd9929cb2bde091bd5c89bbe09879901daf5dc0adc7e38921de5b4989e0d1bbefaa5eb1cdce1dfd2ef58a11 SHA512 7f66fa9287fb80082018613ec3b15a0da3f7a13075e85f0a2eff9e13358c993e56245c441d952d13f232bf7e49a05c799b4affbb844e90abaac736d86bb0a6c9
 DIST pytest-django-4.1.0.gh.tar.gz 67983 BLAKE2B b7f4fe1366ce1443b19f05e8e834f0555cd8d63bf10921be1427338b7e5e737b7e04d96c9c9d2ad1b9c0f0ed6fba4ed93fb4fd9a948dc5315b4b7a35ba8adfd1 SHA512 734921f5c6f8569f6488706fbb6ca2515a5b24c6641fd260771022bd4fd72b65d062a8130f59163e8b30f4c9bceb383d154b26f8fbf46a1903339668d0a7d12b
diff --git a/dev-python/pytest-django/pytest-django-3.10.0.ebuild b/dev-python/pytest-django/pytest-django-3.10.0.ebuild
deleted file mode 100644
index fa080250cd93..000000000000
--- a/dev-python/pytest-django/pytest-django-3.10.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="
-	https://pypi.org/project/pytest-django/
-	https://pytest-django.readthedocs.org
-	https://github.com/pytest-dev/pytest-django"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
-"
-
-# not all test dependencies are packaged and this package isn't worth it.
-RESTRICT="test"
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-django/pytest-django-4.1.0.ebuild b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
index 2e17f13d1319..cf8c135aa6ff 100644
--- a/dev-python/pytest-django/pytest-django-4.1.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-5.0.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-5.0.1.ebuild
index 6b7a7daf585a..74b089755f0d 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-5.0.1.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-5.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index db73f4f97043..28f4a139e0ff 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,2 @@
-DIST python-bugzilla-3.0.0.tar.gz 112525 BLAKE2B f2746091c0152779f49502fd3394e41fdd16349c93806829a06561c49d47f6d9c9ee3b75135b9d6f66dcbb95b892aa62108634ec2e5f642b25e2cce2d06d997b SHA512 1762b1eeed125f3d35f36fa2673c1e9e808209b8723c0fdbf06f3327c40d3a5795b668913d01cf91cde3e4a0516e35c82015dbb6fc575c97b82bb421525ff03f
 DIST python-bugzilla-3.0.1.tar.gz 112600 BLAKE2B b8c81b1b3f16e9b180763dcad8615c2847bf11c2a424d1fe4995091b466c202c23c072659066f66830d6d80a96a864e4148daa7a099edd2962f28345b9c9a8af SHA512 b372aa142e9e3eb456f4bba7cbc71056304ae333635c9ae85605bdcae1e5e92e13263500dba0f844c9c577bcede8ea988a753bfe23e016c8da17f3b6e9efdf3f
 DIST python-bugzilla-3.0.2.tar.gz 115324 BLAKE2B 3f64af96bf61d16e720338055391b187f53a968488535e76a5d6e56817030fc1c45f824ed27424b3e7440dc03759e77bcb8d417fa2278aa611b995bea2775f7a SHA512 c4fb79c9ca4d813a5dd9573e9a300aa01ea713fa11d43e2ee7ca13efb4720fed14fff339e9cc1b756505f43348768f0fdaaa8ae0b370640ff70e402f852e9b1a
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.0.ebuild
deleted file mode 100644
index 51c98d6ae8e6..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
-HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-LICENSE="GPL-2+"
-SLOT="0"
-
-RDEPEND="
-	|| ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.1.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.1.ebuild
index 907780472974..51c98d6ae8e6 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.1.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.0.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
 HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
index ed6daa86d7b8..4917c4787e76 100644
--- a/dev-python/python-designateclient/Manifest
+++ b/dev-python/python-designateclient/Manifest
@@ -1,2 +1 @@
-DIST python-designateclient-4.0.0.tar.gz 61298 BLAKE2B fc307cf07728e1adcd722b7162223ebeed4df34b81249b0ccab4e9c42d191ad1e320be486a9420d7fdbb9c4db02fd9ab2ab80c021472a101c83a1365b200f5f3 SHA512 b6a11c14219a65da059a4d55822d954b96d553c3dc30a0657a3cff1a309715c4d7f009e81ac54820a4d6f27451105833123fb89513cc7309cc09c124d7e15d26
 DIST python-designateclient-4.1.0.tar.gz 60526 BLAKE2B 4df143ea429510aea50235ee80ac8712d436201b54544089860e452e652c220b5fa954ee88b61c30150a34655c6d38839f5d40d5860263a5456a2d65773bd58f SHA512 ae99fcf662b81ec0d14c3536dddd51e3b2f945ff5e62669efd1e2f0ad1f820884f427af6b9112c3fae5e7d0953f2008132e6e6e9fc1ad7b155c993a62434b90b
diff --git a/dev-python/python-designateclient/python-designateclient-4.0.0.ebuild b/dev-python/python-designateclient/python-designateclient-4.0.0.ebuild
deleted file mode 100644
index e9d99ac89b5a..000000000000
--- a/dev-python/python-designateclient/python-designateclient-4.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the Designate API."
-HOMEPAGE="https://github.com/openstack/python-designateclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-designateclient/python-designateclient-4.1.0.ebuild b/dev-python/python-designateclient/python-designateclient-4.1.0.ebuild
index 3016b315e00b..80d2aafb4192 100644
--- a/dev-python/python-designateclient/python-designateclient-4.1.0.ebuild
+++ b/dev-python/python-designateclient/python-designateclient-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-octaviaclient/Manifest b/dev-python/python-octaviaclient/Manifest
index 4790c15fcaaa..12b77b75a594 100644
--- a/dev-python/python-octaviaclient/Manifest
+++ b/dev-python/python-octaviaclient/Manifest
@@ -1,2 +1 @@
-DIST python-octaviaclient-1.8.0.tar.gz 63332 BLAKE2B 7944fd80b5d0ac8b1ff5d0a324d45a4150f6afda865e1db5dec490e5f33850a3fda57214303e1b3c1a65f0b594ec16b49b2f3755e2a303c518ccd09dd3791fe7 SHA512 d73c36f683b6bec0a26d4d118bccb827cd0da494f315762c170b59a2cdef3d138481b26bdcc43e8f9f50128937a39fab8f83c0d8fbc52314f8e3f59f2031a92a
 DIST python-octaviaclient-2.2.0.tar.gz 83099 BLAKE2B 1ee8333ef09b205bb66445cfcb28b6789c73dd4f5752510a88ace02f0a0b5b20a086fccb9e7fd2014ffad5472c03a86bfb0fe8da8f5fb4c223c46d2352529ad9 SHA512 f6707192dd9b281acb8f3124e9c1b6d02b037034677b7c3946e39b70c0f7600790a9d70fa8228c7aa120ba3187a8aa9ce48db0a0afa16a300befd37fd77f80f1
diff --git a/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild b/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
deleted file mode 100644
index bdf54641293f..000000000000
--- a/dev-python/python-octaviaclient/python-octaviaclient-1.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Zun API"
-HOMEPAGE="https://github.com/openstack/python-zunclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cmd2-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-octaviaclient/python-octaviaclient-2.2.0.ebuild b/dev-python/python-octaviaclient/python-octaviaclient-2.2.0.ebuild
index e8513b88a3e2..1efb63ae8dfc 100644
--- a/dev-python/python-octaviaclient/python-octaviaclient-2.2.0.ebuild
+++ b/dev-python/python-octaviaclient/python-octaviaclient-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index ac1c564ea370..17d2a6b00468 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1,2 +1 @@
-DIST python-saharaclient-2.2.1.tar.gz 111417 BLAKE2B b4545a161a630caabca9318eb0ead796b417d686cdf2c134f7e8022e3e62e7b01e5db7cff1950826d49798d6e6ea41334138bcf918dfb23a2eaf6527c0788fde SHA512 f5ebbe76d00a9bab4239bc19df2bde30b133b261bf8abb63db12cde9539c5bc92fb1a24b6c9ed6e8a509a44ae2abe98f5e8b74655517a1e2c2126938cc5c517f
 DIST python-saharaclient-3.2.1.tar.gz 106266 BLAKE2B a9f439028ae523a452b5cdc0024e4d44527c3114826432cef837df1c32bbd89035ec09c8f72c349e7fc8347d438236b61e20df253119bf35bf69e27b00c2affa SHA512 a0e9dec4a8a1b86de182535060c99d79c7aa4c93f801088a0b7d6a40084294821c22de531b00cf73b4f6940e72dc43e505bea8aee218fdcb63ef0727aa806544
diff --git a/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
deleted file mode 100644
index e38439086e85..000000000000
--- a/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
-HOMEPAGE="https://github.com/openstack/python-saharaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-saharaclient/python-saharaclient-3.2.1.ebuild b/dev-python/python-saharaclient/python-saharaclient-3.2.1.ebuild
index af69736001c2..1ff7019212c0 100644
--- a/dev-python/python-saharaclient/python-saharaclient-3.2.1.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-3.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-zaqarclient/Manifest b/dev-python/python-zaqarclient/Manifest
index 4c85236f6589..cd34917373a4 100644
--- a/dev-python/python-zaqarclient/Manifest
+++ b/dev-python/python-zaqarclient/Manifest
@@ -1,2 +1 @@
-DIST python-zaqarclient-1.13.1.tar.gz 88428 BLAKE2B 71870c7232d4f00b626421fc41e033925fe58f0699538d3e7f3deba2ac07e692d8e676eb763429efcc16ca0c39f8a15317106ca8f6ade583555a89495eba324c SHA512 4854e0a90e98d8172058316fbfcefc0a327a81ae870db28a51264b8e4b809383b652818506f734dd2b35648a544d0811046957c97a86f12d696021d54fbfa890
 DIST python-zaqarclient-2.0.1.tar.gz 86779 BLAKE2B 5c19de28ec9329542cc77281596043c746332ac568495a7845150d4449731fd31729c1c745c828f1ba4e4cfa2f64a189b53e982248d3d74e3618e05489e5f24a SHA512 31af3bf16ac821a3f204673c9359d5dcc56915d6f108c0127cad6541ea6760be5b543c839fe053593905b5d876a6910a9038661d818e50af5f986eac442accd4
diff --git a/dev-python/python-zaqarclient/python-zaqarclient-1.13.1.ebuild b/dev-python/python-zaqarclient/python-zaqarclient-1.13.1.ebuild
deleted file mode 100644
index bb54c13c2e7b..000000000000
--- a/dev-python/python-zaqarclient/python-zaqarclient-1.13.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Zaqar API"
-HOMEPAGE="https://github.com/openstack/python-zaqarclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-zaqarclient/python-zaqarclient-2.0.1.ebuild b/dev-python/python-zaqarclient/python-zaqarclient-2.0.1.ebuild
index 28dfaf9eea39..761c4f2dcfc2 100644
--- a/dev-python/python-zaqarclient/python-zaqarclient-2.0.1.ebuild
+++ b/dev-python/python-zaqarclient/python-zaqarclient-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/taskflow/taskflow-4.5.0.ebuild b/dev-python/taskflow/taskflow-4.5.0.ebuild
index 9d421f62b076..1c9455f04969 100644
--- a/dev-python/taskflow/taskflow-4.5.0.ebuild
+++ b/dev-python/taskflow/taskflow-4.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index 4322f30d7faf..6908457c7b65 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,2 +1 @@
-DIST tooz-1.60.1.tar.gz 85330 BLAKE2B 0b75ebc5dcc3c9873fc41ce92e61be0591955b4bbbc4c7f16b87bcd27c24c8f83bd079fd9c24164563908fbb488ec4a259d65ee583146324b67acf048504817e SHA512 5dafaea570cc104b0e82eff3ec54d0969bf84c5d84e20c69957c55b2cd9e80bee2925e2ace6977fd499044df0bae02a18c17dcba9592ee3c4ccdb6b2b1dfae38
 DIST tooz-2.7.1.tar.gz 94084 BLAKE2B f2c49af8ba98144c61c9658d7737d737f0892bff92abe8830da6c0b7bd06905519f9a5c0e89c5d511705bc8ccbf764ad2bbb3bb12f175077ac0fd6896e0b4b23 SHA512 a2c4827daac059e1bf92789226f48c40a328db855b1455b06e9f8949f8e0ea685e6d0ca3fd7ff5b5b309f2f395e7d8e42c2585a68e2c0f3fd9149f0efc829c34
diff --git a/dev-python/tooz/tooz-1.60.1.ebuild b/dev-python/tooz/tooz-1.60.1.ebuild
deleted file mode 100644
index 7876ef731079..000000000000
--- a/dev-python/tooz/tooz-1.60.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library centralizing the most common distributed primitives"
-HOMEPAGE="https://docs.openstack.org/developer/tooz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/tooz/tooz-2.7.1.ebuild b/dev-python/tooz/tooz-2.7.1.ebuild
index ef73193af821..f559c152fa0d 100644
--- a/dev-python/tooz/tooz-2.7.1.ebuild
+++ b/dev-python/tooz/tooz-2.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/vncdotool/vncdotool-1.0.0.ebuild b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
index 586c2cf93a15..5a1b894b8cc8 100644
--- a/dev-python/vncdotool/vncdotool-1.0.0.ebuild
+++ b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # No clue why this happens:
 # pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.