<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/47d1f9b34db83b63d423d59636644606e550fd06">https://github.com/macports/macports-ports/commit/47d1f9b34db83b63d423d59636644606e550fd06</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 47d1f9b34db83b63d423d59636644606e550fd06
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Jan 25 14:28:54 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> zeroinstall-injector: remove Python 2.6 variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - make use of the defaults in the Python PG
</span>---
sysutils/zeroinstall-injector/Portfile | 73 +++++-----------------
.../files/patch-tests_testall.py.diff | 16 +++++
2 files changed, 33 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/zeroinstall-injector/Portfile b/sysutils/zeroinstall-injector/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db4f1e6..33bd09c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/zeroinstall-injector/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/zeroinstall-injector/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ version 1.7
</span> revision 6
platforms darwin freebsd linux
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span> categories sysutils
license LGPL
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,71 +26,31 @@ homepage https://0install.net
</span> master_sites sourceforge
master_sites.mirror_subdir zero-install
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 23e2adf699c52f8cdfbb7ad07d6c5568 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 eabe6d1284522be4a5c2675807646f247a33ffac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 46ac65794f57146afed45582d4ff43f05ffe5bb9
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:bin/gpg:gnupg2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run bin:sudo:sudo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 46ac65794f57146afed45582d4ff43f05ffe5bb9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4472d5964e14a16cec5a27bbfc169340b7e45781ec2429abeaa4726674987c2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 375817
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.branch 2.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.bin ${prefix}/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 27
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python26 conflicts python27 description "use python 2.6" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:py26-pygtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:bin/gpg:gnupg2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pygtk
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.branch 2.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.bin ${prefix}/bin/python${python.branch}
</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;'>-variant python27 conflicts python26 description "use python 2.7" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:py27-pygtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append bin:sudo:sudo
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.branch 2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.bin ${prefix}/bin/python${python.branch}
</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 {![variant_isset python26]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-tests_testall.py.diff
</span>
post-patch {
reinplace "s|'man/man1'|'share/man/man1'|" ${worksrcpath}/setup.py
reinplace "s|local_0launch,|'${python.bin}', local_0launch,|" ${worksrcpath}/tests/testrun.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python|${python.bin}|" ${worksrcpath}/zeroinstall/0launch-gui/0launch-gui
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd ${python.bin} setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target build
</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;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd ${python.bin} setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.destdir --prefix=${prefix} --skip-build --root=${destroot}
</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;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/python${python.branch}/site-packages/zeroinstall/0launch-gui/0launch-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move site-packages to wherever python is looking for it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}[exec ${python.bin} -c "from distutils.sysconfig import get_python_lib; import os; print os.path.dirname(get_python_lib())"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/lib/python${python.branch}/site-packages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}[exec ${python.bin} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"]
</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;'>-pre-test {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.cmd ${python.bin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.dir ${worksrcpath}/tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.target testall.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd ${python.bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.dir ${worksrcpath}/tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target testall.py
</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 https://sourceforge.net/projects/zero-install/files/injector/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /injector/(\\d+(?:\\.\\d+)*)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://sourceforge.net/projects/zero-install/files/injector/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex /injector/(\\d+(?:\\.\\d+)*)/
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/zeroinstall-injector/files/patch-tests_testall.py.diff b/sysutils/zeroinstall-injector/files/patch-tests_testall.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ef464b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/zeroinstall-injector/files/patch-tests_testall.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/testall.py.orig 2020-01-25 14:26:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/testall.py 2020-01-25 14:26:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,12 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Catch silly mistakes...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.environ['HOME'] = '/home/idontexist'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- import coverage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- coverage.erase()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- coverage.start()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-except ImportError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- coverage = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++coverage = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my_dir = os.path.dirname(sys.argv[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not my_dir:
</span></pre><pre style='margin:0'>
</pre>