<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/9cb1cb05bdddc518f25f475d1c8c832c4bcb2ec8">https://github.com/macports/macports-ports/commit/9cb1cb05bdddc518f25f475d1c8c832c4bcb2ec8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9cb1cb05bdddc518f25f475d1c8c832c4bcb2ec8
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Jan 26 06:43:25 2018 -0600

<span style='display:block; white-space:pre;color:#404040;'>    py-acme, py-josepy: move dactivate hack to py-josepy
</span>---
 python/py-acme/Portfile   | 11 -----------
 python/py-josepy/Portfile | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

<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 148cf53..de1e9aa 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;'>@@ -43,17 +43,6 @@ if {${name} ne ${subport}} {
</span>                     port:py${python.version}-tz \
                     port:py${python.version}-werkzeug
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # 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:#ffe0e0;'>-        if {![catch {set installed [lindex [registry_active py${python.version}-acme] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[vercmp $_version 0.21.0] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                # 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:#ffe0e0;'>-                registry_deactivate_composite py${python.version}-acme "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     livecheck.type      none
 } else {
     livecheck.type      regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-josepy/Portfile b/python/py-josepy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8bd8602..9b3ec3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-josepy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-josepy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup           github 1.0
</span> PortGroup           python 1.0
 
 github.setup        certbot josepy 1.0.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> name                py-josepy
 categories-append   security
 license             Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,5 +20,16 @@ checksums           rmd160  231b11a0ecffc4919b6c4b85ffa82b9c7305bdda \
</span>                     sha256  3c09bf78d00dc0c6c1d75d27d1239e6fdeb58c1fdec89dbebf21d5e79d09d7e8
 
 if {${name} ne ${subport}} {
<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>     depends_lib-append  port:py${python.version}-setuptools
 }
</pre><pre style='margin:0'>

</pre>