<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/649ebe2332f927dae71532180d7b978d25b76784">https://github.com/macports/macports-ports/commit/649ebe2332f927dae71532180d7b978d25b76784</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 649ebe2332f927dae71532180d7b978d25b76784
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Jun 1 18:44:30 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-eric-ide: update to 20.6
</span>---
python/py-eric-ide/Portfile | 8 ++++----
python/py-eric-ide/files/patch-disable-update-check.diff | 6 +++---
python/py-eric-ide/files/patch-install.py.diff | 12 ++++++------
3 files changed, 13 insertions(+), 13 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 4660814..b4fe43b 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,7 +5,7 @@ PortGroup python 1.0
</span>
name py-eric-ide
set real_name eric6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20.6
</span> revision 0
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ homepage https://eric-ide.python-projects.org/index.html
</span> master_sites sourceforge:project/eric-ide/${real_name}/stable/${version}
distname ${real_name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 419a3c9133fe5187a2d09de6651f6c5e70cfceb1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a57f95d85cf61a16be7c71cb0d2420503666261c6195179cb348f793dacca422 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17229844
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 41ed1943ffc7bbff58dcd8721adf926efe0347d1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 310049d80d2cb993f9c64fea67409e336876f131a2f1df8525c1cfae13ff6794 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17251040
</span>
python.versions 27 37
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-eric-ide/files/patch-disable-update-check.diff b/python/py-eric-ide/files/patch-disable-update-check.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c700be8..980a3ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-eric-ide/files/patch-disable-update-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-eric-ide/files/patch-disable-update-check.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;'>---- eric/eric6/UI/UserInterface.py.orig 2019-12-13 14:49:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ eric/eric6/UI/UserInterface.py 2019-12-13 14:50:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7065,6 +7065,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- eric/eric6/UI/UserInterface.py.orig 2020-05-31 11:25:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ eric/eric6/UI/UserInterface.py 2020-06-01 21:03:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7030,6 +7030,10 @@
</span> @param alternative index of server to download from (integer)
@keyparam showVersions flag indicating the show versions mode (boolean)
"""
<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 8c3998a..e82f781 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,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install.py.orig 2019-09-18 13:44:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install.py 2019-09-18 13:47:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1213,11 +1213,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- install.py.orig 2020-06-01 05:33:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ install.py 2020-06-01 21:03:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1076,11 +1076,12 @@
</span> if not os.path.exists(directory):
os.makedirs(directory)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if macPythonExe == defaultMacPythonExe:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if macPythonExe == defaultMacPythonExe and macPythonExe:
</span> - starter = os.path.join(directories["exe"], "eric")
- os.symlink(macPythonExe, starter)
- else:
- starter = "python{0}".format(sys.version_info.major)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+## if macPythonExe == defaultMacPythonExe:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## if macPythonExe == defaultMacPythonExe and macPythonExe:
</span> +## starter = os.path.join(directories["exe"], "eric")
+## os.symlink(macPythonExe, starter)
+## else:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span>
wname = os.path.join(directories["exe"], "eric6")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1246,13 +1247,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1106,13 +1107,15 @@
</span> pathlist_n.append(path_)
pathLine = "PATH={0}\n".format(os.pathsep.join(pathlist_n))
</pre><pre style='margin:0'>
</pre>