gentoo resync : 20.03.2022

3 files changed, 21 insertions, 54 deletions

diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 950f43bba851..ef85cf1e0df6 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.utils-4.12.0.tar.gz 100927 BLAKE2B 6f175d7c08a9084af083d1e2a339ef81c9d49f832f0c94b17fe652485f077d787731bbef61bb7b4cc30188b776b7494f53700b76a736be70cff0ce5b4da5b11d SHA512 a31d307199584d6aa891464e0d9ef218d0a2aa6b54337e081ac3d787d883dfa088484f894c421c4cbf428ce2a53b6547770d469299ec7b9d0159e5a38fde06e3
-DIST oslo.utils-4.12.1.tar.gz 101375 BLAKE2B d6f74c8cbe8d28b0955a7f46906f28d7719413a3ea4e210fc050f89aebf30fa03c36bec9d1ccc658d59bcfe6c933d9eb8cc6096d693f0c75882fd3099de5953a SHA512 26d4d8c7584e516c05b035a11d12b638713c9349fa8cf8a310b6ead2a078684b29409c1a6a01ac035f872f3deb0dda2aaef8c3a0150825b36d6583052d887ed7
-EBUILD oslo-utils-4.12.0.ebuild 1286 BLAKE2B b780decbb0cc7d8daf247774ab008ab837c3daa8a8c3090f8018cb7c2e4321ce3dfcda08ef5fbadb8bef0513665b5a15bfc72310eb06d4162634d0f9f75296ae SHA512 d4334c5f92f205f4c5e2563cf1810ad2b339b0003d4eddce52d19575bbf83cb5399b875072d79013e0c76785471da6a924675469d1d6a29ad0700d376695c9a5
-EBUILD oslo-utils-4.12.1.ebuild 1289 BLAKE2B 3b323a7f5230008ae9417ee76db8924c6e05c57086330103b7fd87351c71935e7ce54d2207a8db397b09e459d89258f93978f4a3b92eebf8af8bdfa557801cf3 SHA512 8488cdcc73353db60938ede9ed0f41b97114c66b5af2a87c216b803b94de68182fae0e1472e7639cea566669f94b91e6814a8dd1d11ad0d4052d942d9edc725f
+DIST oslo.utils-4.12.2.tar.gz 101505 BLAKE2B fb2d56c767e8ed100ba789560e6b50dfecf8528de2a2717a9660e3dc8ceb93838137d59f1c2e3f05ccb99b95ea1ec86870e22160fb670a8cfb2dd9d6783f1d0f SHA512 fa56225f1991b031e2122cf08cd0992d8a9bfacd9a83d590f87ff86c495d51763ac06f65076c746a59563a60f886601d00ea9536dfcc927fca94c5a1431bcf67
+EBUILD oslo-utils-4.12.2.ebuild 1625 BLAKE2B 9f10dfc95d869452f0a40e7696bc383b0d99e361a10c28d6bd9cf2c207e475861a627f1a4881eb448761943f43c2b123ea05af129954932ee0eea86fed4a9fd3 SHA512 dc033d47519f54fb0fac47152c7931a670ce885099adb0ba856058683a7aa26555689ceeff9b6510a6faa3d2f7588a2b17e6a9499a56b3a85a9f8f459d478670
 MISC metadata.xml 607 BLAKE2B 4bbcd1e819a4bd7ce0fd4f13d70dfa686c1731f4e7b73d49dbe9dad97d91d6d3bf8c323d0aa167a8ae94b037ef7ef70150debb5a45fc8ba0121e94b02bc688ca SHA512 2a1d9a822c4b6ee4a1cedd2e11970e04ac7ed0639fe6163196874784867a7b2796b840a46338ef53a748b9b6e2dbc6526798124f576a0017c0fe65ec5d46aca8
diff --git a/dev-python/oslo-utils/oslo-utils-4.12.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.12.0.ebuild
deleted file mode 100644
index 48ad03a4b210..000000000000
--- a/dev-python/oslo-utils/oslo-utils-4.12.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-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 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}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	>dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	test? (
-		>=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
-}
diff --git a/dev-python/oslo-utils/oslo-utils-4.12.1.ebuild b/dev-python/oslo-utils/oslo-utils-4.12.2.ebuild
index 188b2dbbcda8..2671db683670 100644
--- a/dev-python/oslo-utils/oslo-utils-4.12.1.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.12.2.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 MY_P=${P/-/.}
@@ -14,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
@@ -28,8 +30,10 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	>dev-python/eventlet-0.23.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}]
@@ -45,3 +49,15 @@ src_prepare() {
 	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
+}