<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/c576fa6a86714a69f16f9de1661031af89ff6d3a">https://github.com/macports/macports-ports/commit/c576fa6a86714a69f16f9de1661031af89ff6d3a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c576fa6a86714a69f16f9de1661031af89ff6d3a
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Tue Oct 26 08:08:10 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-tensorflow-addons: Add tensorflow-macos conflict
</span>---
 python/py-tensorflow-addons/Portfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow-addons/Portfile b/python/py-tensorflow-addons/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bad5ac74424..910ce0762ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow-addons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow-addons/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,11 @@ if {${name} ne ${subport}} {
</span>     # Should match the version required by main tensorflow port
     bazel.version   3.1
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Conflicts with tensorflow_macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} eq 38} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        conflicts   py${python.version}-tensorflow_macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Conflicts with tensorflow-macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { (${build_arch} eq {arm64} && (${python.version} eq 38 || ${python.version} eq 39))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        || (${build_arch} eq {x86_64} && ${python.version} eq 38) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts   py${python.version}-tensorflow-macos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    py${python.version}-tensorflow_macos
</span>     }
 
     depends_build-append \
</pre><pre style='margin:0'>

</pre>