gentoo resync : 25.11.2020

4 files changed, 39 insertions, 85 deletions

diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 2ca891cdea16..d22739716874 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,3 +1,3 @@
-DIST oslo-utils-4.1.2.tar.gz 92889 BLAKE2B 16397708abe47946c1495adf6b91ad9db6bdef8c2f475f398b3b4d390193b800ff0b1710183732b81dde89fc24aad204854d02a0e0567046e712663eaa685711 SHA512 d6784c7e1a30690ec2523514b464c95e1d6704a8c8fef5da85b76583dfb5d4b5cbfd18eb9451a90243210e50405f7541b85b39ac09d4f487119677efeef63418
-EBUILD oslo-utils-4.1.2.ebuild 2449 BLAKE2B dcf2c3583b98de2706dc29b01c8fce68633ebb100ad408981fa6e0a7ab94a4a565669c40526e174d34f38d42da2fb2c5e0a02d5a1bf06ddc89b81489f8daefd1 SHA512 f5d1e7f22bacc3bfafb9453c2db5671b3e4d1f5cac6f68b71b72447cdebb79a85bb33d51565430316b522acd7bce4041b2a878f8cd02a9abff92537c9394bac2
-MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
+DIST oslo-utils-4.6.0.tar.gz 94148 BLAKE2B 2de92b22b849522a43e81f0fa9bb5e92d2c380c07eca81cd916c536e10ec55869d5933a3a9dcc65b682ac793534094e6b0aaa74b7ac9c74724231dccc0dbae3b SHA512 fe91522c9860a7637af8b8521c297d6467f2af643f026abc97b72fd3032789219d2b3fdc9a6d8beecb0e55e4e7c319e800be295abf9639b52e32da81dae0c9a7
+EBUILD oslo-utils-4.6.0.ebuild 1042 BLAKE2B 72c6cdfb0afd2e1932d35eb336400b211fe1ee7b39c17ff5cc67538a00e298e78ca8af8b9519883572c7fe3362dae3d399fa6325a42eead0da9da4e5133535dd SHA512 230cc4f0c7d1928abf53d49d9add4614eb8d3d1b0325b1b33968468ecfbb06074d7f3d7dcf284462f8781eb6c1d1de126872181a3a747f5942810f08d889ed81
+MISC metadata.xml 390 BLAKE2B fccb591d0e5acfaa74a65b37dcb9882d6ef03b62facaf88d5f422bc2815eb32f1616c917d5c7faaccf17abfaf377c35b6d07970ad2c58aa8e267b9b384f0a153 SHA512 7d2445b99524c026c551f5e49d60bd4d05cd6219355a212b444e64e517acef1b63e84bf25daafb3cd902edb74337672983e516389e8f7c3cb26e5fb129c60db9
diff --git a/dev-python/oslo-utils/metadata.xml b/dev-python/oslo-utils/metadata.xml
index dae196bf5de7..10f43e26e551 100644
--- a/dev-python/oslo-utils/metadata.xml
+++ b/dev-python/oslo-utils/metadata.xml
@@ -5,6 +5,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.utils</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild b/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
deleted file mode 100644
index 7a5cefe94e82..000000000000
--- a/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-		>=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}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=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}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
new file mode 100644
index 000000000000..1c43120731b5
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=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}]
+"