gentoo Easter resync : 12.04.2020

6 files changed, 10 insertions, 126 deletions

diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index 998d066f093f..2843a2686841 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,10 +1,5 @@
-AUX mock-1.0.1-fix-python3.4.patch 895 BLAKE2B 0a767889c488559f5cdc8a472a3a58d656d1e974012da5b4e97cdee1e0006d52c2d413520cc59330a6893e430f032040d6cf1179ca282ba55571e75bbf6adba1 SHA512 86c08b8754a7ab7fe923c5d61d66f1196c603efea86a0e04df2fa8f53280522625e175bfd601de49c1f963c0948a2c6279154cd0e1fb5e7c2e5378ddfa512e97
-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
 DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
-EBUILD mock-1.0.1-r2.ebuild 1114 BLAKE2B 0b556a88ba7319d91b05789190fbe52781be57f905ca43b23da6591ff30d38acf67496397b4671b2f785c03cd14844a9d4f87ed028c966cbca46ef3de86b963a SHA512 113f299cbfbba98c6f906ac93866e8a6a975092c1a44f3490ec8d32bf891e3427d0bfe8bbc1088a6c222e7281f08195bbe9b5bd20b8a07b4570bfee97f733018
-EBUILD mock-1.3.0-r2.ebuild 1065 BLAKE2B 90c2be33943ff0999efa5d6b179e95ac4712faa2b5077f4d3dc46627dd1644c048bdea96d1a3203b9be7a82cf1f75b4e317b5ce5c43f46c45cedeb21c0f40170 SHA512 07bd81f45bb56593fe5d9d5490c9f030ffe0a7fdf76cea4f3c39ff48633fb456a666f42f0d65070eb2617f62981e7c4598a5ce6da3c0f4b1261648dc46fee8be
-EBUILD mock-2.0.0.ebuild 1075 BLAKE2B 831127824f1f31f4f732ea263180235a61fab7e03824b94917496616ed316e692c98b38c5f2f5154954a252faf74ddf5ada0eb07060180db2311fea8be101133 SHA512 cdfd2dd282049ae6068442971a40b4b6a9d1cf9907be48be27f1456451738ed35baddf66111710f045f375da7a2bb981062a63131c8243078d30934930c4a15e
-EBUILD mock-3.0.5-r1.ebuild 1469 BLAKE2B 3075913cdf16e2e2265a7e4493d0e51786764ea4574ce0fdc8f09843b97e4141cb1c21bcf2fa563da568a5489d038ebe44dea9b0a6457803e5e3f3a77a7c968e SHA512 430c90e5c0884423e0d85722e6d1b0449689e28718e63fe462a548f8eef1064c55b04f19dd36723ed90a584a27eef59d1bd2b7a5adac4e75488eb5d572715758
+EBUILD mock-2.0.0.ebuild 1097 BLAKE2B bc70db9989c8464d3939820ef714a14d10825fc7484aa0f28a740160cba85f8d980975c325b85ed4ca2b191daf4f13f47e9ef4d5889e0cd73935854a0462295b SHA512 c67884e3512aa4a668d498afbb5ca8f4894b691b8755fb4d8f439fc68030e096723c2e0fc7ec3057f191421b89c0948af3e100978921166d9be28e560f23419e
+EBUILD mock-3.0.5-r1.ebuild 1490 BLAKE2B 61d19722c99685b89765eef425372c1d0f829bd110acdb4d97949f3b20e9c8acf7291eb8f4fad277697e8e76b978e3684244f755d9b17a2104b87641e9b6d03c SHA512 2cdc53ae16eab435b7244f4b0bd068f85cfb9a5e42aaac06eefbbbf7bca3d209ea98965abd90a13ce18eeb4e5630d9f08294eeee0b0710f4e84abe6af97a50cc
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch b/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch
deleted file mode 100644
index 166ee2ac00d3..000000000000
--- a/dev-python/mock/files/mock-1.0.1-fix-python3.4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Fix test errors with python 3.4 - thanks to Ubuntu developer Barry Warsaw.
-
-diff -r d356250e275d mock.py
---- a/mock.py	Tue Apr 09 14:53:33 2013 +0100
-+++ b/mock.py	Wed Feb 26 15:12:18 2014 -0500
-@@ -239,12 +239,21 @@
-     funcopy.__name__ = func.__name__
-     funcopy.__doc__ = func.__doc__
-     #funcopy.__dict__.update(func.__dict__)
--    funcopy.__module__ = func.__module__
-+    try:
-+        funcopy.__module__ = func.__module__
-+    except AttributeError:
-+        pass
-     if not inPy3k:
-         funcopy.func_defaults = func.func_defaults
-         return
--    funcopy.__defaults__ = func.__defaults__
--    funcopy.__kwdefaults__ = func.__kwdefaults__
-+    try:
-+        funcopy.__defaults__ = func.__defaults__
-+    except AttributeError:
-+        pass
-+    try:
-+        funcopy.__kwdefaults__ = func.__kwdefaults__
-+    except AttributeError:
-+        pass
- 
- 
- def _callable(obj):
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
deleted file mode 100644
index bee491b3248c..000000000000
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Mocking and Patching Library for Testing"
-HOMEPAGE="http://www.voidspace.org.uk/python/mock/ https://pypi.org/project/mock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# dev-python/unittest2 is not required with Python >=3.2.
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-fix-python3.4.patch )
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( docs/*.txt )
-
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r html/ -x html/objects.inv -x html/output.txt -x html/_sources
-	fi
-}
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
deleted file mode 100644
index 2789d2fb07cc..000000000000
--- a/dev-python/mock/mock-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="https://github.com/testing-cabal/mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.7[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests --verbose || die "tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( docs/{conf.py,index.txt} AUTHORS ChangeLog NEWS README.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index f57e98c27c96..4e68121e49a5 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.ebuild
@@ -13,13 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=virtual/python-funcsigs-1[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+	' -2)"
 DEPEND="
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/mock/mock-3.0.5-r1.ebuild b/dev-python/mock/mock-3.0.5-r1.ebuild
index 40faa14a5262..661366ae8938 100644
--- a/dev-python/mock/mock-3.0.5-r1.ebuild
+++ b/dev-python/mock/mock-3.0.5-r1.ebuild
@@ -13,10 +13,12 @@ SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.t
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
-	>=virtual/python-funcsigs-1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+	' -2)
 	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"