gentoo resync : 05.02.2020

6 files changed, 10 insertions, 153 deletions

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index e7e6ebca1b1e..41c4b94aab68 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -2,14 +2,10 @@ 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.14.3.tar.gz 288938 BLAKE2B 1a7d6cb8446b83648b67814fb3413da1a9da93e76a508c1fff134c7738feb2a1a5e130201cd7c9f1229c2c05349139bd54aeae1183fdea9c1735ccbde82bcd5a SHA512 5ac912c4f1db7fe23dd6dad68bd15127d3db97498ca58f7b8573f1857634bdf41eb7fdb4cf8d22afa14547363b91a7b52fdd5ad80af5d60ef4dd95c1d103f8fb
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-EBUILD tox-2.9.1.ebuild 1288 BLAKE2B 3e42bca1de4ea29dfce30ece9be5543f2501f43b9ffd31730fd67606d9abdbf3afe2244c5408f12cb6c04314efeaa9f07e0586726c1679034c80219af79f16a2 SHA512 813c4f90bad86dc76fc8d62968e373ef1cbbc8f1c1b38756e8dd927a70363a1eb4c6dd5b81f5da3351d8886562b088505b6d37f4f269a60a8e7894382911c486
+EBUILD tox-2.9.1.ebuild 1283 BLAKE2B 2b406622044831eaf4ede7d01feae7a19ad781f7afdf53caa79f758ad26a374363934bf241b183c499792d0bb251e9179bd796cb6809cc1a018947ef94780bcf SHA512 40ad403cc7e5a7e5fb43d31aeb070dd38015f63d355f19cabce481eb555f8ff3375578d23b471f7e698045ff9475163c2240e610ba98ed38db264297ea90e008
 EBUILD tox-3.12.1.ebuild 1464 BLAKE2B dc081935636ae04e3d4c9ea74341441c6eb6c127d07eafe852aad8484d74af0d4780e4956f91da9b946fe83469716c3c8c3e45261d15ecaf831ea968fad4e1ce SHA512 3705a537cbf6f97edbeaf8b91fd5e9a5e5ba78c6120d0c5b8fceb854addf23cbd1088ca768c2b9cce1936cb9f26c2dd05d748469c4189f2500854932332113db
-EBUILD tox-3.13.2.ebuild 2015 BLAKE2B d675f1b4b7f6f10a9fdd515613990e55a956a6e2394aa57260236916123c914c35481de44ee2fc3a69fc210b3412e26c063b2d2f6757479e5c3eebb6d3da1927 SHA512 38406fe7ccb5add9df41e584330276a3200e1a62cec80b602ed93588b5eb23be108b7403fa989314b466aab17822890b24712ad4c550edd4b47b3c77f258a440
-EBUILD tox-3.14.2.ebuild 2221 BLAKE2B 9f4865c78aa66d3fb5937e783a57d3eb4d9bef3fbbe1fb302869dc8c74961fea510602071c939df0b8fbd90807494a76d446023d341ba7cbb57805ee0f6de2a0 SHA512 11b85a23c47a7d16e52ddf51f25b1ea212cbd1ca7937210b92238197ccf910ea8c500aad1aa7b8455adab78e9335f7a9b1ce5b1402fdc6762bf33dc45c2e599b
-EBUILD tox-3.14.3.ebuild 2233 BLAKE2B 87d45d6315ec648f7338ab389b4c0d06dac2bcccb9f2cd4e8666bc99fc60904ce5eec5a14f3edd6ab9f8eac7d1155674d1de68264681b2a6e17cf5d027d6e774 SHA512 b6e6f07c7aef216e776ebc53efcd292eab4826f48895c39e92c7931735ec86aa2932b16c2c4bfc8c5979e76ae2da8318a5cf8536b2cee5f5ca6f29de3a912b22
-EBUILD tox-3.2.1.ebuild 1975 BLAKE2B 16f3f857f3bf4c89eba1951455101a39de2e593fcede962cb8c36e6260ac3568c09bc759d8cc92c92bc24f742d68448843952278bac04a1711d222ad995e8dc0 SHA512 6bad81cdea97209d8befa10298b4ef1e496581ff5bd581d4e9e7a0c5437fff6da45338bd1abe1eb8af646a45e591ed9e50f55080d679e2eb26d55d8cb8d3becf
+EBUILD tox-3.14.3-r1.ebuild 2236 BLAKE2B fde46522a9c4eba0437673a3ae3d8d5b54cb0836980ae5c1d63449b6664ec256bef84cf412850e23fb07eedcd026b75eda24b5dfe18853f867a720804a04635f SHA512 a9695b63c0d79d8d2cc045970d0a4fce948d1cfef5c2aa44ce67bf63015db9cca4bbb93fb5fd8eefdb3eee7442c4dcc44e896c9b0abd12af86292af5d8aeff48
+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-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
index ba15d6f5b969..ab13183ca68c 100644
--- a/dev-python/tox/tox-2.9.1.ebuild
+++ b/dev-python/tox/tox-2.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc test"
 
diff --git a/dev-python/tox/tox-3.13.2.ebuild b/dev-python/tox/tox-3.13.2.ebuild
deleted file mode 100644
index d255c099c483..000000000000
--- a/dev-python/tox/tox-3.13.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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.3-r1.ebuild
index eb8c4fbba74e..9394dff0d0a3 100644
--- a/dev-python/tox/tox-3.14.2.ebuild
+++ b/dev-python/tox/tox-3.14.3-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,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 ~arm64 ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
@@ -26,9 +27,9 @@ RDEPEND="
 	' python3_{5,6,7} pypy3)
 	dev-python/packaging[${PYTHON_USEDEP}]
 	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${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}]"
diff --git a/dev-python/tox/tox-3.14.3.ebuild b/dev-python/tox/tox-3.14.3.ebuild
deleted file mode 100644
index 8cccb8451fe1..000000000000
--- a/dev-python/tox/tox-3.14.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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 ~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-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 a7c3a9df5999..b8798335d338 100644
--- a/dev-python/tox/tox-3.2.1.ebuild
+++ b/dev-python/tox/tox-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1