Updating liguros repo

22 files changed, 283 insertions, 109 deletions

diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 283e3260e864..3729d1237281 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1 +1,3 @@
+DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738
+DIST certifi-2020.6.20.tar.gz 157997 BLAKE2B 65a6abde798b533742a2e2ac4e1438f059e55075647e494601b69d8c4c0eb12bb58cb75cd9589c621c8f87576687420e1d9c6a418d79894b17ec0358f8d26437 SHA512 a0f22aec563636c270607ce1a27c9996b09f30cf7601b4ed7d7bc20572c411032134c92645f26962331936035cb7016d79b36680c71b7521e00dd0288827a0dc
 DIST certifi-shim-9999.tar.gz 3762 BLAKE2B 3ea85314e37a989d4894ea5fc89fb138e06c7912277f90466c6edb121c39f33b031bcc08346c4766c99fb193a2d53801aa1e8ef30cfede9a7e8247c7e443faef SHA512 ca2844f1680a019dbb5a440141d8ebaddd7c78ce47a23a48a50d2d857d012f90d74d4200168964787e31f16b1e9d7c981c033ff99f1e3ea1fa73cbbbf255edbd
diff --git a/dev-python/certifi/certifi-2020.4.5.1.ebuild b/dev-python/certifi/certifi-2020.4.5.1.ebuild
new file mode 100644
index 000000000000..186151ad99df
--- /dev/null
+++ b/dev-python/certifi/certifi-2020.4.5.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+
+inherit distutils-r1 prefix readme.gentoo-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="https://certifi.io/ https://pypi.org/project/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-misc/ca-certificates"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Do not drop this patch -- this will affect system's security
+PATCHES=( "${FILESDIR}"/${PN}-2020.4.5.1-use-system-cacerts.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Precaution -- nothing should use bundled CA certificates
+	rm certifi/cacert.pem || die "Failed to delete bundled CA certificates"
+
+	eprefixify certifi/core.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="
+		In Gentoo, we don't use certifi's bundled CA certificates.
+		Instead we remove bundled cacert.pem and patch certifi
+		to return system's CA certificates.
+	"
+	readme.gentoo_create_doc
+}
diff --git a/dev-python/certifi/certifi-2020.6.20.ebuild b/dev-python/certifi/certifi-2020.6.20.ebuild
new file mode 100644
index 000000000000..960332327d63
--- /dev/null
+++ b/dev-python/certifi/certifi-2020.6.20.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+
+inherit distutils-r1 prefix readme.gentoo-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="https://certifi.io/ https://pypi.org/project/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-misc/ca-certificates"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Precaution -- nothing should use bundled CA certificates
+	rm certifi/cacert.pem || die "Failed to delete bundled CA certificates"
+
+	eprefixify certifi/core.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="
+		In Gentoo, we don't use certifi's bundled CA certificates.
+		Instead we remove bundled cacert.pem and patch certifi
+		to return system's CA certificates.
+	"
+	readme.gentoo_create_doc
+}
diff --git a/dev-python/certifi/certifi-9999.ebuild b/dev-python/certifi/certifi-9999.ebuild
index bac3b3e93d4e..614b0aed4b01 100644
--- a/dev-python/certifi/certifi-9999.ebuild
+++ b/dev-python/certifi/certifi-9999.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2020 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
diff --git a/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch b/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch
new file mode 100644
index 000000000000..692439a10eac
--- /dev/null
+++ b/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch
@@ -0,0 +1,30 @@
+From f07497e36ccc883626ae5cdfa7f81fcb3fc0d549 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 5 Apr 2020 23:43:30 +0200
+Subject: [PATCH] Use system's CA certificate store
+
+---
+ certifi/core.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/certifi/core.py b/certifi/core.py
+index 56b52a3..467880f 100644
+--- a/certifi/core.py
++++ b/certifi/core.py
+@@ -21,10 +21,9 @@ except ImportError:
+ 
+ 
+ def where():
+-    f = os.path.dirname(__file__)
+-
+-    return os.path.join(f, "cacert.pem")
++    return "@GENTOO_PORTAGE_EPREFIX@/etc/ssl/certs/ca-certificates.crt"
+ 
+ 
+ def contents():
+-    return read_text("certifi", "cacert.pem", encoding="ascii")
++    with open(where(), "r", encoding="ascii") as f:
++        return f.read()
+-- 
+2.24.1
+
diff --git a/dev-python/certifi/metadata.xml b/dev-python/certifi/metadata.xml
index 1b4eb7952579..384dbf3216b9 100644
--- a/dev-python/certifi/metadata.xml
+++ b/dev-python/certifi/metadata.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
+    <email>dev@liguros.net</email>
+    <name>Development</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">certifi</remote-id>
   </upstream>
