<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/08140c577780b5ca23e817a3ae43be3d24fd518a">https://github.com/macports/macports-ports/commit/08140c577780b5ca23e817a3ae43be3d24fd518a</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 08140c57778 py-sip4: always use deactivate hack, do not check py-pip version
</span>08140c57778 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 08140c577780b5ca23e817a3ae43be3d24fd518a
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Sep 16 12:30:42 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-sip4: always use deactivate hack, do not check py-pip version
</span>---
 python/py-sip4/Portfile | 7 ++-----
 1 file changed, 2 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 68f54d2b7ae..c859c246fc8 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;'>@@ -153,13 +153,10 @@ ${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 (providing version 4.x) to py-pip4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # deactivate hack to have a smooth transition from the original py-pip 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;'>-            set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[vercmp $_version ${version}] < 1} {
</span><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:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite py${python.version}-sip "" [list ports_nodepcheck 1]
</span>             }
         }
     } else {
</pre><pre style='margin:0'>

</pre>