gentoo resync : 01.12.2017

4 files changed, 82 insertions, 34 deletions

diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index f0bac161968a..2bfabaa9a64c 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,5 +1,6 @@
+AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c277f287b2444e2bfea9db8fa0344c8817d2316d17cff3d654c3eec3fed448ed200d1f873f6b8f85add6b81ca60a0 SHA512 ee0e9523de4f31bc98a993561e55004a9f877160c1f7a83b9ec83d0654a770972cdefe67692dbd01e322f507370aeee8c2927326ec1797c9c81ff52e085955fd
 DIST wstools-0.4.3.tar.gz 148878 SHA256 578b53e98bc8dadf5a55dfd1f559fd9b37a594609f1883f23e8646d2d30336f8 SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed WHIRLPOOL fa5ca24db23d99337cb08f3317327f6076f230c787477275e54d2322931d4e86831357043df6e8c12f3a62bac95eda13f614120588e9d3265ba40251c68b2881
 DIST wstools-0.4.5.tar.gz 201047 SHA256 499760d87d9bb62fb937669bb9acb2de8a6393dcce3c5fbd3bc693b4a7bdd4ba SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a WHIRLPOOL 80341b7e7756cd750ab97983b9175ed6ad7e482c9d3ca5d2a34a3d9166ec68bca107fbf741f4b18379e3b958b4b1872c32ce3274a859bfbc58c16735f749c652
 EBUILD wstools-0.4.3.ebuild 596 BLAKE2B 784ed1f5f0b24e28d76e88ecd6099dfc6ea6040ba4e1e5ab65ff8610951ca98ac686a226a8a11453c3689fafb33a9772425c428f73e209fcb7a1d30315e60432 SHA512 4a25ec83bcbdde5259b17e94939896bc1c7f229cd1183b4e3faeb18864f0e0d3cf5129696ae0c658e0a587c8804eabb6a8e0ac161ae3b7944934dc952e8c6d0e
-EBUILD wstools-0.4.5.ebuild 936 BLAKE2B 29864ad003a5bb5b14998a707f48ec132e6478d088114bf502d89db35ba11bccfb65eed211d09337d1dea4ee1e543007373c5aee2a3eecfeec49356f4302acfc SHA512 dc9308d3e66cf66f9b501b29bffdbd6387f7b9016ce31659a280ee4789fbe9bf3c123433dfa884f381335cf259b00f42ad7ec663854446e7f8d7007085bd1a2a
+EBUILD wstools-0.4.5-r1.ebuild 797 BLAKE2B 099782c313be5b97ff12ec4c790034c97a44c47077ed2f6967c4c6f32189c963836093ed8fd9ce3dd5d9e6f8e88c9bbab4885c2b0f31b6226b7c9dfc4771887c SHA512 e2358aac3e37833028bb268e6a232fc01b68df37e8529ef2c71d4290ce9ab074ae3768857f4051bd00d0da3c6ed2365bd1d47932fb18cfbb3fa0701e506a4c48
 MISC metadata.xml 376 BLAKE2B 4bee67bc37a09d4b34b1f67902a820f63563f87d9771eb462eb7f098955806e025196082a7e6c118e5ab0638c7ee70d1a63c8183f607d1ff9a26f1b0c16d5206 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8
diff --git a/dev-python/wstools/files/wstools-0.4.5-setup.patch b/dev-python/wstools/files/wstools-0.4.5-setup.patch
new file mode 100644
index 000000000000..9de7c159c972
--- /dev/null
+++ b/dev-python/wstools/files/wstools-0.4.5-setup.patch
@@ -0,0 +1,46 @@
+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
new file mode 100644
index 000000000000..9a3d508f201b
--- /dev/null
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+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.python.org/pypi/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 ~sh ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="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.5.ebuild b/dev-python/wstools/wstools-0.4.5.ebuild
deleted file mode 100644
index 50f2db48e105..000000000000
--- a/dev-python/wstools/wstools-0.4.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-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.python.org/pypi/wstools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-cache[${PYTHON_USEDEP}]
-	dev-python/pytest-cov[${PYTHON_USEDEP}]
-	dev-python/pytest-pep8[${PYTHON_USEDEP}]
-	dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"