gentoo resync : 31.10.2017

5 files changed, 6 insertions, 82 deletions

diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index bc12da60ef10..55984e5c8abb 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,10 +1,6 @@
-DIST pytest-mock-1.2.zip 19461 SHA256 f78971ed376fcb265255d1e4bb313731b3a1be92d7f3ecb19ea7fedc4a56fd0f SHA512 9b87c72e9895a16d4829229a070ba2b8143be894dfbc804b1e882eb2cc5843d8da9db258b5a2b9f8ae6738d9d612dbf1bec16790c5f99c27d9f7554cb676f852 WHIRLPOOL 470832b4df4a9392b0cfcbba96b2a52379d7111af0236f5dbe4e22f4e303da248bf2f936b3b66ae0ff3a197f3c87b0419c54c115fe5c6543e255f11666d3031d
-DIST pytest-mock-1.5.0.tar.gz 17199 SHA256 782f23f227874bac4cee878637c2af8efdd2c34c48fcbf9e79b00a0872056ffb SHA512 5b5acb3ae3040d37768692a5289be269d8e12a6188a2dddefb136bdb99f847bedee525d59ac49886a6a27032b672e442ee256410174777675bf92fc82505f807 WHIRLPOOL 7c9c2617944dbf02cce356d12650d89372db252bdf79b92db304bcb1337858a38ae4b9b640210190338feccf4de0cbd64ad1a2d7ffc411c9184e1cd09dd7ec17
 DIST pytest-mock-1.6.0.tar.gz 17780 SHA256 83a17cbcd4dbc7c6c9dc885a0d598f9acd11f2d5142e0718ed32e14538670c1f SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f WHIRLPOOL 518c8732f722547a0a87f0e1dd4cf8c80272f4a62f238d5bb16766fe0340c8fc022e409f58e6aa8ed7cb17b33fe160574db199197c0466701fa7e7a668fb5116
 DIST pytest-mock-1.6.3.tar.gz 18482 SHA256 920d1167af5c2c2ad3fa0717d0c6c52e97e97810160c15721ac895cac53abb1c SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a WHIRLPOOL 85fe9ed6bec18eacb5cd9c404c7ff032e88869e38ad744628b236fc5081d48eee7fd161a6fd4066f38815474eefb6b7635a82199a130000cbba17b662c2bd0f0
