<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/2a79f5bbdc5b04541917a4153b26ac9ef1f15161">https://github.com/macports/macports-ports/commit/2a79f5bbdc5b04541917a4153b26ac9ef1f15161</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 2a79f5bbdc5 py-cython{-devel}: fix conflicts statements
</span>2a79f5bbdc5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2a79f5bbdc5b04541917a4153b26ac9ef1f15161
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Nov 12 12:37:08 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-cython{-devel}: fix conflicts statements
</span>---
python/py-cython-devel/Portfile | 2 +-
python/py-cython/Portfile | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cython-devel/Portfile b/python/py-cython-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cfc0aefd02d..a697edaee7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cython-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cython-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ checksums rmd160 cec111ecff0b17dadf1dd3df544d673547a965f2 \
</span> size 2527661
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py-cython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-cython
</span>
depends_lib-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cython/Portfile b/python/py-cython/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c7bb2e6762..21ac79dd260 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cython/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cython/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,12 @@ if {${name} ne ${subport}} {
</span> depends_lib-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} >= 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-cython-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${python.version} eq 27} {
version 0.29.13
revision 0
</pre><pre style='margin:0'>
</pre>