<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/97d677d807379ad90c449cb51077cc9958e0c49b">https://github.com/macports/macports-ports/commit/97d677d807379ad90c449cb51077cc9958e0c49b</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 97d677d  py-pyqt5: avoid unnecessary conflict with qscintilla
</span>97d677d is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 97d677d807379ad90c449cb51077cc9958e0c49b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Jan 2 09:13:26 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    py-pyqt5: avoid unnecessary conflict with qscintilla
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Both py-pyqt5 and qscintilla install files into the directory
</span><span style='display:block; white-space:pre;color:#404040;'>    ${python.prefix}/share/sip/PyQt5.
</span><span style='display:block; white-space:pre;color:#404040;'>    Therefore, py-pyqt5 should not try to make it a link to another
</span><span style='display:block; white-space:pre;color:#404040;'>    directory.
</span><span style='display:block; white-space:pre;color:#404040;'>    This causes an unnecessary conflict between the two ports.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Revert part of
</span><span style='display:block; white-space:pre;color:#404040;'>    https://github.com/macports/macports-ports/commit/363ab1ad713cd0e7c50669f084d045407ffcf5b5
</span>---
 python/py-pyqt5/Portfile | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/Portfile b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b06e1cd..1830d99 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup               python 1.0
</span> 
 name                    py-pyqt5
 version                 5.11.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                1
</span> categories-append       devel
 platforms               darwin
 maintainers             {mmoll @mamoll} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,11 +55,6 @@ if {${subport} eq "${name}-common"} {
</span>         depends_lib-append port:py27-enum34
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # declare a runtime, arch-independent dependency on ${name}-common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_run-append  port:${name}-common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        ${name}-common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     use_configure       yes
     configure.pre_args
     configure.cmd       "${python.bin} configure.py"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +68,6 @@ if {${subport} eq "${name}-common"} {
</span>                         --designer-plugindir=${qt_plugins_dir}/designer/Py${python.version}Qt5 \
                         --qml-plugindir=${qt_plugins_dir}/Py${python.version}Qt5 \
                         --no-qsci-api \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --no-sip-files \
</span>                         --disable=QtWebKit \
                         --disable=QtWebKitWidgets \
                         --disable=QtWebEngine \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,16 +89,6 @@ if {${subport} eq "${name}-common"} {
</span>     destroot.cmd        ${build.cmd}
     destroot.destdir    DESTDIR=${destroot}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # make the .sip files accessible via the "normal" path too
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        file delete -force ${destroot}${python.prefix}/share/sip/PyQt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        xinstall -m 755 -d ${destroot}${python.prefix}/share/sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ln -s ${prefix}/share/sip/PyQt5 ${destroot}${python.prefix}/share/sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # as well as via the actual sip repository of the version we're using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        xinstall -m 755 -d ${destroot}${prefix}/share/py${python.version}-sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ln -s ../sip/PyQt5 ${destroot}${prefix}/share/py${python.version}-sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     variant debug description "Build debug libraries" {
         configure.cmd-append --debug
     }
</pre><pre style='margin:0'>

</pre>