<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/2e0af51496db5fac79e2ec731d719ecadce5110d">https://github.com/macports/macports-ports/commit/2e0af51496db5fac79e2ec731d719ecadce5110d</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 2e0af51496d py-sip{-devel}: fix conflicts
</span>2e0af51496d is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2e0af51496db5fac79e2ec731d719ecadce5110d
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Jun 14 04:58:37 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-sip{-devel}: fix conflicts
</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/65342
</span>---
 python/py-sip/Portfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip/Portfile b/python/py-sip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0b599f596a..ee2185ccd74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ checksums           rmd160  a3fb1ca47e41f04e018efbebd95d8a90041b71b1 \
</span> 
 python.versions     35 36 37 38 39 310
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach pver {37 38 39 310} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pver {"" 37 38 39 310} {
</span>     subport py${pver}-sip-devel {
         version         6.6.2.dev2206062241
         master_sites    https://www.riverbankcomputing.com/pypi/packages/sip/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,12 @@ foreach pver {37 38 39 310} {
</span>                         size    1144044
         conflicts       py${pver}-sip
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    subport py${pver}-sip {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts       py${pver}-sip-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} ne ${subport}} {
     if {${python.version} == 35} {
         version     5.5.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +61,6 @@ if {${name} ne ${subport}} {
</span>         depends_lib-append \
                     port:py${python.version}-ply \
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        conflicts   py${pver}-sip-devel
</span>     }
 
     depends_lib-append \
</pre><pre style='margin:0'>

</pre>