dev-python/nose: Update the twisted test dependency, switch order

Switch the order to prefer the single pkg twisted.
Update it for all PYTHON_COMPAT targets available.
Change the split twisted dep for the single twisted in the 9999.

Package-Manager: Portage-2.3.5, Repoman-2.3.2_p30
This commit is contained in:
Brian Dolbec
2017-04-04 16:59:18 -07:00
parent d1d016cab8
commit b72d0fedfc
2 changed files with 4 additions and 3 deletions

View File

@@ -28,8 +28,9 @@ RDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
test? ( || ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7)
$(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7) ) )"
test? ( || ( $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7 python3_{4,5,6})
$(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7)
) )"
PATCHES=(
"${FILESDIR}"/${P}-python-3.5-backport.patch

View File

@@ -31,7 +31,7 @@ RDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
test? ( $(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_{4,5,6}) )"
pkg_setup() {
use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )