gentoo resync 31.01.2019

3 files changed, 14 insertions, 12 deletions

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index d8902fda5feb..90e9c68b9b0a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,8 @@
 DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
-DIST setuptools-40.6.2.zip 839184 BLAKE2B bc17aeaf7710742b70735f4bd0df2f4d8546eebaae000270b21ce605c83966998a2f51658d243838286f3101d7497c761535a9ffed003ae5e00c81bca8b70ad9 SHA512 3f1aa20e905deb22dda366f479f87cd772238d07e869fdc4f65a7926373414a77b7ddbfd78fd9825154409b3c01d787830354d206a45cdfca879bf35d3b83e03
 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
+DIST setuptools-40.7.1.zip 842768 BLAKE2B 1065487540517c1cac6332c0c089b572e04b22dff5308676be2e97a949ff2a85251ecf862284d09718dc69ad611cf1cca6b70c425f210f870a5d1ec1c583fe75 SHA512 384d38afa56409f828cf26443271514feaf82b1d9d99a4a0bb4a9004f9b7a262a0d5ae48905e808381074e948988417e3f7e81a84dcd09359f9185a2305f8cac
 EBUILD setuptools-36.7.2.ebuild 1923 BLAKE2B b7f55129aaef27eee778fdfb97ef06f6f70e558402fe503dd73c7a23502e6454f8c1f0e8182770d9c3334ebe3c1a21eb19e3ee8a0bc26ed99a819e7484b040ef SHA512 98b9465fb954575ed3a4a0b3b5be1c8a4c30d60112d4d222e95786a5a221a5a13799c4055bf7cd074476bd7d65ee7cd5c9a4fcad2a571ba83583e67751bb8376
-EBUILD setuptools-40.6.2.ebuild 1950 BLAKE2B fcf2e368e93d1b07ea3fad99cafb3a609b4ff866b7db92ca875bf94e27cf74153245285ac67265f2e31d8c9295eb0c5f95b94414e88e4bfd34ed6f77b9af162d SHA512 6f1e2d72e9fab011dae6d9a5c75286d56252438be1f3e6dc9d09d57e4c7c447ec21551a71cecf3483d29afebf7e130c7afb725b408cb8499bbd92bc232918649
-EBUILD setuptools-40.6.3.ebuild 2019 BLAKE2B 1cf19a12e8329c592184400b2c27535ec7e889a5ac41f7d303effc2964e0869f58fabf7111f20dbb82dd13bd726eee3db94bb26f358c263a038bf76a63647d5f SHA512 b0c4855cda6cbd4b00e171166031431a03c3475af9c40254172b54453d6ba587ab3cd6bf03d476614c3c605fc2ff0b45cbaeb77a671a78e1964c16f72acca8d4
+EBUILD setuptools-40.6.3.ebuild 2061 BLAKE2B bb970e9160aebe36933092ff6d85e9b1376efc64fff87d8b6dc879fec179390bc775c34e1adbba2c77dd6b45d6d8f7a3855cd0cd48025ba9ce3ec26b1c824caf SHA512 d6c7311869306aabdc4da8094227affdad35bb5b94269f72bc99d730279d6dac3a219fdacf73954e4994b9f5b10c852a586915b0371b10dfcd13668a1de8b8c6
+EBUILD setuptools-40.7.1.ebuild 1993 BLAKE2B ae75fde0a8d0c778463f4ac50634b4b9f93b5ac15e5e8bf1c7ea9951fb8fc65c7d3ac8b11d57de1516b3d47e99a2756b492b10ce3b91eb401402d14da0d511d5 SHA512 06945865143b937fb74b601f1f0c598c93a6b3418432ab7963ebe44c6debf5d8823d5b0875d80ff15cce97e52dfb0ffab28914414ae8ea8ab530cb4efb0e6d19
 EBUILD setuptools-9999.ebuild 1827 BLAKE2B 7b9ecf3287c8896addeaa7b6dce9843ad7ef4df490cb152457213fe82c82955bc7048c32618490ba0532f8d5ca1229444cf333216bc5284c4229aabc93a7a7a5 SHA512 cd1d8b0c15dbea82e728fefd7cf75bc604fd8201e1874c0ddfb8b4e144ca670c86a2ccbef8c455a40faffbb4809179791038af289eacb0cd4823e25d6ce030ea
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index cad68a78dc42..35d6a14f98c8 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
diff --git a/dev-python/setuptools/setuptools-40.6.2.ebuild b/dev-python/setuptools/setuptools-40.7.1.ebuild
index 0f231c9d846b..d67bd927712b 100644
--- a/dev-python/setuptools/setuptools-40.6.2.ebuild
+++ b/dev-python/setuptools/setuptools-40.7.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
@@ -27,12 +27,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-4
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
@@ -61,7 +62,7 @@ python_prepare_all() {
 python_test() {
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
 }
 
 python_install() {