From 09aa647295b8763b1ddfcde1b7e603ce0736c133 Mon Sep 17 00:00:00 2001
From: Arthur Zamarin <arthurzam@gentoo.org>
Date: Thu, 11 Nov 2021 11:35:31 +0200
Subject: dev-python/nose: fix Mixin2to3 import

Closes: https://bugs.gentoo.org/823044
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---
 dev-python/nose/Manifest                       |  2 +-
 dev-python/nose/nose-1.3.7_p20211111.ebuild    | 54 --------------------------
 dev-python/nose/nose-1.3.7_p20211111_p1.ebuild | 54 ++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100644 dev-python/nose/nose-1.3.7_p20211111.ebuild
 create mode 100644 dev-python/nose/nose-1.3.7_p20211111_p1.ebuild

(limited to 'dev-python')

diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 344725536837..dfc5910e6775 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -1,2 +1,2 @@
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-DIST nose-1.3.7_p20211111.gh.tar.gz 327877 BLAKE2B a284275a9fdd74ebffaa425cb89735a8655f9db74e6503ebd9c0420e77006828de1f8383f9c4b4828489208ae8959aa0bd5a75f5a474b61e213e915c5c61b611 SHA512 913a536ce4aba377627a050e7fd8fa5cea843b66bf5da2778d7ce7c26e9485361d60ee09767da721813978576f6ead1219ddafffecc2955a33a0df6d2d44a48c
+DIST nose-1.3.7_p20211111_p1.gh.tar.gz 327855 BLAKE2B acddcaa0718f23f281ea34a977354b3ef88c95d4ef712afd8354effe6df7883d473b50caaa3b5c79fcc4c36a9d45bee4eb5865a6ef66e371dae12ed1a0a0418a SHA512 752eb1337fd481a1b8498ead330d716cf4180c18faabde257e9a1139928b9fa38e2e145d36c1ea8e3867a36d4843134ee26e9e9f83ff84d21f0fe246d2392d15
diff --git a/dev-python/nose/nose-1.3.7_p20211111.ebuild b/dev-python/nose/nose-1.3.7_p20211111.ebuild
deleted file mode 100644
index 2af3c30e088b..000000000000
--- a/dev-python/nose/nose-1.3.7_p20211111.ebuild
+++ /dev/null
@@ -1,54 +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
-
-COMMIT="a4a1710cf5a71bde82951f2ef96a6837124b74af"
-
-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="
-	https://github.com/arthurzam/nose/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-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"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	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})
-	)"
-
-src_prepare() {
-	# failing to find configuration file
-	sed -e 's/test_cover_options_config_file/_&/' \
-		-i unit_tests/test_cover_plugin.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m nose -v -a "!network" || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild b/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
new file mode 100644
index 000000000000..3c7b8f79384f
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
@@ -0,0 +1,54 @@
+# 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
+
+COMMIT="94fd6746619ee8728f2b8740ebf2d1582b03cb15"
+
+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="
+	https://github.com/arthurzam/nose/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+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"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	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})
+	)"
+
+src_prepare() {
+	# failing to find configuration file
+	sed -e 's/test_cover_options_config_file/_&/' \
+		-i unit_tests/test_cover_plugin.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" -m nose -v -a "!network" || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	use examples && dodoc -r examples
+}
-- 
cgit v1.2.3-65-gdbad