<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/53245e797e08de5422002fcdd90e9be239f559f4">https://github.com/macports/macports-ports/commit/53245e797e08de5422002fcdd90e9be239f559f4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 53245e797e08de5422002fcdd90e9be239f559f4
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Nov 5 13:58:56 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-cryptodome: remove conflict against py-crypto
</span><span style='display:block; white-space:pre;color:#404040;'>    - Also auto-deactivate py-crypto, if presently active
</span>---
 python/py-pycryptodome/Portfile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pycryptodome/Portfile b/python/py-pycryptodome/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 83065193c9f..0872526b056 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pycryptodome/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pycryptodome/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup           python 1.0
</span> 
 name                py-pycryptodome
 version             3.10.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> 
 homepage            https://www.pycryptodome.org
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +25,19 @@ checksums           rmd160  c10290cefe964891fac78e8fd32e4d3e667bcdd0 \
</span>                     size    3762120
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # See: See: https://trac.macports.org/ticket/63481
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts           py${python.version}-crypto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     depends_build-append \
                         port:py${python.version}-setuptools
 
     livecheck.type      none
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set pycrypto_name   py${python.version}-crypto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set pycrypto_name   py-crypto
</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;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Deactivate obsolete port 'py-crypto', if installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![catch {set installed [lindex [registry_active ${pycrypto_name}] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        registry_deactivate_composite ${pycrypto_name} "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
</pre><pre style='margin:0'>

</pre>