gentoo resync : 22.12.2021

6 files changed, 2 insertions, 231 deletions

diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 8836d7c05e5a..813aa8d4d7e9 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -1,8 +1,3 @@
-AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb25300fee4430d3c4f42e560eaffdb208b672246fa2a9bce828f57fce36c32f03b329f9e0fcbea6d3b0fd1aef6605567c763fcfc80e SHA512 2d1512ca1f0572e4ffb17ac4b964e391ed9c5b5bdb78eac7a1710d51804f8c33c6ffbeb9b85565dc2d4162c5a912c864f15c7857e85cb294c1e0712ae540e983
-AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
-AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
-DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
 DIST nose-1.3.7_p20211111_p1.gh.tar.gz 327855 BLAKE2B acddcaa0718f23f281ea34a977354b3ef88c95d4ef712afd8354effe6df7883d473b50caaa3b5c79fcc4c36a9d45bee4eb5865a6ef66e371dae12ed1a0a0418a SHA512 752eb1337fd481a1b8498ead330d716cf4180c18faabde257e9a1139928b9fa38e2e145d36c1ea8e3867a36d4843134ee26e9e9f83ff84d21f0fe246d2392d15
-EBUILD nose-1.3.7-r9.ebuild 2290 BLAKE2B f46fef98701ba1dc77aeedd2c9e3d6d572e8b0563956282d76547a6930b5750336fa9528cb11e87179cfb977439fecbb090b5da1ba2cb8ef8d2ed30010fb3090 SHA512 d5a7ffc2d7d72079efd0697b6b1c3edfc41dd3f2349822400ae8c306756b9088dd5460ba11775404d8b4c96b96197156df57fff89967fb7c4c3f1998fa1cb8ec
-EBUILD nose-1.3.7_p20211111_p1.ebuild 1435 BLAKE2B 60a873defdee3d813f921a69559cdace21af501e72e1952ff050943aef41d89ab0245b48e17ac4da1926b90b485c7b3c17c609d735e17159f40c1779b243bdd5 SHA512 ab43485ecd840c7cce4ffb25622622595d44aeb66106b2f113dc9ad662b5b546f615b7cdc2cd63c6f39b545e720efd66f9694e28bd91534fe5d4fac740fcd2d7
+EBUILD nose-1.3.7_p20211111_p1.ebuild 1427 BLAKE2B 8b821d64318e5b5c6b8147e359f5240bc9208bd41c919260b090b8f6376a3e2d62c54c32d42f1b8d28c726a77e0e5acd5cb47acb8dafcc67789372d5d237aaf6 SHA512 ab90f9cffc8235bae080ebc16989677b8131152b0f6ca1c252529aa243db3f8107e832ef962f1a9aa45b81119aaeedbc6ea904c3c768f61d829500bb4dff11bb
 MISC metadata.xml 399 BLAKE2B bccd250e005dc4b4921b8affffa56c918069576663c44671189d40dea344c0fb880fcf41656b1c9c5043cea9a0203b3ad3b980f7920ecebab82b4c71f75214d4 SHA512 15fd9ea9d0c09833f25497e2715a15cb2b2dbcbe042e0a3fa24525455eaeb470d6c799fddcd635a5197c984252649a26352713fcd069123fe2546edc20566fa6
