Updating liguros repo

9 files changed, 46 insertions, 266 deletions

diff --git a/dev-python/errorhandler/files/errorhandler-2.0.1-no-intersphinx.patch b/dev-python/errorhandler/files/errorhandler-2.0.1-no-intersphinx.patch
deleted file mode 100644
index d37e190fb6ed..000000000000
--- a/dev-python/errorhandler/files/errorhandler-2.0.1-no-intersphinx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/docs/conf.py b/docs/conf.py
-index 2c71c44..0e6f0ae 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -5,7 +5,6 @@ pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__),'..'))
- 
- extensions = [
-     'sphinx.ext.autodoc',
--    'sphinx.ext.intersphinx'
-     ]
- 
- intersphinx_mapping = {'http://docs.python.org/dev': None}
diff --git a/dev-python/fcl/fcl-0.0.12.ebuild b/dev-python/fcl/fcl-0.0.12-r1.ebuild
index 7db2c6311838..4448f901e7bb 100644
--- a/dev-python/fcl/fcl-0.0.12.ebuild
+++ b/dev-python/fcl/fcl-0.0.12-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD"
 
 KEYWORDS="~amd64"
 SLOT="0"
-IUSE="examples"
+IUSE=""
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
@@ -27,16 +27,9 @@ RDEPEND="
 
 S=${WORKDIR}/${MY_P}
 
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r example
-	fi
+PATCHES=( "${FILESDIR}"/${P}-fix-compiling-on-lld.patch )
 
