gentoo resync : 15.06.2021

4 files changed, 3 insertions, 94 deletions

diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 5a35ca7f8387..b59c5019a719 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-r7.ebuild 2304 BLAKE2B 97be9d38b82206abc2e04d470f00ac21a6889c632b307e7b6c767c832742843c38cf2f949b5165369a69f222ded243e728ce93cbc044a42a2fcc3026ae01705c SHA512 4382b2a894c356eb311d253d2a49d697d94f623b2695242dfd6d1d07c38a204105de03518cbb461b08ef53d233552a015e17eedbb9ca9b16e14ca3cd110548c5
-EBUILD nose-1.3.7-r8.ebuild 2251 BLAKE2B 8efe621b30a90319cac473346b4776e99b8152e6b86ee7d4cc4aeb410225b7cfff3deaf7f8095966cc3bef97b100604c8ea8f295c6e805ab301a889ae21d29d7 SHA512 a559bea7bbfe88dfd7f3eed8a48bda5f2fbd198a59c0592c9168f34b078cd4462ea7139f2b22eff71fe0ffc7a9903f8d0492f8e548e8b77bfd2368f1ad0746f4
-MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
+EBUILD nose-1.3.7-r8.ebuild 2243 BLAKE2B 9e6efa83d458d958f81a4623d3b09c4fd1d85463e865b1ce10009fb6332f9a83816aa48b0cb2506772aaa96a908f3181055c9840249935937515b3273063ec39 SHA512 abc31a83c574dcfdd2108a19cde5e1f8db32a85081f93ddf7533fc4cd6862d7c0a80af4b884a08fc5759200aefd6c1068b1abad9e8b427b45cc02925121a9ca0
+MISC metadata.xml 398 BLAKE2B a569ad5eb48558ae14aa483c32016a955fb2af9870f7ecd26a2abc8b8aa16c88fef2022ab23c8da7499a7286acc0c2d88bfb203cf2b46c520f78259b801050f5 SHA512 87cde48861c5e2ff2d78831829b4b5bb44821559b31ed995f5e73d60a9ea9d5ebe62f7c568382f91244241adffc458e32c44eb5a8f97d88b684e202e009e2cfc
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index e00e1107d375..1807b936f961 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -10,8 +10,4 @@
     <remote-id type="pypi">nose</remote-id>
     <remote-id type="github">nose-devs/nose</remote-id>
   </upstream>
-  <use>
-    <flag name="coverage">Pull in <pkg>dev-python/coverage</pkg> needed
-      for nose-xcover plugin.</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-python/nose/nose-1.3.7-r7.ebuild b/dev-python/nose/nose-1.3.7-r7.ebuild
deleted file mode 100644
index e1eeb12eb28e..000000000000
--- a/dev-python/nose/nose-1.3.7-r7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} 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="coverage examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	coverage? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' 'python3*')
-	)"
-
-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-r8.ebuild b/dev-python/nose/nose-1.3.7-r8.ebuild
index 9ff8d8ae5d04..fd55e99ba0e6 100644
--- a/dev-python/nose/nose-1.3.7-r8.ebuild
+++ b/dev-python/nose/nose-1.3.7-r8.ebuild
@@ -16,7 +16,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 ~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 )"