Updating liguros repo

20 files changed, 160 insertions, 134 deletions

diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
deleted file mode 100644
index 78c35159489d..000000000000
--- a/dev-python/backports/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
diff --git a/dev-python/backports/backports-1.0-r1.ebuild b/dev-python/backports/backports-1.0-r1.ebuild
deleted file mode 100644
index 5463fef13085..000000000000
--- a/dev-python/backports/backports-1.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Namespace for backported Python features"
-HOMEPAGE="https://pypi.org/project/backports/"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/backports/metadata.xml b/dev-python/backports/metadata.xml
deleted file mode 100644
index 692a7394d59d..000000000000
--- a/dev-python/backports/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">backports</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
index 8fea7dc4dc70..cb6732d40366 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/namespace-jaraco/metadata.xml b/dev-python/namespace-jaraco/metadata.xml
deleted file mode 100644
index 718957b24a69..000000000000
--- a/dev-python/namespace-jaraco/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sbraz@gentoo.org</email>
-		<name>Louis Sautier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
deleted file mode 100644
index 13a2e205ebea..000000000000
--- a/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for jaraco"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="
-	!<dev-python/jaraco-packaging-5.1
-	${PYTHON_DEPS}
-"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/jaraco || die
-	cat > "${S}"/jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule jaraco
-}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 747f365ba246..78116ca24c80 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,4 @@
 DIST pyglet-1.5.10.tar.gz 6417209 BLAKE2B 2c413c111ce3d016ca23186e92b17cb6f67bb904d90ca241eb0f95372a0a9ff8915014f31294a6609e2f35072cb963b6998d791157ede2e2bf01175edeb91582 SHA512 02b3859f2805f703997d7799e324e7debe9375f6c0df211ceff2f750aa7dbbad61b6ece55fbfec111e4f47f0ee6a71881fd73a47bef794a437615ecb42d0f411
 DIST pyglet-1.5.11.tar.gz 6414606 BLAKE2B bc39a611b10a6397f31ce402d0f4be17093e5c37fdbd6bb419156cc00929fd951cfc8e309a0c2a557afba9c567f203956c6ac7fdd1c677d4a5c199c1633e86e4 SHA512 4121fcd45c8d7f500e2bcbaf85e30e39d44b9de165a818455c006964787ad9dcdbb1a670ca72e149a3574ec7c18f113166190acca9a2dec4bef4b5fde856e129
+DIST pyglet-1.5.13.tar.gz 6415241 BLAKE2B 784e387072ea7260c5fc3f0c78869e62d42a68b7ca1208318af3dad77d64d6ca8d12b03c040ce1dca8430cbab31f218c2a1782ccfcaaf3637203e1e9638488b8 SHA512 05863b187653cb82d7727d7d33a65d9907030ac97d926d6dac01301817159c31d4a301570f41ad8e2af9e0509f67008b876e7f3460f31c6d58d5548179cba4ea
 DIST pyglet-1.5.7.tar.gz 6367378 BLAKE2B 68d4aa673a7463f7da0f4ccb7f413b602f32ecc423438326fc4262a4449fe22dff25a513074611ce2c77c130dfe9cc29e44e54a95169875208731f70803f1a45 SHA512 2c2a06636b1db788241028d1ef2290a774b98721ccc92ceed2b2895bcee81d4aa72b2111896091b54531936513772505b0d43003e412735d606130ed4b08f8c9
diff --git a/dev-python/pyglet/pyglet-1.5.13.ebuild b/dev-python/pyglet/pyglet-1.5.13.ebuild
new file mode 100644
index 000000000000..ed04cc5b8864
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.13.ebuild
@@ -0,0 +1,62 @@
+# 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} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="https://www.pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyparted/pyparted-3.11.7.ebuild b/dev-python/pyparted/pyparted-3.11.7.ebuild
index a1868e3f5065..b3812a0c3358 100644
--- a/dev-python/pyparted/pyparted-3.11.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dcantrell/pyparted/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
 
 DEPEND="
 	>=sys-block/parted-3.2
