<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/842009b6bb3e8e698fd54a93037e96a6d456618a">https://github.com/macports/macports-ports/commit/842009b6bb3e8e698fd54a93037e96a6d456618a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 842009b6bb3e8e698fd54a93037e96a6d456618a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 4 06:07:52 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qscintilla2: avoid conflict of python bindings
</span>---
devel/qscintilla2/Portfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/Portfile b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 773e12d..2a3d668 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortSystem 1.0
</span> name qscintilla2
version 2.10
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 4292b3dfb0656dc164b14510468bc774ab71cebd \
sha256 16be30577bc178470936c458551f2512cc068aff6e7a7de6ed244e28c045f6ec
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,13 +72,6 @@ foreach pver ${python_versions} {
</span> port:py${pver}-sip \
port:py${pver}-pyqt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # QScintilla2.api file is installed in the same location for all python subports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach over ${python_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${over} ne ${pver}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append py${over}-${name}
</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> # allow configure.py to respect --sip=... argument
patchfiles-append patch-configure.py.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,6 +94,12 @@ foreach pver ${python_versions} {
</span> --sip=${prefix}/bin/sip-${pbranch}
qt5.spec_cmd --spec=
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${qt_data_dir}/qsci/api/python/QScintilla2.api \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${qt_data_dir}/qsci/api/python/QScintilla2-Python${python_ver_dot}.api
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>