gentoo auto-resync : 23:02:2025 - 19:24:09

3 files changed, 2 insertions, 76 deletions

diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 910f67faa87a..2643b95b4fb7 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,6 +1,4 @@
 AUX pbr-6.1.1-test.patch 3379 BLAKE2B 1d704646e6fc7800af4e562d6636bb05ea524dd2bc526184cac9ffb3bffae1b49eae68b61257929821f3904566cc326cb73295cd2332970ced83e30bcb539830 SHA512 a4998b3c24cd9b3385beaebb3b5b08e27c31a3604ae125931c9f3e9dfb92b0e9547618a1c1a95b0b4ee6d8417b79e3879d1e17629495ec44d864feb314f2c46b
-DIST pbr-6.1.0.tar.gz 124032 BLAKE2B 640c39d75329e4a1c28623439fd1466de3e491bb043abc1c62c68a9e19c6bc5523fca8ad18c4d6246fe2973af5ee6076c1e74e0967b9adb096ec31970fcf8491 SHA512 30478fa3146abdbc1da35ba950dcc3ead04e26060e0926a7a28390cc33cfae5acbb9a2385535bac43cb40830ef7cfa83be8bf963a6ee135a54d696c27b20a962
 DIST pbr-6.1.1.tar.gz 125702 BLAKE2B ee675c029f1ccf66ffb3b92fec67802f1a3d49735e08ec72658e7b3b528014109ec2a4ee0672b7c320d70a3b56b9a0a7929a7ae85915d941ce0e170e0cdc92a7 SHA512 db898469dad4d0ccfa90ee9a8faee83db0897e7451c30561d7e1f92163c82c81586853b8aaabcf80569d1cbdf5177da927ed79b0c393f6c5b2a910de0354a471
-EBUILD pbr-6.1.0.ebuild 2042 BLAKE2B 9e5d2ac67775a02d1bd679b23b33b632831da15003cd325ca5f65b4926a3c38c5c034c35f916d64abca7070bba057057cafeb7ea005ba5f8621369fd7afb3915 SHA512 24e96b386330ff4ca581f6d68c82ece2353afd9dc28224aa8fa8523e0a297198a1d42f099369da71b4d2559bd69cbbb1f7cc97ba1f16ca1c5902b3e40c5bf6e5
-EBUILD pbr-6.1.1.ebuild 2201 BLAKE2B 3ba013659b07992e1530c330760f21a6f25cccb5643537bd348b915d629d435eb1427a5b84afca09e76aa1cfe0e26bcda976f714965b23704acb806bdbbbb715 SHA512 ca7c3e9ed992827f43d92ebb53dcd8f28048170c39b42cd640ffec7e329cd3f101010d95c36688fbca39b542b1fd7efc13e0f625b2c571013bb0a1d8a9f6b4f7
+EBUILD pbr-6.1.1.ebuild 2193 BLAKE2B 5b9013c74d510193bf43029e5136d18427fc155e7bfd14fcf2f7d515cc3fa3826b6eb77bac9f2da56e02bab22e56a9698d17b6f13d31e2c4bd74df8ebf20732f SHA512 29d3e02972456b4b558a8fee219752509facdaab0a70edd05d0dc58a100dabf4830d5563957f6c9fcde7385fc1eaf6789f4bfcd3d244a71ee5349938ccc3ac25
 MISC metadata.xml 815 BLAKE2B 439ee90d79572a8653f1ae3b8b5bf0883adb34ceac5257458dba7a2505e25ebba1c5080095139f6521d8fbd57c11ea38cf4049710b584069aea0ebaa7760077a SHA512 3d0618ef6656706acd829be80b2e6a0b0763b5f4128dcd360f28818d42cbc8825ecd04f7f47af5929a3a35fd60a3b9f9816cc37ee30af164c2e5b51764c25afe
diff --git a/dev-python/pbr/pbr-6.1.0.ebuild b/dev-python/pbr/pbr-6.1.0.ebuild
deleted file mode 100644
index d0b6cf6ce9cb..000000000000
--- a/dev-python/pbr/pbr-6.1.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{10..13} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="
-	https://opendev.org/openstack/pbr/
-	https://github.com/openstack/pbr/
-	https://pypi.org/project/pbr/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
-"
-
-# 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? (
-		$(python_gen_cond_dep '
-			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.12.0[${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-vcs/git
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# TODO: investigate
-	sed -e 's:test_console_script_develop:_&:' \
-		-e 's:test_console_script_install:_&:' \
-		-e 's:test_setup_py_keywords:_&:' \
-		-i pbr/tests/test_core.py || die
-	# network
-	rm pbr/tests/test_wsgi.py || die
-	# installs random packages via pip from the Internet
-	sed -e 's:test_requirement_parsing:_&:' \
-		-e 's:test_pep_517_support:_&:' \
-		-i pbr/tests/test_packaging.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Testing on ${EPYTHON} is not supported at the moment"
-		return
-	fi
-
-	eunittest -b
-}
diff --git a/dev-python/pbr/pbr-6.1.1.ebuild b/dev-python/pbr/pbr-6.1.1.ebuild
index 03d6dd1ce601..c8be2f0783d3 100644
--- a/dev-python/pbr/pbr-6.1.1.ebuild
+++ b/dev-python/pbr/pbr-6.1.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/setuptools-64.0.0[${PYTHON_USEDEP}]