gentoo resync : 28.11.2020

4 files changed, 2 insertions, 135 deletions

diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 173048306588..a8e881010d3a 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,7 +1,3 @@
-DIST pbr-5.4.5.tar.gz 120510 BLAKE2B f0f22a25e41820a0848aface6c241e38d8c4500d14ac3c8abf3d3b5f3f2d88680505d43f045589d700e9c07ade1643712274b156832246ca3f2050f44e4cda26 SHA512 b53ca10b7af7e365ff99ecf11942d3f047112d69f7e963716d07bc156077b08d79bb708bb93aae342e5e03c83278507b6990137dc34d0ebc11de53bd57ab3654
-DIST pbr-5.5.0.tar.gz 117967 BLAKE2B cc3f023493150f0687ede07ccadc3abfb4a8dc5e0cdc0f9fd946d3a28fe2cf496683f37f934a5555875b5ac0546a0c0ed99e1bc2f7be53b47ec68d64d27cb78a SHA512 ce187787d5a51700d854790b329274aafd7d4f9e724b1b69b5ea8684cdc58c738274d30fd85bb890671bb77f2c7c88ccb488ea11df7ae9fd0505b4dc29292889
 DIST pbr-5.5.1.tar.gz 117488 BLAKE2B 52deecc6107d739daec0b2d3c397285c87c63bb3d2a2abc8266feec78d43eff84f4093b9739e2bbdf47b604a1621e4ed809a689b2167e6ea673418bd27f29018 SHA512 c72c2bb8bedd7f0606880f003dffa0ed585521b698e3e986ed2913cd74303e281fbb2374cc1a00b76777c677eb2677507eed9ccaafefceee0a689cb6fa61bab6
-EBUILD pbr-5.4.5-r1.ebuild 2296 BLAKE2B 0b406a9dc60649b7506a02b34854927529d6815d0e9ecbd06668a25af601bfce81b451407f7403102fd9f001aeb17dd4083d22585f3dbe7ff59417a22c0c088b SHA512 07fb007759938be0866bb33a75c346a889f6df35651210e5ab5785efb53d5627d2f4544de57d81ef075b99593901b6b9c377dd93f7ad11d9b860ccdbc22fbb28
-EBUILD pbr-5.5.0-r1.ebuild 2123 BLAKE2B d20d01ffd574065dd9e54e881067c51ca522258df4f45a0d41f567f6fd376c887fe676d704dc15cc5ef07e2ff0e1dc11a6d037f16f2c8a390d50e0983748d826 SHA512 86612b918b5921bc6e713d830c13aacb2c93c7bf152df28522bcaee5b990334e62eafd48b916b52f0f35d56b1367256a0cca9cb78e265bac90cb452665e1c1ce
-EBUILD pbr-5.5.1.ebuild 2127 BLAKE2B 066c4f0655f574a9301f682be45a782e53530d1ddf23c44871729284d4a2ab90c5ddb63847e486b1b4f2b3aaed99d5a51c4abe367782cb47f5710a47f561f0b1 SHA512 391bcae51e982bfd629580989e544a21707894e305c8d686bf8fc30af590211a042ee945e5f0c2b663ffb31959cbea35bf1afab7181ff514a8f388e84feda31e
+EBUILD pbr-5.5.1.ebuild 2118 BLAKE2B 8206a5574d116bff79d7825bf1c5ee8e5ec0ad96e5d8198b30943801d7d888dc19af45915ad68b77611964392889791547847e0761dc8d3f39330b07e58dda9e SHA512 9eeaa41599ef1d32c4df142d39a07d072251c1c631dc1f1f2caa3797d61ae6187cdea72ef73aa87c898e2d1b6c50a86f50b93077c15542f917dc352887e51906
 MISC metadata.xml 818 BLAKE2B b3ed054273dccfd8cd24f2e86e1505be70445aa45d193d37c30e6f5abcfcab489d59cb6a1e11d54cea70bbbcd152d9a208dc32237058537b99061172f573b868 SHA512 3d21678a6769bea88b901391d5df75882798e49ab5266ab7d5a73282c30793e479ebbe24cbb5b7d35ad19b517996e52243d238632a390f136ff30f77f54436fe
diff --git a/dev-python/pbr/pbr-5.4.5-r1.ebuild b/dev-python/pbr/pbr-5.4.5-r1.ebuild
deleted file mode 100644
index b9f96cb30731..000000000000
--- a/dev-python/pbr/pbr-5.4.5-r1.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..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 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
-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.10.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[${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.5.0-r1.ebuild b/dev-python/pbr/pbr-5.5.0-r1.ebuild
deleted file mode 100644
index 47ede22d786c..000000000000
--- a/dev-python/pbr/pbr-5.5.0-r1.ebuild
+++ /dev/null
@@ -1,64 +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_{6..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.5.1.ebuild b/dev-python/pbr/pbr-5.5.1.ebuild
index 09ae1032c9e7..cc0dbd1bf78a 100644
--- a/dev-python/pbr/pbr-5.5.1.ebuild
+++ b/dev-python/pbr/pbr-5.5.1.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 )"