gentoo resync : 01.10.2021

6 files changed, 2 insertions, 150 deletions

diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 1bc49686eaca..a6dd3a08b0a9 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,12 +1,5 @@
-AUX flexmock-0.10.6-fix-with_args-sys.stdout.write.patch 2707 BLAKE2B 9848593b70aca7e118c4a787c2e153e15982eb5f403b1883d484bdd2d22efd8b6d9ff2d9e1bb3e4699215e9c15cb0d5cff8ac2b571e6d87aa0186fa416981cd9 SHA512 3ba7f4ae532670e9576e9e060e0e4a1d0530ae7ab4f0e40e6e20e103e64030d2e5a0900e412d3006e7864e6d67976ee22f2067af7611f21f9400dd7c421b0ebb
 DIST flexmock-0.10.10.tar.gz 49201 BLAKE2B f5d77398ac14a002f78790d4e03f93bcd00c016e6a5eb0be45ce3b59a223159656ab694a1dd1124cbac351680fef25084d69e9533d668177ea73b9e458df5b6f SHA512 211939bf40ecb25981a70d5bfe897ef8127ef38d5adf6a48b086c4b6f49b05e1a04f09afb73f428e3eb21a8090ba33ca86e605c2c1ac70d9fc269fdd640ccb73
-DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
-DIST flexmock-0.10.6.tar.gz 46740 BLAKE2B b5c8083694e8787e85ff0f41265ad9f716a4c82d274ca5c793b6d93bf8bf28f3e57afd33f7ba59149e75f7bffbebd3843901dfa75caaefc6f76f3eef0c603314 SHA512 2ebaed78926f01bd4d886a509d978d0de04629f7d96c48f846b8ccf7906bb2303e7cbeab8226c6eb98d058f940434144cc2d6300d6aa2533f1f217788211490e
-DIST flexmock-0.10.8.tar.gz 46905 BLAKE2B d5f28e012edf9678fd5f72ec1d99e4e98b00dbb36536877cb393c16563097e0e3f18ab24243f7090bfa306f8be194243d201d9aaf5d64491bb594cff82b60e1e SHA512 cac327b3e3c4c6ccbcd6c7f71863b67fdd5454c13bbd5403b3ba521e3ae945ba453152df623eef08b2b60210ba626447a9e6bad76c2215281d43ae0f42ebf1a9
 DIST flexmock-0.10.9.tar.gz 48466 BLAKE2B b6c73fdb6d281870806db7b34d43d8f116c29ff28a3753e7873868e66df9a34f8f4cfa0c1a7f1fd620a58a46b4376538a8a64994ed82d500a850f86c24fe54d2 SHA512 6e39e5a88b1d744d348f834f4664fc477412f6f09dd2500ef35a52126ce14f9e8d24a04c1ceb16c24b31bc40c3d8276f2efa75a701ecf284bb2cb5388513a75f
 EBUILD flexmock-0.10.10.ebuild 533 BLAKE2B 6b4cb39684e9e1b6d384edb5387b8d31412867ed389a15fc5ef793e1764001ab08aed4b82b2ad647f9b9d94940a416940d3e8db09f333d01fe5f39049ed33122 SHA512 0495922974681c9690532746384032c30779299b37538ad32f125a6d71a00ff154c5a1294faeb3863285263f3d7a07e920f58e4624a82e9ba437787e9b3d41dc
-EBUILD flexmock-0.10.4.ebuild 489 BLAKE2B f22dc9131f02343a598a8b61546184bee128d54de48acd2de913f6ef48121438323a0c7c169ad9c8761628f44923147403761e46c59bc5f302c48ec32ddb1be9 SHA512 e389dd36a35931b8d2a7354b32ab3155e3475f92332aee2040576ade042cf9b30310292e0d0925e61cc647993ab857d3e4ad7ccc12198c080f95e11cf2f1a217
-EBUILD flexmock-0.10.6.ebuild 600 BLAKE2B a7e911d052d43c11540d8abfbc90f9d1b5099455bb4efdfb28652d7c017163730d4a282f7af7a824dd9d961b4defb7bc27a77fbf147ff4bc96d01dc5f38944f7 SHA512 df9f8c7b191d71c69978c19e40d300505c8d4d43712db7af15d3ac9dd12f0b76c83e84ce89112492ae78544fa3c4aa914c1701f7a1515869f4e68b77ca44af70
-EBUILD flexmock-0.10.8.ebuild 530 BLAKE2B bea43bb268613fc8d5f415a867f832173edaca8b14241171db7f2fe9f83678e07fbdffa9d045eac859691a83d0bfa355cae22cb7de9bf57c452054364b737f62 SHA512 e280d71065576bf12e5148cec79257a4c5d8b09ad1449f0cea15243772186288aabd8d14d37f928acda25eaea7b0e03576846967c1f1778563cbf5e232cd1f3e
-EBUILD flexmock-0.10.9.ebuild 534 BLAKE2B 086ab543993378bcee8b681b153d1b986d4b0457d384ab482ebbf104e3dd48f7456ba9b0a0f9735a192d5ce349ba3abc89dd66de43cbf4430f9696b34648f42e SHA512 1786d6f08a97852f51b2d102ec552ba91830c9893cb37a8c53c6959c4169c97b8bc4ec40439c6008a16e0f3e678bb018ca8880c35cadf417bd1d08b2b2a56aa4
+EBUILD flexmock-0.10.9.ebuild 533 BLAKE2B e97351a6ee65337b3a6032e428bada4fa77e017e71f9d9aa77f16177c6365a926336f9ae29833aa009986a68d5ad3335e97801da8f630dbcdb3e2dae70dc17d1 SHA512 e1a15900ae680c915a03a8bc511d49a3661a3fbe94cf0f614dad5302bd42575d8da8e7b7891caa9504899e1198fcadda37db64fcaecf3808a5fd3e791b3a51e6
 MISC metadata.xml 397 BLAKE2B d876f426fea0e14ea3518dcf7cf685ec697bfaa09c83b93ad7bf4ecf97dff87cf1ef491e91d759625ee9c8d7f64c4be8419024ad087acac4779a69c283dfde12 SHA512 f8694424c9fe17611fd882f205df6dbe6085b8214a4f1c26e4d5c216e3e018971f85e643a473efd330d61a7759ab9464f9a7fe6e04e2c0d7e02b1e3ce37aab19
