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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/91519e1909277b63e0052a089e74d36b8ee7fcc8">https://github.com/macports/macports-ports/commit/91519e1909277b63e0052a089e74d36b8ee7fcc8</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 91519e1  py-acme 0.21.0: add deactivate hack
</span>91519e1 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 91519e1909277b63e0052a089e74d36b8ee7fcc8
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Tue Jan 23 07:17:20 2018 -0600

<span style='display:block; white-space:pre;color:#404040;'>    py-acme 0.21.0: add deactivate hack
</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/55738
</span>---
 python/py-acme/Portfile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-acme/Portfile b/python/py-acme/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e39e81..148cf53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-acme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-acme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup           python 1.0
</span> set real_name       acme
 name                py-${real_name}
 version             0.21.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> worksrcdir          ${real_name}-${version}
 distfiles           ${real_name}-${version}${extract.suffix}
 categories-append   security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,17 @@ if {${name} ne ${subport}} {
</span>                     port:py${python.version}-tz \
                     port:py${python.version}-werkzeug
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # both py-acme and py-josepy previously conflicted because they installed files now provided by py-josepy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![catch {set installed [lindex [registry_active py${python.version}-acme] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[vercmp $_version 0.21.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                # py-acme used to install some files now provided by py-josepy in versions < 0.21.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                registry_deactivate_composite py${python.version}-acme "" [list ports_nodepcheck 1]
</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;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     livecheck.type      none
 } else {
     livecheck.type      regex
</pre><pre style='margin:0'>

</pre>