gentoo resync : 04.05.2019

8 files changed, 2 insertions, 262 deletions

diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 1dbe5bf1d4f9..7b76830acfd2 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,11 +1,3 @@
-AUX future-0.15.2-fix-py35-test-failures.patch 2339 BLAKE2B 737ba57bc09a141ee2fbfc7339350e3bcf1a1e7feb96cbd8d54bda1e630fd5ef431c0814731d6191618ae88481d39faaa9716ece98c6a481a293cbab95df5ad1 SHA512 816a3d30461f6e0eed0106bc46952e3f6d98323d03ff3f212332871b7eaf7d3b9817ee2043110bd004152c4239bfa427d9ed74f1dc7166d41534ba0fc76ad055
-AUX future-0.16.0-disable-tests-with-internet-connection.patch 2253 BLAKE2B e14121b3b4ef9d2b57f39fe7bfb5dbbe1aab87f03b0a8d2ac0aec3b74314027bfa5f1de5f9fe0309e2270f9da55318b14326bc86abed4378ed3c8126ba8ca3e0 SHA512 f49e468ae59223c3e58fefec25f5006781b4e69cdc3bca4aa65035f6b65e040862c0bdf67798a982a5d9a593bb660949487689b82396a4af6e67d980206b9762
-AUX future-0.16.0-fix-tests-py37.patch 1700 BLAKE2B 175dd229c31768555aef3ed3156c040ed440a480afb6a3179cdbcf8bfec31f2a018cc0c193a0a6306c8c020388827647f4bdce07d05ab418b7003fa6125511cb SHA512 26dcd5fcb18dd0e01032ebbbf2135167558a08c79ed226eed461e4d6c48bc80ded90212b9e8c427828b52e2d6186992f8c2b60558dbb4478c6b0be10e596faa3
-DIST future-0.15.2.tar.gz 1583441 BLAKE2B 9c552a5f3598922f8910480d054015020112aae4f7e14d2c139dda13a0b26e878b75eaf5068d66f20823ac4659d85edd4087a95d9474dc27bf15767cf6e9d921 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee
-DIST future-0.16.0.tar.gz 824484 BLAKE2B b098366cc7a7866c4aa4a35f1a6a5cf113698307de8f4cce6c77e4ce72a8433dd102111f991e35ffa920c09a0d31cc048b9502dacd0aba1b701c11eaaeab8392 SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f
 DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f7e81997bc4ac400842cec5f7a50d7a0f5a743c4c76a7b80be0dcb6f54c06901311fd27781d89a8d2df1cce7e9 SHA512 f2396379e8e36753aeafdf27225c2551a31b10036f21201f1c24d63c1bb318dbd491ec977af514a19a4d477b397df9eed9711be797a64e86fc00c4692729d876
