gentoo resync : 18.11.2019

5 files changed, 56 insertions, 3 deletions

diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index e67557ee045f..fcf161e3425e 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -2,7 +2,9 @@ AUX mock-1.0.1-fix-python3.4.patch 895 BLAKE2B 0a767889c488559f5cdc8a472a3a58d65
 DIST mock-1.0.1.tar.gz 818644 BLAKE2B 7bfe02c413c2f98a2d98ca9cc40ca8831d65b3a5095d95625e0844e764c3510b771dc9e36086dd44f518659cdf7f1d105c02bdb51c5ffe00953c5eb3b0e05106 SHA512 4f6f4ebc34843e16b15d866e415ad9992e79bd266a63a22fee31b773ba77615e3406bc8890ceed92c0ee296380d68c46299c4c4448a3526f9cb96b258d32cf58
 DIST mock-1.3.0.tar.gz 70908 BLAKE2B 4df669c5d54fc835c70d6190362d4dea9cc0d2e7ca47f6ef5a394bc80cac10898b611146f28da93e84c4b26c23f25708be3c8fc6b61062dae099396e351861d8 SHA512 10cbb78b89f2e82abfcadc035a526182f83b59df4775cd85acfdbeb4505791c63b7a3761e6126a08d9aedbd07ead8632ac2a728dc07a362f4aaeea694bdecaf9
 DIST mock-2.0.0.tar.gz 73684 BLAKE2B 970bebe72b6969b58acdc2856b53054f992d01f9f3ca5f91b73073d0a1c9ec89a5c94fd66eab85b258f23f33326825ff6598bb2ba8e07eded1e6540a26ac5fa3 SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238
-EBUILD mock-1.0.1-r2.ebuild 1095 BLAKE2B ab19c5c4ab4e5d66d966db8059dfd22c8f7b596e6899399833a22122ca5aa1e6496a4d925c0259a45edb36f28966795b6b00f7818bfc0ebba7ecf3a97ce12486 SHA512 313aa222f9d76b2916da9fb842959b7095f979ff2903734941b3fa6cfe304fee65e93bda500729edf708b09cbdb7414e7862d8d41d1b45ad157be9b9d70ef3e1
-EBUILD mock-1.3.0-r2.ebuild 1046 BLAKE2B 43550687982c524e5c08bf933e63209e8a10db517a1a4b2372dc2db022d2111ee8e8c7baa81228912a78507d97913f72af1c98c1e2ed9ef2c76f2982ddfed4f5 SHA512 386c4310beef129e0edbaccbab84e76ea1ef40469624c62b16a6c5fde6f28e1376a48ad77feb6bb8ff5b1777de8e9aa41ec41f22c1d8504d4036d0091f03b3cd
-EBUILD mock-2.0.0.ebuild 1054 BLAKE2B 799c012df3cc400541aac4182f56335ac0f4218f8bec47f96c96c77debcea2cd54779dfcf844fc181a45cd74ffb8b91e3084b6cadd45f5576df6d813a6660d8e SHA512 3b2119b5d61ba930a3f2f8b8a4fcf03757cdbdfaeb2bbb1bf7bf0f2074e7efd7f28953c75815e750e7875807828dc19e53512e309908c88766b7070034a5c034
+DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
+EBUILD mock-1.0.1-r2.ebuild 1122 BLAKE2B 4d00d5a77738a33e64cd7298efad068206f44141e7818f1197023da2a08a5549be2fc20c378aff5f3defea1ecd3f48e0e246bde71ddd5271b77a5f4a099b6a27 SHA512 9a849307f5990b5bb85fc7231cce8622bb17fa7a2de24b6f7e0a082c3a415891ffd3c80f034d795d3d346e6ced972e7ba230d61662b1697e32f1562441a8962a
+EBUILD mock-1.3.0-r2.ebuild 1073 BLAKE2B 1e0c6261ebc7b0bc7bc7392c68fbea6b1fdf10d4e58f591e3d35c3f2523ad6bdd0aefb98680bb1da8c70a318808eb557fc86f770218b7d622b493565d73496a0 SHA512 ddaf8c0b2fe99ed6fb2874a2fa212e1fe7df1bc92739aa7b8f134551ea9707e674afc8de16030c03d1c2e35e2f1fcf38c76187d66590ec1ee30baa5e845f0866
+EBUILD mock-2.0.0.ebuild 1081 BLAKE2B 0c43038172d0b22af9759a1abe473d94808ed47c2678304d93c02394cea4fb5992fab6e58a8cca4809277469d71596203d8dd77737056b2c821cfe455e4be5c1 SHA512 d270885452492921423d0f330cfa1a23bc3ba03e3639b29a438cda1f2b224a65dcf6bb1f9c5e2ab7b384d7d4f0452f78c0bef9dfe272ba0038de5a3fffa979d2
+EBUILD mock-3.0.5-r1.ebuild 1476 BLAKE2B 06d3c10e3a6b02675ae5c89e22c69d9f9edb4ebc0477f72dc1e4fc61e980340cc751ae97858a472f8a7982f88fe93a644dea2665b537828121c51cd76e05052e SHA512 55ffd98626870a2ad08b2b191f74a8cd2469fe8574936187073f03f108511ffd6ea316af5936860f7cf117600ea2fcf0fcb2a1c535cb05556cd11aedf865d575
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index 31706242291f..bb4bab3138bd 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 # dev-python/unittest2 is not required with Python >=3.2.
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
index 67c8c68ec048..ba7cdb49f668 100644
--- a/dev-python/mock/mock-1.3.0-r2.ebuild
+++ b/dev-python/mock/mock-1.3.0-r2.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index 4fa375fb9ee8..5981e50dd65d 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-3.0.5-r1.ebuild b/dev-python/mock/mock-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..3482aae0719a
--- /dev/null
+++ b/dev-python/mock/mock-3.0.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="https://github.com/testing-cabal/mock"
+SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=virtual/python-funcsigs-1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"
+
+python_test() {
+	# Upstream supports running tests only in their dream pristine
+	# environment.  pytest doesn't work at all if mock is already
+	# installed.  We can use plain unittest but we have to reinvent
+	# test filtering.
+	cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if ! python_is_python3; then
+		rm mock/tests/*py3* || die
+	fi
+
+	# https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa
+	if [[ ${EPYTHON} == pypy* ]]; then
+		sed -i -e 's:def test_copy:def _test_copy:' \
+			mock/tests/testmock.py || die
+	fi
+
+	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGELOG.rst README.rst )
+
+	distutils-r1_python_install_all
+}