gentoo auto-resync : 24:11:2024 - 03:02:54

4 files changed, 2 insertions, 102 deletions

diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 58b51468edf3..8992f1c2ab84 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,6 +1,3 @@
-AUX oslo-utils-7.3.0-netaddr-1.patch 1238 BLAKE2B 2d3e8e93007a7d73bd855b8b40f4958edfb6e0355a7ed53c9ed186f8d6acd92b0eca42dd66685aa77efd550be07cd71a59235de4d819f8d82ca0e56a1f711c97 SHA512 e55136b715acf20f7cdbf5ce20a8717c9f102657c07df08be5ef617cfa466c21bbb223c55776c8bf3cbc0f0667d3fcdedae406f3fd294baa34dd89f8c2dbcdd8
-DIST oslo.utils-7.3.0.tar.gz 132561 BLAKE2B 98533d7b4e3111a548bfab4cb97854acb4485d84d89eed40fec713fcb14a63deedbf5c019f4ed44d9be535034f3323e96b9b9f5d30467899ea8cd1bdc217200b SHA512 71dcf6fe25cc4c0a2580c32b4a4ceaa22fa1046f84bebc2cbf2c3148379b569638c2e2cce3b7a9bb1bbb87660034baa199bd4a831baa4608ef2f4bbc1d39edb6
 DIST oslo.utils-7.4.0.tar.gz 135993 BLAKE2B 39e23fd850756ff4336d579ca9e3d1ca15de8370298b8bcba6adfc4dc4227c5e8d154347b5f8272ffe7b3f737317fae20f46fc6431cc5d1307b7b2a8d6d51f85 SHA512 b743778529c4da4889737aa249102dd6d7215ce7e794bfb8fb8a48fc448fe34d6a091a8afb551b46b53e2556015bf51ac75d12955a6582972bc7355b68a8799f
-EBUILD oslo-utils-7.3.0-r1.ebuild 1543 BLAKE2B bde34c589e37ae8492a4df6f85e8291353ce02de81184cc9665102781302d6279ef47d18a0ffbcbdbc5d357257a7bd945878c0e398f86906504d02e92c14d3dd SHA512 878b106c40bca95229fc239886613d08ca391d53bbed01a3ff21e3b935f26c461688c9f2ed3b2206ae06347203030980f50cf6367f4664dae1339350659fc03d
-EBUILD oslo-utils-7.4.0.ebuild 1421 BLAKE2B 01c521d07aaf8bf11755f74c4201be33305ca5839adb09e2cdc60c0519eac756d095392f0377e6b7120a0f402e592dc394024218b35dca9d15b169098d1393ce SHA512 3fc3b6d534b54b98977836124565b91f11e98b712f1e57293109f80e87495e8bb980b967a22f0991ad2de49a3f0cc80b5adef2b52002090444770f201b7b2e20
+EBUILD oslo-utils-7.4.0.ebuild 1418 BLAKE2B 2c8579d67b9f0929d31f45dea0313d7993fd503da7174e8cc73c4c66a69545f346ed23b900cac60bec014ab54339f9744cbef600abeea4e6aa80f7581ab3be66 SHA512 05267bb9bb01143b2d7dccb3179c5bbc3ef433fec7c85b261dafa07ea334f0410b9a1007bb028ef4c8b228246c4a442e78b7060059f158c84db0ff012a755b8d
 MISC metadata.xml 667 BLAKE2B 2d3b1f3c01b74c3db8239b0711f6b10488cc17b214509a64607f3112e7100eb39f2d8774639d47a40cbad6786e7dee1430327a78b357b516325e5d06babcdee5 SHA512 e97a4a1f3718a69d39706d816f17018a7d57fd81702cd88ee01f9b849405f2f08769d381c5e41be84d8ae0c69a2a977b0dcb3ee1a481502ebf49f5ad6a5d6a95
diff --git a/dev-python/oslo-utils/files/oslo-utils-7.3.0-netaddr-1.patch b/dev-python/oslo-utils/files/oslo-utils-7.3.0-netaddr-1.patch
deleted file mode 100644
index 93c9a0bc015a..000000000000
--- a/dev-python/oslo-utils/files/oslo-utils-7.3.0-netaddr-1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 20983093b42bf5a9c43f8fa5d23784d26ccbd7b7 Mon Sep 17 00:00:00 2001
-From: Takashi Kajinami <kajinamit@oss.nttdata.com>
-Date: Mon, 7 Oct 2024 11:06:26 +0900
-Subject: [PATCH] Fix compatibility with netaddr 1.1.0
-
-Fix a few different behaviors detected in unit tests.
-
-Closes-Bug: #2054134
-Change-Id: I34f29d983fccc10cc4994fb23527a6dd0eac2b83
----
- oslo_utils/netutils.py | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/oslo_utils/netutils.py b/oslo_utils/netutils.py
-index 6e4c54c1..405256ee 100644
---- a/oslo_utils/netutils.py
-+++ b/oslo_utils/netutils.py
-@@ -101,6 +101,9 @@ def is_valid_ipv4(address, strict=None):
-        (``a.b.c.d``) as opposed to address format
-        (``a.b.c.d``, ``a.b.c``, ``a.b``, ``a``).
-     """
-+    if not address:
-+        return False
-+
-     if strict is not None:
-         flag = INET_PTON if strict else INET_ATON
-         try:
-@@ -228,6 +231,9 @@ def get_ipv6_addr_by_EUI64(prefix, mac):
- 
-     .. versionadded:: 1.4
-     """
-+    if not isinstance(prefix, str):
-+        msg = _("Prefix must be a string")
-+        raise TypeError(msg)
-     # Check if the prefix is an IPv4 address
-     if is_valid_ipv4(prefix):
-         msg = _("Unable to generate IP address by EUI64 for IPv4 prefix")
diff --git a/dev-python/oslo-utils/oslo-utils-7.3.0-r1.ebuild b/dev-python/oslo-utils/oslo-utils-7.3.0-r1.ebuild
deleted file mode 100644
index fbe1cb2e185d..000000000000
--- a/dev-python/oslo-utils/oslo-utils-7.3.0-r1.ebuild
+++ /dev/null
@@ -1,60 +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 Utility library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.utils/
-	https://github.com/openstack/oslo.utils/
-	https://pypi.org/project/oslo.utils/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-# qemu needed for qemu-img
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		app-emulation/qemu
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	local PATCHES=(
-		# https://review.opendev.org/c/openstack/oslo.utils/+/931597
-		"${FILESDIR}/${P}-netaddr-1.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# require eventlet
-	rm oslo_utils/tests/test_eventletutils.py || die
-}
diff --git a/dev-python/oslo-utils/oslo-utils-7.4.0.ebuild b/dev-python/oslo-utils/oslo-utils-7.4.0.ebuild
index 9a8e2700c1e1..1b46cf0b5cef 100644
--- a/dev-python/oslo-utils/oslo-utils-7.4.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-7.4.0.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/iso8601-0.1.11[${PYTHON_USEDEP}]