-EBUILD future-0.15.2.ebuild 488 BLAKE2B 18c0e887f7906fa11d79b9f37855a41593d8cc23ea759c8fe9ca9d577798c33232c0c3877d8bf9134ff91400946e7a790b3c10fc18a0ce09c7a61207c9d4aaed SHA512 0d274b8ca40a88092df02c673a1cf8cc0bb265542ecad324c87c2b95733b273c30e6fead5dc853f0060c412be00456431c6eafca76fd32f763d3f5ad9287b464
-EBUILD future-0.16.0-r1.ebuild 1275 BLAKE2B cf18b9777cab02410556a3ed75155d8d795e31ad6b49db3d4430b1ef1d80da856e34435d824c4b3f0084eeffa90c0281571974367d139e6637e06e4abc445638 SHA512 f68cd8690f91d72738f14744d84a091d28ccfc0291af61906b347c133a13552fe8ddd4effd15c6cd1e5c1cced982a0bfe2183bc1250e5b173b450b048949cc32
-EBUILD future-0.16.0.ebuild 608 BLAKE2B c2c994a3777f6e3bfe07a93de2813dc1c20e1227175cb5951e9d1cfb5a65d87dd3854f5591bc0f2b87a6f3b2b246e1cbd6cc98cc12579a512eb257f268655bca SHA512 b63c1276bc335e62cff012bdbb5a378149b34b5725b2d2eb21ec7ec9c24e9488f9965feee3f03a1a64965eee8e3b1e7bfddcefc8dce40a16bf880c2ad79345f6
-EBUILD future-0.17.0.ebuild 1050 BLAKE2B 3b84fdf4fb509fab71a974eda92f3171ffe2ab076a111a9e350800db34bcac7b3d0a8be61ebb3622483e0fa39a069f3cb23cad9660a9907c03760a0af3682687 SHA512 6334208345accafc8218e2b063f4818e3c4ce7301efc7f67f399c2728708957c85b3b40ac431e1d5403e8a2cc53448df06c9ea8e25602e3ebe5f31f746dd392c
+EBUILD future-0.17.0.ebuild 1048 BLAKE2B a60d74627cd3f3dfe6b043857056012ff81e49c436d6290e8cee470bc843ccaf0d3fa7fa143852cad228411d28cd0467f3186241555d55d673cc31b1d109bf43 SHA512 026c93d4feed6ba82bf389d617a90e4a1e26855f5f0d4f12216f6164758009358c4068a4c35b1d5286d4a0fb1e4fbf74dcebcf045d5450e4678925071db0e9e6
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/files/future-0.15.2-fix-py35-test-failures.patch b/dev-python/future/files/future-0.15.2-fix-py35-test-failures.patch
deleted file mode 100644
index 8d8e5daccf10..000000000000
--- a/dev-python/future/files/future-0.15.2-fix-py35-test-failures.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-* Fix test failures on py3.5, backported from git, see also
-  https://github.com/PythonCharmers/python-future/issues/183
-* Fix unexpected test successes on py3.5, which are now correct
-
---- a/tests/test_future/test_bytes.py
-+++ b/tests/test_future/test_bytes.py
-@@ -10,6 +10,8 @@
- from numbers import Integral
- from future.tests.base import unittest, expectedFailurePY2
- 
-+import sys
-+
- 
- TEST_UNICODE_STR = u'ℝεα∂@ßʟ℮ ☂ℯṧт υηḯ¢☺ḓ℮'
- # Tk icon as a .gif:
-@@ -534,6 +536,8 @@
-         self.assertRaises(ValueError, bytes.maketrans, b'abc', b'xyzq')
-         self.assertRaises(TypeError, bytes.maketrans, 'abc', 'def')
- 
-+    @unittest.skipIf(sys.version_info[:2] == (3, 5),
-+             'Only works in Py3.5+')
-     @unittest.expectedFailure
-     def test_mod(self):
-         """
-@@ -551,6 +555,8 @@
-         a = b % (b'seventy-nine', 79)
-         self.assertEqual(a, b'seventy-nine / 100 = 79%')
- 
-+    @unittest.skipIf(sys.version_info[:2] == (3, 5),
-+             'Only works in Py3.5+')
-     @unittest.expectedFailure
-     def test_imod(self):
-         """
---- a/tests/test_future/test_builtins.py
-+++ b/tests/test_future/test_builtins.py
-@@ -525,11 +525,10 @@
-         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'badmode')
-         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'single', 0xff)
-         # Raises TypeError in Python < v3.5, ValueError in v3.5:
--        # self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
-+        self.assertRaises((TypeError, ValueError), compile, chr(0), 'f', 'exec')
-         self.assertRaises(TypeError, compile, 'pass', '?', 'exec',
-                           mode='eval', source='0', filename='tmp')
-         compile('print("\xe5")\n', '', 'exec')
--        self.assertRaises(TypeError, compile, chr(0), 'f', 'exec')
-         self.assertRaises(ValueError, compile, str('a = 1'), 'f', 'bad')
- 
-         # test the optimize argument
-@@ -1287,7 +1286,7 @@
-         self.assertAlmostEqual(pow(-1, 1/3), 0.5 + 0.8660254037844386j)
- 
-         # Raises TypeError in Python < v3.5, ValueError in v3.5:
--        # self.assertRaises(TypeError, pow, -1, -2, 3)
-+        self.assertRaises((TypeError, ValueError), pow, -1, -2, 3)
-         self.assertRaises(ValueError, pow, 1, 2, 0)
- 
-         self.assertRaises(TypeError, pow)
diff --git a/dev-python/future/files/future-0.16.0-disable-tests-with-internet-connection.patch b/dev-python/future/files/future-0.16.0-disable-tests-with-internet-connection.patch
deleted file mode 100644
index b4ba01ed796a..000000000000
--- a/dev-python/future/files/future-0.16.0-disable-tests-with-internet-connection.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-##Skipping tests due to connection failures on Fedora build-system
-##See https://github.com/PythonCharmers/python-future/issues/165 
-
---- a/tests/test_future/test_standard_library.orig.py	2014-11-21 12:52:03.000000000 +0100
-+++ b/tests/test_future/test_standard_library.py	2015-09-02 11:37:36.808826777 +0200
-@@ -318,7 +318,7 @@
-         import builtins
-         self.assertTrue(hasattr(builtins, 'tuple'))
- 
--    # @unittest.skip("ssl support has been stripped out for now ...")
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_urllib_request_ssl_redirect(self):
-         """
-         This site redirects to https://...
-@@ -332,6 +332,7 @@
-         # pprint(r.read().decode('utf-8'))
-         self.assertTrue(True)
- 
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_moves_urllib_request_http(self):
-         """
-         This site (python-future.org) uses plain http (as of 2014-09-23).
-@@ -343,6 +343,7 @@
-         data = r.read()
-         self.assertTrue(b'</html>' in data)
- 
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_urllib_request_http(self):
-         """
-         This site (python-future.org) uses plain http (as of 2014-09-23).
-
---- a/tests/test_future/test_requests.orig.py	2014-11-21 12:52:03.000000000 +0100
-+++ b/tests/test_future/test_requests.py	2015-09-02 11:39:01.509378296 +0200
-@@ -57,6 +57,7 @@
-     This class tests whether the requests module conflicts with the
-     standard library import hooks, as in issue #19.
-     """
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_remove_hooks_then_requests(self):
-         code = """
-             from future import standard_library
-@@ -79,6 +80,7 @@
-             self.assertTrue(True)
- 
- 
-+    @unittest.skip("ConnectionError: ('Connection aborted.', gaierror(-3, 'Temporary failure in name resolution'))...")
-     def test_requests_cm(self):
-         """
-         Tests whether requests can be used importing standard_library modules
-
diff --git a/dev-python/future/files/future-0.16.0-fix-tests-py37.patch b/dev-python/future/files/future-0.16.0-fix-tests-py37.patch
deleted file mode 100644
index d925d49f983e..000000000000
--- a/dev-python/future/files/future-0.16.0-fix-tests-py37.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit ce4f015978d250718ec8dd9f50721da90a9bd18b
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Mon Aug 20 12:42:29 2018 +0200
-
-    Skip int() keyword tests with Python 3.7
-    
-    The first argument must be positional since
-    https://github.com/python/cpython/commit/2e5642422f6234fd8d0c082142b27340e588f96e
-
-diff --git a/tests/test_future/test_int.py b/tests/test_future/test_int.py
-index f1d9c5d..e306550 100644
---- a/tests/test_future/test_int.py
-+++ b/tests/test_future/test_int.py
-@@ -265,6 +265,9 @@ class IntTestCases(unittest.TestCase):
-     def test_no_args(self):
-         self.assertEqual(int(), 0)
- 
-+    @unittest.skipIf(sys.version_info >= (3, 7),
-+            "The first parameter must be positional with Python >= 3.7"
-+    )
-     def test_keyword_args(self):
-         # Test invoking int() using keyword arguments.
-         self.assertEqual(int(x=1.2), 1)
-
-commit d7a3451753982d944ae0894c9e9f01d0460d03d5
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Mon Aug 20 11:17:59 2018 +0200
-
-    Make test_bad_status_repr work for Python 3.7
-
-diff --git a/tests/test_future/test_httplib.py b/tests/test_future/test_httplib.py
-index 968e933..a1e2b19 100644
---- a/tests/test_future/test_httplib.py
-+++ b/tests/test_future/test_httplib.py
-@@ -197,7 +197,7 @@ class BasicTest(TestCase):
-         if not utils.PY3:
-             self.assertEqual(repr(exc), '''BadStatusLine("u\'\'",)''')
-         else:
--            self.assertEqual(repr(exc), '''BadStatusLine("\'\'",)''')
-+            self.assertIn(repr(exc), ('''BadStatusLine("''",)''', '''BadStatusLine("''")'''))
- 
-     def test_partial_reads(self):
-         # if we have a length, the system knows when to close itself
diff --git a/dev-python/future/future-0.15.2.ebuild b/dev-python/future/future-0.15.2.ebuild
deleted file mode 100644
index 7cc10e8da844..000000000000
--- a/dev-python/future/future-0.15.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="http://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-fix-py35-test-failures.patch" )
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/future/future-0.16.0-r1.ebuild b/dev-python/future/future-0.16.0-r1.ebuild
deleted file mode 100644
index e65bb99c9ec8..000000000000
--- a/dev-python/future/future-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="http://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# https://github.com/PythonCharmers/python-future/issues/165
-	"${FILESDIR}/${P}-disable-tests-with-internet-connection.patch"
-	# https://github.com/PythonCharmers/python-future/pull/355
-	"${FILESDIR}/${P}-fix-tests-py37.patch"
-)
-
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs/ docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
deleted file mode 100644
index aa4638b61ae6..000000000000
--- a/dev-python/future/future-0.16.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="http://python-future.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
index e336aea03b72..7487bf92cefb 100644
--- a/dev-python/future/future-0.17.0.ebuild
+++ b/dev-python/future/future-0.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 BDEPEND="