<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/193cfbdd3cfdff62159948417da0dddb5dffd3af">https://github.com/macports/macports-ports/commit/193cfbdd3cfdff62159948417da0dddb5dffd3af</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 193cfbdd3cf py-sip4: remove conflict with py-sip
</span>193cfbdd3cf is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 193cfbdd3cfdff62159948417da0dddb5dffd3af
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Sep 16 13:28:14 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-sip4: remove conflict with py-sip
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - put back version check, only deactivate when pyX-sip version 4.19.25
</span><span style='display:block; white-space:pre;color:#404040;'>      is installed
</span><span style='display:block; white-space:pre;color:#404040;'>    - effectively still conflicts with the latest py-sip, but fails at
</span><span style='display:block; white-space:pre;color:#404040;'>      activate time
</span>---
 python/py-sip4/Portfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip4/Portfile b/python/py-sip4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c859c246fc8..f86c2c1d839 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sip4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,9 +52,9 @@ version             4.19.25
</span> python.versions     27 35 36 37 38 39
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} != 27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        conflicts           py${python.version}-sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #if {${python.version} != 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #    conflicts           py${python.version}-sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #}
</span> 
     master_sites        https://www.riverbankcomputing.com/static/Downloads/sip/${version}
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,10 +153,14 @@ ${prefix}/share/doc/${subport}/LICENSE \[-GPL2 -GPL3\]\n\n"
</span> 
     livecheck.type   none
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # deactivate hack to have a smooth transition from the original py-pip to the legacy py-pip4 port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # deactivate hack to have a smooth transition from the original py-pip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # (providing version 4.x) to the legacy py-pip4 port
</span>     pre-activate {
         if {![catch {set installed [lindex [registry_active py${python.version}-sip] 0]}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            registry_deactivate_composite py${python.version}-sip "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[vercmp $_version ${version}] < 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                registry_deactivate_composite py${python.version}-sip "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span>             }
         }
     } else {
</pre><pre style='margin:0'>

</pre>