6 files changed, 18 insertions, 144 deletions
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index a6a13b8fe1c4..d9d4b9225c92 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,4 +1 @@
-DIST stevedore-2.0.1.tar.gz 505248 BLAKE2B 2fee9467b70aa605ca89060e839a2c00deec571f15f014cb8118710e9221fef65ec15172d727dbafb5d5e2adf15ce0e94919804e2ec7ee72ae9e47afe2a6b88f SHA512 1efe46983975b1a0f176f847874c68dd91538fc3c029facbbf0f96891894176e0eeaf28c19e674baa9e9dae024deabae0555c846e36211a9be6cbba5e2ecd710
-DIST stevedore-3.0.0.tar.gz 510351 BLAKE2B c73a6baaa4179f8bd45bae92491fa6f87d63594fa245f58f297526a277c7b40f5548526029144da4f18f0df71dcbbdc3620d7dd635db700ad98b597b797c4648 SHA512 5970d13b7986e0f0e0cb6dc30eef8a4a75c6d7122bbf7123f71a9d66bcbd16725a50345217552206506960df1eadbf4e0c04fa6f2cfc25362ed347ebff25d5b6
-DIST stevedore-3.1.0.tar.gz 509580 BLAKE2B d19d70bef6573259f48c171b81aa6c08efa2055825ae8834e30f5713e3049cb75fe6adc07bfd37b4a1b17c0d4eb03cc31bf208cf01b91b94dcd436069e03dcbf SHA512 d5b800b6bcbf21935edc71241de2216690bf879f829264b762ff29402a273e7fa6b20b551be3f38a433eb967ff4f248cb3d2f359bd00fda03e79b21cdc800207
-DIST stevedore-3.2.0.tar.gz 510559 BLAKE2B 69faa75eed9efff36a0dd5f91730dd22936af646bd54e1f8c47da5d3bc3d33e949714ac81898747336bcd8acbdd1bb2addc68fb64add825493ad29fb22393fee SHA512 89b6c88ff41bd9429561886fa2e7cbeef1658e955266b61e1ac9809812ee8e290ecb39819618a12b1a6e080d2e86ea03d951a0a31f7ff4920d8b22bb55420439
+DIST stevedore-5.2.0.tar.gz 513817 BLAKE2B 598e479c18a01fb315f43d0257d555ab7d5c3a67833d3af1f38ac2d0e911e14c3927381b50827d40ae63bdd189c0095daec73daa8bd3cf815aacc6b2d6c813c6 SHA512 ab7afe7d238b7cf1ecdc0cce0b60f0bddc1b59c28c126006bc49c7dbdfa7991fc3813822502ecb4952226b9caf5a80a2809f3b5bd910525c1feab336a5017d26
diff --git a/dev-python/stevedore/metadata.xml b/dev-python/stevedore/metadata.xml
index edf852637d87..180a1476e6f4 100644
--- a/dev-python/stevedore/metadata.xml
+++ b/dev-python/stevedore/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>openstack@gentoo.org</email>
diff --git a/dev-python/stevedore/stevedore-2.0.1.ebuild b/dev-python/stevedore/stevedore-2.0.1.ebuild
deleted file mode 100644
index 6095da755c55..000000000000
--- a/dev-python/stevedore/stevedore-2.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-3.1.0.ebuild b/dev-python/stevedore/stevedore-3.1.0.ebuild
deleted file mode 100644
index 9bd342f667de..000000000000
--- a/dev-python/stevedore/stevedore-3.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-3.2.0.ebuild b/dev-python/stevedore/stevedore-3.2.0.ebuild
deleted file mode 100644
index 9bd342f667de..000000000000
--- a/dev-python/stevedore/stevedore-3.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-3.0.0.ebuild b/dev-python/stevedore/stevedore-5.2.0.ebuild
index 5a3e7abb647c..b5d2a110aa06 100644
--- a/dev-python/stevedore/stevedore-3.0.0.ebuild
+++ b/dev-python/stevedore/stevedore-5.2.0.ebuild
@@ -1,27 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://opendev.org/openstack/stevedore/
+	https://github.com/openstack/stevedore/
+	https://pypi.org/project/stevedore/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
 BDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	test? (
@@ -39,5 +36,10 @@ distutils_enable_sphinx 'doc/source' \
 python_prepare_all() {
 	# Delete spurious data in requirements.txt
 	sed -e '/^pbr/d' -i requirements.txt || die
+
+	# Also known problem, inside venv
+	sed -i -e 's:test_disable_caching_file:_&:' \
+		stevedore/tests/test_cache.py || die
+
 	distutils-r1_python_prepare_all
 }