gentoo resync : 05.12.2021

4 files changed, 123 insertions, 0 deletions

diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 04e880c7f752..cdd710fddf1c 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,5 +1,8 @@
 AUX ioflo-1.7.8-network-test.patch 1090 BLAKE2B 37e6125a3d26b902e3938efe49162c6e9e1beece8960fe035255e79673bd8920f3ca5dee90595accd8dc8883f63727985060e3f8c3d357333065ef1b738b62fa SHA512 76ebc002679a656b21e0e8adbfa46552172392c691db1a39320320a9b0e1261a1bb0fa9058bac0063027b3b56bffa9bfcb1d8dc0b37d232971209123d2ff8aca
+AUX ioflo-2.0.2-py310.patch 2520 BLAKE2B fbb1b8b5d1d2d135abb21f7f2ff094d4c85bf4d8c005981356b13cca2860230542ab6b3c12f553feb84415be901c2a4660847561854cb6c86edb3a2c31ca84d2 SHA512 0917a402063453e5cbadf3cc830d0ec986c1abb7222af1a60aedd45264ed8a06eef6e27ff20ee6f9575752bcf5a18282518ed6368b3b0b7137108e4084718f7f
 AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5ba2b21d5fdb95c7754745fc2cf41f18640d4c79f5e1037fc0d4ca016c7dac062567aa8662b0e41e702e4dd0a94931 SHA512 b588703d653848401fb8e13be949f6de4ff41143eae669ccdcae8edaaac1883be0a684112dacfdf11fa3f2842dbde0dce2b47a7680cb87761d30ffa4018569e8
+AUX ioflo-2.0.2-tests.patch 1059 BLAKE2B a093cf0db0e00c4f06f0eeda76acee4515951e0dca1a77688e2cd4ccc33a3b10402228d76aa25f787cbfa8771d12f0613fe62e5fa38e09b6d8238870c2b25951 SHA512 5642963e6c29941c2803c6833d229b9fab62f60e7534fb6bfd7a101746eff1704dcfe3bdbbc72bfb466317562d995ede5a70a8ffc83ae9e76ab2d9c01bcab349
 DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
+EBUILD ioflo-2.0.2-r1.ebuild 965 BLAKE2B 5ce6e737d9e0aba2c3a34e984e4d5fc342df9c1bd18a3c72413f4ec9f089606f61058b438290f4d11e264c0ffd775c13a567f00e7cf46095342e4a5657d42be1 SHA512 b775f411cbf0770aa8b77f78c8260a49b03e1e0d27988dbb264307db9080f129f0600e0bc7a1689685a2f177ba87c3c55a679a74fe590d65f7fdfd1b9ee699dd
 EBUILD ioflo-2.0.2.ebuild 883 BLAKE2B 6e5a60293a28646691a128428622f66e5b3720d59d5393627e0c61cce95b154c136f8614db8eecc77f025381fc9647f1917fcedb06966a3b17e98df72fa1ac72 SHA512 4ffb6a13d7417ac6ab6dedf900c288aaf2933e7ac047b78ce6566222de2ef023d76353e64cb11d62ee0b070746408a6e27b24ef14b993aabc6f5ef969875e268
 MISC metadata.xml 494 BLAKE2B dc398c0ee508c0c1cf9ee17712efcbf7f994ed053416da6bdd236fe80402b80ce251272824bebbdcc7ea79cf98b6b5dd812de11fca55eb625bf19e5cf93228e3 SHA512 7364c6b7a37dd8ed762fc7d609e71ff93cd3321f6f94f88d795bd0a3082749571644cbdfd3c9d63a916249122fdfb47ff5377907159782ddf5744c5ea4a13f39
