gentoo resync : 25.08.2020

4 files changed, 3 insertions, 87 deletions

diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 6c464532a4ec..d7c8ab6551a6 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,7 +1,4 @@
-AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c277f287b2444e2bfea9db8fa0344c8817d2316d17cff3d654c3eec3fed448ed200d1f873f6b8f85add6b81ca60a0 SHA512 ee0e9523de4f31bc98a993561e55004a9f877160c1f7a83b9ec83d0654a770972cdefe67692dbd01e322f507370aeee8c2927326ec1797c9c81ff52e085955fd
 AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58a93e65b02960d29d50b64bc46023596bdd46f4d8c063e7d06f74f734ae22c71ba751c87b99d90000f946f2daad SHA512 2dbbe6a4b9de7e79334d63e083358253249a73f5e37de71d62a2aa8f889bcc5f76e5842e505a161e08398c572b9cc71a259372a6cc7689206498085c12ff578f
-DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
 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
+EBUILD wstools-0.4.8.ebuild 767 BLAKE2B 81b0fce596e1ee93c4f0ff636221a9e223a74d0311169439ed12cfc84bb4a5601f1805e7017b8080836c64c997fe31b18be54dcc0347c8a78f7b5a0422733f75 SHA512 d22b93b19b37b59ca9e6dcb5ebcd4863c8b7b6037bdce625670c1e4e8f2c055e87a823f2c6f80808ac45fa14f37a0e71a20f21f759b4a36d94c99dbd88b6649a
 MISC metadata.xml 405 BLAKE2B d69d3c4e1719405f04df6f365e85a006018c2901f07b60c5d14ec82c85ca8b976315cdc0c50d5afea0dbcaa433d688a8942214138d31e508787be95e94c135c2 SHA512 1048dfaeda9e0c1a2adb0d723efeafb6aad13d12aef2f5d88c5d23f5ede7b3aac3133272c87f2309dfe10022ac5e1ad4259b02aa37f5b4370fe3fcdb7054e2d9
diff --git a/dev-python/wstools/files/wstools-0.4.5-setup.patch b/dev-python/wstools/files/wstools-0.4.5-setup.patch
deleted file mode 100644
index 9de7c159c972..000000000000
--- a/dev-python/wstools/files/wstools-0.4.5-setup.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Avoid pulling in a lot of unnecessary test and setup deps.
-
---- wstools-0.4.5/setup.py
-+++ wstools-0.4.5/setup.py
-@@ -9,7 +9,7 @@
- 
- from setuptools import setup, find_packages, Command
- from setuptools.command.test import test as TestCommand
--from pip.req import parse_requirements
-+#from pip.req import parse_requirements
- 
- NAME = "wstools"
- url = "https://github.com/pycontribs/wstools.git"
-@@ -55,13 +55,13 @@
- 
-     def run_tests(self):
-         # before running tests we need to run autopep8
--        try:
--            subprocess.check_call(
--                "python -m autopep8 -r --in-place wstools/ tests/",
--                shell=True)
--        except subprocess.CalledProcessError:
--            logging.getLogger().warn('autopep8 is not installed so '
--                                     'it will not be run')
-+        # try:
-+        #     subprocess.check_call(
-+        #         "python -m autopep8 -r --in-place wstools/ tests/",
-+        #         shell=True)
-+        # except subprocess.CalledProcessError:
-+        #     logging.getLogger().warn('autopep8 is not installed so '
-+        #                              'it will not be run')
-         # import here, cause outside the eggs aren't loaded
-         import pytest  # noqa
-         errno = pytest.main(self.pytest_args)
-@@ -136,9 +136,9 @@
-     cmdclass={'test': PyTest, 'release': Release, 'prerelease': PreRelease},
-     packages=find_packages(exclude=['tests']),
-     include_package_data=True,
--    tests_require=get_requirements(base_path, 'requirements-dev.txt'),
-+    #tests_require=get_requirements(base_path, 'requirements-dev.txt'),
-     setup_requires=['setuptools'],
--    install_requires=get_requirements(base_path, 'requirements.txt'),
-+    install_requires=['six'],
- 
-     license='BSD',
-     description="WSDL parsing services package for Web Services for Python. see" + url,
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
deleted file mode 100644
index 8774c5f79d31..000000000000
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6,3_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 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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-setup.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
index 857203dfd07d..97a2acd7dd53 100644
--- a/dev-python/wstools/wstools-0.4.8.ebuild
+++ b/dev-python/wstools/wstools-0.4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -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 ~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 )"