<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/d031cee02ff5b93664ef9b7e4a41662eadea2549">https://github.com/macports/macports-ports/commit/d031cee02ff5b93664ef9b7e4a41662eadea2549</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d031cee02ff5b93664ef9b7e4a41662eadea2549
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Dec 21 20:44:39 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> salt: remove python34 variant, use https
</span>---
sysutils/salt/Portfile | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/salt/Portfile b/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f3455bc..b8da943 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/salt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ description Salt is a Python-based remote execution, automation, \
</span> long_description SaltStack is fast, scalable and flexible software for data \
center automation, from infrastructure and any cloud, \
to the entire application stack.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://saltstack.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://saltstack.com/
</span>
if {$subport eq $name} {
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ if {$subport eq $name} {
</span> github.setup saltstack salt ${version} v
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python.versions 27 34 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.versions 27 35 36
</span> categories sysutils python
checksums rmd160 47b77490e40fdc2ec4c5d262003afecdb0b8e94a \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +32,11 @@ if {$subport eq $name} {
</span>
notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api."
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python35] && ![variant_isset python36]} {
</span> default_variants +python27
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python27 conflicts python34 python35 python36 description {python-2.7 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python27 conflicts python35 python36 description {python-2.7 support} {
</span> python.default_version 27
depends_build port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,20 +51,7 @@ if {$subport eq $name} {
</span> notes "Salt startupitems are installed by subports salt-minion, salt-master, salt-syndic, salt-api."
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python34 conflicts python27 python35 python36 description {python-3.4 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-msgpack \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-tornado \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-zmq
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd-append --with-salt-version=${version}
</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 python35 conflicts python27 python34 python36 description {python-3.5 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python35 conflicts python27 python36 description {python-3.5 support} {
</span> python.default_version 35
depends_build port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +64,7 @@ if {$subport eq $name} {
</span> destroot.cmd-append --with-salt-version=${version}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant python36 conflicts python27 python34 python35 description {python-3.6 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python36 conflicts python27 python35 description {python-3.6 support} {
</span> python.default_version 36
depends_build port:py${python.version}-setuptools
</pre><pre style='margin:0'>
</pre>