1 |
commit: b72d0fedfcaea30b414e3ff10927cdfa40582a11 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 4 23:59:18 2017 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 5 00:02:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72d0fed |
7 |
|
8 |
dev-python/nose: Update the twisted test dependency, switch order |
9 |
|
10 |
Switch the order to prefer the single pkg twisted. |
11 |
Update it for all PYTHON_COMPAT targets available. |
12 |
Change the split twisted dep for the single twisted in the 9999. |
13 |
|
14 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2_p30 |
15 |
|
16 |
dev-python/nose/nose-1.3.7-r3.ebuild | 5 +++-- |
17 |
dev-python/nose/nose-9999.ebuild | 2 +- |
18 |
2 files changed, 4 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild |
21 |
index e58e73ded7d..2a7bb6ef38c 100644 |
22 |
--- a/dev-python/nose/nose-1.3.7-r3.ebuild |
23 |
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild |
24 |
@@ -28,8 +28,9 @@ RDEPEND=" |
25 |
dev-python/setuptools[${PYTHON_USEDEP}]" |
26 |
DEPEND="${RDEPEND} |
27 |
doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) |
28 |
- test? ( || ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) |
29 |
- $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7) ) )" |
30 |
+ test? ( || ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6}) |
31 |
+ $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) |
32 |
+ ) )" |
33 |
|
34 |
PATCHES=( |
35 |
"${FILESDIR}"/${P}-python-3.5-backport.patch |
36 |
|
37 |
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild |
38 |
index 1b37a07fb93..132633f36b1 100644 |
39 |
--- a/dev-python/nose/nose-9999.ebuild |
40 |
+++ b/dev-python/nose/nose-9999.ebuild |
41 |
@@ -31,7 +31,7 @@ RDEPEND=" |
42 |
dev-python/setuptools[${PYTHON_USEDEP}]" |
43 |
DEPEND="${RDEPEND} |
44 |
doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) |
45 |
- test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )" |
46 |
+ test? ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6}) )" |
47 |
|
48 |
pkg_setup() { |
49 |
use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) |