gentoo resync : 25.08.2020

7 files changed, 2 insertions, 427 deletions

diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index e0871cdd9ef2..818601205a08 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,13 +1,3 @@
-DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
-DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
-DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
-DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
 DIST pbr-5.4.5.tar.gz 120510 BLAKE2B f0f22a25e41820a0848aface6c241e38d8c4500d14ac3c8abf3d3b5f3f2d88680505d43f045589d700e9c07ade1643712274b156832246ca3f2050f44e4cda26 SHA512 b53ca10b7af7e365ff99ecf11942d3f047112d69f7e963716d07bc156077b08d79bb708bb93aae342e5e03c83278507b6990137dc34d0ebc11de53bd57ab3654
-DIST pbr-wheel.patch 2781 BLAKE2B f36ac5bfe22e97dd93735581461f5ac79753543e0e03bcf569d95a3bfac70362c50af8bfc745e5d29ff07092e9669782ddaf3f8edd70501966c4d4682a5bfa33 SHA512 3c89eb9ea617da1d3e2eca3fadff6f5be9f55e4a258e1fbcdd221f3c0ec3cbfd13abe401bdfdb4b464baf74b8111e981f2dab4fb2839a4b52aee65212d1589f5
-EBUILD pbr-3.1.1.ebuild 2927 BLAKE2B eaffd31603285ff741a6d945150eb80676a04cce33fc0961dc02db01ccf6a3108d12c8afa75b03483cd1c81f003b1c3a5894d26bf892688721fe6261fef8f1c2 SHA512 4ec995f7ead626e759ce8064b3083ebed8cd44d0edf5533378f9f2f0dc9a84f6533f994d2243376c53bcc4f6490804462872c750b5aff13bc8a40d89032130cf
-EBUILD pbr-4.1.1.ebuild 2797 BLAKE2B 8d178fb9f0a69b22996ea2e40d5df70086ca35230a78656766ad72e7b83c55048fb9f2727868bf49b65473c6dd9c8adb848764b75a0137bd3b22963f62274bfe SHA512 545c0cf96bcfc74691eb804fb95ed6b266cd98ffbf97a15c8b5dc7f5da88f270cc7d8c4d12ab27a477488669c1abcabc08c2700dfe1fe9b1258213608390a268
-EBUILD pbr-4.2.0-r1.ebuild 2938 BLAKE2B f35461acfa86271528f8b5e69b18396bdd3684dd382271b75543a739453eec3e2f8ea9885810447a3b66051303dd4af8711298010a7c70eb9f82369c5e127f38 SHA512 1dff0573e0e793ac68aefb82cdb5680595ef50800706c2e7a6e76a11e9387d00f00ce20154c9705d6cd30f7e386a95fac93922e805b3d41a99caa4e3730e1fb8
-EBUILD pbr-4.2.0-r3.ebuild 3133 BLAKE2B 4c2757cacce58ed2466b58613934370998b4e9479d9a3a06e1326cb43e9b02d5171ea393b353c7a442b791d6c2259f7592dc129f3ddf3198f7896dad7dc5f5e3 SHA512 5e12308c218345aebfb66b6dbd8fde60617112a0194a743feeb8e437844de88893c1add6a6ab34ae86b291e679b14a931e9da59db274ab69d4ef02cbe2c6550a
-EBUILD pbr-5.1.1.ebuild 3158 BLAKE2B fc0a90d48b599a09a6608fe273727068f21c13b7bc69a811a804b17d75fe7f6d185955e3f892b2415c1df8ec3d0941988b9575e4f39f62755c2fc034b3dd8d77 SHA512 5782d5e43c411507efd73de8db18088922f8c732e1a717b98991abf425c5f1ff2e10cfc7175fa72367cd4275a41c0f77df37817b4ebfad767b44ee2c144ba2fd
-EBUILD pbr-5.4.5.ebuild 2506 BLAKE2B 3beff550f3349560c83a865c9b7b8b392b5a6172cd3b31699d3e54d09ecc6128e32764015f75f0e2623f0ad16a75ff92440b3c0d67e0c99a93a5575d3c9667e5 SHA512 1feee555396315cdc6d0fa1089d1f05ba7951b9434968d4a610e935070f158157d45cd909511e4cc8dbad78e7ca050250baae9f36b067e61602441c42cd07987
+EBUILD pbr-5.4.5.ebuild 2497 BLAKE2B 1fdfe4a2af6eb1757f279127b6e02dc0bab35c32cbaf74b97145a4a15d15a057eda21ff65e4aff21d05e28d53cdf21e2a345a2c64273c28fbf7ac09601d1b6c0 SHA512 6c94faf041ac2cf9931753a3f2399ac27d52c939d2b151bdae36fb7a2724d2feb807d7e691a8634235fd700071873076a242498c9b22c0d97217e030f371e9df
 MISC metadata.xml 818 BLAKE2B b3ed054273dccfd8cd24f2e86e1505be70445aa45d193d37c30e6f5abcfcab489d59cb6a1e11d54cea70bbbcd152d9a208dc32237058537b99061172f573b868 SHA512 3d21678a6769bea88b901391d5df75882798e49ab5266ab7d5a73282c30793e479ebbe24cbb5b7d35ad19b517996e52243d238632a390f136ff30f77f54436fe
