[gentoo-commits] repo/gentoo:master commit in: dev-python/nose/

[Michał Górny]

commit:     ebeea9c6b8c29acc1102d4c805d6acdfed0b11b6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 17:29:24 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 17:35:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebeea9c6

dev-python/nose: Flatten twisted dep

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/nose/nose-1.3.7-r3.ebuild | 8 +++++---
 dev-python/nose/nose-1.3.7-r4.ebuild | 9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild 
b/dev-python/nose/nose-1.3.7-r3.ebuild
index 9543143b1bc..a52cccd978f 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -29,9 +29,11 @@ RDEPEND="
        dev-python/setuptools[${PYTHON_USEDEP}]"
 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})
-                       $(python_gen_cond_dep 
'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7)
-                ) )"
+       test? (
+               $(python_gen_cond_dep '
+                       dev-python/twisted[${PYTHON_USEDEP}]
+               ' python2_7 python3_{6,7})
+       )"
 
 PATCHES=(
        "${FILESDIR}"/${P}-python-3.5-backport.patch

diff --git a/dev-python/nose/nose-1.3.7-r4.ebuild 
b/dev-python/nose/nose-1.3.7-r4.ebuild
index 431ecc06eef..e09fa46958b 100644
--- a/dev-python/nose/nose-1.3.7-r4.ebuild
+++ b/dev-python/nose/nose-1.3.7-r4.ebuild
@@ -35,9 +35,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
        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})
+               $(python_gen_cond_dep '
+                       dev-python/coverage[${PYTHON_USEDEP}]
+               ' "${COVERAGE_IMPLS[@]}")
+               $(python_gen_cond_dep '
+                       dev-python/twisted[${PYTHON_USEDEP}]
+               ' python2_7 python3_{6,7})
        )"
 
 PATCHES=(