<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dc6c70da49ab34f62cc051dd65859167ce8531f4">https://github.com/macports/macports-ports/commit/dc6c70da49ab34f62cc051dd65859167ce8531f4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new dc6c70da49a git-cola: update to 4.1.0
</span>dc6c70da49a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit dc6c70da49ab34f62cc051dd65859167ce8531f4
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Mar 4 09:01:29 2023 -0500

<span style='display:block; white-space:pre;color:#404040;'>    git-cola: update to 4.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - switch to PyPI
</span><span style='display:block; white-space:pre;color:#404040;'>    - use Python 3.11
</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/65541
</span>---
 devel/git-cola/Portfile                      | 58 ++++++++++++----------------
 devel/git-cola/files/patch-pyqt-version.diff | 10 ++---
 2 files changed, 29 insertions(+), 39 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-cola/Portfile b/devel/git-cola/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 922ccef2715..fc77299cad0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-cola/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-cola/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           python 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        git-cola git-cola 3.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories          devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name                git-cola
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             4.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs     noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms           {darwin any}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-prepend  devel
</span> maintainers         {raimue @raimue} \
                     openmaintainer
 license             GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,36 +18,30 @@ description         The highly caffeinated Git GUI
</span> long_description    git-cola is a powerful Git GUI with a slick and \
                     intuitive user interface.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  0ea666f81054289dc0e98c7a38547b73143e96da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  d8a5ee637aea00965121cd4f2388319983bcd05ae7149069a6d553268149350b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    1180032
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  effbd5a8d4ce0ddafdbd1fe1604ec88f58d35612 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  d77ba2eb1d1240f47cc44f5fcb9230cc65681834e7e27edf17c5ada462d3fb07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    1140358
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://git-cola.github.io/
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build       port:py36-sphinx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:git \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:python36 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py36-pyqt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py36-qtpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517       yes
</span> 
 patchfiles          patch-pyqt-version.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# now default to Qt5, Qt6 and/or PySide2 are other options, for which one could add
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# variants if deemed useful
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set pyqt "pyqt4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set pyqt "pyqt5"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace -W ${worksrcpath} -E "s/@@pyqt@@/${pyqt}/" cola/app.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace -W ${worksrcpath} -E "s/@@pyqt@@/pyqt5/" cola/app.py
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args          prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    PYTHON=${prefix}/bin/python3.6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    SPHINXBUILD=${prefix}/bin/sphinx-build-3.6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    NO_VENDOR_LIBS=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target        all man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-setuptools_scm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-toml
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args       ${build.args}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target     install install-man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:git \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${python.version}-qtpy
</span> 
 post-destroot {
     xinstall -d ${destroot}${prefix}/share/bash-completion/completions
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,11 +56,3 @@ notes "\
</span>       source ${prefix}/share/bash-completion/completions/git
       source ${prefix}/share/bash-completion/completions/git-cola
 "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 description (Use qt5 instead of qt4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # This variant is meant to match py36-qtpy +qt5, which also depends on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # py36-qtpy5. However, all variants of py36-qtpy support all Qt versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Always add the dependency in this port to ensure the selected Qt version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # is available.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-replace port:py36-pyqt4 port:py36-pyqt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-cola/files/patch-pyqt-version.diff b/devel/git-cola/files/patch-pyqt-version.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 27228c7a5dd..f9c11e6b7c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-cola/files/patch-pyqt-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-cola/files/patch-pyqt-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cola/app.py.orig       2017-04-10 05:20:15.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cola/app.py    2017-05-09 17:35:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,6 +9,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Copyright (C) 2009-2016 David Aguilar and contributors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cola/app.py.orig       2023-03-04 09:22:38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cola/app.py    2023-03-04 09:23:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +12,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Copyright (C) 2007-2022 David Aguilar and contributors
</span>  """
  
 +# Use this specific version of Qt
 +os.environ['QT_API'] = '@@pyqt@@'
 +
<span style='display:block; white-space:pre;background:#ffe0e0;'>- from . import core
</span>  try:
      from qtpy import QtCore
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ except ImportError:
</span></pre><pre style='margin:0'>

</pre>