Updating liguros repo

12 files changed, 144 insertions, 109 deletions

diff --git a/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild b/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild
index b556cf7bfae7..557b0276ca63 100644
--- a/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild
@@ -19,8 +19,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-distutils_enable_tests setup.py
-
 RDEPEND="
 	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
 	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
@@ -31,3 +29,5 @@ BDEPEND="
 "
 
 S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
index b29642a2777e..03d6cc1bb5e2 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index acb17cff5e28..44570901a0f8 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1 +1,2 @@
 DIST python-rsa-version-4.2.gh.tar.gz 63280 BLAKE2B 1260fe2a0f34c16b3cd2e18bc642da2e9c6caad851920a4c010aaad31959d0baab397356cd2437eb4a9091b3f524760f45b8d46ff9a207be009b2613615681c1 SHA512 a4df2de41d252a42627e96298b044a50953c429b5062f02cc7b64a7e17f75b09bb8b0f9b371353e639d1daec7775c20f20348f45baf00f591514c54e1315f044
+DIST python-rsa-version-4.7.gh.tar.gz 64870 BLAKE2B 1e8c8c1a2c4261fdfacf5c83a76b0828dd2fabd26c0a76c0d39e7043a3005058e74a50c1d8f6ed705f5a47ab5d7c077587061ff097cad87424a2e82a8b478b3f SHA512 a88c8f04860e8babe762eb70e6096c55fbb4bbde43525564ecc719f5e6c56fdb65fa7b82a907c6de529a8effea26b1f6f8ffa3440dab99bff97664f7ce5fe31a
diff --git a/dev-python/rsa/rsa-4.7.ebuild b/dev-python/rsa/rsa-4.7.ebuild
new file mode 100644
index 000000000000..21dbd9cb6042
--- /dev/null
+++ b/dev-python/rsa/rsa-4.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_P=python-rsa-version-${PV}
+DESCRIPTION="Pure-Python RSA implementation"
+HOMEPAGE="
+	https://stuvel.eu/rsa/
+	https://pypi.org/project/rsa/"
+SRC_URI="
+	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	rm tests/test_mypy.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index dfbced9240ed..c5723b7e71e5 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,3 +1 @@
-DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
 DIST setproctitle-1.2.1.tar.gz 23628 BLAKE2B a50f078a08d2828b03b3cde261af419f88e08045fc18230be017c642c2d4e1b4fb6809e1e2230160d46ba24ba893beb1f95f125b93e7d1b9aacd4ed333bfea7e SHA512 c11f756a61501c4126e6bba5d931a3fb26294d2a55255c717f0e3c3b72184841452195ddf04fb6e8b686d26caa36cb5e13fbd66c66c151c54981a9edc620da1e
