Updating liguros repo

35 files changed, 17 insertions, 528 deletions

diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index e2123a7248b0..50b086580ea6 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,2 +1 @@
-DIST oslo-cache-1.33.3.tar.gz 56098 BLAKE2B b3d2ab549a2b2066ffdfc5d9b680da35501818719a8c6f460be1520c2d6342f1c41f0f1aa20ffdcc45958e83e242515a3ec8bf69ce1273ab47a8a26e648069c8 SHA512 7edc1d8ceb00f2989093ec1809120f2aa552de2d5ce6176c9af56278040d652fc0d627e0f7f427b9bacaaa24cec7b0fe24568316d90a4e52054357bc9b9e30e2
 DIST oslo-cache-2.3.0.tar.gz 57209 BLAKE2B aa34c4deb0206c86181e629b1ccedaa3b0b7a503f4648b9ffb23dcba84c98658017a720701176776652a2a58447c54662314dd4853ec6ccf6c2acebb4b559325 SHA512 c3ad9c326fa71985d4546bd20bcb8aa9508808c8eae2a9e3dac1c014d148bfa8f5a847eb2ca8d1a204cce07b6d640f9541491dd41c7c6169e993e408786358af
diff --git a/dev-python/oslo-cache/metadata.xml b/dev-python/oslo-cache/metadata.xml
index f150ed30e4aa..a9b2c2be7f42 100644
--- a/dev-python/oslo-cache/metadata.xml
+++ b/dev-python/oslo-cache/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Wraps the dogpile.cache library
-	</longdescription>
 	<upstream>
 		<remote-id type="launchpad">oslo</remote-id>
 		<remote-id type="pypi">oslo.cache</remote-id>
