gentoo auto-resync : 08:09:2024 - 12:29:27

4 files changed, 2 insertions, 87 deletions

diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 7d207f0aac3a..ee2f84a62a09 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,6 +1,3 @@
-AUX oslo-log-6.1.0-py313.patch 1154 BLAKE2B d43a43de9f9053ac1cee4c3db4946f73a76d6890c9ac90ef78ec2f66c2db164aff91c423151f05c7897773d2ffc68387d84d2cd771b2daec22ca722d10e73134 SHA512 8b9d621eebb9a0e53817a3d4a8905c3730f1d7fc9cc326358367ec7014be105bd8003152d1bc87e9a5f2eca91da804069a0f632b3db6b6d0ff13995bca11e22a
-DIST oslo.log-6.1.1.tar.gz 95558 BLAKE2B 04897e2f568dc634ee49a0980aa19ebd967dfb758840bdf3029c52d00481492ee43b7dc93a427de2c61edf8ef2f7819344263c282068acec835ea8c669d9e0a0 SHA512 2e5692dd3b59711139a3e049e5f167c456a6779f6eacb540d70ae7f2347062d6d635e5f9fa893919205b842958bcb3767e8a644466b06928623f8a569f2274e8
 DIST oslo.log-6.1.2.tar.gz 95653 BLAKE2B 2cbac1274b8409faeefe2dc1d070acb264a9f1089369eb11bd16dd2f62d978f060c4845b76e38fb9c18cd832d06f18ecfc60098adc28cd98693271d1584b1816 SHA512 5eaf8ac49a7658e60116cea20207687050c911e2d93361942fd33d4bc321f67e4cb48d47e15faba95e0e31f945b5d6b46442ae8b2d39c8603879677e8f2dad09
-EBUILD oslo-log-6.1.1.ebuild 1466 BLAKE2B 17c71332eacafeee33cfaa6052bc441c30e9f5df20c161acf38f6117e7c458e1182ebea6b51ab367e249ffe527014f289c30dc036cdb597cfab455c81779e8c9 SHA512 dad74b199cf34538adbd7c78370b6249cf55fa29d374c08b6a7f2db5a1e457384a4156d38e4c6e1fd5c47c864c4d789f873358d45172df20317a10cbc71d4a57
-EBUILD oslo-log-6.1.2.ebuild 1357 BLAKE2B a429d40adb1544469364dbe24ee737547f66a60680e35b398ad8c346ef59217031a905a8cdb7c57ffb39725d505f18c011e65b2a9f95d582d9a47a007c243f5c SHA512 6e3b3ab40612857423a4f5a13a03513ae276baec5f19c3d337223b2b261dee02b21638296a3395ac1e7ae99b9a0a70c9dca9363018d5ef58840690b317c2d6fe
+EBUILD oslo-log-6.1.2.ebuild 1354 BLAKE2B 941ef1ba17533ab38dc2b900d157bb8e00525bcd6f09562234813fc88d00c2b8cb9600b47ed7dff707a6e07521cbb32118614cabbba2470b4350c27e0513c136 SHA512 321ee66167afdb94ca79686dc807ca8c90d79fa121fc0835c238a02eee0e0d5ddd9e762e076c67b3f3364435ea6ee282095847af16fa75e1f8a0693996755c21
 MISC metadata.xml 914 BLAKE2B 47a0937cefc2cc4c8c4300f4aae699a42c5d659cb6017aa01b87aca14bdcb9f47256c3417cc0178999c452a35ebccd915b020b537a4d688d1d00664b7be1332d SHA512 dfeb43d43608a56c60e62046f1fbef6c6cc794431917d7734caf0b3afb5d1b761c1a04ee01ab0fc4d6051c39a984d6edb25663dae2cf94354192d5f2b8abd6e7
diff --git a/dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch b/dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch
deleted file mode 100644
index 916c6b132c2d..000000000000
--- a/dev-python/oslo-log/files/oslo-log-6.1.0-py313.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1bd9d229824c16f521fb1d3ba306fe8cb2a5aada Mon Sep 17 00:00:00 2001
-From: Michał Górny <mgorny@gentoo.org>
-Date: Wed, 12 Jun 2024 11:22:48 +0200
-Subject: [PATCH] Fix test time mocking for Python 3.13
-
-Fix test_rfc5424_isotime_format_no_microseconds() to mock time.time_ns(),
-logging uses that function rather than tiem.time() in logging.
-
-Change-Id: I0cc429e2ea8ee7fef3b0a5662d584dac65d657ad
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
-
-diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py
-index d17d20a..0580908 100644
---- a/oslo_log/tests/unit/test_log.py
-+++ b/oslo_log/tests/unit/test_log.py
-@@ -991,6 +991,8 @@
-                 get_fake_datetime(
-                     datetime.datetime(2015, 12, 16, 13, 54, 26)))
-     @mock.patch("time.time", new=mock.Mock(return_value=1450274066.000000))
-+    @mock.patch("time.time_ns",
-+                new=mock.Mock(return_value=1450274066000000000))
-     @mock.patch("dateutil.tz.tzlocal", new=mock.Mock(return_value=tz.tzutc()))
-     def test_rfc5424_isotime_format_no_microseconds(self):
-         self.config(logging_default_format_string="%(isotime)s %(message)s")
diff --git a/dev-python/oslo-log/oslo-log-6.1.1.ebuild b/dev-python/oslo-log/oslo-log-6.1.1.ebuild
deleted file mode 100644
index 0715254b3851..000000000000
--- a/dev-python/oslo-log/oslo-log-6.1.1.ebuild
+++ /dev/null
@@ -1,57 +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="OpenStack logging config library, configuration for all openstack projects"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.log/
-	https://github.com/openstack/oslo.log/
-	https://pypi.org/project/oslo.log/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-7.1.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme \
-	dev-python/oslo-config
-
-PATCHES=(
-	# https://review.opendev.org/c/openstack/oslo.log/+/921842
-	"${FILESDIR}/${PN}-6.1.0-py313.patch"
-)
-
-src_test() {
-	# requires eventlet
-	rm oslo_log/tests/unit/test_pipe_mutex.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/oslo-log/oslo-log-6.1.2.ebuild b/dev-python/oslo-log/oslo-log-6.1.2.ebuild
index 771fcebe9837..bd790bf13830 100644
--- a/dev-python/oslo-log/oslo-log-6.1.2.ebuild
+++ b/dev-python/oslo-log/oslo-log-6.1.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]