<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aff5a1ce24bc196cb1a438599caba0dd872270a2">https://github.com/macports/macports-ports/commit/aff5a1ce24bc196cb1a438599caba0dd872270a2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aff5a1ce24bc196cb1a438599caba0dd872270a2
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Mar 10 12:42:35 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-eric-ide: remove py27 subport and Qt4
</span>---
python/py-eric-ide/Portfile | 76 +++++----------------------------------------
1 file changed, 8 insertions(+), 68 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-eric-ide/Portfile b/python/py-eric-ide/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b41b29bd75..27c2b7ce788 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-eric-ide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-eric-ide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,95 +30,37 @@ checksums rmd160 6bc5f8ed55d56fc9f3134a28231943df0d0b265e \
</span> sha256 fdc62c8360b704d4ad38aba56898917f4d5ad1f5a01adc4d1a67648b23c28418 \
size 16537184
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 37 38 39 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 37 38 39 310
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} <= 13 && ${python.version} < 310} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {![ variant_isset qt4 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +qt5
</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;'>- if {${python.version} eq 27 || [ variant_isset qt4 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 19.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SourceForge directory name is YY.MM, with leading zero for month
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lassign [split ${version} .] year month
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set directory [format %i.%02i ${year} ${month}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites sourceforge:project/eric-ide/${real_name}/stable/${directory}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${real_name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 34a8f2a9b2af2fa0e0e4b17e6822c97ed13ac864 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7adcc5299df105d70eae71b4ed02781c937858ac2aee6bfc8dbf63f68527b025 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17205953
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-install.py_v198.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-disable-update-check_v198.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-install.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-disable-update-check.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-install.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-disable-update-check.diff
</span>
post-patch {
reinplace "s|@@PYTHON_BIN_NAME@@|${python.bin}|g" ${worksrcpath}/install.py
reinplace "s|@@PYTHON_PKG_DIR@@|${python.pkgd}/${real_name}|g" ${worksrcpath}/install.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[ variant_isset qt4 ]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PYQT_VERSION@@|--pyqt4|g" ${worksrcpath}/install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PYQT_VERSION@@|--pyqt5|g" ${worksrcpath}/install.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYQT_VERSION@@|--pyqt5|g" ${worksrcpath}/install.py
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qt5 conflicts qt4 description "Use Qt5 backend" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.min_version 5.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.min_version 5.12
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span> port:py${python.version}-pyqt5 \
port:py${python.version}-pyqt5-chart \
port:py${python.version}-pyqt5-webengine \
port:py${python.version}-pyqt5-sip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt5-scintilla
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} eq 27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt5-chart \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt5-sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace \
</span> port:py${python.version}-pyqt5-scintilla \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-qscintilla-qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append --pyqt=5
</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;'>- if {${python.version} < 310} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qt4 conflicts qt5 description "Use Qt4 backend" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-qscintilla-qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append --pyqt=4
</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;'>- depends_lib-append \
</span> port:py${python.version}-cx_Freeze \
port:py${python.version}-enchant \
port:py${python.version}-pylint \
port:py${python.version}-pysvn \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-rope
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} >= 37} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-rope \
</span> port:py${python.version}-asttokens \
port:py${python.version}-editorconfig \
port:py${python.version}-yaml \
port:py${python.version}-toml
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
build.cmd ${python.bin} install.py
build.args -b ${python.prefix}/bin \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,8 +78,6 @@ if {${name} ne ${subport}} {
</span> xinstall -m 0644 {*}[glob ${worksrcpath}/eric/docs/*] \
${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span> } else {
livecheck.regex ${real_name}-(\[0-9.\]+)${extract.suffix}
}
</pre><pre style='margin:0'>
</pre>