gentoo resync : 15.12.2019

5 files changed, 149 insertions, 3 deletions

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 67b7090c8945..54c3fc01a32d 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -2,8 +2,12 @@ AUX tox-3.12.1-skip-broken-tests.patch 2766 BLAKE2B f2776638f48909c18a14c0e556d7
 AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
 DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
+DIST tox-3.13.2.tar.gz 286403 BLAKE2B 579692b4902e9cff0ede954fcf2d1a7f1771c0e3ad4b6cd362f93b1e745b238c739ab857b2394700d736eb6a0d91c1f2b385de1926908c0c4aa5a9d183a6b29a SHA512 b2447d4300a7469eb53f094427a7bb92ac973b5fdcfdf9b98736225b3a315953e06e92a4accb2f84f8649fe79a9146fb804afdf9adebf9231afb0bd143e646cc
+DIST tox-3.14.2.tar.gz 288615 BLAKE2B d74de145c8e839938c332f1e5a4819126d2ab1212679cc5c50390a9c7b0edb8a7059c55d9c6c8d3697f36cace7c0d3361725f5020d3f9d7efcddf8faae8c9be5 SHA512 c573d4b6a8e6538eb17031f7432d6f52f75514309c5daad53286aeff00db51146a5de089bdc1efd76f8126c374efa02c0ea7a8ca4224c0ec0f9ee945edd62c97
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1295 BLAKE2B 42e92124d10084a3e3f590699af9b455d3d3a453e0faada3d92eaed7f535a02d35144361df37b74588e6a25053a682ee5cc5c796f4a9b7b0e57cad4deeb1f6be SHA512 c2adc590bd462960943af135dd2b5782b35f90c06a2413ea50d46ebaef1cf4b0014368bb904d4332f619f2dbde4aa7f9633a0bed80303372e0f426ef6656ea88
-EBUILD tox-3.12.1.ebuild 1433 BLAKE2B 8e2e812e24167ddb09c8e594e2b90b9ce1e3a894dfaed7f943febfc5118d4df6fbf58008fab263641ab12f141a329fc16598e7eb5d78471c0c47b0038395bd17 SHA512 93616596aa72c04bdb323214cfb9ce0b869ec35bca2e388292802945385c1c377fb3fd10ec84392b83a3dc5a229cf201dad2e82656bf92a7f176cade7b1c262b
-EBUILD tox-3.2.1.ebuild 1953 BLAKE2B 20ef7befbe5fced2de522b65745e159fdbdc323c887eaad5feeda601bc68180651716913e8c84a5fe778a52ce3dcd0db2b7ee76309cd3e7583c2b90914c0ad74 SHA512 255146b77fedd2a709cb6b0bffeac1469811028d7dd806219107139bc27a171826dee2cb0d65672e8e206cd8c0d37fa5d84dab8d81b53aa6b5627b39a9e0e376
+EBUILD tox-3.12.1.ebuild 1466 BLAKE2B ebdfeb3f2c2dd9276fe685667f4dc6f23e0fa7ebf6c006d0b9cd34c36752603e9059353ebffc68fb3ab5afe82b5c8dc3f034470f6f263f12d05d7cb804ad10d5 SHA512 eca0be5a74a97ee23c93b76a5cf7c9b4c667417b01235ab98bff8e5c7c98b5fb901338a65f208ed85ffb00a54f5130cf61157290f67a6f019c26129ed1c04bd8
+EBUILD tox-3.13.2.ebuild 2017 BLAKE2B 7d19851d54cc581c7975caee5934bfc9e29561d6a51ea37cabdbc4d8f425c052d4661f532c7df8bc6877180ffe304e7a110f3bd9515b2edafd9eb93fd4d34d53 SHA512 820e7a1728c30f0c538f0d9d457512d2196e966d6a0a0ea3922c95a3ab2697cd4b923ae7d1a4166852b9c7798461728a0fe3845a5548709174a020fffc4ea881
+EBUILD tox-3.14.2.ebuild 2223 BLAKE2B 0ded1bfb604a2659511fa18067f07745b6ff66b0765a44524bf76572b345811f8ff7e7a37fc9097a24ef3718558cf6c8755af66da88c80a33be10a569ea8880c SHA512 89990208337a8187c8315c85e51dbc5c6160e07af80dc43f7aa281f5fbcde2ead3a7686217e0902758d33f96c284c262c733880bd05fa4011c47e0aac1d2b7fa
+EBUILD tox-3.2.1.ebuild 1980 BLAKE2B 171526d62a97d38f8c7cd90aec04e82c90695e67bf68d842733d74fb1352979989290abbd52cad3ba619d04c4a9f301e551f552269d31382048bae067e2bc9a1 SHA512 cd2c04bee98b2b5bc33a01eb4269bfae4928a102cd9cdff091f4713324d822a9fb0dd3f5e3f9e7f6cfc882094ca84b186ffe5ea5e3ee7349bff8b84ab17f926f
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-3.12.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild
index 97ebcbe09d1e..8f133f3ef0d7 100644
--- a/dev-python/tox/tox-3.12.1.ebuild
+++ b/dev-python/tox/tox-3.12.1.ebuild
@@ -13,10 +13,11 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~mips ~sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/tox-3.13.2.ebuild b/dev-python/tox/tox-3.13.2.ebuild
new file mode 100644
index 000000000000..c127fe10fc49
--- /dev/null
+++ b/dev-python/tox/tox-3.13.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} 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 ~arm64 ~ia64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		<dev-python/flaky-4
+		>=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-2.0[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
+)
+
+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
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tox/tox-3.14.2.ebuild b/dev-python/tox/tox-3.14.2.ebuild
new file mode 100644
index 000000000000..8e6bee7f637d
--- /dev/null
+++ b/dev-python/tox/tox-3.14.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} 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 ~arm64 ~ia64 ~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-1.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${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="
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		<dev-python/flaky-4
+		>=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-2.0[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
+)
+
+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
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tox/tox-3.2.1.ebuild b/dev-python/tox/tox-3.2.1.ebuild
index ad9bfd78868c..458036b2e40c 100644
--- a/dev-python/tox/tox-3.2.1.ebuild
+++ b/dev-python/tox/tox-3.2.1.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]