<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/ae8596d9e3d3c798ec5e911d5e1cdcbf52ae77e3">https://github.com/macports/macports-ports/commit/ae8596d9e3d3c798ec5e911d5e1cdcbf52ae77e3</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 ae8596d9e3d py-sip4: use deactivate hack for py-sip
</span>ae8596d9e3d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ae8596d9e3d3c798ec5e911d5e1cdcbf52ae77e3
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Sep 16 11:21:53 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-sip4: use deactivate hack for py-sip
</span>---
python/py-sip4/Portfile | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 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 6a4a929347f..68f54d2b7ae 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,7 +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;'>- conflicts py${python.version}-sip
</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;'>@@ -149,16 +151,19 @@ if {${name} ne ${subport}} {
</span> GPL-2 or GPL-3 licenses are also available. For details see
${prefix}/share/doc/${subport}/LICENSE \[-GPL2 -GPL3\]\n\n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string last devel ${subport}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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;'>+ pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active py${python.version}-sip] 0]}]} {
</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><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;'>+ } else {
</span> livecheck.type regex
livecheck.url https://www.riverbankcomputing.com/software/sip/download
livecheck.regex sip-(4(\\.\\d+)+)${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
</pre><pre style='margin:0'>
</pre>