* [gentoo-commits] gentoo-x86 commit in dev-python/ipython: ipython-1.1.0.ebuild ipython-1.0.0.ebuild ChangeLog
@ 2013-11-14 18:48 Mike Gilbert (floppym)
0 siblings, 0 replies; only message in thread
From: Mike Gilbert (floppym) @ 2013-11-14 18:48 UTC (permalink / raw
To: gentoo-commits
floppym 13/11/14 18:48:50
Modified: ipython-1.1.0.ebuild ipython-1.0.0.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.2 dev-python/ipython/ipython-1.1.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-1.1.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-1.1.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-1.1.0.ebuild?r1=1.1&r2=1.2
Index: ipython-1.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.1.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipython-1.1.0.ebuild 23 Oct 2013 10:33:53 -0000 1.1
+++ ipython-1.1.0.ebuild 14 Nov 2013 18:48:50 -0000 1.2
@@ -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 @@
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 @@
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}]
1.13 dev-python/ipython/ipython-1.0.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild?r1=1.12&r2=1.13
Index: ipython-1.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ipython-1.0.0.ebuild 26 Sep 2013 17:59:01 -0000 1.12
+++ ipython-1.0.0.ebuild 14 Nov 2013 18:48:50 -0000 1.13
@@ -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 @@
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 @@
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}]
1.127 dev-python/ipython/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ChangeLog?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ChangeLog?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ipython/ChangeLog?r1=1.126&r2=1.127
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- ChangeLog 23 Oct 2013 10:33:53 -0000 1.126
+++ ChangeLog 14 Nov 2013 18:48:50 -0000 1.127
@@ -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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-11-14 18:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-14 18:48 [gentoo-commits] gentoo-x86 commit in dev-python/ipython: ipython-1.1.0.ebuild ipython-1.0.0.ebuild ChangeLog Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox