[130114] trunk/dports/science/plplot/Portfile

[larryv at macports.org]

Revision: 130114
          https://trac.macports.org/changeset/130114
Author:   larryv at macports.org
Date:     2014-12-26 22:01:35 -0800 (Fri, 26 Dec 2014)
Log Message:
-----------
plplot: Retire python25, py2{5,6}_pyqt4 variants

py25-pyqt4 and py26-pyqt4 were retired in r127572.

Revision Links:
--------------
    https://trac.macports.org/changeset/127572

Modified Paths:
--------------
    trunk/dports/science/plplot/Portfile

Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile	2014-12-27 05:51:34 UTC (rev 130113)
+++ trunk/dports/science/plplot/Portfile	2014-12-27 06:01:35 UTC (rev 130114)
@@ -7,7 +7,7 @@
 
 name            plplot
 version         5.10.0
-revision        2
+revision        3
 platforms       darwin
 maintainers     takeshi openmaintainer
 categories      science
@@ -176,7 +176,7 @@
     configure.args-append   -DPL_DOUBLE=OFF
 }
 
-if {[variant_isset py25_pyqt4] || [variant_isset py26_pyqt4] ||  [variant_isset py27_pyqt4]} {
+if {[variant_isset py27_pyqt4]} {
     default_variants +qt4
 }
 
@@ -220,16 +220,10 @@
     configure.args-append   -DENABLE_java=ON
 }
 
-variant python25 conflicts python26 python27 description {Add support for python25} {
-    depends_lib-append      port:python25 \
-                            port:py25-numpy \
-                            port:swig-python
-    configure.args-delete   -DENABLE_python=OFF
-    configure.args-append   -DENABLE_python=ON \
-                            -DHAVE_NUMPY:BOOL=ON \
-                            -DPYTHON_INCLUDE_PATH=${prefix}/include/python2.5
-}
-variant python26 conflicts python25 python27 description {Add support for python26} {
+# TODO: Remove after 2015-12-27.
+variant python25 requires python27 description {Legacy variant} {}
+
+variant python26 conflicts python27 description {Add support for python26} {
     depends_lib-append      port:python26 \
                             port:py26-numpy \
                             port:swig-python
@@ -238,7 +232,7 @@
                             -DHAVE_NUMPY:BOOL=ON \
                             -DPYTHON_INCLUDE_PATH=${frameworks_dir}/Python.framework/Versions/2.6/Headers
 }
-variant python27 conflicts python25 python26 description {Add support for python27} {
+variant python27 conflicts python26 description {Add support for python27} {
     depends_lib-append      port:python27 \
                             port:py27-numpy \
                             port:swig-python
@@ -248,18 +242,10 @@
                             -DPYTHON_INCLUDE_PATH=${frameworks_dir}/Python.framework/Versions/2.7/Headers
 }
 
-variant py25_pyqt4 requires python25 description {Add support for pyQT4 using python25} {
-    # Can use either py*-pyqt4 or py*-pyqt4-devel.
-    depends_lib-append     path:share/py25-sip/PyQt4:py25-pyqt4
-    configure.args-delete   -DENABLE_pyqt4=OFF
-    configure.args-append   -DENABLE_pyqt4=ON
-}
-variant py26_pyqt4 requires python26 description {Add support for pyQT4 using python26} {
-    # Can use either py*-pyqt4 or py*-pyqt4-devel.
-    depends_lib-append     path:share/py26-sip/PyQt4:py26-pyqt4
-    configure.args-delete   -DENABLE_pyqt4=OFF
-    configure.args-append   -DENABLE_pyqt4=ON
-}
+# TODO: Remove after 2015-12-27.
+variant py25_pyqt4 requires py27_pyqt4 description {Legacy variant} {}
+variant py26_pyqt4 requires py27_pyqt4 description {Legacy variant} {}
+
 variant py27_pyqt4 requires python27 description {Add support for pyQT4 using python27} {
     # Can use either py*-pyqt4 or py*-pyqt4-devel.
     depends_lib-append     path:share/py27-sip/PyQt4:py27-pyqt4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141226/1f16a576/attachment-0001.html>