gentoo Easter resync : 12.04.2020

6 files changed, 1 insertions, 203 deletions

diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index ec1bc74019c6..ac6919e5c535 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,8 +1,3 @@
-AUX txaio-2.7.1.chained-callback.patch 1297 BLAKE2B 41aea0fac54ef4256e191d7d505d5d74119f77f23825a4a944813540874f69566fe15f1f7e535a8402dcf85fcded3183632898657c5257b695dcc899ad98e6b0 SHA512 69132c9cbda71da30ecce6385552e1d3ecdf0ca57562d7c0ef2dd8917ef1d1bfd03c55008690f34a31d31418bb7cdb9f690c75a0b996a4f8de0b0642a824e40e
-AUX txaio-2.7.1.f._result.patch 1140 BLAKE2B 675ffec2a0d4d9bb312492603765e79ddab23c063297f4ab79d3cbb57cace511b92e357cf54a283d0f096de9d3209fca266238282cd3a1e77039332c696ca00e SHA512 bcf4681ca1501dc9b21514dca68fb36d6b50550fe1760b4af00786a698b26c3fb64afebcf29c2404dd0923867da010bfa41afa9501f59f43306b55871d951a29
-AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7daa3cb5f20b88935a2c9dcd0784968edda8586a00ea69552e72ffd04647ce4ef96928059da SHA512 a82754ff4b81cdacd7010cb30065ae1a3408b2ed6e8a47021a2c7066adb614a87cc3d70b7980f10b9a6b063f4087ee44c5df2adab0d23ce90c1beb1368b4a498
-DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
-EBUILD txaio-2.7.1.ebuild 1823 BLAKE2B 5557230a52e08bcc513c459babf44be1e0199b5fdd97aca8c1a87903e21a819556fbde4846f602264e85c3861caa1bf1534a137fdb3bbdb848e1a1cc50e8a5db SHA512 142491502064c90d8ccba2cd93d6bd6d052584b9dc7a051bb1a8721fbaf8e2db59aaf94c194b821d3e6f298154e6cee6e9279272e04339ce76eebe700829cf8e
-EBUILD txaio-2.9.0.ebuild 1450 BLAKE2B 55440e977ed9b65347261a4e83c44ba31e7c902fee3ab1a7c2096f1f46b7204e4e0fea22faf46a8dd39a52baa60bbd091231617926c97fc7dcbd50f66f2e3191 SHA512 4a9fe4cb3df5aaa853a71b5aa952f4831b93a23c5d9d50a91b2a29eebea143a740cf7abcf55c863fd21f5b12d844291188426f71dc026d1839fccebf2ee40008
+EBUILD txaio-2.9.0.ebuild 1277 BLAKE2B 6d2ba58eed43d55a7ee40cbc3b1e4e604b45712796ad8f156e17c155edca9ca4a17961132770a8f44bdbfe3b26738f86af1e646c00297c6c839d672910b1609d SHA512 85b98df51df9b0766c2f07a62ee5b90c240c8d8c8d0ebe700890701db5e05bc06bd6a84ede19c811bf47e1218dd78c72003df52c7025b8720d6c4406e2137dcb
 MISC metadata.xml 487 BLAKE2B e04a40627282564f381f0070344ba6e2a08e572121e150b5775239dacf22212fb273253dae6ad19ba2cea7f15e84c7f92c6d0671353b2d159b9e7f40d3415914 SHA512 d7eb59861e36e29555d46c3a65814428e64473abff01b6d5489b7f4419f535c991a443345058a8f618574019d5581d3df94fc0339c3a53d4c3147f5e11ca3a11