diff --git a/dev-python/pytaglib/pytaglib-1.4.6.ebuild b/dev-python/pytaglib/pytaglib-1.4.6.ebuild
index b5fcd98a07b5..22ac188210ad 100644
--- a/dev-python/pytaglib/pytaglib-1.4.6.ebuild
+++ b/dev-python/pytaglib/pytaglib-1.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/supermihi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/taglib"
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
deleted file mode 100644
index 907bbab5b20e..000000000000
--- a/dev-python/pytest-catchlog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pytest-catchlog-1.2.2.zip 18028 BLAKE2B aecc020f34010f20ada7a65b069b5f6de79de301dffd765a0f395127582a90e7913057332a760de38e20f273f0b1ff6dd5afb39f5b3ee1d1e2f2f1e4187eb252 SHA512 bbeeb7213898844a7956712992ddaca1e28c52fc5712339b9730f181a124af5ec90b5460981066638658246da4321840a7583ee14eec7c0482e069e2a824d031
diff --git a/dev-python/pytest-catchlog/metadata.xml b/dev-python/pytest-catchlog/metadata.xml
deleted file mode 100644
index 914300ba599d..000000000000
--- a/dev-python/pytest-catchlog/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pytest-catchlog</remote-id>
-		<remote-id type="github">eisensheng/pytest-catchlog</remote-id>
-	</upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
deleted file mode 100644
index f325c910ead8..000000000000
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to catch log messages, fork of pytest-capturelog"
-HOMEPAGE="https://pypi.org/project/pytest-catchlog/ https://github.com/eisensheng/pytest-catchlog"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		${COMMON_DEPEND}
-		>=dev-python/pytest-2.7.1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!dev-python/pytest-capturelog"
-
-python_test() {
-	PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_pytest_catchlog.py || die
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..0463a9278ea5
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-2.2.0-r1.ebuild
@@ -0,0 +1,37 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# pytest-xdist >= 2 fails with pytest < 6
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-services-conflict.patch
+)
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/secretstorage/secretstorage-3.3.0.ebuild b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
index 137fe9e39920..4fa986130d51 100644
--- a/dev-python/secretstorage/secretstorage-3.3.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index fb2025ef6db9..61589a5eb2fc 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1 +1,2 @@
 DIST spyder-kernels-1.10.0-gh.tar.gz 77416 BLAKE2B 0d3e3f8228d2a76174e8d7c64a55c9fda384961065673b1b6b64591f476e8932c5dc3fe253b67d94135688b8d346828f88800bdc3bb0b83450d51669218f98b3 SHA512 59a66d9f6c9b53a2cb058e1c493535ee18c3965a62d6ff728cc0f9544c35fbdf56f18024c778c242802f961259231e153cdcd98c867bec84a80ca3541dbcf455
+DIST spyder-kernels-1.10.1-gh.tar.gz 78055 BLAKE2B 51b087d44ef91bc79b10edb12054a2dd6d950b43f39f783f91be4a7681d40c1aa777514517d3b8e9de6fa8c03dbd23ec7a0c46dd9901102bcd06107af51f960d SHA512 f7504691143aff043e39bcab479d1aa76e5814670e081472dde719936f840b3f5e7812575fd829b34301ccdf7f1cd32afb705d37ee452f3e3a691e12bb57965a
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
index 08900078c038..bd2fd3e59372 100644
--- a/dev-python/spyder-kernels/metadata.xml
+++ b/dev-python/spyder-kernels/metadata.xml
@@ -13,5 +13,9 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
new file mode 100644
index 000000000000..9894ffa10087
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.10.1.ebuild
@@ -0,0 +1,47 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# requires dask[distributed] while we last-rited distributed
+	sed -i -e 's:test_dask_multiprocessing:_&:' \
+				spyder_kernels/console/tests/test_console_kernel.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
index c4e7a7e3d49d..a56745df0223 100644
--- a/dev-python/sudsds/metadata.xml
+++ b/dev-python/sudsds/metadata.xml
@@ -8,5 +8,5 @@
 	<longdescription lang="en">
 		A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
 	</longdescription>
-	<origin>calculatelinux-overlay</origin>
+	<origin>kit-fixups</origin>
 </pkgmetadata>
diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
index ac0d6b9c7860..054a9f5306c4 100644
--- a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
+++ b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9,10} )
 
@@ -17,4 +17,4 @@ KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND=""