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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ec766723801f738d4b54e2feef16acda75c3e3f4">https://github.com/macports/macports-ports/commit/ec766723801f738d4b54e2feef16acda75c3e3f4</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 ec76672  py-shiboken: update to version 1.2.4. remove unnecessary patch.
</span>ec76672 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ec766723801f738d4b54e2feef16acda75c3e3f4
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Tue Nov 28 09:10:43 2017 -0600

<span style='display:block; white-space:pre;color:#404040;'>    py-shiboken: update to version 1.2.4. remove unnecessary patch.
</span>---
 python/py-shiboken/Portfile                       | 28 +++++++----------------
 python/py-shiboken/files/filename_collision.patch | 28 -----------------------
 2 files changed, 8 insertions(+), 48 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-shiboken/Portfile b/python/py-shiboken/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9703007..7c2ca72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-shiboken/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-shiboken/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,12 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
 PortGroup qt4 1.0
 PortGroup python 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span> cmake.out_of_source yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set realname        shiboken
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name                py-${realname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version             1.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        pyside Shiboken 1.2.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name                py-shiboken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> python.versions     27 34 35 36
 python.default_version 27
 categories-append   devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,26 +18,20 @@ description         Plugin for generatorrunner that generates python bindings \
</span> long_description    Shiboken is a plugin (front-end) for generatorrunner that \
                     generates python bindings for C++ libraries using CPython \
                     source code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://qt-project.org/wiki/PySide
</span> platforms           darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        http://download.qt-project.org/official_releases/pyside
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           md5     9f5bee9d414ce51be07ff7a20054a48d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  19c8ea09d552bf371668cd8359d9602f5ac13634 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha1    55731616791500750ef373f382057a43e133fa08
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname            ${realname}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2           yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           md5     fd37c9054c76c28f731fe01f33d6bc71 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  efcfb5820bb85360e1c8c045ae2cfdea8d6e81f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha1    62f2d231b42a061cf0a19a1caeb70dde39e68e55 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  cf634ad51e9b0538c4283dbbf5e86268db793552364a03735c51299bc36ee4e4
</span> 
 if {${name} ne ${subport}} {
     pre-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # MacOS cannot have a file and directory with the same name, as occurs here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        system "mv -v '${worksrcpath}/generator/shiboken' '${worksrcpath}/generator/shiboken.d'"
</span>         reinplace "s|3.2 3.1 3.0|${python.branch}|g" ${worksrcpath}/cmake/Modules/FindPython3Libs.cmake
         reinplace "s|NAMES python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3|NAMES python${python.branch}|g" ${worksrcpath}/cmake/Modules/FindPython3Interp.cmake
     }
 
     patchfiles          default_visibility.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        filename_collision.patch \
</span>                         patch-cmakepkgconfig.diff
 
     depends_lib-append  port:python${python.version} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,12 +60,6 @@ if {${name} ne ${subport}} {
</span>         move ${destroot}${prefix}/lib/cmake ${destroot}${python.prefix}/lib/cmake
         move ${destroot}${prefix}/lib/pkgconfig ${destroot}${python.prefix}/lib/pkgconfig
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.type      regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.url       http://qt-project.org/wiki/PySideDownloads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.regex     ${realname}-(\[0-9.\]+)\\.tar\\.bz2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span>     livecheck.type      none
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-shiboken/files/filename_collision.patch b/python/py-shiboken/files/filename_collision.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f7279d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-shiboken/files/filename_collision.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- generator/CMakeLists.txt       2012-08-08 11:38:27.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ generator/CMakeLists.txt       2012-08-08 11:39:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,11 +2,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(shiboken_SRC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- generator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shiboken/cppgenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shiboken/headergenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shiboken/overloaddata.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shiboken/shibokengenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shiboken/shibokennormalize.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+shiboken.d/cppgenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+shiboken.d/headergenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+shiboken.d/overloaddata.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+shiboken.d/shibokengenerator.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+shiboken.d/shibokennormalize.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main.cpp
</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;'>-@@ -15,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     add_definitions(-DDOCSTRINGS_ENABLED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     ${CMAKE_CURRENT_SOURCE_DIR}/qtdoc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     ${CMAKE_CURRENT_BINARY_DIR}
</span></pre><pre style='margin:0'>

</pre>