From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF265138350 for ; Thu, 26 Mar 2020 17:36:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFE0FE0AB0; Thu, 26 Mar 2020 17:36:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96141E0AB0 for ; Thu, 26 Mar 2020 17:36:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C482A34F9BF for ; Thu, 26 Mar 2020 17:36:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF90E1A4 for ; Thu, 26 Mar 2020 17:36:20 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1585244149.ebeea9c6b8c29acc1102d4c805d6acdfed0b11b6.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/nose/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/nose/nose-1.3.7-r3.ebuild dev-python/nose/nose-1.3.7-r4.ebuild X-VCS-Directories: dev-python/nose/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ebeea9c6b8c29acc1102d4c805d6acdfed0b11b6 X-VCS-Branch: master Date: Thu, 26 Mar 2020 17:36:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c8a87b7e-f892-41c2-8cc9-63e23f67e829 X-Archives-Hash: 2031a6431e35794f4329c436b9e9f304 commit: ebeea9c6b8c29acc1102d4c805d6acdfed0b11b6 Author: Michał Górny gentoo org> AuthorDate: Thu Mar 26 17:29:24 2020 +0000 Commit: Michał Górny gentoo 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 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=(