From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-968032-garchives=archives.gentoo.org@lists.gentoo.org>
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 ED3111396D0
	for <garchives@archives.gentoo.org>; Sat, 19 Aug 2017 22:40:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 61CF1E0E8B;
	Sat, 19 Aug 2017 22:40:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 30FABE0E8B
	for <gentoo-commits@lists.gentoo.org>; Sat, 19 Aug 2017 22:40:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 329C43419F4
	for <gentoo-commits@lists.gentoo.org>; Sat, 19 Aug 2017 22:39:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E0B647B99
	for <gentoo-commits@lists.gentoo.org>; Sat, 19 Aug 2017 22:39:56 +0000 (UTC)
From: "Sebastien Fabbro" <bicatali@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" <bicatali@gentoo.org>
Message-ID: <1503181975.29e16e14253a3fd9de6c43b211347e37440da447.bicatali@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/ipykernel/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/ipykernel/ipykernel-4.2.2.ebuild dev-python/ipykernel/ipykernel-4.3.1.ebuild dev-python/ipykernel/ipykernel-4.4.1.ebuild dev-python/ipykernel/ipykernel-4.5.2.ebuild dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild dev-python/ipykernel/ipykernel-4.6.1.ebuild
X-VCS-Directories: dev-python/ipykernel/
X-VCS-Committer: bicatali
X-VCS-Committer-Name: Sebastien Fabbro
X-VCS-Revision: 29e16e14253a3fd9de6c43b211347e37440da447
X-VCS-Branch: master
Date: Sat, 19 Aug 2017 22:39:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 5557df28-0de7-463c-8707-57bba8703c33
X-Archives-Hash: d508ad996514c9484c6b7d0b9aa095e3

commit:     29e16e14253a3fd9de6c43b211347e37440da447
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 22:32:55 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 22:32:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e16e14

dev-python/ipykernel: add conditional block on ipython-6 for python-2.7

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 dev-python/ipykernel/ipykernel-4.2.2.ebuild                           | 3 ++-
 dev-python/ipykernel/ipykernel-4.3.1.ebuild                           | 3 ++-
 dev-python/ipykernel/ipykernel-4.4.1.ebuild                           | 3 ++-
 dev-python/ipykernel/ipykernel-4.5.2.ebuild                           | 1 +
 .../ipykernel/{ipykernel-4.6.1.ebuild => ipykernel-4.6.1-r1.ebuild}   | 4 +++-
 dev-python/ipykernel/ipykernel-4.6.1.ebuild                           | 1 +
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev-python/ipykernel/ipykernel-4.2.2.ebuild b/dev-python/ipykernel/ipykernel-4.2.2.ebuild
index 1c84abb227f..f92f84765ba 100644
--- a/dev-python/ipykernel/ipykernel-4.2.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,6 +22,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 	"

diff --git a/dev-python/ipykernel/ipykernel-4.3.1.ebuild b/dev-python/ipykernel/ipykernel-4.3.1.ebuild
index e6985ef4de5..608aee74cc6 100644
--- a/dev-python/ipykernel/ipykernel-4.3.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]

diff --git a/dev-python/ipykernel/ipykernel-4.4.1.ebuild b/dev-python/ipykernel/ipykernel-4.4.1.ebuild
index 2d2adf778c5..1e126fb6cc6 100644
--- a/dev-python/ipykernel/ipykernel-4.4.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]

diff --git a/dev-python/ipykernel/ipykernel-4.5.2.ebuild b/dev-python/ipykernel/ipykernel-4.5.2.ebuild
index 3e015222c82..83d38512977 100644
--- a/dev-python/ipykernel/ipykernel-4.5.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.5.2.ebuild
@@ -19,6 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]

diff --git a/dev-python/ipykernel/ipykernel-4.6.1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild
similarity index 87%
copy from dev-python/ipykernel/ipykernel-4.6.1.ebuild
copy to dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild
index d0ddc55f8da..ec1018dbdab 100644
--- a/dev-python/ipykernel/ipykernel-4.6.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild
@@ -19,16 +19,18 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
 	)
-	"
+"
 
 python_test() {
 	nosetests --verbose ipykernel || die

diff --git a/dev-python/ipykernel/ipykernel-4.6.1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1.ebuild
index d0ddc55f8da..fc775127657 100644
--- a/dev-python/ipykernel/ipykernel-4.6.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1.ebuild
@@ -19,6 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]