[122243] trunk/dports/python

[petr at macports.org]

Revision: 122243
          https://trac.macports.org/changeset/122243
Author:   petr at macports.org
Date:     2014-07-18 04:44:09 -0700 (Fri, 18 Jul 2014)
Log Message:
-----------
ports py-spyder-devel py-spyder py-astlib: switch from py*-pil to path-based dependency, closes #44284

Modified Paths:
--------------
    trunk/dports/python/py-astlib/Portfile
    trunk/dports/python/py-spyder/Portfile
    trunk/dports/python/py-spyder-devel/Portfile

Modified: trunk/dports/python/py-astlib/Portfile
===================================================================
--- trunk/dports/python/py-astlib/Portfile	2014-07-18 11:12:17 UTC (rev 122242)
+++ trunk/dports/python/py-astlib/Portfile	2014-07-18 11:44:09 UTC (rev 122243)
@@ -31,16 +31,9 @@
                         port:py${python.version}-pyfits \
                         port:py${python.version}-numpy \
                         port:py${python.version}-scipy \
-                        port:py${python.version}-matplotlib
+                        port:py${python.version}-matplotlib \
+                        path:${python.pkgd}/PIL:py${python.version}-Pillow
 
-    if {[expr ${python.branch} < 3]} { 
-        depends_lib-append \
-                        port:py${python.version}-pil
-    } else {
-        depends_lib-append \
-                        port:py${python.version}-pillow
-    }
-
 }
 
 if {${name} eq ${subport}} {

Modified: trunk/dports/python/py-spyder/Portfile
===================================================================
--- trunk/dports/python/py-spyder/Portfile	2014-07-18 11:12:17 UTC (rev 122242)
+++ trunk/dports/python/py-spyder/Portfile	2014-07-18 11:44:09 UTC (rev 122243)
@@ -10,7 +10,6 @@
 PortGroup           python 1.0
 
 python.versions     26 27
-python.default_version 27
 
 PortGroup           qt4 1.0
 categories-append   devel
@@ -120,10 +119,10 @@
     }
 
     variant pil description {
-       Support image objects in editor through PIL (many dependencies.)
+       Support image objects in editor through PIL or Pillow (many dependencies.)
     } {
         depends_lib-append \
-            port:py${python.version}-pil
+            path:${python.pkgd}/PIL:py${python.version}-Pillow
     }
 
     post-extract {

Modified: trunk/dports/python/py-spyder-devel/Portfile
===================================================================
--- trunk/dports/python/py-spyder-devel/Portfile	2014-07-18 11:12:17 UTC (rev 122242)
+++ trunk/dports/python/py-spyder-devel/Portfile	2014-07-18 11:44:09 UTC (rev 122243)
@@ -128,10 +128,10 @@
 
     if { ${python.version} < 30 } {
         variant pil description {
-           Support image objects in editor through PIL (many dependencies.)
+           Support image objects in editor through PIL or Pillow (many dependencies.)
         } {
             depends_lib-append \
-                port:py${python.version}-pil
+                path:${python.pkgd}/PIL:py${python.version}-Pillow
         }
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140718/034285e4/attachment.html>