diff --git a/dev-python/pbr/pbr-3.1.1.ebuild b/dev-python/pbr/pbr-3.1.1.ebuild
deleted file mode 100644
index 75406d50940e..000000000000
--- a/dev-python/pbr/pbr-3.1.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.5.1[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.6.1[${PYTHON_USEDEP}]
-			>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-13.1.0[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-vcs/git
-		' -3)
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if ! python_is_python3; then
-		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
-		ewarn "Please run tests manually."
-		return
-	fi
-
-	distutils_install_for_testing
-
-	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}"
-}
diff --git a/dev-python/pbr/pbr-4.1.1.ebuild b/dev-python/pbr/pbr-4.1.1.ebuild
deleted file mode 100644
index f9fbfd117e8e..000000000000
--- a/dev-python/pbr/pbr-4.1.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			dev-vcs/git
-		' -3)
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if ! python_is_python3; then
-		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
-		ewarn "Please run tests manually."
-		return
-	fi
-
-	distutils_install_for_testing
-
-	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}"
-}
diff --git a/dev-python/pbr/pbr-4.2.0-r1.ebuild b/dev-python/pbr/pbr-4.2.0-r1.ebuild
deleted file mode 100644
index 48528dd607dc..000000000000
--- a/dev-python/pbr/pbr-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 hppa ~mips s390 ~sparc x86 ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-# stestr is run as external tool
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			>=dev-python/stestr-2.1.0
-			dev-vcs/git
-		' -3)
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if ! python_is_python3; then
-		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
-		ewarn "Please run tests manually."
-		return
-	fi
-
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	stestr init || die "stestr init failed under ${EPYTHON}"
-	stestr run || die "stestr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-4.2.0-r3.ebuild b/dev-python/pbr/pbr-4.2.0-r3.ebuild
deleted file mode 100644
index 3b838aa43596..000000000000
--- a/dev-python/pbr/pbr-4.2.0-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://github.com/openstack/pbr/commit/f14a3b2b73c6c95edbea8de799cf1df07decdf0e.patch -> ${PN}-wheel.patch"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-# stestr is run as external tool
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			>=dev-python/stestr-2.1.0
-			dev-vcs/git
-		' -3)
-	)"
-PDEPEND=""
-
-PATCHES=("${DISTDIR}/${PN}-wheel.patch")
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if ! python_is_python3; then
-		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
-		ewarn "Please run tests manually."
-		return
-	fi
-
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	stestr init || die "stestr init failed under ${EPYTHON}"
-	stestr run || die "stestr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
deleted file mode 100644
index 2442fec934db..000000000000
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-# stestr is run as external tool
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/wheel-0.32.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/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-			>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-			!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			>=dev-python/stestr-2.1.0
-			dev-vcs/git
-		' -3)
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if ! python_is_python3; then
-		ewarn "Skipping tests on ${EPYTHON} to unblock circular deps."
-		ewarn "Please run tests manually."
-		return
-	fi
-
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	stestr init || die "stestr init failed under ${EPYTHON}"
-	stestr run || die "stestr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-5.4.5.ebuild b/dev-python/pbr/pbr-5.4.5.ebuild
index 26c449ed139f..36454f258a7f 100644
--- a/dev-python/pbr/pbr-5.4.5.ebuild
+++ b/dev-python/pbr/pbr-5.4.5.ebuild
@@ -14,7 +14,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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"