diff --git a/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild b/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
deleted file mode 100644
index e0d9e2955bfe..000000000000
--- a/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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/six-1.10.0[${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.3.0.ebuild b/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
index 617334205e5a..d4994a79e4e3 100644
--- a/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-2.3.0.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"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 19e1dd9dc944..e4542793eb06 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,2 +1 @@
-DIST oslo.concurrency-3.29.1.tar.gz 51785 BLAKE2B 4035981fcff3cb4384209f3b640b928dfacd13e324c9df1dfebb0c5230727736ff803b478e506b08ac4bd7bd405763b93bdb951b01751a5e293daa33df860c8e SHA512 f820b07dbb26be9170c7ded08ce96bebc8c8cbfa72a3be56e0cb0fd7a025160fe630ad256c8c5b1adc9059cd1608c3625513b3da311e5a611866280d2b65424e
 DIST oslo.concurrency-4.0.2.tar.gz 53910 BLAKE2B 090d9ba4b5267f63edf6cbc6f585e48019a4ac293e24914a8f7c52009b34ce9a4822a8705934c642663bd2a09be3085458868159ef041498e2085e4ccbec50f9 SHA512 ca1ef615ebe986acac853666877061bbc7a02c09bec294ec6221ae4800a561cf9f218855f7eb8b96184d645924e5c68963b47116835c7d2495de83617439d1ef
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
deleted file mode 100644
index 02eb25dc688b..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDPEND=">=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/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^futures/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
index 7d4e1b76c591..6e2470a8637d 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
@@ -13,7 +13,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/Manifest b/dev-python/oslo-config/Manifest
index fb45fe5ebd77..40a6b73dafda 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,2 +1 @@
-DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
 DIST oslo-config-8.0.3.tar.gz 147691 BLAKE2B 9af2a1ff399b52261561d268f6b9cc673629af572faadc736e851826ccf84ea8fcb8b8846b62f85671934f5214f289301157da7197dd5a15ad6e9ec1792bdb31 SHA512 09c49b0917d20c74e59efd6b8cca0394f98c337b075f916ae21f6072ce6f28a90a701a3f63f0737e4b3161cf4795fdb2be9b01091fd00828990cbc715683b0f4
diff --git a/dev-python/oslo-config/oslo-config-6.11.2.ebuild b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
deleted file mode 100644
index 8bc82001771a..000000000000
--- a/dev-python/oslo-config/oslo-config-6.11.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-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"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-config/oslo-config-8.0.3.ebuild b/dev-python/oslo-config/oslo-config-8.0.3.ebuild
index ceaab62f1656..bb05b85eae23 100644
--- a/dev-python/oslo-config/oslo-config-8.0.3.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.0.3.ebuild
@@ -15,7 +15,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=""
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index ee80f28f3e2e..9f8252c8deb0 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,2 +1 @@
-DIST oslo.db-4.45.0.tar.gz 172505 BLAKE2B b280daf94dcdcaa21051bb1c8d611199725b7ad9017225f16ef2ae7342941a6b2bd474b1598cdb54e301f5143c985f250ec1b1f64cddf2ac3cb71a03d9acf589 SHA512 f976ff2aab1e39ce253618ed5669ee0b824ada03073028a990899784d96378eb7c5a2476e1a60ab9afa5a30fd8e34c84b0545d63a7f3c522cad9c7423208b1ba
 DIST oslo.db-8.1.0.tar.gz 171252 BLAKE2B dbf6f580d95ce06f0ab4a50cf289765a2fa55459c56b89f079cbe93b319c1ebdd4287c47a7b69e0bff1ff91149f2dc9c7b8d90769f17cca26f42a2d0a69e46d6 SHA512 3070561990c630a26c936f787be1cacc7747b915bf01178624047551891c9e44b3d17a8d818bfac259d7083a8bbadba1859ade4a15821c00316bdb3860056208
diff --git a/dev-python/oslo-db/metadata.xml b/dev-python/oslo-db/metadata.xml
index 24ec928a3a39..4235bf4f1f7c 100644
--- a/dev-python/oslo-db/metadata.xml
+++ b/dev-python/oslo-db/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-	OpenStack Common DB Code
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">oslo.db</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/oslo-db/oslo-db-4.45.0.ebuild b/dev-python/oslo-db/oslo-db-4.45.0.ebuild
deleted file mode 100644
index d4bf92584022..000000000000
--- a/dev-python/oslo-db/oslo-db-4.45.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.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.1.0.ebuild b/dev-python/oslo-db/oslo-db-8.1.0.ebuild
index 216614e84cb7..faeef68958d0 100644
--- a/dev-python/oslo-db/oslo-db-8.1.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-8.1.0.ebuild
@@ -13,7 +13,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-log/Manifest b/dev-python/oslo-log/Manifest
index 784a708e5285..4629af0d09be 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,2 +1 @@
-DIST oslo.log-3.44.1.tar.gz 87427 BLAKE2B 225f855c2539557d4d673c23fd58618c669864ea3d5c13f6ffdfc64b4926fd33ec45b6730671b4fe70a105aee39adea63af88a735dabbd5fe9588afb1fd9e2dc SHA512 b8c655bbe2e49b1d69ba7a68c9f115f012d75f0bc0fa1d5583d692b01e65dc17c956fc738cf8092ebb90ac9605c644989526fab4132f23ddef92835ff433e1ca
 DIST oslo.log-4.1.2.tar.gz 87095 BLAKE2B 20dd69c5002f33c288c7c04818435076ffba112b91e0f5726cb32674f10e162e378bce221278428714aa827cee81253cc21bb0588934cd024b7948b349e60a76 SHA512 f34ed66bd289fc88420d02d67ce59b498274d44f43d20b53cef1369699d715ec9706a5f62b81de3005010de1e1fa4c36aa935ee72f81160a75cbda3596a0d167
diff --git a/dev-python/oslo-log/oslo-log-3.44.1.ebuild b/dev-python/oslo-log/oslo-log-3.44.1.ebuild
deleted file mode 100644
index 9071f914d928..000000000000
--- a/dev-python/oslo-log/oslo-log-3.44.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/oslo-log-4.1.2.ebuild b/dev-python/oslo-log/oslo-log-4.1.2.ebuild
index fa80b804fb41..cb23d1034473 100644
--- a/dev-python/oslo-log/oslo-log-4.1.2.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.1.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index b93a070c1283..80a6bb0cb816 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,2 +1 @@
-DIST oslo.middleware-3.37.1.tar.gz 56354 BLAKE2B e9b119d2163c3949eb98b7580b4d5aa4a4427b9a8b3a841549f282358d8daefe62cc3f0588535c744aab7b77b44d38691316f50b9d60e5c974e3a0714a367699 SHA512 1864b2c25602ac7e27e2b080617f7af5f38083705735893dde744e7535d127d62ab0f29a0ef2575ec53af22969544d83e454bc5913b5719c4eb7d312764fa5c0
 DIST oslo.middleware-4.0.2.tar.gz 56678 BLAKE2B 5e548f35eccb896447337317dc68d2294c6cf9a064c8cf938c205dbea47af11107d98efdfbfa1829dd2c4f74bd6a9ab51854cdb267321c1b80dc8f9f5ccdf3ee SHA512 8be5fcd85b3afcd0115f4c700f7b2e8846d5b23f0e93765e2cf693b2e0f982a9a8feee6648e261e36890a8a57c28dc550d2d65e5ebc209a4e709b463e5f8ce04
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
deleted file mode 100644
index 529e6b770e81..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-3.37.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_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.org/project/oslo.middleware/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${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[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${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/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild b/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
index 6ad72d5e3427..2cb93036d245 100644
--- a/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
@@ -13,7 +13,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 01a3be7c7d2c..02d88808a659 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,2 +1,2 @@
 DIST oslo.policy-2.3.3.tar.gz 93581 BLAKE2B 50d1b45b596242b901a5b583b412c90d55b2ea9501dab29fa24be7b1c64eacf89f0f7df742f897503ab3c09399bfca25b93ed9cc3aa2377a72986f73bb96f1e4 SHA512 b4a2febe240582dbad8306e2208bfb7bd83c2783002544428b5888a8930d959919f10044eb2c30579e2fe61a6958ebefce4300f1778798b201714232a2edb88f
-DIST oslo.policy-3.1.0.tar.gz 94290 BLAKE2B 90257806c834317b509d7b7e72ed00166b71fb692c68d86ce9ef3a4fe2fa671625ba677a4b86fd2ab43f4cc04d1b7f54314c80c1baea8baf0d116689cd178618 SHA512 61f7267abb1268627ba50f2a7d4196c6a6805aa3bbb5c3bb26d8c96d2c526d24102d11fab39e7043722dbd64f32848fbc277cda7699e76334fa73afff8adba54
+DIST oslo.policy-3.1.1.tar.gz 95063 BLAKE2B 2173ab727bceb53f8a4d4babb3b4a8de47b6398ea842cff097be21446a1aef0b77bd1b4a89dadc1e48acc9f0355d378e65f8288ff559e970d3ea1da6f2163e8f SHA512 3021433d4e4dd496ee7aafdcce60e3cdc4a9a8fe64724babfb146a077c91dfe0300500c199e7e7664f89dc2430fbab47700e767db64a5d9c931d8838cdc9ee65
diff --git a/dev-python/oslo-policy/oslo-policy-3.1.0.ebuild b/dev-python/oslo-policy/oslo-policy-3.1.1.ebuild
index 6e917950a2e5..6e917950a2e5 100644
--- a/dev-python/oslo-policy/oslo-policy-3.1.0.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-3.1.1.ebuild
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index e18628a334a4..08f8fc664147 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,2 +1 @@
-DIST oslo-serialization-2.28.2.tar.gz 30807 BLAKE2B ff0ee4d4215943d0fa419d0d0989c093812d354da6727f5e87a27ff0562baf5e3a22c781c686ce5156fcff065e03c7481bcf3e16041a2296366a1f297060eff5 SHA512 78305f20392348b73eca244464cd4167177cd82ea74597641ee9de60b51182e5e3d75e5d748fe2c39ddb322a08f2ee5044c846bc969022b738a0b89874451337
 DIST oslo-serialization-3.1.1.tar.gz 32180 BLAKE2B 5ce0db206732430b2553b0eb01d5df717069a07370a20ef452b77e83ed95f1cd0542eac287ba28d4fd2a3f66541823c362a925e48a3ed175abdbab2c1aa5b2f2 SHA512 5a551c33a001eeb73213dac1b4e4bc50db2ceb7dc2f9881c07abbab05cc8ccfda4d73cc9bdc673e26628aaa05c3d66f9c76ba4eb370c851990f3614b33233a95
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
deleted file mode 100644
index 0179307703c9..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Serialization 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="doc 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/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
index 2b721387653a..f5f4d9cb8de3 100644
--- a/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
@@ -15,7 +15,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-service/Manifest b/dev-python/oslo-service/Manifest
index 6e845341b7f7..f97dcaef4e5d 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,2 +1 @@
-DIST oslo.service-1.40.2.tar.gz 80334 BLAKE2B 6000ba70c414ae6396f8be3911511b073f0f6a73a3a98e92e0c662b42a637b4cccbe684ceb1df2613aedad3fbd430ff588dca001997293563f39525efba05d99 SHA512 e412ae3d96e7e7f5f40238b3b9d9623a36347c3d8c6e06baa11133da71d4f5e55bd1ac2f43b45a2f84f725f84c59ec6870bc557fb623ab681bbeec27bffd086d
 DIST oslo.service-2.1.1.tar.gz 81030 BLAKE2B f6221d9e3d7624dccb614b2dbe6529937fd00495db80cddd9412c53fdacd4a5c5a5fe33468ab53c65e0cb741e82519de971f19d662e633f658641c978dcf0b2b SHA512 8d2beba973444eb6ef32c011928376b6ba61388837178f9043105100f05644137d9bf6ae235c4c7260b05d956bfda42890dcd5727dd4d6f9559e7206f7139f95
diff --git a/dev-python/oslo-service/oslo-service-1.40.2.ebuild b/dev-python/oslo-service/oslo-service-1.40.2.ebuild
deleted file mode 100644
index cca69a142a6c..000000000000
--- a/dev-python/oslo-service/oslo-service-1.40.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.service/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${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}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/yappi-1.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-service/oslo-service-2.1.1.ebuild b/dev-python/oslo-service/oslo-service-2.1.1.ebuild
index d318fd27e7b2..26d50d44e7b8 100644
--- a/dev-python/oslo-service/oslo-service-2.1.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-2.1.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${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-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index e597b23466fe..e4a4a7173a7e 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,2 +1 @@
-DIST oslo-upgradecheck-0.2.1.tar.gz 14624 BLAKE2B 0b6e397c67df12f3162f4f05334b775e05ec253f642d707a262901b90120eedeef7aaaa3764c04620426e62031f953096cba975dc3e8dc7da3e091c7ac8f2d57 SHA512 26c771b3bc07b9d13fea6638330c785ef82781e794084088bbf46ec811a615e58123d5a42d17a9e31685308a4c1d2ccb7b839c32d9f454e3934d5fb625b73816
 DIST oslo-upgradecheck-1.0.1.tar.gz 15636 BLAKE2B 1247658ae351e11b3320415cd66bb5831bd018bced2e0440dc882d4c945dc81111544b063fb78e4b812d50c21ef7bde3eee30f8f12724d00077a32a05bb308c2 SHA512 92a8cfe51e4ddcdd7a1e8cab7296e7702a1389cbc9df17d0c5da133b21413efb5a650495d1b3bd2e2a58c376dd8c844e96ae20d2d56d387c29de635918a96d30
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
deleted file mode 100644
index ff64429a1ec8..000000000000
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.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_{6,7} )
-
-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.0.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
index c3202a21255e..ff64429a1ec8 100644
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
@@ -15,7 +15,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/Manifest b/dev-python/oslo-utils/Manifest
index 1378f359be3f..778b67489227 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,2 +1,2 @@
-DIST oslo-utils-3.41.5.tar.gz 91662 BLAKE2B 28ab74823b68cdf427396e5e357f567be5540eaf28e56416015d41ba76ddbe0970064b672c46b53bf23c2dfaae442462fa89d1e140e5f5a271db6e72e4b3e615 SHA512 0d9f9a99a48c0d6623947df6557eca24ebb2ae21d110e1c2a37e09c89fc2749d3ae480bfb534b3a2e3a6f9e7b0db126497f3403825b1272a30f532aa57795b04
 DIST oslo-utils-4.1.1.tar.gz 92838 BLAKE2B f468f77bc72124c404d4aac2b8ca9fd7f05140e45bfcc9b19e04e5d3181532fd82f941b7a00d22f1cb656ae46dc205e7da449772666a8892b8d7ea6469bb6505 SHA512 d6388af59caa7531901eb5585e1dd9eca544dd722bb4cdafb19221c33c543508306415f504b27559366eec2a9c7102acb181d8b833ee038e46e90567208daefd
+DIST oslo-utils-4.1.2.tar.gz 92889 BLAKE2B 16397708abe47946c1495adf6b91ad9db6bdef8c2f475f398b3b4d390193b800ff0b1710183732b81dde89fc24aad204854d02a0e0567046e712663eaa685711 SHA512 d6784c7e1a30690ec2523514b464c95e1d6704a8c8fef5da85b76583dfb5d4b5cbfd18eb9451a90243210e50405f7541b85b39ac09d4f487119677efeef63418
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild b/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
index 41b6669851c7..eed1c4c3fe24 100644
--- a/dev-python/oslo-utils/oslo-utils-3.41.5.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
@@ -15,8 +15,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -38,26 +38,16 @@ DEPEND="
 		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 		<dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
 	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
 "
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
@@ -70,10 +60,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
 # Note: Tests fail due to requiring installation
 #
 # Installation appears to fail due to the use of namespace packages but root
@@ -94,9 +80,3 @@ python_test() {
 	testr init || die "testr init failed under ${EPYTHON}"
 	testr run || die "testr run failed under ${EPYTHON}"
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
index ee17743bf12e..15e5c4b9d10c 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.versionedobjects-${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/pynvim/pynvim-0.4.1.ebuild b/dev-python/pynvim/pynvim-0.4.1.ebuild
index 8459c3eba0eb..f1b7eb1ca6f3 100644
--- a/dev-python/pynvim/pynvim-0.4.1.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.1.ebuild
@@ -16,11 +16,8 @@ KEYWORDS="amd64 ~arm ~x86"
 
 DEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	${DEPEND}
-	app-editors/neovim"
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	test? ( app-editors/neovim )"
 
 distutils_enable_tests pytest