gentoo resync : 30.05.2020

5 files changed, 188 insertions, 1 deletions

diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 6b60cf7e6a3d..bea80c5b43d5 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,10 +2,15 @@ AUX virtualenv-12.1.1-skip-broken-test.patch 542 BLAKE2B 8c924cafcc0ee78b3101d55
 AUX virtualenv-16.7.7-tests-internet.patch 2103 BLAKE2B 56ac246fb6675c273e288b230c2502691f36f49502427c234c8b2da1a2d187791aced234fd70f7be98b98ff158f570747e670cc0ededdab1d5ed499d7b8588be SHA512 17f2a38d32f17c7f8bfe138939b6953dcbf13404371b8377a47759118ad37aaf73f45f670d46d5956fd5948754fb9c60248d9222920c6fd7e7c2e7c7661c9a18
 AUX virtualenv-16.7.7-tests.patch 2092 BLAKE2B fe9eef6372958265ff4b0b919c424a16313934973f29f15f726541cf3a32a9e49d163a40ff0b2d08d17f6521cc7d651fa092d66eb196261706d8d11a9e590e31 SHA512 f4c8a46d5d064672bd154beb0c1fd4a368e9879046931a67fc053e314b5f8510e825cbb3ad3d7e149a19745149a47d4e694b0f6b9f771dcf55e35bcc0871eb59
 AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014ee6091d4b4ca5155da86280aaebfb1a8d26ce9c6a055e47b11129509d7d00abcee0e3a915bd6ff4665b289cfce399f2dfd3b6 SHA512 f99cd435fe9fa98465addc6b22310e5d708c87edef224cdf540556a2ab1a70bebf06e828c02148bb597d163c31b2816845c0c8126727d1d25b38ffcb91c2251e
+AUX virtualenv-20.0.21-py39.patch 1161 BLAKE2B a8f8f9f45add1e48b0904b5de85479b44cf5bae9153d8362bdd47892ec5ef57a85e55d6d7e797b5d7a79efcb2bf579f39b6c5fe4fc31dff4f9e6fa8bd442aea6 SHA512 17886796c0dbc388c4d115f81f7b129ff18a649a68e474142ebf06d708864a7ca19a32e19c7b3b9d7d526b52be38dc76c8b26f761088b60ec8c9d3252ac6b0c2
 DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
+DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
 DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12e3a7616f979e18a5a91d58afd190beea86c67e0f7c530ba327427f3a4967ab27d7b922723c9ce92cba844946f8eb8ff SHA512 9295acb4d21da13c93fcf2a73244137a6fd8384313cf2685b67295f3be8cf33aaf6d22fc9ba4fa93dbfd81429eeaf4eb46d752fb717f0f74c172a754b92d41e6
+DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
 EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
+EBUILD virtualenv-16.7.10.ebuild 1734 BLAKE2B e1f0b8f354cb86573f6adbaf73f99fc4ab38ec9341bf17965c6e5166ff5c71bd26ba29af095509250286ec057ead88b27e16c39d63886100a1be579322e5dade SHA512 395406a79d9be8ae64ec4bece7aae666968a89742fd74ad38ae2f58fb99e68d0eadc0e77dabd9658d0a2605f489f09de27e48268c37b8cb32c770a839156e46a
 EBUILD virtualenv-16.7.9-r1.ebuild 1828 BLAKE2B a6092602da117163b2b6b7882a7e2fff1acd9334c5150b8d9f7ea37b5855dda60924d374e3b3ecc4f2426f3a0d426ec7dbb17a9c577f4285f499123ccfd39b62 SHA512 0c714cb640d21eabb8eafd0c641989b9d896748889f987b381ec137d15da79dc1caa757ef94ef1ecbdef790d9018fc8197b4337223b85eca4821770eaaf2b35f
