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 32FB91395E2 for ; Sat, 12 Nov 2016 13:18:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B1F321C1BF; Sat, 12 Nov 2016 13:18:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F72721C1BF for ; Sat, 12 Nov 2016 13:18:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5A5D3412B7 for ; Sat, 12 Nov 2016 13:18:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAB4D303 for ; Sat, 12 Nov 2016 13:18:46 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1478956689.d84f53a8c41b8fc9684e0d33b39ff2a949524487.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/qtconsole/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/qtconsole/qtconsole-4.1.1.ebuild dev-python/qtconsole/qtconsole-4.2.1.ebuild X-VCS-Directories: dev-python/qtconsole/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: d84f53a8c41b8fc9684e0d33b39ff2a949524487 X-VCS-Branch: master Date: Sat, 12 Nov 2016 13:18:46 +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-Archives-Salt: 912700b6-3a06-4c37-9125-0cad223da86d X-Archives-Hash: 685494908af2256088d1cf94ea52a5ea commit: d84f53a8c41b8fc9684e0d33b39ff2a949524487 Author: Marius Brehler linux sungazer de> AuthorDate: Tue Nov 8 09:50:42 2016 +0000 Commit: Patrice Clement gentoo org> CommitDate: Sat Nov 12 13:18:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d84f53a8 dev-python/qtconsole: Fix test dependencies. Gentoo-Bug: https://bugs.gentoo.org/598659 Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/2775 Signed-off-by: Patrice Clement gentoo.org> dev-python/qtconsole/qtconsole-4.1.1.ebuild | 9 +++++++-- dev-python/qtconsole/qtconsole-4.2.1.ebuild | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dev-python/qtconsole/qtconsole-4.1.1.ebuild b/dev-python/qtconsole/qtconsole-4.1.1.ebuild index a7c0411..5c5587c 100644 --- a/dev-python/qtconsole/qtconsole-4.1.1.ebuild +++ b/dev-python/qtconsole/qtconsole-4.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -29,11 +29,16 @@ DEPEND="${RDEPEND} ) test? ( >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] + || ( + dev-python/pyside[${PYTHON_USEDEP},svg] + dev-python/PyQt5[${PYTHON_USEDEP},svg,testlib] + dev-python/PyQt4[${PYTHON_USEDEP},svg,testlib] + ) ) || ( dev-python/pyside[${PYTHON_USEDEP},svg] - dev-python/PyQt4[${PYTHON_USEDEP},svg] dev-python/PyQt5[${PYTHON_USEDEP},svg] + dev-python/PyQt4[${PYTHON_USEDEP},svg] ) dev-python/pygments[${PYTHON_USEDEP}] >=dev-python/pyzmq-13[${PYTHON_USEDEP}] diff --git a/dev-python/qtconsole/qtconsole-4.2.1.ebuild b/dev-python/qtconsole/qtconsole-4.2.1.ebuild index 378cd20..afeb182 100644 --- a/dev-python/qtconsole/qtconsole-4.2.1.ebuild +++ b/dev-python/qtconsole/qtconsole-4.2.1.ebuild @@ -29,11 +29,16 @@ DEPEND="${RDEPEND} ) test? ( >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] + || ( + dev-python/pyside[${PYTHON_USEDEP},svg] + dev-python/PyQt5[${PYTHON_USEDEP},svg,testlib] + dev-python/PyQt4[${PYTHON_USEDEP},svg,testlib] + ) ) || ( dev-python/pyside[${PYTHON_USEDEP},svg] - dev-python/PyQt4[${PYTHON_USEDEP},svg] dev-python/PyQt5[${PYTHON_USEDEP},svg] + dev-python/PyQt4[${PYTHON_USEDEP},svg] ) dev-python/pygments[${PYTHON_USEDEP}] >=dev-python/pyzmq-13[${PYTHON_USEDEP}]