gentoo resync : 25.08.2020

4 files changed, 5 insertions, 106 deletions

diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index ac2456e179ab..b0743105ea93 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,6 +2,5 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 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
-EBUILD nose-1.3.7-r4.ebuild 2756 BLAKE2B 35632aa573ca794f3ebeaec11b83c6f7d51d292f84567b070c4530a8520a0603dc453c66e5680895610f0d6f5ae91c6fb07a1fad13aa70691ebda7771893d9ff SHA512 a3475035911fe40dbc9787b7554740983fb6bc4a9b1d7ff9ebd0018259e62eed7948d0ac39c2b1c3e23428ba2fce6c7bf5d388f97205d82e10fa688abaacbf5b
-EBUILD nose-1.3.7-r5.ebuild 2314 BLAKE2B 9930f846e80f5f991e3e7bc1871e805029597adb6b5628265e0d769086f94aa0992d1a1725026966cef3a09c180da30a4fc929213416d3375448fb6a9e097504 SHA512 aca4b69d95206ecfd0aec7b5733c682965c0bbaad17364f0efc796daec1fe9ec646641a214932673b8c2514dc7fe416c96589fdf277a9bdb3b4b2028f5f201a5
-MISC metadata.xml 499 BLAKE2B 9d6ffb5484f11c5f4c46e0013d4e93d01afef48339e83f4e4fb7d86776267256b30da1aba61c2609e5163abd012a57bc820ab77ad79577e748b56f7e8c327cee SHA512 c037d0a22b7bc9f61c10d8223932f2ebdaab4d9ac538dff56ab7e6fa263734992e8834cf739b7d787cd1243af5a9ccfccb81c2c0e4d2e8889498a707c96bd44e
+EBUILD nose-1.3.7-r5.ebuild 2295 BLAKE2B 4b784950f9d1e23fa439603751ed9f353f16741001fa990577c25442cf6ad2abc9f70165d7858cef941b8324872540e44a464e9460e09edc519db5d908b98178 SHA512 bd596cd6d76260fe5290d2c30f318eec3fa76061076a785413e93068f0c49ae6212c5115c8d33403abc2ae91fa6fa5822cfbef3906ccc7edd1739a5f8e7d79ba
+MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index a92a97fc50db..e00e1107d375 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">nose</remote-id>
     <remote-id type="github">nose-devs/nose</remote-id>
diff --git a/dev-python/nose/nose-1.3.7-r4.ebuild b/dev-python/nose/nose-1.3.7-r4.ebuild
deleted file mode 100644
index 4c1588f59bce..000000000000
--- a/dev-python/nose/nose-1.3.7-r4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="coverage doc examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-RDEPEND="
-	coverage? ( dev-python/coverage[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[$(python_gen_usedep 'python2*')] )
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' python2_7 python3_{6,7,8})
-	)"
-
-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
-)
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-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"
-
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.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_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && HTML_DOCS=( doc/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nose/nose-1.3.7-r5.ebuild b/dev-python/nose/nose-1.3.7-r5.ebuild
index 0b0eda13af04..7cd58888bdb7 100644
--- a/dev-python/nose/nose-1.3.7-r5.ebuild
+++ b/dev-python/nose/nose-1.3.7-r5.ebuild
@@ -18,7 +18,7 @@ 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="coverage examples test"
 RESTRICT="!test? ( test )"
 
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 		${COV_DEP}
 		$(python_gen_cond_dep '
 			dev-python/twisted[${PYTHON_USEDEP}]
-		' python2_7 python3_{6,7,8})
+		' python3_{6,7,8})
 	)"
 
 PATCHES=(