<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6c34014a6137e02b60486a1b89ac6a0ee5b814d9">https://github.com/macports/macports-ports/commit/6c34014a6137e02b60486a1b89ac6a0ee5b814d9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6c34014a6137e02b60486a1b89ac6a0ee5b814d9
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Sat May 19 21:33:51 2018 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-spyder-devel: update to provide development version
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - whitespace changes and reorder/cleanup of Portfile
</span><span style='display:block; white-space:pre;color:#404040;'>    - update dependencies and variants
</span><span style='display:block; white-space:pre;color:#404040;'>    - support qt4/qt5 through variants
</span><span style='display:block; white-space:pre;color:#404040;'>    - update/add patches
</span><span style='display:block; white-space:pre;color:#404040;'>    - update post-destroot phase
</span><span style='display:block; white-space:pre;color:#404040;'>    - use spyder_select
</span><span style='display:block; white-space:pre;color:#404040;'>    - add myself as maintainer
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/56476
</span>---
 python/py-spyder-devel/Portfile                    | 203 ++++++++++-----------
 python/py-spyder-devel/files/ipython_checks.diff   |  11 --
 .../files/patch-scripts_spyder-qt4.diff            |   8 +
 .../files/patch-scripts_spyder3-qt4.diff           |   8 +
 ...py.diff => patch-spyder_app_mainwindow.py.diff} |  10 +-
 .../files/patch-spyder_app_start.py.diff           |  12 ++
 ...ig.py.diff => patch-spyder_config_base.py.diff} |  28 +--
 .../files/patch-spyder_plugins_editor.py.diff      |  11 ++
 ...py.diff => patch-spyder_utils_programs.py.diff} |   6 +-
 ... patch-spyder_utils_syntaxhighlighters.py.diff} |   8 +-
 python/py-spyder-devel/files/spyder-27             |   1 +
 python/py-spyder-devel/files/spyder-34             |   1 +
 python/py-spyder-devel/files/spyder-35             |   1 +
 python/py-spyder-devel/files/spyder-36             |   1 +
 .../files/spyderlib_plugins_editor.py.diff         |  11 --
 .../files/spyderlib_start_app.py.diff              |  12 --
 16 files changed, 166 insertions(+), 166 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 52a9168..b802887 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;'>@@ -2,22 +2,22 @@
</span> 
 PortSystem          1.0
 PortGroup           github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           python 1.0
</span> PortGroup           active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           select 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        spyder-ide spyder 3.2.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        spyder-ide spyder c595543
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.2.8-20180522
</span> name                py-spyder-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span> # Preference on mailing list is to use small numbers for epoch.
 # This is already a date code, so sticking with dates.
 epoch               20161005
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           python 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> python.versions     27 35 36
 
 categories-append   devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers         {eborisch @eborisch} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers         {gmail.com:ottenr.work @reneeotten} {eborisch @eborisch} openmaintainer
