Updating liguros repo

37 files changed, 36 insertions, 48 deletions

diff --git a/dev-python/coverage/coverage-5.3.ebuild b/dev-python/coverage/coverage-5.3.ebuild
index 3f0d6ca363f3..44b7c17141ba 100644
--- a/dev-python/coverage/coverage-5.3.ebuild
+++ b/dev-python/coverage/coverage-5.3.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
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
index 3d363048e2e7..5bdc90240bb0 100644
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild
+++ b/dev-python/distlib/distlib-0.3.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 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"
 IUSE="test"
 # This package's tests are extremely fragile and tend to break or hang
 # when it doesn't like metadata of packages installed on the system.
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
index 1154927e4703..f1c37a2f5b41 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.14.5.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="~amd64 arm64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/greenlet/greenlet-0.4.17.ebuild b/dev-python/greenlet/greenlet-0.4.17.ebuild
index b8a3574636a2..8a1c0289d6a9 100644
--- a/dev-python/greenlet/greenlet-0.4.17.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/lit/lit-11.0.0.ebuild b/dev-python/lit/lit-11.0.0.ebuild
index 46922973db5c..14fff54955a0 100644
--- a/dev-python/lit/lit-11.0.0.ebuild
+++ b/dev-python/lit/lit-11.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lmdb/lmdb-1.0.0.ebuild b/dev-python/lmdb/lmdb-1.0.0.ebuild
index 6f1c63fa791c..86e1ab79d5df 100644
--- a/dev-python/lmdb/lmdb-1.0.0.ebuild
+++ b/dev-python/lmdb/lmdb-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-db/lmdb:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
index e95aef0f0c56..22602b7991b9 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20201016.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/multidict/multidict-5.0.0.ebuild b/dev-python/multidict/multidict-5.0.0.ebuild
index bce0c324c147..fd7511510858 100644
--- a/dev-python/multidict/multidict-5.0.0.ebuild
+++ b/dev-python/multidict/multidict-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/nbformat/nbformat-5.0.8.ebuild b/dev-python/nbformat/nbformat-5.0.8.ebuild
index ef53ed01d26f..30464adb0eb4 100644
--- a/dev-python/nbformat/nbformat-5.0.8.ebuild
+++ b/dev-python/nbformat/nbformat-5.0.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="~amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/odfpy/odfpy-1.3.6.ebuild b/dev-python/odfpy/odfpy-1.3.6.ebuild
index 9b7fe5b1c10b..caa39b8d69e3 100644
--- a/dev-python/odfpy/odfpy-1.3.6.ebuild
+++ b/dev-python/odfpy/odfpy-1.3.6.ebuild
@@ -3,9 +3,6 @@
 
 EAPI=7
 
