From ebeea9c6b8c29acc1102d4c805d6acdfed0b11b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Mar 2020 18:29:24 +0100 Subject: [PATCH] dev-python/nose: Flatten twisted dep MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- 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 9543143b1bcc..a52cccd978fe 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 431ecc06eef7..e09fa46958b6 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=( -- 2.26.2