6 files changed, 64 insertions, 27 deletions
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 6c99193b4573..6c464532a4ec 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,6 +1,7 @@
 AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c277f287b2444e2bfea9db8fa0344c8817d2316d17cff3d654c3eec3fed448ed200d1f873f6b8f85add6b81ca60a0 SHA512 ee0e9523de4f31bc98a993561e55004a9f877160c1f7a83b9ec83d0654a770972cdefe67692dbd01e322f507370aeee8c2927326ec1797c9c81ff52e085955fd
-DIST wstools-0.4.3.tar.gz 148878 BLAKE2B 96b1e9dc0310fb0fc5515a7c061f82897e2ecd1b6187167b57444394d1e64e8f63e5db011d77c80b5fe6df2f67fecffe82f861fb761190c6b3248346cd9f5b5c SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed
+AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58a93e65b02960d29d50b64bc46023596bdd46f4d8c063e7d06f74f734ae22c71ba751c87b99d90000f946f2daad SHA512 2dbbe6a4b9de7e79334d63e083358253249a73f5e37de71d62a2aa8f889bcc5f76e5842e505a161e08398c572b9cc71a259372a6cc7689206498085c12ff578f
 DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
-EBUILD wstools-0.4.3.ebuild 574 BLAKE2B 1f8a0eda04ae984b7cf3407512fd68d6a14c1fc5ecb06cc29987c5c0b07c482fb99a3baec126dd521eef02aa1cbf7deb0bf866813683368497bdb7f50f2ba267 SHA512 3b3296504efe8d8ae59718401f586203d84c0c2787a54669e3ad76e9eb20c7390befab10c9f2d38da4c67d4b5bd93f816d3907ededd6005881df4a665ee48ce4
-EBUILD wstools-0.4.5-r1.ebuild 832 BLAKE2B d9b362c95a79cc9d4b9062f3d405400913283c9800195da7f92f6afdf944bf8d9c099f0aabbe8228db7afcda207c4f287c91e87637fb3d669c8198edf83adaf5 SHA512 862083dc0b455b326c3f3fde9365acd9db46ba2940de04beaa6f91096ed006229f2fd0109eb97c661421a0b768058a929a6135bee8bf8c4c1a16cde75310d322
-MISC metadata.xml 376 BLAKE2B 4bee67bc37a09d4b34b1f67902a820f63563f87d9771eb462eb7f098955806e025196082a7e6c118e5ab0638c7ee70d1a63c8183f607d1ff9a26f1b0c16d5206 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8
+DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
+EBUILD wstools-0.4.5-r1.ebuild 821 BLAKE2B 21629f745d6bbffffa6495e5cef50c56e3bde0f5568fef88c5b47f7d5a3f7d3fef1c774926038f3e9415d5a31541392ad7bd42128926a11dd1e67d29096efe48 SHA512 12c38791953f9a72e971ffbce13ad500e46524cf27c674545c93f2ab51d782f29a9caf21753c18fba1a9f77cd5f766ab9607797430956671270d7bc403c60dc0
+EBUILD wstools-0.4.8.ebuild 781 BLAKE2B fa21ba75efb161e1c8041a232958d63801f86e1e5ccc111969d7f63544fde9b20a1f3a59bd2791ae50e5cf0301b449eda418551128ff0875f63c8d68d1e5b832 SHA512 8b648c5605444c137c853d0fe2ebe3d8757b444ee0d6376a4240f9e3221ad87a773fa7faa6f7d4d9e71746f481922f83110cc84a99ebebc89444294a6c353099
+MISC metadata.xml 405 BLAKE2B d69d3c4e1719405f04df6f365e85a006018c2901f07b60c5d14ec82c85ca8b976315cdc0c50d5afea0dbcaa433d688a8942214138d31e508787be95e94c135c2 SHA512 1048dfaeda9e0c1a2adb0d723efeafb6aad13d12aef2f5d88c5d23f5ede7b3aac3133272c87f2309dfe10022ac5e1ad4259b02aa37f5b4370fe3fcdb7054e2d9
diff --git a/dev-python/wstools/files/wstools-0.4.8-setup.patch b/dev-python/wstools/files/wstools-0.4.8-setup.patch
new file mode 100644
index 000000000000..3d8c168037a8
--- /dev/null
+++ b/dev-python/wstools/files/wstools-0.4.8-setup.patch
@@ -0,0 +1,25 @@
+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/metadata.xml b/dev-python/wstools/metadata.xml
index a09270e1fdbf..59b345f0b6c2 100644
--- a/dev-python/wstools/metadata.xml
+++ b/dev-python/wstools/metadata.xml
@@ -5,8 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">wstools</remote-id>
-    <remote-id type="github">kiorky/wstools</remote-id>
+    <remote-id type="github">pycontribs/wstools</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/wstools/wstools-0.4.3.ebuild b/dev-python/wstools/wstools-0.4.3.ebuild
deleted file mode 100644
index 89eac2c6532d..000000000000
--- a/dev-python/wstools/wstools-0.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/kiorky/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 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
index 5d7da026788e..8774c5f79d31 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -14,7 +14,7 @@ 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
new file mode 100644
index 000000000000..857203dfd07d
--- /dev/null
+++ b/dev-python/wstools/wstools-0.4.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_REQ_USE="xml(+)"
+
+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 ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/pbr[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.8-setup.patch )
+
+distutils_enable_tests pytest