gentoo resync : 12.11.2017

3 files changed, 8 insertions, 4 deletions

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 2814695ea5d5..957ee4b785c5 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -11,8 +11,8 @@ EBUILD setuptools-35.0.1.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2
 EBUILD setuptools-35.0.2.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2a4bd55662898f0cf7af8f9175cc5 SHA512 bf2b6cc66a48202471b0c904075376993d26edb0fe4cfeaa56c44d4610019f359404810d4bceff35fb7cc3f5e7dbeb469f69dfa911ffa223cfad51c8e6d18eb4 WHIRLPOOL cfb66cd81c642f03546f01395b2ad1e67a5797c0a97fc701ee2602520ef827aaee7b344bacc79525edac4026120610c5def45768fcc18e388642391e18d10f3d
 EBUILD setuptools-36.0.1.ebuild 1902 SHA256 21e17a1e229890cd6bb9e86c9c33bc16fc04fb0e9196341d7d1b1eb1b11bc521 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b WHIRLPOOL c45c02f0e4ee088e6e44fa076abb33ad2317f2344777247eaeb9b33cf3af5105c9b45632644769da62d1ea00cc9865d264ac15b70121b3aea015c6dc9802abb8
 EBUILD setuptools-36.5.0.ebuild 1791 SHA256 bd91c146723054ebfb78d33811b3f998b08ad52c002af6f37205dd0b00e94fba SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03 WHIRLPOOL 3b9c38ac6cf7b1ffca735c5c566b96fbcf1171097f244477ceccd22e2d4970017ef00d512c0525ecd1500f056b2b3789788ef096f0fab5e08ccc9add98441617
-EBUILD setuptools-36.6.0.ebuild 1791 SHA256 bd91c146723054ebfb78d33811b3f998b08ad52c002af6f37205dd0b00e94fba SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03 WHIRLPOOL 3b9c38ac6cf7b1ffca735c5c566b96fbcf1171097f244477ceccd22e2d4970017ef00d512c0525ecd1500f056b2b3789788ef096f0fab5e08ccc9add98441617
-EBUILD setuptools-9999.ebuild 1896 SHA256 27917cfbea477fbcc04bab18db0547a18d69cfb9825eaffae785a4bb1a937547 SHA512 4a88df7828f94c34c4131626054fec2d6fb1f1dcf2abe48ae872efb0d020e07fda6c6bfdc126a53e4463d1e7f932f84bf24d992913726dbbe98488d539f9ff64 WHIRLPOOL fd6ab34da65bac9a0bc60bb0dd4fce0ef51920a648dbc87355d44a275e3a2a089be651210a8356330c413289da3323fef2ee3070e594961c761c80d87ca72aad
+EBUILD setuptools-36.6.0.ebuild 1828 SHA256 439ba0542110b7a37f7c67f997c9f9ac3d84bca817c0e1e8b01b467bbefeeb5e SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c WHIRLPOOL 8ee243dd3d9de88589dbb07b8bccbaf3669ed3bd55090f2bca3305209c02dd066fa3e592e014ed9f908e88b5d81f2b3f6632ac8a7c63781ed547b7e38eb88e79
+EBUILD setuptools-9999.ebuild 1828 SHA256 439ba0542110b7a37f7c67f997c9f9ac3d84bca817c0e1e8b01b467bbefeeb5e SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c WHIRLPOOL 8ee243dd3d9de88589dbb07b8bccbaf3669ed3bd55090f2bca3305209c02dd066fa3e592e014ed9f908e88b5d81f2b3f6632ac8a7c63781ed547b7e38eb88e79
 MISC ChangeLog 17985 SHA256 b31d25f57897e897354a84f36573decb09bf17e88b4f8ceb1fe0cb8cbef64a3a SHA512 099eb73daea0a5a0035af624f7c59dc7ecdd77523df9de74741cceb01b64514d8b58ce98c13b58729d900f680416e97408a19e46ddca1c9c34f1a845af86ebc8 WHIRLPOOL c5e8a538a838684f6c57ac9eb516b36572c7ca62697ea12b59a9db6c89c7fd555f6af6877aa24761c6ee6fce5b262c4ba31cd9c03b44378532773653164262d6
 MISC ChangeLog-2015 40164 SHA256 688e239d071bc1023126c3f0bb1e62c72a1c217a7290312441ad91829ee51d84 SHA512 d009c942ddc4d8beb2ba9f756a0f00d292c1accd029288727ef23811dba8854b0cdffc4b753883975adaa1572c4cd15e5a1e14d9fb2afb50e852cb14e71b635f WHIRLPOOL dfe2b05139f33b1b94481d040c5b58cd687331b3d96f7d0cb6e49d28574c3b0f4325b22aec97cd5ba138ee7caec989f18c94456cdb0651bb19611328623e11be
 MISC metadata.xml 380 SHA256 569713c1c2db0d1e3d052dcda58cb2c25cec18a554152d646f377affd0c7c09c SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94 WHIRLPOOL 29131f5c4625e3415fa2079dde921e3d8a2849c382e1408edeb35157b4e8c931b6ba43fef383c4fa83cf8279f8eaeaf1a6bbd15dc949e35b1cd9085c61811623
diff --git a/dev-python/setuptools/setuptools-36.6.0.ebuild b/dev-python/setuptools/setuptools-36.6.0.ebuild
index 569852df901c..b9335a39d953 100644
--- a/dev-python/setuptools/setuptools-36.6.0.ebuild
+++ b/dev-python/setuptools/setuptools-36.6.0.ebuild
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
index 6b01e904a243..b9335a39d953 100644
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -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 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="