<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/212bb7e159ace99e92c888991aba5803916dcd43">https://github.com/macports/macports-ports/commit/212bb7e159ace99e92c888991aba5803916dcd43</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 212bb7e159a mame: eliminate python variants
</span>212bb7e159a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 212bb7e159ace99e92c888991aba5803916dcd43
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Jun 5 11:07:27 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> mame: eliminate python variants
</span>---
emulators/mame/Portfile | 38 +++++++++++++-------------------------
1 file changed, 13 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/mame/Portfile b/emulators/mame/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33551f612b0..af91eced18f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/mame/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/mame/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ if {${g_mame_latest}} {
</span> set g_mame_release \
"0232"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
checksums \
rmd160 8478869e6b2be1e7edf6de2cd86af2908690fe7d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@ if {${g_mame_latest}} {
</span> set g_mame_release \
"0226"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span>
# Mame 0.226: Fix errors during translation build phase.
# Merged into Mame releases from 0.227 onward. Tracked by issue:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,6 +116,13 @@ if {!${g_mame_latest}} {
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python Version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set g_mame_pyver_major 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set g_mame_pyver_minor 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #------------------------------------------------------------------------------
# Port-Specific Globals
#------------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -583,32 +590,13 @@ variant tools \
</span> mame_variant_tools_setup
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Use python 3.7 for build} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts python38 python39 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mame_variant_python_setup 3 7
</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 python38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Use python 3.8 for build} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts python37 python39 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mame_variant_python_setup 3 8
</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 python39 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Use python 3.9 for build} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts python37 python38 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mame_variant_python_setup 3 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> default_variants-append \
+tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Ensure one python* variant is selected by default, if not specified by user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- +python38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python variants eliminated; setup via default Python version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mame_variant_python_setup \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${g_mame_pyver_major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${g_mame_pyver_minor}
</span>
#------------------------------------------------------------------------------
# Phases
</pre><pre style='margin:0'>
</pre>