gentoo auto-resync : 15:11:2023 - 10:39:42

3 files changed, 77 insertions, 0 deletions

diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index f16b1f7ebb58..ada17a23ba4d 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,4 +1,7 @@
 AUX oslo-i18n-5.1.0-fix-py3.11.patch 1196 BLAKE2B 08d78934986b45d23095e73cd1f465c371372de3fe3f2681bd087a00556fda60b719a40471638423df109be55929c34602bdc589c256421bc89d5c2a0dfcbcfd SHA512 214f367932692c4910b4285df1c05ceb7389bdbf9821e6287df33c9a07e81990a00ce9514e6b53e9f562ae3647aa198247808a2e10f1a746ebdeff169b6c4749
+AUX oslo-i18n-6.2.0-test.patch 1413 BLAKE2B 9a4fd035cc9c9b286adc7a0d8642aae11d7db22f3f0707820975de21b6746c5d12b774f4ba2fe018e16b54dd771498d0cac3d9f3d1ef3e161b6bf78c6caa085d SHA512 86b98eccf476bfeb32cd5b38eae797f74a4359da5033db22299e0182a13dc08c985e91ede04513c77f555b925b1f977ce3ec99d31c7ab11a7595cda9aee97558
 DIST oslo.i18n-6.1.0.tar.gz 48031 BLAKE2B da2a03eb382154be31dfc09636395cc5f1c816972e81829181b7745b5f35693069fbe68b6b6223d9188d08a0e1ba277a137290810da9aebf3af49a9b4f2069ea SHA512 6ac6a4c7ea5e43d57c04765f0b0ae90047042ead81c086aa3229d8ffe5402a836e82238f6689d6f6d1a503d8abf147605dc1aab8b8bb4d738e575fb7948fd7e3
+DIST oslo.i18n-6.2.0.tar.gz 48228 BLAKE2B bb65caff703e2bbc82f4fecd4b0d491f64ec7d863f848f8f79497df9471257dec25a77ad7f084c6d88ac14a4b1a1f44fd302297e1e13919e69ebaf27c5491d6f SHA512 725d814c7db35250e8ffe06c0021fc9147bcdaa300791f1d50b0eef2897abe609b415a12b6aa58d50925516fd9e6a1ad54e141f77e11856de3ab765b4e06939b
 EBUILD oslo-i18n-6.1.0.ebuild 761 BLAKE2B 7cab1ada992dc451adb90d773d7b1271ef061218cdd37cdc65efcb57892db868b690644f98ff35c2183ac3c9509d46a8f2e26a4edf047aa30d792b38e9bde4c4 SHA512 9df372087171183a8993cb59b949f78f7b7e6896c9503d6b138df1c1a44066a805e382a3d72acc1dd22f60d84a6a693ba648e236c8385a69001b0c7a6d180a4f
+EBUILD oslo-i18n-6.2.0.ebuild 812 BLAKE2B 73157aa2079c0ed8d1bba391a82a0c8cdb80664aed97ad9b46bed0f3bd2918601e2540878fa938b1c79dbf0bdd7db21cddf25c22ec52f2290f399a42abc26edd SHA512 dbb085e8fe528208269bd89ec22370d27d911619b1e4c1c54f008f099eb80164d289d32434dccf6bf10b352b2f76ccd74acd550493e95cb4accdf66e729b74b9
 MISC metadata.xml 665 BLAKE2B 8890b37ab4cb0fce66a2e6f8be6da304a0c28d75d203a4413d6c8062a984a52b4c6004145992d3e00dd156ffd64a2bbb6b75eba85954de9fabcd88d24e925cc6 SHA512 b4a5778815e857a638e0ca9c9d228e9c941f9b541d667c7e4fcf6ef4814c8b24cbf0c8d24317ffbc7e65e25326f5043a546f42b7982f355551d1b0d0351472b0
diff --git a/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch b/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch
new file mode 100644
index 000000000000..6c3c19be0644
--- /dev/null
+++ b/dev-python/oslo-i18n/files/oslo-i18n-6.2.0-test.patch
@@ -0,0 +1,34 @@
+From 151fa09cf0248b2dfc8bb9e960e0383583985781 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 15 Nov 2023 09:16:21 +0100
+Subject: [PATCH] Fix leftover `locale.getdefaultlocale` mock
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replace the remaining `locale.getdefaultlocale` mock with
+`locale.getlocale`.  77a994a99385d33b1b2e626094cbd09fd0d85873 has
+replaced the `locale.getdefaultlocale()` call and updated all other
+mocks but this one remained, causing test failures on non-en_US locales.
+
+Closes-Bug: 2043539
+Change-Id: I5ab36a0ead05fa7a83fc1c64e440482f2cc8e675
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ oslo_i18n/fixture.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/oslo_i18n/fixture.py b/oslo_i18n/fixture.py
+index 5c5fddc..7a69aff 100644
+--- a/oslo_i18n/fixture.py
++++ b/oslo_i18n/fixture.py
+@@ -160,5 +160,5 @@ class PrefixLazyTranslation(fixtures.Fixture):
+             lambda *x, **y: self.languages))
+         self.useFixture(fixtures.MonkeyPatch('gettext.translation',
+                                              _prefix_translations))
+-        self.useFixture(fixtures.MonkeyPatch('locale.getdefaultlocale',
++        self.useFixture(fixtures.MonkeyPatch('locale.getlocale',
+                                              lambda *x, **y: self.locale))
+-- 
+2.42.1
+
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild
new file mode 100644
index 000000000000..dfb65f41a2d8
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-6.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 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..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="
+	https://opendev.org/openstack/oslo.i18n/
+	https://github.com/openstack/oslo.i18n/
+	https://pypi.org/project/oslo.i18n/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+PATCHES=(
+	# https://review.opendev.org/c/openstack/oslo.i18n/+/901002
+	"${FILESDIR}/${P}-test.patch"
+)
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest