<pre style='margin:0'>
Marko Käning (mkae) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8582b1233d323493a8c5b9f60848122919c014da">https://github.com/macports/macports-ports/commit/8582b1233d323493a8c5b9f60848122919c014da</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 8582b12  py-pyqt5: fix previously wrongly applied patch
</span>8582b12 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8582b1233d323493a8c5b9f60848122919c014da
</span>Author: Marko Käning <mk@macports.org>
AuthorDate: Wed Dec 21 21:07:38 2016 +0100

<span style='display:block; white-space:pre;color:#404040;'>    py-pyqt5: fix previously wrongly applied patch
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Finally fixes: https://trac.macports.org/ticket/53090
</span>---
 python/py-pyqt5/Portfile | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 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 4e79c80..f18fd41 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;'>@@ -21,29 +21,33 @@ checksums               rmd160  498905b678fc2641c8ff6521b5c2126ac6ddf347 \
</span> 
 python.versions 27 34 35
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[info procs qt5.depends_component] eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    proc qt5.depends_component {first args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        global qt5_component_lib qt5.using_kde os.major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # join ${first} and (the optional) ${args}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set args [linsert $args[set list {}] 0 ${first}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[info exists qt5.using_kde] && ${qt5.using_kde}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set qt5main "qt5-kde"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } elseif {${os.major} == 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set qt5main "qt55"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set qt5main "qt5"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach comp ${args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {${comp} eq "qt5"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[info exists qt5.using_kde] && ${qt5.using_kde}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    global qt5_dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    depends_lib-append ${qt5_dependency}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup           qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[info procs qt5.depends_component] eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        proc qt5.depends_component {first args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            global qt5_component_lib qt5.using_kde os.major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # join ${first} and (the optional) ${args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set args [linsert $args[set list {}] 0 ${first}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[info exists qt5.using_kde] && ${qt5.using_kde}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set qt5main "qt5-kde"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } elseif {${os.major} == 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set qt5main "qt55"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set qt5main "qt5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach comp ${args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {${comp} eq "qt5"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[info exists qt5.using_kde] && ${qt5.using_kde}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        global qt5_dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        depends_lib-append ${qt5_dependency}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        depends_lib-append port:${qt5main}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span>                 } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    depends_lib-append port:${qt5main}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set portname "${qt5main}-${comp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    depends_lib-append port:${portname}
</span>                 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set portname "${qt5main}-${comp}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                depends_lib-append port:${portname}
</span>             }
         }
     }
</pre><pre style='margin:0'>

</pre>