-DIST setproctitle-1.2.tar.gz 23454 BLAKE2B 4a69566e48a2985ae8add0341feba26f062d8345dd773570e0500795e43b349777d4bf557bd8b88d9cec37850c129009823a1f87ed6261a9709e84c8a6f56868 SHA512 7dc84ac0fc028ca71e786622aa6b649961feb816e0f03a3d52ab7b1a5d7edc0c932695687f1f5487d27104535a3db0c48d12fd69859478a604dbf60c615f4e01
diff --git a/dev-python/setproctitle/files/setproctitle-1.2-pypy3.patch b/dev-python/setproctitle/files/setproctitle-1.2-pypy3.patch
deleted file mode 100644
index 01d4b0e4dd53..000000000000
--- a/dev-python/setproctitle/files/setproctitle-1.2-pypy3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b13b7254fa10b4ba461c03b0f1f03858a2368bdc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 25 Nov 2020 09:29:18 +0100
-Subject: [PATCH] Fix skipping embedded tests with pypy
-
-Fix skipping embedded tests by using the 'skipif' decorator.  The tests
-need to be skipped early, as otherwise they error out trying to
-initialize pyconfig fixture.
----
- tests/setproctitle_test.py | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/tests/setproctitle_test.py b/tests/setproctitle_test.py
-index 5d73733..7b679df 100644
---- a/tests/setproctitle_test.py
-+++ b/tests/setproctitle_test.py
-@@ -340,12 +340,10 @@ print(os.popen("ps -x -o pid,command 2> /dev/null").read())
- 
- 
- @pytest.mark.embedded
-+@pytest.mark.skipif(IS_PYPY, reason="skip test, pypy")
- def test_embedded(pyrun, spt_directory):
-     """Check the module works with embedded Python.
-     """
--    if IS_PYPY:
--        pytest.skip("skip test, pypy")
--
-     if not os.path.exists("/proc/%s/cmdline" % os.getpid()):
-         pytest.skip("known failure: '/proc/PID/cmdline' not available")
- 
-@@ -371,11 +369,9 @@ print(os.popen("ps -x -o pid,command 2> /dev/null").read())
- 
- 
- @pytest.mark.embedded
-+@pytest.mark.skipif(IS_PYPY, reason="skip test, pypy")
- def test_embedded_many_args(pyrun, spt_directory):
-     """Check more complex cmdlines are handled in embedded env too."""
--    if IS_PYPY:
--        pytest.skip("skip test, pypy")
--
-     if not os.path.exists("/proc/%s/cmdline" % os.getpid()):
-         pytest.skip("known failure: '/proc/PID/cmdline' not available")
- 
--- 
-2.29.2
-
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
deleted file mode 100644
index e51d4400a34d..000000000000
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 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 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-python_configure_all() {
-	2to3 -w --no-diffs tests || die
-}
-
-python_test() {
-	if [[ ${EPYTHON} != pypy* ]]; then
-		# prepare executable for embedded interpreter test
-		# (skipped with pypy)
-		rm -f tests/pyrun3 || die
-		emake \
-			CC="$(tc-getCC)" \
-			PYINC="$(python_get_CFLAGS)" \
-			PYLIB="$(python_get_LIBS)" \
-			tests/pyrun3
-	fi
-
-	"${EPYTHON}" tests/setproctitle_test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/setproctitle/setproctitle-1.2.1.ebuild b/dev-python/setproctitle/setproctitle-1.2.1.ebuild
index 6f2d25ef7ff9..21f3648d16bd 100644
--- a/dev-python/setproctitle/setproctitle-1.2.1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.ebuild
deleted file mode 100644
index b7e0ed44f145..000000000000
--- a/dev-python/setproctitle/setproctitle-1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 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 toolchain-funcs
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy3.patch
-)
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index ab5fc560cde5..764cce290c85 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,2 +1,3 @@
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-20.2.1.tar.gz 8286055 BLAKE2B da77c51b352e979f05515107df49101a70f97da01862ae92aff0e185065edf1d6d517ee68057f1f2efe5ee999dd9dec24c0f2967b1f10130b446e83e478ccbd1 SHA512 e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118
+DIST virtualenv-20.3.0.tar.gz 9074217 BLAKE2B a5a00e39e31beff84e28e66d1cf6693804861ec0a3c0d0ee5c042e39a8edf894e89d6e78093fe1a4fecaf8b43bceff82e47a1ef7b8a92a1d2bc58d61411575b9 SHA512 5703a934d373d88670092febf26782f65303c65de93cffdd1a2ca06d6f2de4868378421f3ad96e3857eb99d0b60e7a77b0a2dbcf10561918efcbadb29a4ebf3b
diff --git a/dev-python/virtualenv/virtualenv-20.3.0.ebuild b/dev-python/virtualenv/virtualenv-20.3.0.ebuild
new file mode 100644
index 000000000000..7a01fa9ad8dc
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.3.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 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=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/wsaccel/wsaccel-0.6.3.ebuild b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
index 774553bcb166..a99529632cd6 100644
--- a/dev-python/wsaccel/wsaccel-0.6.3.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/methane/wsaccel/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"