gentoo resync : 29.12.2022

4 files changed, 4 insertions, 61 deletions

diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index d6a4af04e232..5b2b47c4c634 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,7 +1,4 @@
 AUX wstools-0.4.8-fix-py3.10.patch 932 BLAKE2B 48d67a79f12a35fd93e5e493f3f488055b7be491790a3bb9bc2e4e823c329d3eff2f1243b85e84d137f386e29cb32ffc1185d6dc632bcce62da9e3454d33231b SHA512 cd6a16c72a7b3a565add77ed07e7864e5085dacd22891113d30920f336fc92628d75adf46f5ce684b502a0a03a88220e37966eaddcd53ca06a6911a3c967edeb
-AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58a93e65b02960d29d50b64bc46023596bdd46f4d8c063e7d06f74f734ae22c71ba751c87b99d90000f946f2daad SHA512 2dbbe6a4b9de7e79334d63e083358253249a73f5e37de71d62a2aa8f889bcc5f76e5842e505a161e08398c572b9cc71a259372a6cc7689206498085c12ff578f
 DIST wstools-0.4.10.gh.tar.gz 204095 BLAKE2B 8d7652729846e991d84bf3c2b64394bf3954ae69cb1ed49ea7822432b965e5cfabd02f8d4ba7caa0cbf9df57def062b085aae75c5d4af1f9be078e2fd8031e0d SHA512 1acd8e62d71c7d330f1e953a0da1956291c5dfb25ff9b8b8799c83feaa4230e384955735b131bab7b430b92ae6c18498927d416d2d1e11fb5c5dad93417c671a
-DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
-EBUILD wstools-0.4.10.ebuild 1106 BLAKE2B 86eb49d5a1c243c9f5570667ac7647094916b7ced27eff7572925d182769605b23be12720eaa076716fccc907b0ee835ab38b01cc1f744444651ef15e5849661 SHA512 49ea1227347ab2045e8424def5bcd328f096486a7e8751f06d7701486f9c226547ac458c1df251b6c34fb1bbaf5b5797b5fa2e6a492796982a9aa461dcf464f7
-EBUILD wstools-0.4.8.ebuild 822 BLAKE2B bf2c734584ec582d4e8e3f99ded708defd575affbeb2b3d604d8c6132994b697a1b3c751d19e5093c0190a958b193f2330cfe5fd99b1a14f11a4bd80754b142c SHA512 8c369002ff292e187ed5a1978ae248bbbf5871cf0941b0e0bf38d81740e86c90d6caed400aa5465e1561ab41be1d204052bd4d36948fb3171da36ad9bdc31be2
+EBUILD wstools-0.4.10-r1.ebuild 1141 BLAKE2B f9c43d6b35e24f65f348e18c46f654d04b287ddd1ef0ece0baa0a38baecbbf3da1de493e6774b171dce27ecad27218d1b502351ed61e286dca7a8f5f55eff314 SHA512 8e61e8dc0ac046fd72b46a3d959be6290964ed4fcbcc6dfbd93013667c0e268e28ee6a2aea110e0d597fd65a7637db069d8ae59058c37543e7e424e95aa9c5d7
 MISC metadata.xml 406 BLAKE2B c08ab496c34bba9eb3e7d29283823fa8b2898921e12026d32bbf137df9f0a7aa0d55c2a31c1c28770472db5b0f94fc3fe37adcaffc1d6879d9272ec7c1ea60c5 SHA512 53227904b908d921e3f89ae8955e1334838436058bee7a1b286844b6fd0bf6290fc4e197e268725be7c5e075f07da7303d652b2729374ccdf108982a52647c32
diff --git a/dev-python/wstools/files/wstools-0.4.8-setup.patch b/dev-python/wstools/files/wstools-0.4.8-setup.patch
deleted file mode 100644
index 3d8c168037a8..000000000000
--- a/dev-python/wstools/files/wstools-0.4.8-setup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From eb57ef5ad6abeaf8d9daf4914f95bcd86670340a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 6 Apr 2020 13:00:31 +0200
-Subject: [PATCH] Drop dependency on pytest-runner
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index d9887a8..8a63a13 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,7 @@ class PyTest(TestCommand):
- 
- 
- setuptools.setup(
--    setup_requires=['pbr>=1.10', 'setuptools>=17.1', 'pytest-runner'],
-+    setup_requires=['pbr>=1.10', 'setuptools>=17.1'],
-     pbr=True,
-     cmdclass={'test': PyTest},
-     test_suite='tests')
--- 
-2.24.1
-
diff --git a/dev-python/wstools/wstools-0.4.10.ebuild b/dev-python/wstools/wstools-0.4.10-r1.ebuild
index ae43a5fb3904..ca9fde70b010 100644
--- a/dev-python/wstools/wstools-0.4.10.ebuild
+++ b/dev-python/wstools/wstools-0.4.10-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -21,9 +21,10 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
+	>=dev-python/pbr-3.0.0[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
deleted file mode 100644
index d6450a8d82fc..000000000000
--- a/dev-python/wstools/wstools-0.4.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/pycontribs/wstools https://pypi.org/project/wstools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-setup.patch"
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest