gentoo resync : 29.12.2022

3 files changed, 2 insertions, 58 deletions

diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index c9d7c98e214a..e0064d9e9683 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,5 +1,4 @@
 AUX mock-4.0.3-py310.patch 2849 BLAKE2B a23047a6a872f7badb845388c3dcfb6c554824e524a094c09762a8749b3f6c292ddd58a1843cc540892a1a850f639af254a74abbfffb70deda4b756dca7dec9f SHA512 ad4448a85267aab11a35c761896779d66b45c2a38b6208226eeddcbbb7b28bac840f11fb9d69b72781383a82334a37b00dfac601fd9fe16f842da93c1b4ee3bb
 DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89
-EBUILD mock-4.0.3-r1.ebuild 875 BLAKE2B 51127615212ea62f8ed4a2c31d2f1857d2f49e6930d73289fe013f7f327ea236e42c406d3184a55a09dbb94c1eecda1976a410ccbc180ebef302a54370bfdb0e SHA512 c9ecf9fcf5d7af60aa1b5f3ef269dc78cb0f298c3e0a5861d58a3cec473a07d2ce8c8f5a0c1cb884ffd50c7f3f1b43c0851d6d2319190cbf100a8a929c164c63
-EBUILD mock-4.0.3.ebuild 1540 BLAKE2B d41fbeb74d3b151eb58373b20b6046239a75b0429bff8a83eb3bfc1ecba815768f5838f0d234e1864f251c2c17b4e67ccd378556129ea8c0d41457416c84a4e1 SHA512 69d6cec9a1cbca7df447f3597c08469548cb0d53344ffff0457dc3b59eb1d06fba8bc5a08a0b318930bc3eae82aa4023903b2652b099afe85d5c4b5d02ce3bc3
+EBUILD mock-4.0.3-r1.ebuild 867 BLAKE2B eb394dfe8d34ba9c00879e98c972e802908ba9313d90acf4425fa048236ddaec98db5745360d237e1369e2e5a3c9c6d841860f6b3bd4a6913fb2172ce64355e3 SHA512 ce209606b78052b54f71873b98df4df33055255630d73a454cd3184a021b01d5c32ee4c81dde04a66e1b072fec3d2c30aad12536d9461ea2f32f5a2e70fea8b8
 MISC metadata.xml 390 BLAKE2B ab0f000e11ee427d56fa28e307764a2c1864ce74bc679a491ab005a70d2bf8502d9a82b5d1941fcc268438880f8f950587aa090de9e611a520f89a49c78c0cbc SHA512 8456ad417374be30c038abce5a232d1075b8685e6432be93f49a74f327239354e14edfddf5e4a473264fb09bc0e4e6059489c1d0d651e8391ab0678d22987aeb
diff --git a/dev-python/mock/mock-4.0.3-r1.ebuild b/dev-python/mock/mock-4.0.3-r1.ebuild
index 98086486bfc5..ef0f66319384 100644
--- a/dev-python/mock/mock-4.0.3-r1.ebuild
+++ b/dev-python/mock/mock-4.0.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-4.0.3.ebuild b/dev-python/mock/mock-4.0.3.ebuild
deleted file mode 100644
index 522c268a1f72..000000000000
--- a/dev-python/mock/mock-4.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
-BDEPEND=${RDEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-src_prepare() {
-	sed -i -e '/  pytest.*/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-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
-
-	# 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
-
-	# Avoid pytest dependency
-	sed -i -e '/import pytest/d' mock/tests/testhelpers.py || die
-
-	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG.rst README.rst )
-
-	distutils-r1_python_install_all
-}