-EBUILD virtualenv-20.0.18.ebuild 2227 BLAKE2B ee93f38475db9248376cf3cd9e5745ed6155e486088e588d08d2d212fdfaf4f902a93e5e1e898b97b5a8595c06398729bd35d14555b08f81bb481222630af90f SHA512 1d81e1aaed8c579bb53345c54b1fbe7a164beaaa5c0878720ea44175d4196ebc0cb9318fa612097c0e5fb873762c21dcf2948ce9b506ad268ec57456f126bdb5
+EBUILD virtualenv-20.0.18.ebuild 2272 BLAKE2B 0ae1219c1cb9d17e39912cd4963a3c2ee8898e71a61e894ab453e85c50926a2721be52a26652028a30decace9d4ad0eb0f30ba3d569e19d132e0472728f16cae SHA512 989f04d992e7699038ded65a15f5904fd077b6037b49711f0df91fb8b760207b2abb967fda53d2aa684371bb9dd38f30f2189be2d4d8e7de78c7098dfdde9768
+EBUILD virtualenv-20.0.21.ebuild 2559 BLAKE2B 088917832382df5084b000d1f368842eeb7635782425a8ee35db98a79a513fb0cb9723e8a745c54a97be523f16f4bf63dfd8eda2310d4d820c81d4c56e2d5b7c SHA512 5e442d0333b5f2040d8de3c400e8fc9268b12733f5bc5967944df019ec044ee2488bb3d2b7c12ac3ad18f86413e994753cb9d7c6e3aa6d0cb7a715db298da0bc
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch b/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
new file mode 100644
index 000000000000..221cc734d268
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-20.0.21-py39.patch
@@ -0,0 +1,27 @@
+From a8717bf6ac3375d7f26738189c32e3bae04d280a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= <bgabor8@bloomberg.net>
+Date: Fri, 22 May 2020 12:41:32 +0100
+Subject: [PATCH] Add 3.9 on Linux to the test suite (#1839)
+
+---
+ azure-pipelines.yml                  | 10 ++++++----
+ setup.cfg                            |  3 ++-
+ tests/integration/test_zipapp.py     |  2 ++
+ tests/unit/activation/test_xonsh.py  |  3 +++
+ tests/unit/discovery/test_py_spec.py |  2 ++
+ tox.ini                              |  2 +-
+ 6 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/tests/unit/discovery/test_py_spec.py b/tests/unit/discovery/test_py_spec.py
+index 445412773..52154f14c 100644
+--- a/tests/unit/discovery/test_py_spec.py
++++ b/tests/unit/discovery/test_py_spec.py
+@@ -95,6 +95,8 @@ def _version_not_satisfies_pairs():
+                 for o in [1, -1]:
+                     temp = copy(sat_ver)
+                     temp[patch] += o
++                    if temp[patch] < 0:
++                        continue
+                     sat = ".".join(str(i) for i in temp)
+                     target.add((req, sat))
+     return sorted(target)
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
new file mode 100644
index 000000000000..72bbf587452c
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} 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="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( docs/index.rst docs/changes.rst )
+
+PATCHES=(
+	"${FILESDIR}/virtualenv-16.7.7-tests.patch"
+
+	# disable tests that need internet access
+	"${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
+
+	# test fixes for pypy
+	"${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
+)
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+python_test() {
+	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
+		die "Could not copy LICENSE.txt with ${EPYTHON}"
+
+	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/virtualenv/virtualenv-20.0.18.ebuild b/dev-python/virtualenv/virtualenv-20.0.18.ebuild
index 3bc6dde6c8b1..85130547d143 100644
--- a/dev-python/virtualenv/virtualenv-20.0.18.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.18.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
 BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/virtualenv-20.0.21.ebuild b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
new file mode 100644
index 000000000000..15edadfdb160
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.0.21.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} 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="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.0[${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/contextlib2-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' -2 python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' -2 python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${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}]
+		$(python_gen_cond_dep '
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' -3)
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
+
+src_prepare() {
+	# we don't have xonsh
+	rm tests/unit/activation/test_xonsh.py || die
+	# require internet
+	sed -e 's:test_seed_link_via_app_data:_&:' \
+		-i tests/unit/seed/test_boostrap_link_via_app_data.py || die
+	# TODO: investigate
+	sed -e 's:test_cross_major:_&:' \
+		-i tests/unit/create/test_creator.py || die
+	sed -e 's:test_py_info_to_system_raises:_&:' \
+		-i tests/unit/discovery/py_info/test_py_info.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	# TODO: fix/skip with more granularity tests on pypy3
+	if has "${EPYTHON}" pypy3 python2.7; then
+		einfo "Skipping broken tests on pypy3"
+		continue
+	fi
+
+	distutils_install_for_testing
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}