diff --git a/dev-python/flexmock/files/flexmock-0.10.6-fix-with_args-sys.stdout.write.patch b/dev-python/flexmock/files/flexmock-0.10.6-fix-with_args-sys.stdout.write.patch
deleted file mode 100644
index 0c3988e41788..000000000000
--- a/dev-python/flexmock/files/flexmock-0.10.6-fix-with_args-sys.stdout.write.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 020ebef66523e9496f8042beb9384f3f770a6412 Mon Sep 17 00:00:00 2001
-From: Arthur Zamarin <arthurzam@gentoo.org>
-Date: Thu, 19 Aug 2021 20:39:04 +0300
-Subject: [PATCH] Fix with_args not working with sys.stdout.write
-
-https://github.com/flexmock/flexmock/commit/513265e731fc4daceeb19123a4e71d652b990a1a
-
-Backported to 0.10.6 by Arthur Zamarin <arthurzam@gentoo.org>
-
---- a/flexmock.py
-+++ b/flexmock.py
-@@ -254,13 +254,13 @@ class Expectation(object):
-         #  - it's not a static method
-         #  - the mocked object is a module - module "methods" are in fact plain functions;
-         #    unless they're classes, which means they still have __init__
--        is_method = ((inspect.ismethod(self.original) or inspect.isfunction(self.original)
--                      or _isclass(self.original)) and
--                     self.method_type is not staticmethod and
--                     (not isinstance(self._mock, types.ModuleType) or
--                      _isclass(self.original)))
-+        is_builtin_method = isinstance(self.original, types.BuiltinMethodType)
-+        is_method = inspect.ismethod(self.original) and self.method_type is not staticmethod
-+        is_class = inspect.isclass(self.original)
-+        is_class_method = (inspect.isfunction(self.original) and inspect.isclass(self.mock)
-+                           and self.method_type is not staticmethod)
-         args_len = len(allowed.args)
--        if is_method:
-+        if is_builtin_method or is_method or is_class or is_class_method:
-             args_len -= 1
-         minimum = args_len - (allowed.defaults and len(allowed.defaults) or 0)
-         maximum = None
---- a/tests/flexmock_test.py
-+++ b/tests/flexmock_test.py
-@@ -17,6 +17,7 @@ from flexmock import ReturnValue
- from flexmock import flexmock_teardown
- from flexmock import _format_args
- from flexmock import _isproperty
-+import random
- import flexmock
- import re
- import sys
-@@ -308,6 +309,15 @@ class RegularClass(object):
-         assertEqual('got an int', mock.method_foo(23))
-         assertRaises(MethodSignatureError, mock.method_foo, 2.0)
- 
-+    def test_with_args_should_work_with_builtin_c_functions_and_methods(self):
-+        flexmock(sys.stdout).should_call("write")  # set fall-through
-+        flexmock(sys.stdout).should_receive("write").with_args("flexmock_builtin_test").once()
-+        sys.stdout.write("flexmock_builtin_test")
-+
-+    def test_with_args_should_work_with_builtin_python_methods(self):
-+        flexmock(random).should_receive("randint").with_args(1, 10).once()
-+        random.randint(1, 10)
-+
-     def test_flexmock_should_match_expectations_against_user_defined_classes(self):
-         mock = flexmock(name='temp')
- 
--- 
-2.33.0
-
diff --git a/dev-python/flexmock/flexmock-0.10.4.ebuild b/dev-python/flexmock/flexmock-0.10.4.ebuild
deleted file mode 100644
index 5be99a9dfb3e..000000000000
--- a/dev-python/flexmock/flexmock-0.10.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="https://flexmock.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
diff --git a/dev-python/flexmock/flexmock-0.10.6.ebuild b/dev-python/flexmock/flexmock-0.10.6.ebuild
deleted file mode 100644
index 67922e50909b..000000000000
--- a/dev-python/flexmock/flexmock-0.10.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="https://flexmock.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-with_args-sys.stdout.write.patch"
-)
-
-python_test() {
-	epytest -p no:flaky
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
diff --git a/dev-python/flexmock/flexmock-0.10.8.ebuild b/dev-python/flexmock/flexmock-0.10.8.ebuild
deleted file mode 100644
index dd44eb32f8f8..000000000000
--- a/dev-python/flexmock/flexmock-0.10.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="https://flexmock.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
diff --git a/dev-python/flexmock/flexmock-0.10.9.ebuild b/dev-python/flexmock/flexmock-0.10.9.ebuild
index 2efe124954db..6e73a091c173 100644
--- a/dev-python/flexmock/flexmock-0.10.9.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="amd64 ~arm ~riscv"
 
 distutils_enable_tests pytest