gentoo resync : 14.05.2020

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index 2843a2686841..14da42be4a3d 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,5 +1,3 @@
-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-2.0.0.ebuild 1097 BLAKE2B bc70db9989c8464d3939820ef714a14d10825fc7484aa0f28a740160cba85f8d980975c325b85ed4ca2b191daf4f13f47e9ef4d5889e0cd73935854a0462295b SHA512 c67884e3512aa4a668d498afbb5ca8f4894b691b8755fb4d8f439fc68030e096723c2e0fc7ec3057f191421b89c0948af3e100978921166d9be28e560f23419e
-EBUILD mock-3.0.5-r1.ebuild 1490 BLAKE2B 61d19722c99685b89765eef425372c1d0f829bd110acdb4d97949f3b20e9c8acf7291eb8f4fad277697e8e76b978e3684244f755d9b17a2104b87641e9b6d03c SHA512 2cdc53ae16eab435b7244f4b0bd068f85cfb9a5e42aaac06eefbbbf7bca3d209ea98965abd90a13ce18eeb4e5630d9f08294eeee0b0710f4e84abe6af97a50cc
+EBUILD mock-3.0.5-r1.ebuild 1481 BLAKE2B 2bfc2db7866ddf4ef24d9591d3cb4309737dd220916e0a4b9536c8f74d819cc2fa7b745ed05f56f65802d57c2f8dc235ee2783d0e86d9055a850d7863cd21cd5 SHA512 15e171fd4a165ea1fead152f89151646bfe8301a264b337a5b060042c2e1d7f9b5d28d82b09880a97aa3374d5c4eec3b2c1ae07450c7ce1a154f7e4425426efd
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
deleted file mode 100644
index 4e68121e49a5..000000000000
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} 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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/funcsigs[${PYTHON_USEDEP}]
-	' -2)"
-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.9[${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-3.0.5-r1.ebuild b/dev-python/mock/mock-3.0.5-r1.ebuild
index 661366ae8938..105b0eb75595 100644
--- a/dev-python/mock/mock-3.0.5-r1.ebuild
+++ b/dev-python/mock/mock-3.0.5-r1.ebuild
@@ -13,7 +13,7 @@ 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 ~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="
 	$(python_gen_cond_dep '