-	distutils-r1_python_install_all
-}
+distutils_enable_tests unittest
 
 python_test() {
 	"${EPYTHON}" test/test_fcl.py -v || die "tests failed with ${EPYTHON}"
diff --git a/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch b/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch
new file mode 100644
index 000000000000..0e3cf7a54196
--- /dev/null
+++ b/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch
@@ -0,0 +1,12 @@
+--- a/setup.py
++++ b/setup.py
+@@ -21,8 +21,7 @@
+         include_dirs = ['/usr/include',
+                         '/usr/local/include',
+                         '/usr/include/eigen3']
+-        lib_dirs = ['/usr/lib',
+-                    '/usr/local/lib']
++        lib_dirs = ['/usr/local/lib']
+         
+         if 'CPATH' in os.environ:
+             include_dirs += os.environ['CPATH'].split(':')
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index afe555d50715..837989d96cfa 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1 +1,2 @@
 DIST humanize-3.1.0.tar.gz 54352 BLAKE2B 0e25f4f7f01244f5b24a33c54546c2b2d82e0e069d2cabbe67ff0e5f8e2bc9d3aa2eb7f4d63d4a01dc8ff4ddcfee030b33015ede00d769dfafccb6c2af95171a SHA512 71cb2766a791481f4dc5e02b77357e8e4e7332e533ee055a207cf145f2b2f9041c5bc4ce25f061f0cc1498f37edbc6243f63b888a322c0cf19e5216e120542dc
+DIST humanize-3.2.0.tar.gz 53976 BLAKE2B 2e9347418ffa103c6a66583136aa0c79bce669b48fcbc01bf482ba16659af14d4b4a88e78167e8013a8ede6467ed7b7f5eea8f46ed4234294a79b0c63fabd17c SHA512 448919e762e0ecc95f5a7158e0dd8bc028d173ee236be8e15fd0283741af037af1bcdc671ed83b0c16c1998dc0a70debf11cb1c349085530e458bc7aa2f6dde4
diff --git a/dev-python/humanize/humanize-3.2.0.ebuild b/dev-python/humanize/humanize-3.2.0.ebuild
new file mode 100644
index 000000000000..f7c2754b14a7
--- /dev/null
+++ b/dev-python/humanize/humanize-3.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# The package uses pkg_resources to determine its version
+	distutils_install_for_testing --via-root
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/libnacl/files/libnacl-1.7.1-py39.patch b/dev-python/libnacl/files/libnacl-1.7.1-py39.patch
deleted file mode 100644
index 62fc1e30258d..000000000000
--- a/dev-python/libnacl/files/libnacl-1.7.1-py39.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 53c1576b21b53156fc30d357b40c88c7eefb50de
-Author: Karthikeyan Singaravelan <tir.karthi@gmail.com>
-Date:   Thu Jan 30 22:22:58 2020 +0530
-
-    Remove encoding parameter json.loads for Python 3.9 compatibility.
-
-diff --git a/libnacl/utils.py b/libnacl/utils.py
-index 412d518..e06e078 100644
---- a/libnacl/utils.py
-+++ b/libnacl/utils.py
-@@ -1,6 +1,7 @@
- # -*- coding: utf-8 -*-
- 
- import struct
-+import sys
- import time
- 
- # Import nacl libs
-@@ -31,7 +32,10 @@ def load_key(path_or_file, serial='json'):
-             key_data = msgpack.load(stream)
-         elif serial == 'json':
-             import json
--            key_data = json.loads(stream.read(), encoding='UTF-8')
-+            if sys.version_info[0] >= 3:
-+                key_data = json.loads(stream.read())
-+            else:
-+                key_data = json.loads(stream.read(), encoding='UTF-8')
-     finally:
-         if stream != path_or_file:
-             stream.close()
-@@ -95,4 +99,3 @@ def time_nonce():
-     '''
-     nonce = rand_nonce()
-     return (struct.pack('=d', time.time()) + nonce)[:len(nonce)]
--
diff --git a/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch b/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch
deleted file mode 100644
index be94fe028755..000000000000
--- a/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c2904eac1a6daf8a3aaef6af0791b101e1971544 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 7 Oct 2020 15:01:07 +0200
-Subject: [PATCH] Update tests for pygments-2.7.1
-
-Closes #1030
----
- .../extensions/test_code_hilite.py            | 22 +++++++++----------
- .../extensions/test_fenced_code.py            |  2 +-
- tox.ini                                       |  2 +-
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/tests/test_syntax/extensions/test_code_hilite.py b/tests/test_syntax/extensions/test_code_hilite.py
-index 8d5512d..3e36ae5 100644
---- a/tests/test_syntax/extensions/test_code_hilite.py
-+++ b/tests/test_syntax/extensions/test_code_hilite.py
-@@ -205,7 +205,7 @@ class TestCodeHiliteClass(TestCase):
-     def test_codehilite_linenos_inline(self):
-         if has_pygments:
-             expected = (
--                '<div class="codehilite"><pre><span></span><code><span class="lineno">1 </span>plain text\n'
-+                '<div class="codehilite"><pre><span></span><code><span class="linenos">1</span>plain text\n'
-                 '</code></pre></div>'
-             )
-         else:
-@@ -259,7 +259,7 @@ class TestCodeHiliteClass(TestCase):
-     def test_codehilite_linenostart(self):
-         if has_pygments:
-             expected = (
--                '<div class="codehilite"><pre><span></span><code><span class="lineno">42 </span>plain text\n'
-+                '<div class="codehilite"><pre><span></span><code><span class="linenos">42</span>plain text\n'
-                 '</code></pre></div>'
-             )
-         else:
-@@ -274,9 +274,9 @@ class TestCodeHiliteClass(TestCase):
-         if has_pygments:
-             expected = (
-                 '<div class="codehilite"><pre><span></span><code>'
--                '<span class="lineno">1 </span><span class="hll">line 1\n'
--                '</span><span class="lineno">2 </span>line 2\n'
--                '<span class="lineno">3 </span><span class="hll">line 3\n'
-+                '<span class="linenos">1</span><span class="hll">line 1\n'
-+                '</span><span class="linenos">2</span>line 2\n'
-+                '<span class="linenos">3</span><span class="hll">line 3\n'
-                 '</span></code></pre></div>'
-             )
-         else:
-@@ -291,9 +291,9 @@ class TestCodeHiliteClass(TestCase):
-     def test_codehilite_linenos_linenostep(self):
-         if has_pygments:
-             expected = (
--                '<div class="codehilite"><pre><span></span><code><span class="lineno">  </span>line 1\n'
--                '<span class="lineno">2 </span>line 2\n'
--                '<span class="lineno">  </span>line 3\n'
-+                '<div class="codehilite"><pre><span></span><code><span class="linenos"> </span>line 1\n'
-+                '<span class="linenos">2</span>line 2\n'
-+                '<span class="linenos"> </span>line 3\n'
-                 '</code></pre></div>'
-             )
-         else:
-@@ -308,9 +308,9 @@ class TestCodeHiliteClass(TestCase):
-     def test_codehilite_linenos_linenospecial(self):
-         if has_pygments:
-             expected = (
--                '<div class="codehilite"><pre><span></span><code><span class="lineno">1 </span>line 1\n'
--                '<span class="lineno special">2 </span>line 2\n'
--                '<span class="lineno">3 </span>line 3\n'
-+                '<div class="codehilite"><pre><span></span><code><span class="linenos">1</span>line 1\n'
-+                '<span class="linenos special">2</span>line 2\n'
-+                '<span class="linenos">3</span>line 3\n'
-                 '</code></pre></div>'
-             )
-         else:
-diff --git a/tests/test_syntax/extensions/test_fenced_code.py b/tests/test_syntax/extensions/test_fenced_code.py
-index e5de0b7..8fa75f7 100644
---- a/tests/test_syntax/extensions/test_fenced_code.py
-+++ b/tests/test_syntax/extensions/test_fenced_code.py
-@@ -629,7 +629,7 @@ class TestFencedCode(TestCase):
-         if self.has_pygments:
-             expected = (
-                 '<div class="python codehilite" style="background: #f8f8f8">'
--                '<pre style="line-height: 125%"><span></span><code>'
-+                '<pre style="line-height: 125%; margin: 0;"><span></span><code>'
-                 '<span style="color: #408080; font-style: italic"># Some python code</span>\n'
-                 '</code></pre></div>'
-             )
--- 
-2.28.0
-
diff --git a/dev-python/spyder/files/spyder-4.1.2-py3-only.patch b/dev-python/spyder/files/spyder-4.1.2-py3-only.patch
deleted file mode 100644
index afdc92a1e122..000000000000
--- a/dev-python/spyder/files/spyder-4.1.2-py3-only.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2d5d58b..4adc952 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,13 +31,6 @@ import shutil
- from distutils.core import setup
- from distutils.command.install_data import install_data
- 
--
--#==============================================================================
--# Check for Python 3
--#==============================================================================
--PY3 = sys.version_info[0] == 3
--
--
- #==============================================================================
- # Minimal Python version sanity check
- # Taken from the notebook setup.py -- Modified BSD License
-@@ -87,13 +80,8 @@ def get_subpackages(name):
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
--                          ('share/icons', ['img_src/spyder.png'])]
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-+                      ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-                                    'img_src/spyder_reset.ico'])]
-@@ -131,9 +119,7 @@ CMDCLASS = {'install_data': MyInstallData}
- # See spyder-ide/spyder#1158.
- SCRIPTS = ['%s_win_post_install.py' % NAME]
- 
--if PY3 and sys.platform.startswith('linux'):
--    SCRIPTS.append('spyder3')
--else:
-+if sys.platform.startswith('linux'):
-     SCRIPTS.append('spyder')
- 
- if os.name == 'nt':
-@@ -269,8 +255,7 @@ if 'setuptools' in sys.modules:
- 
-     setup_args['entry_points'] = {
-         'gui_scripts': [
--            '{} = spyder.app.start:main'.format(
--                'spyder3' if PY3 else 'spyder')
-+            '{} = spyder.app.start:main'.format('spyder')
-         ]
-     }
- 
diff --git a/dev-python/urllib3/files/urllib3-1.26.2-brotlicffi.patch b/dev-python/urllib3/files/urllib3-1.26.2-brotlicffi.patch
deleted file mode 100644
index b7cbf9bb7e9e..000000000000
--- a/dev-python/urllib3/files/urllib3-1.26.2-brotlicffi.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 14bcf7004a143f7a6fb2df9a48196a113d531f50 Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <sethmichaellarson@gmail.com>
-Date: Tue, 1 Dec 2020 20:09:32 -0600
-Subject: [PATCH] Switch to Brotli C bindings for CPython, brotlicffi for
- non-CPython
-
----
- setup.cfg                   | 3 ++-
- setup.py                    | 5 ++++-
- src/urllib3/response.py     | 5 ++++-
- src/urllib3/util/request.py | 5 ++++-
- 7 files changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/setup.cfg b/setup.cfg
-index 90b79d8c5..31a465b58 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -15,7 +15,7 @@ requires-dist =
-     idna>=2.0.0; extra == 'secure'
-     certifi; extra == 'secure'
-     PySocks>=1.5.6,<2.0,!=1.5.7; extra == 'socks'
--    brotlipy>=0.6.0; extra == 'brotli'
-+    brotlicffi>=0.8.0; extra == 'brotli'
- 
- [tool:pytest]
- xfail_strict = true
-diff --git a/setup.py b/setup.py
-index 2d449b095..02071aa58 100755
---- a/setup.py
-+++ b/setup.py
-@@ -109,7 +109,7 @@
-     requires=[],
-     python_requires=">=3.6, <4",
-     extras_require={
--        "brotli": ["brotlipy>=0.6.0"],
-+        "brotli": ["brotlicffi>=0.8.0"],
-         "secure": [
-             "pyOpenSSL>=0.14",
-             "cryptography>=1.3.4",
-diff --git a/src/urllib3/response.py b/src/urllib3/response.py
-index 77b6ffc16..d277120ee 100644
---- a/src/urllib3/response.py
-+++ b/src/urllib3/response.py
-@@ -7,7 +7,7 @@
- from socket import timeout as SocketTimeout
- 
- try:
--    import brotli
-+    import brotlicffi as brotli
- except ImportError:
-     brotli = None
- 
-diff --git a/src/urllib3/util/request.py b/src/urllib3/util/request.py
-index 6cbdad9b4..64d40641d 100644
---- a/src/urllib3/util/request.py
-+++ b/src/urllib3/util/request.py
-@@ -11,7 +11,7 @@
- 
- ACCEPT_ENCODING = "gzip,deflate"
- try:
--    import brotli as _unused_module_brotli  # noqa: F401
-+    import brotlicffi as _unused_module_brotli  # noqa: F401
- except ImportError:
-     pass
- else: