<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d91edede5f19f311800ac148e408b8ef6d5ebd4b">https://github.com/macports/macports-ports/commit/d91edede5f19f311800ac148e408b8ef6d5ebd4b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d91edede5f19f311800ac148e408b8ef6d5ebd4b
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Dec 13 11:42:30 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-eric-ide: update to 19.12
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - for py27 and/or qt4 variant pin version to 19.8
</span><span style='display:block; white-space:pre;color:#404040;'>    - add dependency on py-pyqt5-chart (only for version 19.12)
</span>---
 python/py-eric-ide/Portfile                        | 54 +++++++++++++++-------
 python/py-eric-ide/files/patch-install.py.diff     | 28 ++++-------
 ...-install.py.diff => patch-install.py_v198.diff} |  0
 3 files changed, 47 insertions(+), 35 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-eric-ide/Portfile b/python/py-eric-ide/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d74a70..ea2a22d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-eric-ide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-eric-ide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,9 @@ PortGroup           python 1.0
</span> 
 name                py-eric-ide
 set real_name       eric6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             19.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             19.12
</span> revision            0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# sourceforge directory name is YY.MM, with leading zero for month
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SourceForge directory name is YY.MM, with leading zero for month
</span> lassign             [split ${version} .] year month
 set directory       [format %i.%02i ${year} ${month}]
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,22 +29,54 @@ homepage            https://eric-ide.python-projects.org/index.html
</span> master_sites        sourceforge:project/eric-ide/${real_name}/stable/${directory}
 distname            ${real_name}-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  34a8f2a9b2af2fa0e0e4b17e6822c97ed13ac864 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  7adcc5299df105d70eae71b4ed02781c937858ac2aee6bfc8dbf63f68527b025 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    17205953
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  ea53a31d05501275965698cb065e81f84ff3faeb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  fd5a96996e31149bc4532b5a63638537e9f8cd67a1cd1b759fd5a46934a2b1d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    16263848
</span> 
 python.versions     27 37
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} eq 27 || [ variant_isset qt4 ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        version         19.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lassign         [split ${version} .] year month
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set directory   [format %i.%02i ${year} ${month}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        master_sites    sourceforge:project/eric-ide/${real_name}/stable/${directory}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        distname        ${real_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums       rmd160  34a8f2a9b2af2fa0e0e4b17e6822c97ed13ac864 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  7adcc5299df105d70eae71b4ed02781c937858ac2aee6bfc8dbf63f68527b025 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    17205953
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles      patch-install.py_v198.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        livecheck.type  none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles      patch-install.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;'>+    post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PYTHON_BIN_NAME@@|${python.bin}|g" ${worksrcpath}/install.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PYTHON_PKG_DIR@@|${python.pkgd}/${real_name}|g" ${worksrcpath}/install.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[ variant_isset qt4 ]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@PYQT_VERSION@@|--pyqt4|g" ${worksrcpath}/install.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@PYQT_VERSION@@|--pyqt5|g" ${worksrcpath}/install.py
</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;'>+
</span>     variant qt5 conflicts qt4 description "Use Qt5 backend" {
         PortGroup   qt5 1.0
 
         depends_lib-append  \
                     port:py${python.version}-pyqt5 \
                     port:py${python.version}-pyqt5-webengine \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-pyqt5-chart \
</span>                     port:py${python.version}-qscintilla-qt5
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        build.args-append --pyqt=5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${python.version} eq 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            depends_lib-delete  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-pyqt5-chart \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.args-append --pyqt=5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     variant qt4 conflicts qt5 description "Use Qt4 backend" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,16 +102,6 @@ if {${name} ne ${subport}} {
</span>                     port:py${python.version}-pysvn \
                     port:py${python.version}-rope
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles      patch-install.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@PYTHON_BIN_NAME@@|${python.bin}|g" ${worksrcpath}/install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@PYTHON_PKG_DIR@@|${python.pkgd}/${real_name}|g" ${worksrcpath}/install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[ variant_isset qt4 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            reinplace "s|@@PYQT_VERSION@@|--pyqt4|g" ${worksrcpath}/install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            reinplace "s|@@PYQT_VERSION@@|--pyqt5|g" ${worksrcpath}/install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span> 
     build.cmd       ${python.bin} install.py
     build.args      -b ${python.prefix}/bin \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-eric-ide/files/patch-install.py.diff b/python/py-eric-ide/files/patch-install.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 26cbef3..8c3998a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-eric-ide/files/patch-install.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-eric-ide/files/patch-install.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install.py.orig        2019-05-04 05:26:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install.py     2019-05-12 15:14:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -828,7 +828,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     # set install prefix, if not None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     if distDir:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         for key in list(cfg.keys()):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            cfg[key] = os.path.normpath(os.path.join(distDir, cfg[key]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            cfg[key] = os.path.normpath(distDir + os.sep + cfg[key])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         # Install the files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1190,11 +1190,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     os.makedirs(dirs["exe"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     os.makedirs(dirs["icns"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- install.py.orig        2019-09-18 13:44:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ install.py     2019-09-18 13:47:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1213,11 +1213,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if not os.path.exists(directory):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             os.makedirs(directory)
</span>      
 -    if macPythonExe == defaultMacPythonExe:
<span style='display:block; white-space:pre;background:#ffe0e0;'>--        starter = os.path.join(dirs["exe"], "eric")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        starter = os.path.join(directories["exe"], "eric")
</span> -        os.symlink(macPythonExe, starter)
 -    else:
 -        starter = "python{0}".format(sys.version_info.major)
 +##    if macPythonExe == defaultMacPythonExe:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+##        starter = os.path.join(dirs["exe"], "eric")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++##        starter = os.path.join(directories["exe"], "eric")
</span> +##        os.symlink(macPythonExe, starter)
 +##    else:
 +##        starter = "python{0}".format(sys.version_info.major)
 +    starter = "@@PYTHON_BIN_NAME@@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span>      
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     wname = os.path.join(dirs["exe"], "eric6")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     wname = os.path.join(directories["exe"], "eric6")
</span>      
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1223,13 +1225,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1246,13 +1247,15 @@
</span>                  pathlist_n.append(path_)
          pathLine = "PATH={0}\n".format(os.pathsep.join(pathlist_n))
      
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-eric-ide/files/patch-install.py.diff b/python/py-eric-ide/files/patch-install.py_v198.diff
</span>similarity index 100%
copy from python/py-eric-ide/files/patch-install.py.diff
copy to python/py-eric-ide/files/patch-install.py_v198.diff
</pre><pre style='margin:0'>

</pre>