gentoo resync : 15.06.2021

3 files changed, 2 insertions, 68 deletions

diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 548e5690fec2..8f4e80de2fe5 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,5 +1,3 @@
-DIST pbr-5.5.1.tar.gz 117488 BLAKE2B 52deecc6107d739daec0b2d3c397285c87c63bb3d2a2abc8266feec78d43eff84f4093b9739e2bbdf47b604a1621e4ed809a689b2167e6ea673418bd27f29018 SHA512 c72c2bb8bedd7f0606880f003dffa0ed585521b698e3e986ed2913cd74303e281fbb2374cc1a00b76777c677eb2677507eed9ccaafefceee0a689cb6fa61bab6
 DIST pbr-5.6.0.tar.gz 125220 BLAKE2B fc26737857195b0dbe16ecbcbc6e389b53a61105b3bc66e714bb4fcb4907e4329ee7c76b5748fa7d892bf231522e6ff9d414328ae0d97e6262b608c44c737764 SHA512 1dca9020a84e3b9be71fa07e2feb37bbdb2bb69d0b4f69fdcee0fc3c7fe4d84ac2e2079d6bd7560192833f069ca6f5dc27d03a3ef87c168eed18eee8579647fc
-EBUILD pbr-5.5.1.ebuild 2120 BLAKE2B 247f52c2fe42b84d69fcc99a7e3739bb524f9595541912a7927396d6c1745e5f3eb4178be89d048563bc3d0d28aa3a47f66716668f5abf5e01a504dac8416b43 SHA512 ff668c7413939f6ae59b471c315f728eafa5d9dc31f0a4194db0588fcaf4767b2a7d513c55f7eaec31e2fa77e912b2af57b8fd4c779b52145af51dfe34738d1c
-EBUILD pbr-5.6.0.ebuild 2307 BLAKE2B 51769fef99c54da79c80e55131a71516539f3bf77b8ec25ea880d2f5870e0f8291f4753c924623380a99de5a04bc8ed4fb66bde1b655568051688b8c220b97da SHA512 a8ec64dcacc9b54d74d65f5691bc04160767a9d8b60835800db86a738448c46bb9d2304f3b56c027906a0bbff85cb301438b56b858ce7698daebe816ac04cacc
+EBUILD pbr-5.6.0.ebuild 2300 BLAKE2B 073cf980c49f7476b4a1f2a79c31f5888690dbab5cea77c1abffff940949214519663dba49f58becd519b8def6a415d6c365fcb89009cd5f6e335d78a9d81a30 SHA512 bdcb1a4f0061597396915a6dc2151054597de824440afd95e0ee786ad9ff8c8ab21770b6a23bf873ab130aaf19f28fce1b20ebddd445d4852833ef4a0d27be5d
 MISC metadata.xml 814 BLAKE2B ca519dee02f08350185d53773b1c90724c92c7c814025417b295cf0ad961064d26323830ee19f78416bd6fc67b43517736d51bf485c4d314c9313ca4c420a6dd SHA512 0c0b2f916a99a568c224cce64636f513bc7d8bb2c7ddf690f55eb46d5b98afd0060a5db74a8515277e84dc5c08d8d5754a37eae73b1fdb3460cf1d45b5797e88
diff --git a/dev-python/pbr/pbr-5.5.1.ebuild b/dev-python/pbr/pbr-5.5.1.ebuild
deleted file mode 100644
index 0192a5da39a3..000000000000
--- a/dev-python/pbr/pbr-5.5.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} 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 ~riscv ~s390 sparc x86 ~x64-cygwin ~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
-BDEPEND="
-	test? (
-		>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-		dev-python/sphinx[${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-20.0.3[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.1.0
-		dev-vcs/git
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# TODO: investigate
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-i pbr/tests/test_core.py || die
-	# broken on pypy3
-	# https://bugs.launchpad.net/pbr/+bug/1881479
-	sed -e 's:test_generates_c_extensions:_&:' \
-		-i pbr/tests/test_packaging.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	local -x PATH=${TEST_DIR}/scripts:${PATH}
-
-	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.6.0.ebuild b/dev-python/pbr/pbr-5.6.0.ebuild
index 60fecc79e508..a59c1d35b29b 100644
--- a/dev-python/pbr/pbr-5.6.0.ebuild
+++ b/dev-python/pbr/pbr-5.6.0.ebuild
@@ -15,7 +15,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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"