[127083] trunk/dports/python/py-ipython/Portfile

[aronnax at macports.org]

Revision: 127083
          https://trac.macports.org/changeset/127083
Author:   aronnax at macports.org
Date:     2014-10-20 11:51:04 -0700 (Mon, 20 Oct 2014)
Log Message:
-----------
py-ipython: Python 3.1 and 3.2 do not support the notebook because Flask doesn't support them

Modified Paths:
--------------
    trunk/dports/python/py-ipython/Portfile

Modified: trunk/dports/python/py-ipython/Portfile
===================================================================
--- trunk/dports/python/py-ipython/Portfile	2014-10-20 18:29:29 UTC (rev 127082)
+++ trunk/dports/python/py-ipython/Portfile	2014-10-20 18:51:04 UTC (rev 127083)
@@ -66,12 +66,24 @@
 }
 
 if {${name} ne ${subport} && ${python.version} >= 26} {
-    default_variants-append     +notebook
 
     variant parallel description "Support for parallel computing" {
         depends_lib-append      port:py${python.version}-zmq
     }
 
+    variant pyqt4 conflicts pyside requires parallel description "Support for the Qt console using pyqt4" {
+        # Can use either py*-pyqt4 or py*-pyqt4-devel.
+        depends_lib-append      path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
+                                port:py${python.version}-pygments
+    }
+
+    variant pyside conflicts pyqt4 requires parallel description "Support for the Qt console using pyside" {
+        depends_lib-append      port:py${python.version}-pyside \
+                                port:py${python.version}-pygments
+    }
+}
+
+if {${name} ne ${subport} && (${python.version} == 26 || ${python.version} == 27 || ${python.version} >= 33)} {
     variant notebook requires parallel description "Support for IPython HTML notebook" {
         depends_lib-append      port:py${python.version}-jinja2 \
                                 port:py${python.version}-requests \
@@ -88,16 +100,7 @@
 "
     }
 
-    variant pyqt4 conflicts pyside requires parallel description "Support for the Qt console using pyqt4" {
-        # Can use either py*-pyqt4 or py*-pyqt4-devel.
-        depends_lib-append      path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4 \
-                                port:py${python.version}-pygments
-    }
-
-    variant pyside conflicts pyqt4 requires parallel description "Support for the Qt console using pyside" {
-        depends_lib-append      port:py${python.version}-pyside \
-                                port:py${python.version}-pygments
-    }
+    default_variants-append     +notebook
 }
 
 if {${name} ne ${subport}} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141020/b664b595/attachment.html>