Fix jinja dependency to allow more that one slot to satisfy it.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 25 insertions, 7 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index c2e01f986c09..f9ac99c52717 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/ipython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.126 2013/10/23 10:33:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.127 2013/11/14 18:48:50 floppym Exp $
+
+  14 Nov 2013; Mike Gilbert <floppym@gentoo.org> ipython-1.0.0.ebuild,
+  ipython-1.1.0.ebuild:
+  Fix jinja dependency to allow more that one slot to satisfy it.
 
 *ipython-1.1.0 (23 Oct 2013)
 
diff --git a/dev-python/ipython/ipython-1.0.0.ebuild b/dev-python/ipython/ipython-1.0.0.ebuild
index 3fcba654a7b3..49f00a05f7d1 100644
--- a/dev-python/ipython/ipython-1.0.0.ebuild
+++ b/dev-python/ipython/ipython-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild,v 1.12 2013/09/26 17:59:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild,v 1.13 2013/11/14 18:48:50 floppym Exp $
 
 EAPI=5
 
@@ -22,6 +22,13 @@ IUSE="doc emacs examples matplotlib mongodb notebook nbconvert octave
 
 PY2_USEDEP=$(python_gen_usedep 'python2*')
 
+gen_python_deps() {
+	local impl
+	for impl in "${PYTHON_COMPAT[@]}"; do
+		echo "python_targets_${impl}? ( ${1}[python_targets_${impl}(-)] )"
+	done
+}
+
 CDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PY2_USEDEP}]
@@ -41,13 +48,13 @@ RDEPEND="${CDEPEND}
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/pyzmq[${PYTHON_USEDEP}]
 		dev-libs/mathjax
-		dev-python/jinja[${PYTHON_USEDEP}]
+		$(gen_python_deps dev-python/jinja)
 	)
 	nbconvert? (
 		app-text/pandoc
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
+		$(gen_python_deps dev-python/jinja)
 	)
 	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
 			dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/ipython-1.1.0.ebuild b/dev-python/ipython/ipython-1.1.0.ebuild
index 07bedb3857b8..183b1ac0f174 100644
--- a/dev-python/ipython/ipython-1.1.0.ebuild
+++ b/dev-python/ipython/ipython-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.1.0.ebuild,v 1.1 2013/10/23 10:33:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.1.0.ebuild,v 1.2 2013/11/14 18:48:50 floppym Exp $
 
 EAPI=5
 
@@ -22,6 +22,13 @@ IUSE="doc emacs examples matplotlib mongodb notebook nbconvert octave
 
 PY2_USEDEP=$(python_gen_usedep 'python2*')
 
+gen_python_deps() {
+	local impl
+	for impl in "${PYTHON_COMPAT[@]}"; do
+		echo "python_targets_${impl}? ( ${1}[python_targets_${impl}(-)] )"
+	done
+}
+
 CDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PY2_USEDEP}]
@@ -41,13 +48,13 @@ RDEPEND="${CDEPEND}
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/pyzmq[${PYTHON_USEDEP}]
 		dev-libs/mathjax
-		dev-python/jinja[${PYTHON_USEDEP}]
+		$(gen_python_deps dev-python/jinja)
 	)
 	nbconvert? (
 		app-text/pandoc
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
+		$(gen_python_deps dev-python/jinja)
 	)
 	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
 			dev-python/pygments[${PYTHON_USEDEP}]