-# Classifier: Programming Language :: Python :: 2 :: Only
-# py3 fails one test, pypy anpother.
-# Notes on page of home repo reports support of python3.
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -17,16 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -v || die "Tests failed with ${EPYTHON}"
-}
+distutils_enable_tests pytest
 
 python_install_all() {
 	if use examples; then
diff --git a/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
index f3c4d9fa36de..1e0dd7f1cde9 100644
--- a/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.50.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 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/os-client-config-2.1.0.ebuild b/dev-python/os-client-config/os-client-config-2.1.0.ebuild
index ac9549537864..ecf52caede58 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.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"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-ken/os-ken-1.2.0.ebuild b/dev-python/os-ken/os-ken-1.2.0.ebuild
index 80033011b582..cb12672b6799 100644
--- a/dev-python/os-ken/os-ken-1.2.0.ebuild
+++ b/dev-python/os-ken/os-ken-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os-ken-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-testr/os-testr-2.0.0.ebuild b/dev-python/os-testr/os-testr-2.0.0.ebuild
index dad3302204ea..9ede5a66be67 100644
--- a/dev-python/os-testr/os-testr-2.0.0.ebuild
+++ b/dev-python/os-testr/os-testr-2.0.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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/osc-lib/osc-lib-2.2.1.ebuild b/dev-python/osc-lib/osc-lib-2.2.1.ebuild
index ba5401336d27..117b88e64015 100644
--- a/dev-python/osc-lib/osc-lib-2.2.1.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.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"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
index 3387817524cb..40759847899b 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE=""
 RESTRICT=""
 
diff --git a/dev-python/oslo-config/oslo-config-8.3.2.ebuild b/dev-python/oslo-config/oslo-config-8.3.2.ebuild
index a0600d0731ae..6b775a8a2a73 100644
--- a/dev-python/oslo-config/oslo-config-8.3.2.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.3.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-context/oslo-context-3.1.1.ebuild b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
index 08eec7c58bad..a98eb33aa488 100644
--- a/dev-python/oslo-context/oslo-context-3.1.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.context-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-log/oslo-log-4.4.0.ebuild b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
index 589127d40339..c50d8ce3121a 100644
--- a/dev-python/oslo-log/oslo-log-4.4.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 
 RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild
index fc907a4df19c..f6b99599ff2a 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.0.1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.0.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"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
index 99f87f4b39c7..1bb98a5750d9 100644
--- a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/owslib/owslib-0.20.0.ebuild b/dev-python/owslib/owslib-0.20.0.ebuild
index a901ed6ac69c..6bac5de44044 100644
--- a/dev-python/owslib/owslib-0.20.0.ebuild
+++ b/dev-python/owslib/owslib-0.20.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/OWSLib-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 01316a2fbe99..c0a3b72b1f68 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -14,7 +14,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/passlib/passlib-1.7.4.ebuild b/dev-python/passlib/passlib-1.7.4.ebuild
index 33717c3390b3..4d3a5983a8c4 100644
--- a/dev-python/passlib/passlib-1.7.4.ebuild
+++ b/dev-python/passlib/passlib-1.7.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/pycairo/pycairo-1.20.0.ebuild b/dev-python/pycairo/pycairo-1.20.0.ebuild
index 8dc0b84f4aff..f96efea72c53 100644
--- a/dev-python/pycairo/pycairo-1.20.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild b/dev-python/pyproj/pyproj-2.6.1_p1.ebuild
index 457c8d466c4f..c1ce0936e020 100644
--- a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild
+++ b/dev-python/pyproj/pyproj-2.6.1_p1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux"
 IUSE="doc"
 
 RDEPEND=">=sci-libs/proj-6.2.0:="
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
index d0346efb33b0..73d0f3d5a884 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
index f7bc66c54f92..b574e38882a3 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 BDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
index f9693844ac8e..e4a933f3e615 100644
--- a/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-7.2.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 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild b/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild
index 62ceb4e0a8cf..da5674cfba94 100644
--- a/dev-python/python-glanceclient/python-glanceclient-3.2.2.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-3.2.2.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"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ldap/python-ldap-3.3.1.ebuild b/dev-python/python-ldap/python-ldap-3.3.1.ebuild
index a570002bb365..775436269d38 100644
--- a/dev-python/python-ldap/python-ldap-3.3.1.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
 fi
 
 LICENSE="PSF-2"
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index 1e6c09641a93..7119af9cb70a 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -15,6 +15,5 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
index eeb6567ce9fa..bb2dff87d590 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.20.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/testfixtures/testfixtures-6.15.0.ebuild b/dev-python/testfixtures/testfixtures-6.15.0.ebuild
index 31817303684f..3a9b162be1c6 100644
--- a/dev-python/testfixtures/testfixtures-6.15.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/virtualenv/virtualenv-20.0.35.ebuild b/dev-python/virtualenv/virtualenv-20.0.35.ebuild
index 470272aef1b9..39d0f5104be2 100644
--- a/dev-python/virtualenv/virtualenv-20.0.35.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.35.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/yarl/yarl-1.6.2.ebuild b/dev-python/yarl/yarl-1.6.2.ebuild
index b2083f19f565..3a1ea7f2a570 100644
--- a/dev-python/yarl/yarl-1.6.2.ebuild
+++ b/dev-python/yarl/yarl-1.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/zope-interface-5.1.2.ebuild b/dev-python/zope-interface/zope-interface-5.1.2.ebuild
index c0fe271fbb35..389a06a33cab 100644
--- a/dev-python/zope-interface/zope-interface-5.1.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 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"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="