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

[Mike Gilbert]

commit:     1c0ff8413255268a8807036f61c4213973d60f19
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 16:21:49 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 16:22:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0ff841

dev-python/pytest: block dev-python/logilab-common

Bug: https://bugs.gentoo.org/592948

Package-Manager: portage-2.3.0_p24

 dev-python/pytest/pytest-3.0.2.ebuild | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/dev-python/pytest/pytest-3.0.2.ebuild b/dev-python/pytest/pytest-3.0.2.ebuild
index 293c437..c28a988 100644
--- a/dev-python/pytest/pytest-3.0.2.ebuild
+++ b/dev-python/pytest/pytest-3.0.2.ebuild
@@ -19,15 +19,8 @@ IUSE="test"
 
 # When bumping, please check setup.py for the proper py version
 PY_VER="1.4.29"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-
-# dev-python/pluggy
-# https://github.com/hpk42/pluggy
-# See https://github.com/pytest-dev/pytest/issues/944
-# for why not now
-
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
-DEPEND="${RDEPEND}
+COMMON_DEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
@@ -36,6 +29,9 @@ DEPEND="${RDEPEND}
 		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
+RDEPEND="${COMMON_DEPEND}
+	!dev-python/logilab-common
+"
 
 python_prepare_all() {
 	chmod o-w *egg*/* || die