commit: f47aa832af8470c6d9eb8a92b18bfa265d57d0fb Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Nov 3 20:18:41 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Nov 3 20:19:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47aa832
dev-python/pytest-catchlog: block dev-python/pytest-capturelog Closes: https://bugs.gentoo.org/636468 Package-Manager: Portage-2.3.13_p1, Repoman-2.3.3_p81 dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild index b2170e32985..b948075d79e 100644 --- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild +++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild @@ -16,12 +16,14 @@ LICENSE="MIT" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="test" -RDEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]" +COMMON_DEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]" DEPEND=" test? ( - ${RDEPEND} + ${COMMON_DEPEND} >=dev-python/pytest-2.7.1[${PYTHON_USEDEP}] )" +RDEPEND="${COMMON_DEPEND} + !dev-python/pytest-capturelog" python_test() { PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_pytest_catchlog.py || die
