<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4edaea2ffba6223bda92e5b7824be36a37480ebd">https://github.com/macports/macports-ports/commit/4edaea2ffba6223bda92e5b7824be36a37480ebd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4edaea2ffba6223bda92e5b7824be36a37480ebd
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Sat Jul 7 08:45:55 2018 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-spyder-devel: update to de337a2 (20180706)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - update/add dependencies (py-spyder-kernels-devel and py-keyring)
</span><span style='display:block; white-space:pre;color:#404040;'>    - remove Qt4 variant (no longer supported by upstream)
</span>---
 python/py-spyder-devel/Portfile | 57 ++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 40 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/Portfile b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06b3d2e..a710a21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,12 @@
</span> PortSystem          1.0
 PortGroup           github 1.0
 PortGroup           python 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           qt5 1.0
</span> PortGroup           active_variants 1.1
 PortGroup           select 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        spyder-ide spyder 2c917bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.2.8-20180625
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        spyder-ide spyder de337a2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.3.0-20180706
</span> name                py-spyder-devel
 # Preference on mailing list is to use small numbers for epoch.
 # This is already a date code, so sticking with dates.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,12 +39,15 @@ supported_archs     noarch
</span> #pyNN-scipy doesn't build universal
 universal_variant   no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  1e049f523a36fd9a44f361b17b7f110ba79da57b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  e6c67bb8f1ec79c5fce7d1f570f90bdf96a34a67c04652fb5394f7f6039ea56a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    4033834
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  6cf4f26ec42c9c1d15878bf6d0163bb6a277a86c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  370a4792d4481ad75f6230326e8158a8a469648a934043c4cc41ae932a762fc1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    4062528
</span> 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts       py${python.version}-spyder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants    py${python.version}-pyqt5 webengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants    py${python.version}-qtpy qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts    py${python.version}-spyder
</span> 
     depends_run-append \
         port:spyder_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +57,7 @@ if {${name} ne ${subport}} {
</span>         port:py${python.version}-cloudpickle \
         port:py${python.version}-codestyle \
         port:py${python.version}-jedi \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-keyring \
</span>         port:py${python.version}-nbconvert \
         port:py${python.version}-numpydoc \
         port:py${python.version}-pickleshare \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,35 +65,15 @@ if {${name} ne ${subport}} {
</span>         port:py${python.version}-pyflakes \
         port:py${python.version}-pygments \
         port:py${python.version}-pylint \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-pyqt5 \
</span>         port:py${python.version}-qtawesome \
         port:py${python.version}-qtconsole \
         port:py${python.version}-qtpy \
         port:py${python.version}-rope \
         port:py${python.version}-sphinx \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:py${python.version}-spyder-kernels \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-spyder-kernels-devel \
</span>         port:py${python.version}-zmq
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant pyqt5 conflicts pyqt4 description "Qt backend using PyQt5" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        PortGroup                  qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append         port:py${python.version}-pyqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        require_active_variants    py${python.version}-pyqt5 webengine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        require_active_variants    py${python.version}-qtpy qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant pyqt4 conflicts pyqt5 description "Qt backend using PyQt4" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        PortGroup                  qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append         port:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                   port:qt4-mac-sqlite3-plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        require_active_variants    py${python.version}-qtpy "" qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # make sure that py-pyqt4 is used when also py-pyqt5 is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-append          patch-scripts_spyder-qt4.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                   patch-scripts_spyder3-qt4.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![ variant_isset pyqt4 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants    +pyqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     variant small description "Remove all optional dependencies." {}
 
     variant no_anti_alias description "Use non-anti-aliased fonts in editor." {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,10 +91,8 @@ if {${name} ne ${subport}} {
</span>     }
 
     variant docs description "Include offline Python and Qt documentation." {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append        port:py${python.version}-htmldocs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[ variant_isset pyqt5 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            depends_lib-append    port:qt5-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append   port:py${python.version}-htmldocs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                             port:qt5-docs
</span>     }
 
     variant pil description "Support image objects in editor through PIL or Pillow." {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,14 +118,8 @@ if {${name} ne ${subport}} {
</span>             ${worksrcpath}/spyder/app/mainwindow.py
         reinplace "s|@@PREFIX@@|${prefix}|g" \
             ${worksrcpath}/spyder/app/mainwindow.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[ variant_isset pyqt4 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt4|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ${worksrcpath}/spyder/utils/programs.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ${worksrcpath}/spyder/utils/programs.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt5|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/spyder/utils/programs.py
</span>     }
 
     post-destroot {
</pre><pre style='margin:0'>

</pre>