diff --git a/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch b/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch
deleted file mode 100644
index 87577871b613..000000000000
--- a/dev-python/nose/files/nose-1.3.7-coverage-4.1-support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/nose/plugins/cover.py	2016-10-11 15:51:26.990868010 +0200
-+++ b/nose/plugins/cover.py	2016-10-11 15:52:28.261102027 +0200
-@@ -187,7 +187,7 @@
-                     for name, module in sys.modules.items()
-                     if self.wantModuleCoverage(name, module)]
-         log.debug("Coverage report will cover modules: %s", modules)
--        self.coverInstance.report(modules, file=stream)
-+        self.coverInstance.report(modules, file=stream, show_missing=True)
- 
-         import coverage
-         if self.coverHtmlDir:
-@@ -207,7 +207,7 @@
-         # make sure we have minimum required coverage
-         if self.coverMinPercentage:
-             f = StringIO.StringIO()
--            self.coverInstance.report(modules, file=f)
-+            self.coverInstance.report(modules, file=f, show_missing=True)
- 
-             multiPackageRe = (r'-------\s\w+\s+\d+\s+\d+(?:\s+\d+\s+\d+)?'
-                               r'\s+(\d+)%\s+\d*\s{0,1}$')
diff --git a/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
deleted file mode 100644
index 8d2f2f05dc29..000000000000
--- a/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8e7ad3d50012688ca029d126cbc88251831fea88 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57@gmail.com>
-Date: Mon, 1 Feb 2016 00:05:30 +0300
-Subject: [PATCH 1/2] Set __qualname__ equal to __name__ on derived classes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-To make output on Python ≥ 3.5 the same as on previous Python versions.
-
-This fixes #928.
----
- functional_tests/test_load_tests_from_test_case.py | 1 +
- nose/util.py                                       | 1 +
- unit_tests/test_xunit.py                           | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py
-index 42f8563..13d0c8a 100644
---- a/functional_tests/test_load_tests_from_test_case.py
-+++ b/functional_tests/test_load_tests_from_test_case.py
-@@ -29,6 +29,7 @@ def setUp(self):
-                 pass
-             def tearDown(self):
-                 pass
-+        Derived.__qualname__ = Derived.__name__
-         # must use nose loader here because the default loader in 2.3
-         # won't load tests from base classes
-         l = loader.TestLoader()
-diff --git a/nose/util.py b/nose/util.py
-index bfe1658..80ab1d4 100644
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -643,6 +643,7 @@ class C(cls):
-         pass
-     C.__module__ = module
-     C.__name__ = cls.__name__
-+    C.__qualname__ = cls.__name__
-     return C
- 
- 
-diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py
-index 944d285..261436b 100644
---- a/unit_tests/test_xunit.py
-+++ b/unit_tests/test_xunit.py
-@@ -16,6 +16,7 @@ def mktest():
-     class TC(unittest.TestCase):
-         def runTest(self):
-             pass
-+    TC.__qualname__ = TC.__name__
-     test = TC()
-     return test
- 
-
diff --git a/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch b/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch
deleted file mode 100644
index eda10ff036cf..000000000000
--- a/dev-python/nose/files/nose-1.3.7-python-3.6-test.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 84bb82245d10798825439dc13846eb0538d84239 Mon Sep 17 00:00:00 2001
-From: Tomas Orsava <torsava@redhat.com>
-Date: Mon, 12 Dec 2016 14:35:50 +0100
-Subject: [PATCH] Fix compatibility with Python 3.6
-
-Python 3.6 returns ModuleNotFoundError instead of the previous ImportError.
-https://github.com/nose-devs/nose/pull/1029
----
- functional_tests/test_loader.py           |  2 +-
- functional_tests/test_withid_failures.rst | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/functional_tests/test_loader.py b/functional_tests/test_loader.py
-index 104f220..906e2ba 100644
---- a/functional_tests/test_loader.py
-+++ b/functional_tests/test_loader.py
-@@ -372,7 +372,7 @@ def test_failed_import_module_name(self):
-         assert res.errors, "Expected errors but got none"
-         assert not res.failures, res.failures
-         err = res.errors[0][0].test.exc_class
--        assert err is ImportError, \
-+        assert issubclass(err, ImportError), \
-             "Expected import error, got %s" % err
- 
-     def test_load_nonsense_name(self):
-diff --git a/functional_tests/test_withid_failures.rst b/functional_tests/test_withid_failures.rst
-index cf09d4f..cb20886 100644
---- a/functional_tests/test_withid_failures.rst
-+++ b/functional_tests/test_withid_failures.rst
-@@ -7,16 +7,16 @@
-     >>> support = os.path.join(os.path.dirname(__file__), 'support', 'id_fails')
-     >>> argv = [__file__, '-v', '--with-id', '--id-file', idfile, support]
-     >>> run(argv=argv, plugins=[TestId()]) # doctest: +ELLIPSIS
--    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
-+    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
-     #2 test_b.test ... ok
-     #3 test_b.test_fail ... FAIL
-     <BLANKLINE>
-     ======================================================================
--    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
-+    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
-     ----------------------------------------------------------------------
-     Traceback (most recent call last):
-     ...
--    ImportError: No module ...apackagethatdoesntexist...
-+    ...: No module ...apackagethatdoesntexist...
-     <BLANKLINE>
-     ======================================================================
-     FAIL: test_b.test_fail
-@@ -35,14 +35,14 @@ Addressing failures works (sometimes).
-     >>> argv.append('1')
-     >>> _junk = sys.modules.pop('test_a', None) # 2.3 requires
-     >>> run(argv=argv, plugins=[TestId()]) #doctest: +ELLIPSIS
--    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
-+    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
-     <BLANKLINE>
-     ======================================================================
--    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
-+    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
-     ----------------------------------------------------------------------
-     Traceback (most recent call last):
-     ...
--    ImportError: No module ...apackagethatdoesntexist...
-+    ...: No module ...apackagethatdoesntexist...
-     <BLANKLINE>
-     ----------------------------------------------------------------------
-     Ran 1 test in ...s
diff --git a/dev-python/nose/nose-1.3.7-r9.ebuild b/dev-python/nose/nose-1.3.7-r9.ebuild
deleted file mode 100644
index bc0a95507ce8..000000000000
--- a/dev-python/nose/nose-1.3.7-r9.ebuild
+++ /dev/null
@@ -1,83 +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 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	<dev-python/setuptools-58[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
-		' python3_{8..10} pypy3)
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.5-backport.patch
-
-	# Patch against master found in an upstream PR, backported:
-	# https://github.com/nose-devs/nose/pull/1004
-	"${FILESDIR}"/${P}-coverage-4.1-support.patch
-
-	"${FILESDIR}"/${P}-python-3.6-test.patch
-)
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# fix manpage install path
-	sed -i -e 's:man/:share/&:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile "${add_targets[@]}"
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild b/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
index 3c7b8f79384f..08ed5c46c31d 100644
--- a/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
+++ b/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"