-	<origin>gentoo-staging</origin>
+	<origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-python/helpdev/helpdev-0.7.1.ebuild b/dev-python/helpdev/helpdev-0.7.1.ebuild
index 48dabc7184c9..52bb4cf4873e 100644
--- a/dev-python/helpdev/helpdev-0.7.1.ebuild
+++ b/dev-python/helpdev/helpdev-0.7.1.ebuild
@@ -21,5 +21,7 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 "
 
+BDEPEND="test? ( dev-python/pip[${PYTHON_USEDEP}] )"
+
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild
index d6fbde857966..6a0487f714b3 100644
--- a/dev-python/lit/lit-10.0.0.ebuild
+++ b/dev-python/lit/lit-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch b/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch
deleted file mode 100644
index f7cfeae404ad..000000000000
--- a/dev-python/llvmlite/files/llvmlite-0.15.0-use-system-six.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: use packaged six instead of stripped module
-Author: Daniel Stender <debian@danielstender.com>
-Forwarded: not-needed
-Last-Update: 2016-21-06
-
---- a/llvmlite/binding/ffi.py
-+++ b/llvmlite/binding/ffi.py
-@@ -3,7 +3,7 @@ import os
- 
- from .common import _decode_string, _is_shutting_down
- from ..utils import get_library_name
--from ..six import PY2
-+from six import PY2
- 
- 
- def _make_opaque_ref(name):
---- a/llvmlite/ir/values.py
-+++ b/llvmlite/ir/values.py
-@@ -7,7 +7,7 @@ from __future__ import print_function, absolute_import
- 
- import string
- 
--from .. import six
-+import six
- from . import types, _utils
- from ._utils import _StrCaching, _StringReferenceCaching, _HasMetadata
- 
---- a/llvmlite/tests/customize.py
-+++ b/llvmlite/tests/customize.py
-@@ -12,7 +12,7 @@ import unittest
- import warnings
- from unittest import result, runner, signals
- 
--from ..six import StringIO
-+from six import StringIO
- 
- 
- # "unittest.main" is really the TestProgram class!
---- a/llvmlite/tests/test_binding.py
-+++ b/llvmlite/tests/test_binding.py
-@@ -12,7 +12,8 @@ import subprocess
- import sys
- import unittest
- 
--from llvmlite import six, ir
-+from llvmlite import ir
-+import six
- from llvmlite import binding as llvm
- from llvmlite.binding import ffi
- from . import TestCase
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 70883cb9ae0d..e2878553a9ea 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1 +1,2 @@
 DIST PyGreSQL-5.1.tar.gz 642216 BLAKE2B 4f3ff4e59c47d86007884b41355ec5cbc3893ba21e3e5b7a354aab698dde947622ba4b7a1590325ae36f132759e26f37868844c3c21605ead068261129331453 SHA512 d36be0f121c20469193600c551e15b430fdc9e44db00e4ae7adb4985697ddc5653f52fb642b0f3de8316fb916616d07ac1ef03e1e6b20043b7cace131b232a3a
