<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/e16f27f495e759b777ab65ac0e8c185ff5a8705e">https://github.com/macports/macports-ports/commit/e16f27f495e759b777ab65ac0e8c185ff5a8705e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e16f27f495e759b777ab65ac0e8c185ff5a8705e
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Dec 7 15:26:22 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    arpeggio,py312-arpeggio: ports conflict
</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/71482
</span>---
 python/py-arpeggio/Portfile | 5 +++--
 science/arpeggio/Portfile   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-arpeggio/Portfile b/python/py-arpeggio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96b2003aacc..f16a00383cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-arpeggio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-arpeggio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,8 +26,9 @@ checksums           rmd160  9384ca40412f52d7efdc28470fdd15c030056a10 \
</span> python.versions     38 39 310 311 312 313
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} == 312} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts   arpeggio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     test.run        yes
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arpeggio/Portfile b/science/arpeggio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7be7682d421..98f8b738920 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/arpeggio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/arpeggio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup           github 1.0
</span> github.setup        PDBeurope arpeggio 1.4
 github.tarball_from archive
 revision            3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           arpeggio-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           arpeggio-devel py312-arpeggio
</span> 
 categories-prepend  science
 maintainers         {reneeotten @reneeotten} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ subport arpeggio-devel {
</span>     github.tarball_from tarball
     version             20241024-[string range ${github.version} 0 7]
     revision            0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts           arpeggio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts           arpeggio py312-arpeggio
</span>     patchfiles          patch-setup-devel.py.diff
     checksums           rmd160  1abaea6d60d18ea650c6b84f4274051cc74eeebb \
                         sha256  796581fdb52f028ae9a30c8a184fe67925729accdedea512cb4a77da30dc1076 \
</pre><pre style='margin:0'>

</pre>