gentoo resync : 13.06.2020

4 files changed, 77 insertions, 3 deletions

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 6e5578117dbe..43d3799ae622 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -6,12 +6,14 @@ DIST tox-3.14.4.tar.gz 289600 BLAKE2B 413782a524b70b4e301f5a4bda9c763dc7e670d7fe
 DIST tox-3.14.5.tar.gz 290075 BLAKE2B 7e412e85981fe11cba4dc6a4ab3df824678b11fe59bd7d909361029f30e407ffe62a24967e5a447cc643500dfb61326d47fb276bb669311780ac49aa2075fe09 SHA512 cbd0e4c53bb82a302016f380a246e9a9630b8f0c6631195af2dfa12c090cc76c3d9da8362e11c42e74bacbb3f9be504eb67e07de1d2cbac7b5f05341ea2970c4
 DIST tox-3.15.0.tar.gz 291890 BLAKE2B 9c42c587332eafcfd02d2d8a42588af6253baf9f62e82eb8a8bf10da291b4868b1fe319e38a583bc67bb26ab868b8a123feccd5bd008ce618ceb46d3121c68d2 SHA512 cb21574301d953b361eb5e1d89eefe22e68ae5871036f03d5753ee97c888cadde548d62a50622dd65b3c488143bbbdf8d309bafa3b6a4807871c9e78b6fcdb9c
 DIST tox-3.15.1.tar.gz 292044 BLAKE2B eb3062fb1a2494a6b23e1c6f2c6af56be5879664ae26918e60839d2f8cff98dc6b684a27469eac81c363a3cd3e90abdafe0ab4dc601840023e5263a42301f384 SHA512 334e2129d5418d4733a25419b81cc57e794a11954c21774231e32c93e977f1a7fb71c739adabccb5cdde9428ab69772e8623a0c0a1172855957f7cbcd4a917b1
+DIST tox-3.15.2.tar.gz 293523 BLAKE2B a1a1c84a987d2b2e5194321405775ee3828b8e2c8dcd38c7e780a9d508b789a42f1880cffcecd68c50dfdc37008a4e9a117660fa2c732864c82af6c2eaf5a99e SHA512 9448554452c79039289d2d2c05c974f451647329701372c3e4b154a0161fa768245c0068cd5e3f1221b4b51a07be806f7c66ab9d4ef83a3e8e5964e18b9cde85
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1284 BLAKE2B 601887c581bbd95d0c6377a4383693b4dc9956a8bfc474ce73f77b22ed8f73593a3ec7ef002e1b415798024a6451ce8f85f7c9dc03dc01b3af392babb2ef3524 SHA512 730680951dda514c0b228f7f37b06537ee44893a0fc0dd812954350f4123519514b07a7394b83243c267c1e05c5c0917efe6c8ea1b04c11418a2f997cea38878
 EBUILD tox-3.12.1.ebuild 1470 BLAKE2B 328809a7f1aac4a932586a88ac9082a83f8f5aa66b09714747584ed6d4acb8ab18480d2da58d7b74992633ccda2e223214eb871206d2a1531de97f5165f991ba SHA512 3e3f7bb27056a9e5bbaf3c699b1618bbde793518aed71acdc639e4f7692417b23e669c79f9737eff6e21ae255551f6cc296519cf85c28126e897a8dfb414f6f4
 EBUILD tox-3.14.4.ebuild 2249 BLAKE2B 4a8e695a7625cfebed1fc86451ceec4459673d31385a3bc295bd311e5c9c045b86b4b5b6577bf6ba6fb4b2f142812dcbf8003a53668a1035c964d2c2c68f16f0 SHA512 10d73cfdf517bc0726ee19609134914bf8bdf3b79dfae810e7eb9ac3c7e9713b8a2da28e7927cbbba8da571fe56a9d8c4b7767ad4b22d88d97f92770167ec10b
 EBUILD tox-3.14.5.ebuild 2289 BLAKE2B 987bd969cf8477bfa0436717e70915918f1d97a2149ff1cc9f76df58d8f105ea959f8f50f2a684c09ea1613281e294694aa7f53c2992124c89e12f78261f02c5 SHA512 5e7a92de1f17558593d06f417b4d8655c20308f8d0af92ceeaf6570228835d53d3592c9183f9a6fc1f390dd3f6e2f3f63cd03b4e52677101a8166ca5efc7165a
-EBUILD tox-3.15.0.ebuild 2283 BLAKE2B 1062d0d123cf5881a018766371874f7dff0f954b6d660ebff7d0a7f9d3e1b08ef6f1d021b9389187c6acbeb8489d8818eb4d0498033a6243246a3e023fb510c2 SHA512 f0fc337ca5aef51f9e0413c73572c5988d0b0b8f25085c3274a45082f20464997b2b1c12a239f96a207800cead7ecc1877813eb5a64744eddafd6d1b49ebcea2
-EBUILD tox-3.15.1.ebuild 2195 BLAKE2B 1e2272d3b74b2e67b7e95965f8179fa7610d621db574613d678b5beb58e59fc747ea0d8ab4e5d767bb9e926a0fde48357afd6f8286b4113f23815f5c3252e7ae SHA512 de8134be84a0b87264a66098a10666d3fc4a38c83f21af4a0848ff680793408f19ddee567b944f8057abea08c36e505012b396851021aa908072ef55349f7446
+EBUILD tox-3.15.0.ebuild 2280 BLAKE2B 9a813c89fdf90197b265e4c9f1f2aa2cf817122c4edb9b41606e35368dcb9b24f8e105d8fe04b5a90fbc6be2dca7fe05d8470983422da1cc780b668c0712a09c SHA512 806f69eb7a848de87fe9f45a7ec538c21f3f1d6a418d84f59b0181d1a6c6764a9ad1c5383e79e815aab04e93aff1473b8ceec5f31a496d3223795405e2daf364
+EBUILD tox-3.15.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
+EBUILD tox-3.15.2.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
 EBUILD tox-3.2.1.ebuild 1969 BLAKE2B 20c9b07cceda854b8ecf10ffa1c75349cbf35c6deed3cabea04d8530be46e175aa311d7862108dfd575e1e4e27fea54f9f6c70fe710855a52ae660a37fcd6d85 SHA512 74c107f3fed79053c9e9339e50037aceb233215af2704a5c176b8fa27b735e7ce09eb56f3fcb05d00a48d5fc3c95837dfb7767971062402db19389fdeb84964b
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-3.15.0.ebuild b/dev-python/tox/tox-3.15.0.ebuild
index 17f2cb7f0ce0..d07fe2ed8a50 100644
--- a/dev-python/tox/tox-3.15.0.ebuild
+++ b/dev-python/tox/tox-3.15.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/tox/tox-3.15.1.ebuild b/dev-python/tox/tox-3.15.1.ebuild
index 8d18f6512c45..0365e6a79004 100644
--- a/dev-python/tox/tox-3.15.1.ebuild
+++ b/dev-python/tox/tox-3.15.1.ebuild
@@ -42,6 +42,7 @@ BDEPEND="
 		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
 		dev-python/pathlib2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/tox/tox-3.15.2.ebuild b/dev-python/tox/tox-3.15.2.ebuild
new file mode 100644
index 000000000000..0365e6a79004
--- /dev/null
+++ b/dev-python/tox/tox-3.15.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}