From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A644E1388C1 for ; Wed, 2 Mar 2016 20:44:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5509221C02D; Wed, 2 Mar 2016 20:44:54 +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 EDFCD21C02D for ; Wed, 2 Mar 2016 20:44:53 +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 34FB2340C02 for ; Wed, 2 Mar 2016 20:44:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D936818A6 for ; Wed, 2 Mar 2016 20:44:44 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1456951479.b3504dd7a88a7c23833de1cf1037e5d8f6e968a4.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/ipython/ipython-4.1.1.ebuild X-VCS-Directories: dev-python/ipython/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: b3504dd7a88a7c23833de1cf1037e5d8f6e968a4 X-VCS-Branch: master Date: Wed, 2 Mar 2016 20:44:44 +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: d4b75cd8-9734-47e1-a502-85db3a59969b X-Archives-Hash: 1c60b999ffca6230c7fadeaffb3eff1e commit: b3504dd7a88a7c23833de1cf1037e5d8f6e968a4 Author: Justin Lecher gentoo org> AuthorDate: Wed Mar 2 20:11:41 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Mar 2 20:44:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3504dd7 dev-python/ipython: Break circular dependency with dev-python/qtconsole Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=576088 Signed-off-by: Justin Lecher gentoo.org> dev-python/ipython/ipython-4.1.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/ipython/ipython-4.1.1.ebuild b/dev-python/ipython/ipython-4.1.1.ebuild index 3934c31..41d72d7 100644 --- a/dev-python/ipython/ipython-4.1.1.ebuild +++ b/dev-python/ipython/ipython-4.1.1.ebuild @@ -38,8 +38,7 @@ RDEPEND="${CDEPEND} dev-python/notebook[${PYTHON_USEDEP}] dev-python/ipywidgets[${PYTHON_USEDEP}] ) - nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] ) - qt4? ( dev-python/qtconsole )" + nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )" DEPEND="${CDEPEND} >=dev-python/setuptools-18.5[${PYTHON_USEDEP}] test? ( @@ -66,6 +65,7 @@ DEPEND="${CDEPEND} )" PDEPEND=" + qt4? ( dev-python/qtconsole ) smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )" PATCHES=(