-EBUILD pytest-mock-1.2.ebuild 796 SHA256 74fd452ae9f6d9ba20bf292bd0be6aeb465b7ba0c5ab49c60d234f1e9b86a0cd SHA512 8aea21fa51730a6cc912bee6666c649aea6ec7425f49b45958e67da8f49920544b0649e987fa34d0b54a24bb93ee54f93bf05f9609acc7106c1072ada97e65ef WHIRLPOOL 25c80cb868eab7bbfaeef0227b2fa16d190cc841c59aad0d8aa73fa25c28fc5d156817901f2a88b8da84678a895ce92a18cfe2d27ee8e32bd4bacf3341dea1cb
-EBUILD pytest-mock-1.5.0.ebuild 1055 SHA256 1fc5f352976e6289f53c80c9231640c9d9709d9413c3efd3d4af0878872cb3a7 SHA512 67428d7a2be06c3de4103eb6b9f6344f87c27e13d38809ce3215e4d1352c74c251975816a3983af45f4b22071d7fc3959c26923d49db2296dc7c3a411ce5f1f8 WHIRLPOOL ae2bbf6eaddb788067adb462a38464975a5a22dea3e6d1d6cf409e211f8435ac2258666852bc31ac3fb004300d38bb99c365318f460f336a7a4b723ca4e071ee
-EBUILD pytest-mock-1.6.0.ebuild 1060 SHA256 4aa1a30e02ae2ca174f61aa6eb9e249e69db85cccd7892eb552606eea13cd437 SHA512 2c5d6dd6c9f3460bfec3f5dbe51d1e65957025d6c54a5167e6223b7703244ac2bb358cec539d0f6e7ab587b5e48a6bad89d9c52778d8096062d68a18d81a5c36 WHIRLPOOL 0de88c20cd03bfbadae426c3ce5e8d2cc67c1ef5d4dad6b6e06ca824b14c52e1962b76284c3a914d93e0dd2c4ed2161be951d55baf2b126f8c84e7df250f0a8c
-EBUILD pytest-mock-1.6.3.ebuild 1062 SHA256 dc6d99a280c657d767a66d76b86545762048d5fe03f87cfefc3616dd2e8656c5 SHA512 3782f4ec667b3f6719d99e1d9d3524755951207795574ce5a065fd5225fdbce479a227d719a7e00dbaacc1f4fd551538549cd56783a8956499a5ccf849e879bf WHIRLPOOL 1ece0c57f77ffae2c813a8e577480598b2d5d96663cdfa19eeee086cc66d2250063c8abc847a0c7e31119be51b2507c45451d0f033507d99230de6fd46b86518
+EBUILD pytest-mock-1.6.0.ebuild 1068 SHA256 9d334430e23d166bc15adc3997804e6f90ee075d017c357d1c99e3c79a1af3f1 SHA512 712dd100338130ab0306632b7832dee14fffee2de39d3b785b6cf0b4ca2b447fd09fc75fb7c4f714702aa6b8094168178b3a7b71ee7b3e7a42921fe459f4eec4 WHIRLPOOL 0141d2a1f3ddb3feef341e4e1f336d391a0e16b43cc8593cc284339890c753a9d775e2bbdadab2d2b1e6137942cdbaf6b7b98770294a61b9822b8404e92ea032
+EBUILD pytest-mock-1.6.3.ebuild 1070 SHA256 c3a5d66d4adbb3320c76b83141a859890e451d328df9cfd7a873ff750916e492 SHA512 1b21e9b8689b143c966b9feb4fcb1ca3d086709c13c3bfa374ba859f1fdaf33046abfd630dfc39e5f9b6b6fcb12c434b45e79d61d5fcb29f5a1350fc3cb980d5 WHIRLPOOL 339255e6590b65798657d336047c1df143f60c2c5740fb8998ea9c1472007d74ce57b928f689241c363157553c1cab4e030051e779d7f83aa386407dd0535038
 MISC ChangeLog 312 SHA256 97cf1df2daf23cae8b1ae0dc66ddad9fdcd16dc73b666d2e9de3c27a30b69f62 SHA512 db44b605f1fc76018824eb1ec5df5eeab336dad4767b071849849aa3006e6534488f0588b9cc4979c142ea9cc2175ac17b963476e1eac4705d133e31539199ad WHIRLPOOL d9f281985bc5676d3c0735ce42d8b0e54f1ff7f611613378c4696ac82886a035a40f1783ddacc102ab6efce2063121f988007e4d352dfba4d5112a7e32a3e333
 MISC metadata.xml 354 SHA256 e083a9809968a19c662d955492e0e251df5a8e868ebf4fbed9b8791aa55bd229 SHA512 83a168d22f4d604827aa42966ccd1b99d53f069cdfffe69b29fad8f13c4959ff287915c0fdc29e53ce2c3d5625b4f4620861b927571dc91c93ac199a5985a3da WHIRLPOOL 2d5ded63d065fd8687cf0a52115ca71fb28faa2a3e1db9fba6c4b0d2b8b4e7b1a4a72674c522a1d0d1ec8528088d9db2cc6a0c528677a9780e7ebc45c1b2fab2
diff --git a/dev-python/pytest-mock/pytest-mock-1.2.ebuild b/dev-python/pytest-mock/pytest-mock-1.2.ebuild
deleted file mode 100644
index 2dc05b0a31ce..000000000000
--- a/dev-python/pytest-mock/pytest-mock-1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		dev-python/mock[python_targets_python2_7]
-	)
-	python_targets_pypy? (
-		dev-python/mock[python_targets_pypy]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
-		py.test test_pytest_mock.py || die
-}
diff --git a/dev-python/pytest-mock/pytest-mock-1.5.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.5.0.ebuild
deleted file mode 100644
index 32941be25b3c..000000000000
--- a/dev-python/pytest-mock/pytest-mock-1.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with py.test"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		dev-python/mock[python_targets_python2_7]
-	)
-	python_targets_pypy? (
-		dev-python/mock[python_targets_pypy]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	if has_version dev-python/mock; then
-		# test fails when standalone mock is installed
-		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	PYTHONPATH=${PWD}${PYTHONPATH:+:}${PYTHONPATH} \
-		py.test test_pytest_mock.py || die
-}
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
index 0d8b032e8541..80f4d4912349 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
@@ -17,10 +17,10 @@ IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
 	python_targets_python2_7? (
-		dev-python/mock[python_targets_python2_7]
+		>=dev-python/mock-2[python_targets_python2_7]
 	)
 	python_targets_pypy? (
-		dev-python/mock[python_targets_pypy]
+		>=dev-python/mock-2[python_targets_pypy]
 	)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
index afa47bdffc92..4d4ced48dfbc 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
@@ -17,10 +17,10 @@ IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
 	python_targets_python2_7? (
-		dev-python/mock[python_targets_python2_7]
+		>=dev-python/mock-2[python_targets_python2_7]
 	)
 	python_targets_pypy? (
-		dev-python/mock[python_targets_pypy]
+		>=dev-python/mock-2[python_targets_pypy]
 	)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]