gentoo auto-resync : 21:07:2024 - 12:30:10

4 files changed, 2 insertions, 110 deletions

diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 488ed4c9f62e..3412cb6b9697 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,6 +1,3 @@
-AUX oslo-config-9.4.0-py313.patch 1576 BLAKE2B 8e142c694da6556a4c49637b27d3b6ea6309a27bd12340c42d43f50b57517dd0f1b6ade31cec5544b98e0e546a31559517c89b25097d4281eb22e33ef7a8eef6 SHA512 dc62cf1dc1a0d3c22f091e2af85c0871952dcf4f927328378023d5b66b58df8a721f6398cb14012ab19464203416c3a41f3c9660c043e837628a8589478fc754
-DIST oslo.config-9.4.0.tar.gz 161322 BLAKE2B 3edd3be09ebe777ebcb4cd79171bae764046f6ceb0f0c9ca8f88388f1a0bcd23d2bb4e4130ab81a7f3cf063ce0ee668ffbcd8c4bf9f633213e97dcd12e2575dd SHA512 d404876c34c82963af8b992091fd1186855b3ced9a6a574ca4fc152a5b50bfc1945aca04e163770d8bec948cb57904a83eae9e3d7c4c3b852c90987f73e66ba9
 DIST oslo.config-9.5.0.tar.gz 161655 BLAKE2B 7844729658ddd13ff89b4c14983cfeeb3f6352f99a190058bd924592d9183459ea2da5caead7a77ed6c4a4e395aac2dd53f56847d81ce911ce76a04fa69f5b7d SHA512 517bb9fe416451eb791087216facd8643d77affb738aa2623817302dfc9dbd242d1aa2ba8c542fee437f91b2049129fa097fe37fec8c6a28e0092fc4d64c0c4f
-EBUILD oslo-config-9.4.0.ebuild 1634 BLAKE2B 608a531d79bbbf36328d5149efb2611cfb9af52431e77ac03a3bd6af3a80467191f2e2403f7ccb50f8dcf86f5c10e9612520ad42e1a14b0befbceee6b437e473 SHA512 c6152669ac71a0c8b4c2ee859f7325d75149377e8811f5e076ecd1760796f42b4d9922f3ca9f9e34cfebf6598113eb4a50251a4455289405f26d32c21c6c7d32
-EBUILD oslo-config-9.5.0.ebuild 1522 BLAKE2B f414a73c6267d177d39320f190ffb1c3b79ef92bc861b41cf1c5c1a0d816597febbd90c7096ca0e7e7410b56a1b6475c9967001ba4657116aaa4f5ad79336e05 SHA512 832e50bd15313108797f505e2919c382c842618f61decccc1b8b161815bd0a885df908707bf14e9a576c3c65684f87e4de8efa5a950bb83e8c8511cf26137589
+EBUILD oslo-config-9.5.0.ebuild 1519 BLAKE2B 6dacd9508a5f491fee75c647b235f832316f8b608d1208769a034e54133125959c3f9ea77b4bd1a1359ead30a5e17c4135dc208bfc2ffb1b236d166fffa5b490 SHA512 0830f035e382525edfa1ab10684c50e487be80964672d51bb0da3833c2c86398bf9137f21e49304445a1984085d6d8590b0f8a08e4430fabae6672f9744d5b74
 MISC metadata.xml 759 BLAKE2B 88d0bbdc03286429f96554d184f664fbbdb4e067ed137f95a96a573c09b4573de90e50b2d5875d627c8b9ed03a0aec7233bdc8684b721e16085157480568c330 SHA512 a29b5a534042e949f780cfb000bd9ce9cde81ae1c5e6b429bd7854598a2d0f0c8b5358dc645135ba9016065460ff5b858e48e02cdbd12ade2b1fea9d0b407410
diff --git a/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch b/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch
deleted file mode 100644
index b3e6979f9e4f..000000000000
--- a/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4f916edb457eb02bede0a7c4a64741ef13709af7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 12 Jun 2024 07:47:18 +0200
-Subject: [PATCH] Fix tests for Python 3.13
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix expected argparse --help output to account for changes in Python
-3.13.
-
-Closes-Bug: 2069108
-Change-Id: Ie221e5f5b369930f015a74998f50ddb473b53b94
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- oslo_config/tests/test_cfg.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py
-index 926eb8c..f69f7a0 100644
---- a/oslo_config/tests/test_cfg.py
-+++ b/oslo_config/tests/test_cfg.py
-@@ -264,8 +264,14 @@ class HelpTestCase(BaseTestCase):
-         self.conf.register_cli_opt(uvw)
-         self.conf([])
-         self.conf.print_help(file=f)
--        self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC', f.getvalue())
--        self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW', f.getvalue())
-+        if sys.version_info >= (3, 13):
-+            self.assertIn('--a-bc, --d-ef, --d_ef A_BC', f.getvalue())
-+            self.assertIn('--u-vw, --x-yz, --x_yz U_VW', f.getvalue())
-+        else:
-+            self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC',
-+                          f.getvalue())
-+            self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW',
-+                          f.getvalue())
- 
- 
- class FindConfigFilesTestCase(BaseTestCase):
--- 
-2.45.2
-
diff --git a/dev-python/oslo-config/oslo-config-9.4.0.ebuild b/dev-python/oslo-config/oslo-config-9.4.0.ebuild
deleted file mode 100644
index 69c20f0f2f3d..000000000000
--- a/dev-python/oslo-config/oslo-config-9.4.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.config/
-	https://github.com/openstack/oslo.config/
-	https://pypi.org/project/oslo.config/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${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-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	local PATCHES=(
-		# https://review.opendev.org/c/openstack/oslo.log/+/921797
-		"${FILESDIR}/${P}-py313.patch"
-	)
-
-	# broken by some dep upgrade
-	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
-		oslo_config/tests/test_cfg.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-9.5.0.ebuild b/dev-python/oslo-config/oslo-config-9.5.0.ebuild
index 31e09862511a..347ed61767a7 100644
--- a/dev-python/oslo-config/oslo-config-9.5.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.5.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]