</span> license             MIT
 homepage            https://packages.python.org/spyder/
 description         Spyder is the Scientific PYthon Development EnviRonment
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,142 +38,133 @@ supported_archs     noarch
</span> #pyNN-scipy doesn't build universal
 universal_variant   no
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        rmd160  a698ca83df7b795b0cee61406eb112e1256b639e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        sha256  508e473c64fec5197761d368a5dbfafd187b38e8e668df8bb2e1430b3b3eb61f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts           py${python.version}-spyder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Will *work* with either/both under the hood, but for dependencies,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # provide variants to determine what we label depends_lib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  47f5c844eac16fe26ba528cfe320072fe4001344 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  c2a570d9c7c98f456b9dced044fa6f395e19b39bcadb591906cef5462ca5c123 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    4062623
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Set the pylint executable name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set LINT_BIN_NAME   pylint-${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set WINPDB_BIN_NAME winpdb-${python.branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles          spyderlib_baseconfig.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        spyderlib_plugins_editor.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        spyderlib_start_app.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        spyderlib_spyder.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        spyderlib_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts       py${python.version}-spyder
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/plugins/editor.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|\"assistant\"|\"Assistant\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|\"linguist\"|\"Linguist\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|\"designer\"|\"Designer\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/spyder/app/mainwindow.py
</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;'>+    depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:spyder_select
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Bare minimum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append \
</span>         port:py${python.version}-chardet \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:py${python.version}-codestyle \
</span>         port:py${python.version}-cloudpickle \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:py${python.version}-path \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-codestyle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-jedi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-nbconvert \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-numpydoc \
</span>         port:py${python.version}-pickleshare \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:py${python.version}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-pyflakes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-pygments \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-pylint \
</span>         port:py${python.version}-qtawesome \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-qtconsole \
</span>         port:py${python.version}-qtpy \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-rope \
</span>         port:py${python.version}-sphinx \
         port:py${python.version}-zmq
 
<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;'>-    depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:GraphicsMagick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant tiny description {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        Remove all optional dependencies for quickest install. Dependencies\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        are detected/enabled at runtime and may be installed separately.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } conflicts small {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant small description {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        Remove most optional dependencies for quicker install. Dependencies\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        are detected/enabled at runtime and may be installed separately.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } conflicts tiny {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant no_anti_alias description {Use non-anti-aliased fonts in editor.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-append   no_AA.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant pyqt5 conflicts pyqt4 description "Qt backend using PyQt5" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PortGroup                  qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append         port:py${python.version}-pyqt5
</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:#ffe0e0;'>-    # These add very little to the install time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![ variant_isset tiny ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:py${python.version}-pylint \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            path:${python.pkgd}/pep8:py${python.version}-pep8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:py${python.version}-pyflakes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:py${python.version}-rope \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:py${python.version}-psutil \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:py${python.version}-jedi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant pyqt4 conflicts pyqt5 description "Qt backend using PyQt4" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        PortGroup                  qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append         port:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   port:qt4-mac-sqlite3-plugin
</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;'>+        # make sure that py-pyqt4 is used when also py-pyqt5 is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append          patch-scripts_spyder-qt4.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   patch-scripts_spyder3-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![ variant_isset pyqt4 ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        default_variants    +pyqt5
</span>     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # These add substantially to the install time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![ variant_isset small ] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ![ variant_isset tiny  ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant small description "Remove all optional dependencies." {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant no_anti_alias description "Use non-anti-aliased fonts in editor." {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append    patch-spyder_utils_syntaxhighlighters.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![ variant_isset small ]} {
</span>         depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            path:${python.pkgd}/h5py/__init__.py:py${python.version}-h5py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:py${python.version}-qtconsole \
</span>             port:py${python.version}-matplotlib \
             port:py${python.version}-scipy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:py${python.version}-nbconvert \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${python.version}-numpy \
</span>             port:py${python.version}-pandas \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            port:py${python.version}-sympy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${python.version}-sympy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${python.version}-cython
</span>     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant docs description {Include python and Qt offline documentation.} {
</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;'>-        depends_lib-append  port:py${python.version}-htmldocs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant docs description "Include offline Python and Qt documentation." {
</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;'>+        if {[ variant_isset pyqt5 ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            depends_lib-append    port:qt5-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant pil description {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           Support image objects in editor through PIL or Pillow (many dependencies.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant pil description "Support image objects in editor through PIL or Pillow." {
</span>         depends_lib-append \
             path:${python.pkgd}/PIL:py${python.version}-Pillow
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        touch $f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set WINPDB_BIN_NAME    winpdb-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append      patch-spyder_config_base.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           patch-spyder_plugins_editor.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           patch-spyder_app_start.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           patch-spyder_app_mainwindow.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@WINPDB_BIN_NAME@@|${WINPDB_BIN_NAME}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/spyder/plugins/editor.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|\"assistant\"|\"Assistant\"|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|\"linguist\"|\"Linguist\"|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|\"designer\"|\"Designer\"|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PREFIX@@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/spyder/app/mainwindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[ variant_isset pyqt4 ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@APPS_DIR@@|${applications_dir}/Qt4|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/spyder/utils/programs.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } else {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span>     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {${python.version} == ${python.default_version}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          ln -s ${python.prefix}/bin/spyder ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        system -W ${destroot}${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            "find . -name *.png -print0 | xargs -0 gm mogrify -strip"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-destroot {
</span>         delete \
           ${destroot}${prefix}/bin/spyder_win_post_install.py-${python.branch}
         delete ${destroot}${python.prefix}/bin/spyder_win_post_install.py
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        file mkdir ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        copy ${worksrcpath}/LICENSE \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 0644 -W ${worksrcpath} AUTHORS Announcements.md LICENSE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            CHANGELOG.md CONTRIBUTING.md README.md RELEASE.md TROUBLESHOOTING.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${destroot}${docdir}
</span>     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} == ${python.default_version}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set EXENAME   "'spyder'    "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set EXENAME   "'spyder-${python.branch}'"
</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;'>-    notes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    select.group    spyder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    select.file     ${filespath}/spyder-${python.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To make the Python ${python.branch} version of spyder the one that is run\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+when you execute the commands without a version suffix, e.g. 'spyder', run:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo port select --set ${select.group} [file tail ${select.file}]
</span> "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-##############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-### Spyder is launched from the terminal with ${EXENAME} ###
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-##############################################################"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     livecheck.type      none
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/ipython_checks.diff b/python/py-spyder-devel/files/ipython_checks.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 38ce7c0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/ipython_checks.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./spyderlib/widgets/explorer.py.orig   2012-07-17 15:31:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./spyderlib/widgets/explorer.py        2012-07-17 15:30:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,7 +286,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                triggered=lambda fnames=fnames:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                self.open_interpreter(fnames))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         actions.append(action)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        if programs.is_module_installed('IPython', '0.10'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        if programs.is_module_installed('IPython', '>=0.10'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             _title = _("Open IPython here")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             action = create_action(self, _title, icon="ipython.png",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    triggered=lambda fnames=fnames:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-scripts_spyder-qt4.diff b/python/py-spyder-devel/files/patch-scripts_spyder-qt4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6a9face
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-scripts_spyder-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/spyder.orig    2018-05-20 13:13:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/spyder 2018-05-20 13:13:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++os.environ['QT_API'] = 'pyqt'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.app import start
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ start.main()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-scripts_spyder3-qt4.diff b/python/py-spyder-devel/files/patch-scripts_spyder3-qt4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e954934
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-scripts_spyder3-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/spyder3.orig   2018-05-20 13:13:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/spyder3        2018-05-20 13:14:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #! /usr/bin/python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++os.environ['QT_API'] = 'pyqt'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.app import start
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ start.main()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyderlib_spyder.py.diff b/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
</span>similarity index 51%
rename from python/py-spyder-devel/files/spyderlib_spyder.py.diff
rename to python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index d04dfc9..2866342 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/spyderlib_spyder.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/app/mainwindow.py.orig  2011-09-05 18:29:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/mainwindow.py       2011-09-08 08:36:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,7 +142,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             return osp.join(doc_path, python_chm[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/mainwindow.py.orig  2018-05-19 23:02:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/mainwindow.py       2018-05-19 23:02:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,7 +206,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             return file_uri(osp.join(doc_path, python_chm[0]))
</span>      else:
          vinf = sys.version_info
 -        doc_path = '/usr/share/doc/python%d.%d/html' % (vinf[0], vinf[1])
 +        doc_path = '@@PREFIX@@/share/doc/python%d%d-doc' % (vinf[0], vinf[1])
      python_doc = osp.join(doc_path, "index.html")
      if osp.isfile(python_doc):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         return python_doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return file_uri(python_doc)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_app_start.py.diff b/python/py-spyder-devel/files/patch-spyder_app_start.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..87fbb05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_app_start.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/app/start.py.orig       2018-05-19 22:59:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/app/start.py    2018-05-19 22:59:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if os.environ.get('LANG') == 'UTF-8':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    os.environ['LANG'] = 'en_US.UTF-8'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Local imports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.app.cli_options import get_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from spyder.config.base import (get_conf_path, running_in_mac_app,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff b/python/py-spyder-devel/files/patch-spyder_config_base.py.diff
</span>similarity index 65%
rename from python/py-spyder-devel/files/spyderlib_baseconfig.py.diff
rename to python/py-spyder-devel/files/patch-spyder_config_base.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index 994d1ba..2f0ab21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/spyderlib_baseconfig.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_config_base.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/config/base.py.orig     2016-08-23 09:15:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/config/base.py  2016-08-23 09:18:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/config/base.py.orig     2018-05-19 22:50:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/config/base.py  2018-05-19 22:51:58.000000000 -0400
</span> @@ -22,6 +22,7 @@
  import sys
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@
</span> +from spyder import __version__
  from spyder.utils import encoding
  from spyder.py3compat import (is_unicode, TEXT_TYPES, INT_TYPES, PY3,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                  to_text_string, is_text_string)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,10 +74,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                               to_text_string, is_text_string)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,10 +84,10 @@
</span>  # since 3.0+ we've reverted back to use .spyder to simplify major
  # updates in version (required when we change APIs by Linux
  # packagers)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,27 +16,27 @@
</span> -    SUBFOLDER = 'spyder'
 -else:
 -    SUBFOLDER = '.spyder'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#    SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#    SUBFOLDER = '.spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##if sys.platform.startswith('linux'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##    SUBFOLDER = 'spyder'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##    SUBFOLDER = '.spyder'
</span>  
  
  # We can't have PY2 and PY3 settings in the same dir because:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,9 +85,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,8 +95,14 @@
</span>  #    embed a PY2 interpreter in PY3)
  # 2. We need to save the list of installed modules (for code
  #    completion) separately for each version
 -if PY3:
 -    SUBFOLDER = SUBFOLDER + '-py3'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PY3:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#    SUBFOLDER = SUBFOLDER + '-py3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Macports: We allow multiple python 2.x or 3.x versions side-by-side; keep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##if PY3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##    SUBFOLDER = SUBFOLDER + '-py3'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MacPorts: we allow multiple python 2.x or 3.x versions side-by-side; keep
</span> +# preferences separate.
 +SUBFOLDER = '.spyder%s-%s%s' % (__version__.split('.')[0],
 +                                sys.version_info[0],
 +                                sys.version_info[1])
  
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span>  def get_home_dir():
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     """
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/patch-spyder_plugins_editor.py.diff b/python/py-spyder-devel/files/patch-spyder_plugins_editor.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..923ca0f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_plugins_editor.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/plugins/editor.py.orig  2018-05-19 22:55:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/plugins/editor.py       2018-05-19 22:55:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         save_breakpoints(filename, breakpoints)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-WINPDB_PATH = programs.find_program('winpdb')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++WINPDB_PATH = programs.find_program('@@WINPDB_BIN_NAME@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class EditorConfigPage(PluginConfigPage):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyderlib_utils_programs.py.diff b/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
</span>similarity index 65%
rename from python/py-spyder-devel/files/spyderlib_utils_programs.py.diff
rename to python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index 91f48f7..907fc59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/spyderlib_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/utils/programs.py.orig  2011-10-12 11:06:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/utils/programs.py       2011-10-12 11:07:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/programs.py.orig  2018-05-19 23:42:30.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/programs.py       2018-05-19 23:42:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,6 +46,11 @@
</span>          abspath = osp.join(path, basename)
          if osp.isfile(abspath):
              return abspath
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/no_AA.diff b/python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff
</span>similarity index 55%
rename from python/py-spyder-devel/files/no_AA.diff
rename to python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff
<span style='display:block; white-space:pre;color:#808080;'>index 93294fc..988e935 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/no_AA.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyderlib/widgets/sourcecode/syntaxhighlighters.py.orig        2014-05-01 12:42:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyderlib/widgets/sourcecode/syntaxhighlighters.py     2014-05-01 12:43:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -265,6 +265,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- spyder/utils/syntaxhighlighters.py.orig        2018-05-19 22:47:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ spyder/utils/syntaxhighlighters.py     2018-05-19 22:47:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,6 +191,10 @@
</span>              if bold:
                  format.setFontWeight(QFont.Bold)
              format.setFontItalic(italic)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,4 +10,4 @@
</span> +                format.setFont(font)
              self.formats[name] = format
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     def _check_color_scheme(self, color_scheme):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     def set_color_scheme(self, color_scheme):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyder-27 b/python/py-spyder-devel/files/spyder-27
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bf361f6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/spyder-27
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/spyder-2.7
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyder-34 b/python/py-spyder-devel/files/spyder-34
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1fa3393
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/spyder-34
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/spyder-3.4
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyder-35 b/python/py-spyder-devel/files/spyder-35
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fc1e4ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/spyder-35
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/spyder-3.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyder-36 b/python/py-spyder-devel/files/spyder-36
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..22b47ce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spyder-devel/files/spyder-36
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/spyder-3.6
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyderlib_plugins_editor.py.diff b/python/py-spyder-devel/files/spyderlib_plugins_editor.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1852d99..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/spyderlib_plugins_editor.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/plugins/editor.py.orig  2011-10-12 11:11:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/plugins/editor.py       2011-10-12 11:12:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     CONF.set('run', 'breakpoints', {})
</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;'>--WINPDB_PATH = programs.find_program('winpdb')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+WINPDB_PATH = programs.find_program('@@WINPDB_BIN_NAME@@')
</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;'>- class EditorConfigPage(PluginConfigPage):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spyder-devel/files/spyderlib_start_app.py.diff b/python/py-spyder-devel/files/spyderlib_start_app.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9edc2a1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spyder-devel/files/spyderlib_start_app.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- spyder/app/start.py-orig       2013-10-14 12:43:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ spyder/app/start.py    2013-10-14 12:45:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import atexit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import random
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if os.environ.get('LANG') == 'UTF-8':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  os.environ['LANG'] = 'en_US.UTF-8'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Local imports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyderlib.cli_options import get_options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from spyderlib.baseconfig import get_conf_path
</span></pre><pre style='margin:0'>

</pre>