Updating liguros repo

6 files changed, 32 insertions, 20 deletions

diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index 429a474b0880..2e0cf8f0742b 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1 +1 @@
-DIST metakernel-0.20.4.tar.gz 67895 BLAKE2B 17cbb8238eb092a9f31616e83ce638a921f84dced9ee7ed896d2470b6c1d1424e2b165da386cc997647f83bf0da02ddfabc3b74bf2fade1d312124906a2dda2d SHA512 8ab2943a93e61bfca276607adac5e619c407a2356656424d261eb520002bf582469f71329a3b2b2fcc290b21a4dffd724f5b73697c6853b5cb74eec07e26ede3
+DIST metakernel-0.25.0.tar.gz 182808 BLAKE2B 40fbd44109e3b9e88fa8065138e7ffe3b42320651c1731249a10c443a456a5eaa5c91110fcc223f1d557aaa1acfee670a3a36dacf78e6bc9b2ecba0e39f7cc21 SHA512 89a46d3b746a0f4c435dcbeefdb485257c2813790849f95bc0508fee7c2a892e688fdbe2dc9db5f2a0c69ed4917e8de81753492e686337d5e1ab692e9e51ea5a
diff --git a/dev-python/metakernel/files/metakernel-0.25.0-disable-brittle-tests.patch b/dev-python/metakernel/files/metakernel-0.25.0-disable-brittle-tests.patch
new file mode 100644
index 000000000000..673a96e22af3
--- /dev/null
+++ b/dev-python/metakernel/files/metakernel-0.25.0-disable-brittle-tests.patch
@@ -0,0 +1,23 @@
+--- a/metakernel/magics/tests/test_parallel_magic.py
++++ b/metakernel/magics/tests/test_parallel_magic.py
+@@ -2,7 +2,9 @@
+ from metakernel.tests.utils import get_kernel, get_log_text, EvalKernel
+ import os
+ import time
++import pytest
+ 
++@pytest.mark.skip(reason="requires starting an ipycluster")
+ def test_parallel_magic():
+     kernel = get_kernel(EvalKernel)
+     # start up an EvalKernel on each node:
+--- a/metakernel/tests/test_parser.py
++++ b/metakernel/tests/test_parser.py
+@@ -41,8 +41,6 @@
+     if not os.name == 'nt':
+         code = '/usr/bi'
+         assert 'bin/' in p.parse_code(code)['path_matches']
+-    code = '~/.bashr'
+-    assert 'bashrc' in p.parse_code(code)['path_matches']
+ 
+     for f in os.listdir('.'):
+         if f.startswith('.'):
diff --git a/dev-python/metakernel/metakernel-0.20.4.ebuild b/dev-python/metakernel/metakernel-0.25.0.ebuild
index de828aa2b366..841d5a6bca94 100644
--- a/dev-python/metakernel/metakernel-0.20.4.ebuild
+++ b/dev-python/metakernel/metakernel-0.25.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
@@ -13,20 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-"
+	dev-python/pexpect[${PYTHON_USEDEP}]"
 
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-"
+distutils_enable_tests pytest
 
-python_test() {
-	nosetests -v || die
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.25.0-disable-brittle-tests.patch )
diff --git a/dev-python/octave_kernel/Manifest b/dev-python/octave_kernel/Manifest
index 761ede358bfe..376a1f3e8020 100644
--- a/dev-python/octave_kernel/Manifest
+++ b/dev-python/octave_kernel/Manifest
@@ -1 +1 @@
-DIST octave_kernel-0.26.2.tar.gz 11152 BLAKE2B 8331bb595a2e95c8bd1ba2975d45cb65a3cf417bf56c21ee7dc0c0d1e25bd45c51ea6c317f72bd868fe8b401ecb20b862037bbe8ef7cadd44569c17089504415 SHA512 95072ea3e0f74c57e71ef51c3c2050be9c739693bbee22fc5fa63e24fd639daf1bcf4f3a8b5be499de2e4e723bedc8d1f59237ffc1a17ad634a519c96cdde34f
+DIST octave_kernel-0.32.0.tar.gz 27353 BLAKE2B da8ddb0c50c65937b4c2b803b6ecc6c5627b3044597ad21377fae9aca5e0ad4bddb6ba65dea77606741c51e435d55c83770d7442de66874c2124f63fda333ac3 SHA512 de8293bed51aca9fe16c2969a467916c90c0c900c5818d48368cd4307bc2b5f0a925f85a0c824c4789d48f72bc31fd7cb341486e70c87a0ca6bc61c799da0ab9
diff --git a/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild b/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild
index 34da97cf38bd..cf9d55d833bf 100644
--- a/dev-python/octave_kernel/octave_kernel-0.26.2.ebuild
+++ b/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
@@ -14,12 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/metakernel[${PYTHON_USEDEP}]
-	sci-mathematics/octave
-"
+	>=dev-python/metakernel-0.24.0[${PYTHON_USEDEP}]
+	sci-mathematics/octave"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 417e9765f534..4ece3fe2d8bb 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,2 +1 @@
-DIST pyenchant-2.0.0.tar.gz 64022 BLAKE2B ee1200ded8e2a8f9145fece64cee1c8ea3129d540e10708d51acf6491c200a0f39927b47fce51d2e2f932e465d7acd5bb4afd31712183530f6da5e8ea899c0c7 SHA512 c985714bc8ad69b6580fa1dd546243da5f3f92e8681d846ed265b086c486ae7ed33754fba303b450be4c0cb20e975a9a10efbeb700ea5213a11ed00612a93af0
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de