gentoo resync : 18.11.2019

5 files changed, 41 insertions, 16 deletions

diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 4b2d2ed51b70..6d16ea59c6a1 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,7 +2,7 @@ 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-r1.ebuild 2440 BLAKE2B 4d5fc12ddc35fa19a253e0ab6b9f04ecbaecbf1fdbf593d6a6859761b33d44221eb8ab0eae5d64309d7f5d21b3c83251278cc9ef610fc91467da90208f29a20d SHA512 a7ae054366a797c244e43e5a1464d1a86996d8744b16d6fea471f9fa803926480780a00801296336ab08ac71faeb5937c4f3f011144659f1381606a2a220e080
-EBUILD nose-1.3.7-r3.ebuild 2743 BLAKE2B 06912c6aea3c333cd0115348ebfaac5779e929e90fc5421d45b5c13f8212107435333de516659f00820e44ee41e9677c75c0fe3ef9ec0ab97330de434b8709eb SHA512 70cb35ad1d699595e46f62aab571539b8bb103ccce53d7b53975860a0a382788c22005c9985c3153e02c90913f28102e7022e0f031f9f0d5643b46645a3700e6
-EBUILD nose-9999.ebuild 2229 BLAKE2B 49b85be43d903924108b0a03ff1d5b8557c1902654b286c34fb90b5d56dcbf56e40180073f7d82f20bfb1235d1eb109d23822f7cae438d285fef553c12d3bf59 SHA512 7195a0528141d360c0ae9390b309afc0074c3b8f8ddbc964f3f46c557c3bd80904be7a49b5de92f487285f77af51490716428ea2b060b8496cd89c3b6468f1fe
-MISC metadata.xml 373 BLAKE2B 43ba4a1d3072a67aa7ada67e06fb1fe53cb9f2305143f23553705c3b8a0a12f10d295f458a7f9a08bc7273fc4ef8f87460ce53919f7f26d58da186f5bba02a52 SHA512 88a78ed0996cc2252a6cc707fbaa081b8ae3d03620dafcce844d6e760437dfc916d3a0244d3bf4fd9005d6cfd731858a9aa5b7fe99a89dc47a7ef75b2f8663dd
+EBUILD nose-1.3.7-r1.ebuild 2467 BLAKE2B 307d6f07969c4c8cca3801fbfe41e951d21bb4ab116a61f5a827268926d3e71937c8c91984bd31d3c1c33e185c9ed11b311e6fa90c75905fd0192df79ade6aee SHA512 d5856fc5e678e1bfbb5d1c7ccc1e60ce6be8956399264679fa39494215479e5d5498641746d1b8c171a5d1ad3d7b785695bcc20b25c25a3b90d36627f991e9d7
+EBUILD nose-1.3.7-r3.ebuild 2770 BLAKE2B d4815e041836a554970c90d31e4780649c32c369fad7d1e2ab0ed4eb3e275ca19e2b278e1074300dbba99cdb23b28bec2378e6630e383651528bde2dd087c44a SHA512 a3e7199ec2ea81f4d00bc336d0ad7e7890da3128d2200d7590651555f1a555b20362ed0b7dcd43497f23190a34354d0e50f329703bec48c640f4376ebcf6e191
+EBUILD nose-1.3.7-r4.ebuild 2996 BLAKE2B 551a6253133fa2c08ffea29b73287462fd6a8d58eda516fcaa3c192b5423034ff791528b821c26eb7687e9599df131fc1501d827a8be95457beb8013796846f1 SHA512 965cd7b81597c987dd676ca92ee9504a16c52d0a3892c447fd188dd853d6351054bc10866cc518bd3dbbde7c31e62c063f3dfa4ef12edc63a1a9f6990bc0a4e4
+MISC metadata.xml 499 BLAKE2B 9d6ffb5484f11c5f4c46e0013d4e93d01afef48339e83f4e4fb7d86776267256b30da1aba61c2609e5163abd012a57bc820ab77ad79577e748b56f7e8c327cee SHA512 c037d0a22b7bc9f61c10d8223932f2ebdaab4d9ac538dff56ab7e6fa263734992e8834cf739b7d787cd1243af5a9ccfccb81c2c0e4d2e8889498a707c96bd44e
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index 13648a4f19f0..a92a97fc50db 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -9,4 +9,8 @@
     <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-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
index 91a73b8eabe7..d58786445780 100644
--- a/dev-python/nose/nose-1.3.7-r1.ebuild
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -19,6 +19,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index faea7532c457..69746257a397 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -19,6 +19,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-1.3.7-r4.ebuild
index 03c347f62ba1..333bd6d07d11 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-1.3.7-r4.ebuild
@@ -1,35 +1,54 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1 git-r3
+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=""
-EGIT_REPO_URI="https://github.com/nose-devs/${PN}.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc examples test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 )"
 
+COVERAGE_IMPLS=( -2 python3_{5,6,7} pypy3 )
 REQUIRED_USE="
+	coverage? ( || ( $(python_gen_useflags "${COVERAGE_IMPLS[@]}") ) )
 	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	coverage? (
+		$(python_gen_cond_dep 'dev-python/coverage[${PYTHON_USEDEP}]' \
+			"${COVERAGE_IMPLS[@]}")
+	)"
 DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6}) )"
+	doc? ( >=dev-python/sphinx-0.6[$(python_gen_usedep 'python2*')] )
+	test? (
+		$(python_gen_cond_dep 'dev-python/coverage[${PYTHON_USEDEP}]' \
+			"${COVERAGE_IMPLS[@]}")
+		$(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{5,6})
+	)"
+
+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*' )
@@ -72,7 +91,7 @@ python_compile_all() {
 }
 
 python_test() {
-	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {