gentoo resync : 29.12.2022

4 files changed, 72 insertions, 5 deletions

diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index a218166d58cc..223a163fde51 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,7 @@
-DIST oslo.utils-4.12.2.tar.gz 101505 BLAKE2B fb2d56c767e8ed100ba789560e6b50dfecf8528de2a2717a9660e3dc8ceb93838137d59f1c2e3f05ccb99b95ea1ec86870e22160fb670a8cfb2dd9d6783f1d0f SHA512 fa56225f1991b031e2122cf08cd0992d8a9bfacd9a83d590f87ff86c495d51763ac06f65076c746a59563a60f886601d00ea9536dfcc927fca94c5a1431bcf67
 DIST oslo.utils-4.13.0.tar.gz 101834 BLAKE2B 9d3457ee9ce1746869120bf66d83495b4e1f2b4ca005285fa121ff4c176e85148662cd1de52bdaf93dc18d85478f2cbfde9b310e748b895f01c77ef82019dc0e SHA512 1d97fdaab79cc6c4cc34efdafca7263a2679e60d446aadc46fe31d7fdda2051b37f9df79d149644d914c7274e7fa2d9ef6a1c1aeafad8a1333221dcbe65f4723
-EBUILD oslo-utils-4.12.2.ebuild 1625 BLAKE2B 9f10dfc95d869452f0a40e7696bc383b0d99e361a10c28d6bd9cf2c207e475861a627f1a4881eb448761943f43c2b123ea05af129954932ee0eea86fed4a9fd3 SHA512 dc033d47519f54fb0fac47152c7931a670ce885099adb0ba856058683a7aa26555689ceeff9b6510a6faa3d2f7588a2b17e6a9499a56b3a85a9f8f459d478670
-EBUILD oslo-utils-4.13.0-r1.ebuild 1665 BLAKE2B c6cd2ab7179ab9422b68cda82dabf6d689a100a804c211c66be1a7871c5da942b7191dbb13c0561ba76a1e9fb165373a2d896c0cef8e87eec41ed9a68c60ecb6 SHA512 eb604282dddbd71b8df0d8ceb1f955c3b5551405b03647b51a9c1e881267f3d3caa3fa287a57b08d1b5037bfc4d4194caec1bd9689b4d15f78f23b4801e5fea1
+DIST oslo.utils-5.0.0.tar.gz 101823 BLAKE2B be62ddc2fb9130e3f678366b6181f1f334f95846a09ede4a08917cd88427492978e53039a482a7158f234caf96c9e520026ab6009f1df5de588a9fe68aa0664f SHA512 8941caf086354c9066ef51e64dcab5854b8d99c2b51807cb2d8b75fac0983f5787e499b0727423b624791ead2b5c9b55b463d5ff47f7586f3e302dccec1f5408
+DIST oslo.utils-6.0.0.tar.gz 101261 BLAKE2B 8a659b4bedf49e40c85ee40fe026205964d2f4a919170e4700c85e754f4bbffdf5bb9305aea00f7b36233feec93e42bf5e0c72591eeedc02709a7fcdba64d9b6 SHA512 9f9dcd585419372711af69917daf717d7c694cc604aed4db242e508ca6bdea3db9a52a29c354dbb5c80473a819c80dec9eccad7e6f6ca297c3469bcd2db5c7d5
+EBUILD oslo-utils-4.13.0-r1.ebuild 1669 BLAKE2B 7bada81a49796f1b4cb9cc7ad4feb1e9832149624076dd26fe8c8e610c394127f031d367c14abe46c22212b9882f9c82ff896aab1f984a8f762f40f721d7659d SHA512 b86f2f59fcd2f18bde993c47862462ba1becc45c2b99f27db40c32caf6fcc6b0c2f5c1ffb82547500cd2372f5b381efcfcc5c935a230d3e98b703e8eb5162dff
+EBUILD oslo-utils-5.0.0.ebuild 1672 BLAKE2B 5c9840e3cda6c0548860f3896dd2915e6f816990ad0ccd9e7f90656d52e8b199aa8063db0fdb6b6c0a0e2e6e908ac25b212256699c2ec52a5eb5c51a2c2fa42b SHA512 4f6dec1e7153b2858c7594b528c9b6552a710296a4b79fe77866514813e0a1d8b6f96a30823defcc0b53de45f7153ffb70693738d72b2eb78a23eb249a6790b5
+EBUILD oslo-utils-6.0.0.ebuild 1672 BLAKE2B 5c9840e3cda6c0548860f3896dd2915e6f816990ad0ccd9e7f90656d52e8b199aa8063db0fdb6b6c0a0e2e6e908ac25b212256699c2ec52a5eb5c51a2c2fa42b SHA512 4f6dec1e7153b2858c7594b528c9b6552a710296a4b79fe77866514813e0a1d8b6f96a30823defcc0b53de45f7153ffb70693738d72b2eb78a23eb249a6790b5
 MISC metadata.xml 607 BLAKE2B 4bbcd1e819a4bd7ce0fd4f13d70dfa686c1731f4e7b73d49dbe9dad97d91d6d3bf8c323d0aa167a8ae94b037ef7ef70150debb5a45fc8ba0121e94b02bc688ca SHA512 2a1d9a822c4b6ee4a1cedd2e11970e04ac7ed0639fe6163196874784867a7b2796b840a46338ef53a748b9b6e2dbc6526798124f576a0017c0fe65ec5d46aca8
diff --git a/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild b/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
index 15e4051eafb6..fbf7c0e01d64 100644
--- a/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/oslo-utils-4.12.2.ebuild b/dev-python/oslo-utils/oslo-utils-5.0.0.ebuild
index 2671db683670..a0bf0d0fa37e 100644
--- a/dev-python/oslo-utils/oslo-utils-4.12.2.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-5.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
@@ -27,6 +27,7 @@ RDEPEND="
 	>=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[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/oslo-utils-6.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-6.0.0.ebuild
new file mode 100644
index 000000000000..a0bf0d0fa37e
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-6.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+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/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${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[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+		' python3_{8..9})
+		>=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() {
+	# spurious rdep
+	sed -i -e '/pbr/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		find "${BUILD_DIR}"/install -name '*eventletutils*.py' -delete || die
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}