diff --git a/dev-python/ioflo/files/ioflo-2.0.2-py310.patch b/dev-python/ioflo/files/ioflo-2.0.2-py310.patch
new file mode 100644
index 000000000000..7effeeb57811
--- /dev/null
+++ b/dev-python/ioflo/files/ioflo-2.0.2-py310.patch
@@ -0,0 +1,51 @@
+commit 2961d846dd250334b8fc52c2ef4c00ebc36ed510
+Author: Felix Yan <felixonmars@archlinux.org>
+Date:   Fri Nov 20 04:42:02 2020 +0800
+
+    Fix compatibility with Python 3.9
+    
+    json.loads() removed encoding parameter
+    (https://bugs.python.org/issue39377)
+    It was a no-op since 3.1.
+
+diff --git a/ioflo/aio/http/clienting.py b/ioflo/aio/http/clienting.py
+index 11132e3..967570e 100644
+--- a/ioflo/aio/http/clienting.py
++++ b/ioflo/aio/http/clienting.py
+@@ -268,13 +268,13 @@ class Requester(object):
+                                          '\r\n{2}'.format(boundary, key, val))
+                     formParts.append('\r\n--{0}--'.format(boundary))
+                     form = "".join(formParts)
+-                    body = form.encode(encoding='utf-8')
++                    body = form.encode('utf-8')
+                     self.headers[u'content-type'] = u'multipart/form-data; boundary={0}'.format(boundary)
+                 else:
+                     formParts = [u"{0}={1}".format(key, val) for key, val in self.fargs.items()]
+                     form = u'&'.join(formParts)
+                     form = quote_plus(form, '&=')
+-                    body = form.encode(encoding='utf-8')
++                    body = form.encode('utf-8')
+                     self.headers[u'content-type'] = u'application/x-www-form-urlencoded; charset=utf-8'
+             else:  # body last in precendence
+                 body = self.body
+diff --git a/ioflo/aio/http/httping.py b/ioflo/aio/http/httping.py
+index ba604e7..a22cc84 100644
+--- a/ioflo/aio/http/httping.py
++++ b/ioflo/aio/http/httping.py
+@@ -746,7 +746,7 @@ class EventSource(object):
+                 if edata:  # data so dispatch event by appending to .events
+                     if self.dictable:
+                         try:
+-                            ejson = json.loads(edata, encoding='utf-8', object_pairs_hook=odict)
++                            ejson = json.loads(edata, object_pairs_hook=odict)
+                         except ValueError as ex:
+                             ejson = None
+                         else:  # valid json set edata to ejson
+@@ -1058,7 +1058,6 @@ class Parsent(object):
+         if self.jsoned or self.dictable:  # attempt to deserialize json
+             try:
+                 self.data = json.loads(self.body.decode('utf-8'),
+-                                       encoding='utf-8',
+                                        object_pairs_hook=odict)
+             except ValueError as ex:
+                 self.data = None
diff --git a/dev-python/ioflo/files/ioflo-2.0.2-tests.patch b/dev-python/ioflo/files/ioflo-2.0.2-tests.patch
new file mode 100644
index 000000000000..6003cb374f0d
--- /dev/null
+++ b/dev-python/ioflo/files/ioflo-2.0.2-tests.patch
@@ -0,0 +1,29 @@
+diff --git a/ioflo/aio/tcp/test/test_tcping.py b/ioflo/aio/tcp/test/test_tcping.py
+index f78d43f..ea9cc26 100644
+--- a/ioflo/aio/tcp/test/test_tcping.py
++++ b/ioflo/aio/tcp/test/test_tcping.py
+@@ -12,6 +12,8 @@ import shutil
+ import socket
+ import errno
+ 
++import pytest
++
+ from ioflo.aid.sixing import *
+ from ioflo.aid.consoling import getConsole
+ from ioflo.aio import wiring
+@@ -966,6 +968,7 @@ class BasicTestCase(unittest.TestCase):
+         wireLogBeta.close()
+         console.reinit(verbosity=console.Wordage.concise)
+ 
++    @pytest.mark.skip("Broken on modern python versions")
+     def testTLSConnectionVerifyNeither(self):
+         """
+         Test TLS client server connection with neither verify certs
+@@ -1490,6 +1493,7 @@ class BasicTestCase(unittest.TestCase):
+         wireLogBeta.close()
+         console.reinit(verbosity=console.Wordage.concise)
+ 
++    @pytest.mark.skip("Broken on modern python versions")
+     def testTLSConnectionVerifyBothTLSv1(self):
+         """
+         Test TLS client server connection with neither verify certs
diff --git a/dev-python/ioflo/ioflo-2.0.2-r1.ebuild b/dev-python/ioflo/ioflo-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..4042046fb8bf
--- /dev/null
+++ b/dev-python/ioflo/ioflo-2.0.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
+HOMEPAGE="https://github.com/ioflo/ioflo/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-lang/python-3.7.4' python3_7)
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
+		app-admin/salt[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/ioflo-1.7.8-network-test.patch"
+	"${FILESDIR}/ioflo-2.0.2-python39.patch"
+	"${FILESDIR}/ioflo-2.0.2-tests.patch"
+	"${FILESDIR}/ioflo-2.0.2-py310.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's:"setuptools_git[^"]*",::' -i setup.py || die
+	distutils-r1_python_prepare_all
+}