diff --git a/dev-python/txaio/files/txaio-2.7.1.chained-callback.patch b/dev-python/txaio/files/txaio-2.7.1.chained-callback.patch
deleted file mode 100644
index f72ccb03918b..000000000000
--- a/dev-python/txaio/files/txaio-2.7.1.chained-callback.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f27f2945c8ca06e2eb0c2b95366a7a4c1363d857 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
-Date: Mon, 8 May 2017 21:20:01 +0300
-Subject: [PATCH] Removed the test for the chained callback feature
-
----
- test/test_callback.py | 25 -------------------------
- 1 file changed, 25 deletions(-)
-
-diff --git a/test/test_callback.py b/test/test_callback.py
-index 08d31e3..9c8ab99 100644
---- a/test/test_callback.py
-+++ b/test/test_callback.py
-@@ -59,31 +59,6 @@ def test_callback(framework):
-     assert results[0] == "it worked"
- 
- 
--def test_chained_callback(framework):
--    """
--    Chain two callbacks where the first one alters the value.
--    """
--    calls = []
--
--    def callback0(arg):
--        calls.append(arg)
--        return arg + " pray I do not alter it futher"
--
--    def callback1(arg):
--        calls.append(arg)
--
--    f = txaio.create_future()
--    txaio.add_callbacks(f, callback0, None)
--    txaio.add_callbacks(f, callback1, None)
--    txaio.resolve(f, "the deal")
--
--    run_once()
--
--    assert len(calls) == 2
--    assert calls[0] == "the deal"
--    assert calls[1] == "the deal pray I do not alter it futher"
--
--
- def test_immediate_result(framework):
-     f = txaio.create_future_success("it worked")
-     results = []
--- 
-2.13.0
-
diff --git a/dev-python/txaio/files/txaio-2.7.1.f._result.patch b/dev-python/txaio/files/txaio-2.7.1.f._result.patch
deleted file mode 100644
index 8c72b45e48de..000000000000
--- a/dev-python/txaio/files/txaio-2.7.1.f._result.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7ecd9cbb4e7202f7c583f9080ac13db94672bc4b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
-Date: Thu, 4 May 2017 21:47:02 +0300
-Subject: [PATCH] Removed code that sets f._result
-
-This stopped working from Python 3.6 onwards, as the Future implementation is now written in C.
----
- txaio/aio.py | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/txaio/aio.py b/txaio/aio.py
-index 55d3ca5..becfba5 100644
---- a/txaio/aio.py
-+++ b/txaio/aio.py
-@@ -437,17 +437,12 @@ class _AsyncioApi(object):
-         """
-         callback or errback may be None, but at least one must be
-         non-None.
--
--        XXX beware the "f._result" hack to get "chainable-callback" type
--        behavior.
-         """
-         def done(f):
-             try:
-                 res = f.result()
-                 if callback:
--                    x = callback(res)
--                    if x is not None:
--                        f._result = x
-+                    callback(res)
-             except Exception:
-                 if errback:
-                     errback(create_failure())
--- 
-2.13.0
-
diff --git a/dev-python/txaio/files/util.py b/dev-python/txaio/files/util.py
deleted file mode 100644
index 254df70a5aac..000000000000
--- a/dev-python/txaio/files/util.py
+++ /dev/null
@@ -1,40 +0,0 @@
-try:
-    import asyncio
-    from asyncio.test_utils import run_once as _run_once
-
-    def run_once():
-        return _run_once(asyncio.get_event_loop())
-
-except ImportError as e:
-    try:
-        import trollius as asyncio
-    except ImportError:
-        asyncio = None
-
-    def run_once():
-        '''
-        copied from asyncio.testutils because trollius has no
-        "testutils"
-        '''
-        # in Twisted, this method is a no-op
-        if asyncio is None:
-            return
-
-        # just like modern asyncio.testutils.run_once does it...
-        loop = asyncio.get_event_loop()
-        loop.stop()
-        loop.run_forever()
-        asyncio.gather(*asyncio.Task.all_tasks())
-
-
-try:
-    # XXX fixme hack better way to detect twisted
-    # (has to work on py3 where asyncio exists always, though)
-    import twisted  # noqa
-
-    def await(_):
-        return
-
-except ImportError:
-    def await(future):
-        asyncio.get_event_loop().run_until_complete(future)
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
deleted file mode 100644
index 237f82b5fc44..000000000000
--- a/dev-python/txaio/txaio-2.7.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
-		dev-python/alabaster[${PYTHON_USEDEP}]
-	)
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
-	)
-"
-
-# py 3.6 upstream bug fixes applied just after the release
-PATCHES=(
-	"${FILESDIR}/txaio-2.7.1.f._result.patch"
-	"${FILESDIR}/txaio-2.7.1.chained-callback.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-	# Take out failing tests known to pass when run manually
-	# we certainly don't need to test "python setup.py sdist" here
-	rm "${S}/test/test_packaging.py" || die
-}
-
-python_prepare() {
-	# https://github.com/tavendo/txaio/issues/3
-	cp -r "${FILESDIR}"/util.py test || die
-
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 62b4cbab2dc1..2ecf87e168a7 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -16,10 +16,6 @@ KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
-"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]