<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/82feb236e87587dad0e727f50d010bfb2651a681">https://github.com/macports/macports-ports/commit/82feb236e87587dad0e727f50d010bfb2651a681</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 82feb23  py-josepy: remove old conflict handler
</span>82feb23 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 82feb236e87587dad0e727f50d010bfb2651a681
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri May 24 16:05:54 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-josepy: remove old conflict handler
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Was added in 9cb1cb05bd over one year ago.
</span>---
 python/py-josepy/Portfile | 11 -----------
 1 file changed, 11 deletions(-)

<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 1c71012..03baacd 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;'>@@ -20,16 +20,5 @@ checksums           rmd160  c297a66f6f9f50c30c82292ed0e0a5c2c87e8d3c \
</span>                     size    52130
 
 if {${name} ne ${subport}} {
<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>     depends_lib-append  port:py${python.version}-setuptools
 }
</pre><pre style='margin:0'>

</pre>