+DIST PyGreSQL-5.2.tar.gz 267557 BLAKE2B 92c2c0810a9b763fc2e9fec2e920ca1e21da4eb4ede5f2e20f66fd385ccc623fd9fe74075c6b995c6ea6348df76dcd723c8e4b6d83afdb53c978c02cc5220e49 SHA512 ce1cd29c714ab863dbdc7dde920f8938b115535ae3a0b54c770d7648f05011a716d604eec2d73c321fe2a408e64bcd9208c204856e5ddb0e0675ef7c076e4da7
diff --git a/dev-python/pygresql/files/pygresql-5.1-CFLAGS.patch b/dev-python/pygresql/files/pygresql-5.1-CFLAGS.patch
new file mode 100644
index 000000000000..480d0a3dc4c1
--- /dev/null
+++ b/dev-python/pygresql/files/pygresql-5.1-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -101,7 +101,7 @@
+ library_dirs = [get_python_lib(), pg_config('libdir')]
+ define_macros = [('PYGRESQL_VERSION', version)]
+ undef_macros = []
+-extra_compile_args = ['-O2', '-funsigned-char', '-Wall', '-Werror']
++extra_compile_args = ['-funsigned-char', '-Wall']
+ 
+ 
+ class build_pg_ext(build_ext):
diff --git a/dev-python/pygresql/files/pygresql-5.2-CFLAGS.patch b/dev-python/pygresql/files/pygresql-5.2-CFLAGS.patch
new file mode 100644
index 000000000000..24b9da21d165
--- /dev/null
+++ b/dev-python/pygresql/files/pygresql-5.2-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -95,7 +95,7 @@
+ library_dirs = [get_python_lib(), pg_config('libdir')]
+ define_macros = [('PYGRESQL_VERSION', version)]
+ undef_macros = []
+-extra_compile_args = ['-O2', '-funsigned-char', '-Wall', '-Wconversion']
++extra_compile_args = ['-funsigned-char', '-Wall']
+ 
+ 
+ class build_pg_ext(build_ext):
diff --git a/dev-python/pygresql/pygresql-5.2.ebuild b/dev-python/pygresql/pygresql-5.2.ebuild
new file mode 100644
index 000000000000..9f157721a12a
--- /dev/null
+++ b/dev-python/pygresql/pygresql-5.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{5..6} {10..12} )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1 postgres
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="https://pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2-CFLAGS.patch
+)
+
+python_install_all() {
+	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 5ce83b0cf452..76387d4b5ce8 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -3,3 +3,4 @@ DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa
 DIST pytest-xdist-1.31.0.tar.gz 66133 BLAKE2B 79fe5f3bcad3421c1c751ffe6e09f0da42d4ff7c0016cb421ffabcab167028ec41ccfb02bbb275564cd74b13ade8d6e79bbb70b34995f3bc9000604a1533df9a SHA512 b7960d20295232b251c8ddcc5a3b9d6e7b761d577ba11c2647b4b4b410ee5c05998cf57fa57208561eb3ea7c4914db1fd446173794589d8c8e8e79ff8e0ad3aa
 DIST pytest-xdist-1.32.0.tar.gz 67733 BLAKE2B da0ce4e43dc8752e4329ddcbc13a5f55f5bc120c13f39bb01916770d2dc1864197fd91f92bc55ba27cd74b0d837ac2d310980874cdf54761339b2cd654dd6e74 SHA512 f159b4653efb4afeff4124df484670d3c672e1014712f948390b25efc53096f8237258c83a5f1a9e688c52b4a756291cb731d37fdfa800707f556550a19cb0e8
 DIST pytest-xdist-1.33.0.tar.gz 65588 BLAKE2B 096ffa9295ec0ef4d390b714b02a4d126aa33475b55591b91375f2da0c957802e007b990dc2051d5198f223b250a4a7294367c9da8f8969313a61a7e8ef18ebd SHA512 5e5b23e60b546779d4bbcc9b86c004bdb084689ba006c8bb8a7db9be60b6080f04a5bb2b1f5b43a5062b82e35493331d1da699d8a36177307280b06aa23a1367
+DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
new file mode 100644
index 000000000000..8595480c01f0
--- /dev/null
+++ b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
@@ -0,0 +1,50 @@
+From bd4e91d12bf6e20538d9b3acfe69536b3badcde5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 31 Jul 2020 20:13:24 +0200
+Subject: [PATCH 1/3] Fix test_config_initialization condition for pytest<5
+
+Fix test_config_initialization to be correctly skipped on pytest<5,
+by explicitly checking pytest version (idea copied from
+test_looponfail_removed_test).  The current conditions are insufficient
+-- the outer check wrongly assumes pytest>=5 will always be used
+on Python 3 (which is not true if you need the same version to support
+both Python 2 and Python 3), and the inner condition apparently
+wrongly assuming that invocation_params attribute is not present
+in pytest-4.
+---
+ testing/acceptance_test.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index 7f9a551..29c5d9a 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -2,6 +2,7 @@ import os
+ import re
+ import sys
+ import textwrap
++from pkg_resources import parse_version
+ 
+ import py
+ import pytest
+@@ -594,15 +595,11 @@ def test_fixture_teardown_failure(testdir):
+ 
+ 
+ @pytest.mark.skipif(
+-    sys.version_info[:2] == (2, 7),
+-    reason="Only available in pytest 5.0+ (Python 3 only)",
++    parse_version(pytest.__version__) < parse_version("5"),
++    reason="Only available in pytest 5.0+",
+ )
+ def test_config_initialization(testdir, monkeypatch, pytestconfig):
+     """Ensure workers and master are initialized consistently. Integration test for #445"""
+-    if not hasattr(pytestconfig, "invocation_params"):
+-        pytest.skip(
+-            "requires pytest >=5.1 (config has no attribute 'invocation_params')"
+-        )
+     testdir.makepyfile(
+         **{
+             "dir_a/test_foo.py": """
+-- 
+2.28.0
+
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
new file mode 100644
index 000000000000..fc678385af58
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest4.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
index 2e031c10132c..fd2c520e477f 100644
--- a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
@@ -21,10 +21,15 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="examples"
 
-RDEPEND=">=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.7[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.7[gui,${PYTHON_USEDEP}]
+"
 
-DEPEND="test? ( dev-python/qtsass[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+	dev-python/qtsass[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.7[gui,testlib,${PYTHON_USEDEP}]
+)"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/m2r
diff --git a/dev-python/qtconsole/qtconsole-4.3.1.ebuild b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
index 61ca56ca84d1..c3980c082143 100644
--- a/dev-python/qtconsole/qtconsole-4.3.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.3.1.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
+HOMEPAGE="https://qtconsole.readthedocs.io"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/qtconsole/qtconsole-4.7.4.ebuild b/dev-python/qtconsole/qtconsole-4.7.4.ebuild
index 8b69c1a1c6c3..1faeeb0c1625 100644
--- a/dev-python/qtconsole/qtconsole-4.7.4.ebuild
+++ b/dev-python/qtconsole/qtconsole-4.7.4.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
+HOMEPAGE="https://qtconsole.readthedocs.io"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ryu/ryu-4.26-r1.ebuild b/dev-python/ryu/ryu-4.26-r1.ebuild
index 8392dc4154ac..b473d89efd4f 100644
--- a/dev-python/ryu/ryu-4.26-r1.ebuild
+++ b/dev-python/ryu/ryu-4.26-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Component-based Software-defined Networking Framework"
-HOMEPAGE="https://osrg.github.io/ryu/"
+HOMEPAGE="https://ryu-sdn.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/simpy/simpy-3.0.13.ebuild b/dev-python/simpy/simpy-3.0.13.ebuild
index c60de8aa110a..bdc566a7af4b 100644
--- a/dev-python/simpy/simpy-3.0.13.ebuild
+++ b/dev-python/simpy/simpy-3.0.13.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 MY_P="${P/simpy/SimPy}"
 
 DESCRIPTION="Object-oriented, process-based discrete-event simulation language"
-HOMEPAGE="https://simpy.readthedocs.org/en/latest/"
+HOMEPAGE="https://simpy.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/wstools/files/wstools-0.4.5-setup.patch b/dev-python/wstools/files/wstools-0.4.5-setup.patch
deleted file mode 100644
index 9de7c159c972..000000000000
--- a/dev-python/wstools/files/wstools-0.4.5-setup.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Avoid pulling in a lot of unnecessary test and setup deps.
-
---- wstools-0.4.5/setup.py
-+++ wstools-0.4.5/setup.py
-@@ -9,7 +9,7 @@
- 
- from setuptools import setup, find_packages, Command
- from setuptools.command.test import test as TestCommand
--from pip.req import parse_requirements
-+#from pip.req import parse_requirements
- 
- NAME = "wstools"
- url = "https://github.com/pycontribs/wstools.git"
-@@ -55,13 +55,13 @@
- 
-     def run_tests(self):
-         # before running tests we need to run autopep8
--        try:
--            subprocess.check_call(
--                "python -m autopep8 -r --in-place wstools/ tests/",
--                shell=True)
--        except subprocess.CalledProcessError:
--            logging.getLogger().warn('autopep8 is not installed so '
--                                     'it will not be run')
-+        # try:
-+        #     subprocess.check_call(
-+        #         "python -m autopep8 -r --in-place wstools/ tests/",
-+        #         shell=True)
-+        # except subprocess.CalledProcessError:
-+        #     logging.getLogger().warn('autopep8 is not installed so '
-+        #                              'it will not be run')
-         # import here, cause outside the eggs aren't loaded
-         import pytest  # noqa
-         errno = pytest.main(self.pytest_args)
-@@ -136,9 +136,9 @@
-     cmdclass={'test': PyTest, 'release': Release, 'prerelease': PreRelease},
-     packages=find_packages(exclude=['tests']),
-     include_package_data=True,
--    tests_require=get_requirements(base_path, 'requirements-dev.txt'),
-+    #tests_require=get_requirements(base_path, 'requirements-dev.txt'),
-     setup_requires=['setuptools'],
--    install_requires=get_requirements(base_path, 'requirements.txt'),
-+    install_requires=['six'],
- 
-     license='BSD',
-     description="WSDL parsing services package for Web Services for Python. see" + url,