<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/69c4f724ed128880fa303a2eed4323be5545442a">https://github.com/macports/macports-ports/commit/69c4f724ed128880fa303a2eed4323be5545442a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 69c4f724ed128880fa303a2eed4323be5545442a
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Tue Nov 2 14:11:43 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-mkl: conform to modeline, simplify livecheck
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - remove python.default_version
</span><span style='display:block; white-space:pre;color:#404040;'>    - use python.rootname
</span>---
 python/py-mkl/Portfile | 66 ++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 37 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-mkl/Portfile b/python/py-mkl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f96031fda8..6afbfd1595d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-mkl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-mkl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,6 @@ extract.suffix      .whl
</span> extract.only
 
 python.versions     27 35 36 37 38 39 310
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 38
</span> 
 # Intel only supports 10.12 and newer
 if {${os.platform} eq "darwin" && ${os.major} <= 15} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +37,9 @@ if {${os.platform} eq "darwin" && ${os.major} <= 15} {
</span> 
 # add sub-ports for headers
 foreach _py ${python.versions} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    subport py${_py}-mkl-include { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    subport py${_py}-mkl-include {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        python.rootname     mkl_include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,57 +51,55 @@ if {${name} ne ${subport}} {
</span> 
     build { }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # strip pyXY from subport name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set local_name [string replace ${subport} 0 4 ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    homepage https://pypi.org/project/${local_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    homepage    https://pypi.org/project/${python.rootname}
</span> 
     if {[string match "*-include" $subport]} {
 
         if {${os.platform} eq "darwin" && ${os.major} < 19} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            master_sites   https://files.pythonhosted.org/packages/4f/49/c24113b33981a2c3e6915eb94f50c56ea61639963339e03eaed37787cc81/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            distname       mkl_include-${version}-py2.py3-none-macosx_10_12_intel.macosx_10_12_x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            master_sites    https://files.pythonhosted.org/packages/4f/49/c24113b33981a2c3e6915eb94f50c56ea61639963339e03eaed37787cc81/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            distname        mkl_include-${version}-py2.py3-none-macosx_10_12_intel.macosx_10_12_x86_64
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            checksums      rmd160  097dd5bcbcc0a704e065cbdc629c7a10bf9e0b71 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           sha256  dd9e2224dcdbede569c996f971e663f64f184a432ccb01f2dceca768a77cb2b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           size    871122
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            checksums       rmd160  097dd5bcbcc0a704e065cbdc629c7a10bf9e0b71 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  dd9e2224dcdbede569c996f971e663f64f184a432ccb01f2dceca768a77cb2b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    871122
</span> 
         } else {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            master_sites   https://files.pythonhosted.org/packages/96/15/cb0b6d590a7fa8a5df38da43f5909be065eb78b9d7c8187e8ddd4b6ca8eb/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            distname       mkl_include-${version}-py2.py3-none-macosx_10_15_x86_64.macosx_11_0_x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            master_sites    https://files.pythonhosted.org/packages/96/15/cb0b6d590a7fa8a5df38da43f5909be065eb78b9d7c8187e8ddd4b6ca8eb/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            distname        mkl_include-${version}-py2.py3-none-macosx_10_15_x86_64.macosx_11_0_x86_64
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            checksums      rmd160  e9a2c5199d3997cfcbbe704fc5e4bf2b9a258e3d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           sha256  d8b3ad7254047c952aa1e3059ed2a8c671cf70dc3a8aa7f7195757ee7936b75f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           size    902519
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            checksums       rmd160  e9a2c5199d3997cfcbbe704fc5e4bf2b9a258e3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  d8b3ad7254047c952aa1e3059ed2a8c671cf70dc3a8aa7f7195757ee7936b75f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    902519
</span> 
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append port:py${python.version}-mkl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:py${python.version}-mkl
</span> 
     } else {
 
         if {${os.platform} eq "darwin" && ${os.major} < 19} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            master_sites   https://files.pythonhosted.org/packages/ac/1e/c713b011b90cd238023df1c0025130c40bc40870a46273d942e89114233c/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            distname       mkl-${version}-py2.py3-none-macosx_10_12_intel.macosx_10_12_x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            master_sites    https://files.pythonhosted.org/packages/ac/1e/c713b011b90cd238023df1c0025130c40bc40870a46273d942e89114233c/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            distname        mkl-${version}-py2.py3-none-macosx_10_12_intel.macosx_10_12_x86_64
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            checksums      rmd160  62011c74574b354c8996edfdd1d6b3d5e1aa2623 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           sha256  23c8e8ba2cac703d8bc357d2bf10519e91dc4371e7dd1decf461f70db20b9783 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           size    193800193
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            checksums       rmd160  62011c74574b354c8996edfdd1d6b3d5e1aa2623 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  23c8e8ba2cac703d8bc357d2bf10519e91dc4371e7dd1decf461f70db20b9783 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    193800193
</span>         } else {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            master_sites   https://files.pythonhosted.org/packages/b6/b2/b8c755092e3881d6b5ea74be49c7bf3758b6174296626aed39c3416a1b02/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            distname       mkl-${version}-py2.py3-none-macosx_10_15_x86_64.macosx_11_0_x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            master_sites    https://files.pythonhosted.org/packages/b6/b2/b8c755092e3881d6b5ea74be49c7bf3758b6174296626aed39c3416a1b02/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            distname        mkl-${version}-py2.py3-none-macosx_10_15_x86_64.macosx_11_0_x86_64
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            checksums      rmd160  a0148fc03cb0a6c95a75cdf30dd67e5032345cf2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           sha256  67460f5cd7e30e405b54d70d1ed3ca78118370b65f7327d495e9c8847705e2fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                           size    186391276
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            checksums       rmd160  a0148fc03cb0a6c95a75cdf30dd67e5032345cf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  67460f5cd7e30e405b54d70d1ed3ca78118370b65f7327d495e9c8847705e2fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    186391276
</span> 
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append port:tbb port:libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:libomp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:tbb
</span> 
         post-destroot {
             set PythonVersionWithDot [string index ${python.version} 0].[string range ${python.version} 1 end]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,7 +112,7 @@ if {${name} ne ${subport}} {
</span> 
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.cmd  pip-${python.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.cmd    pip-${python.branch}
</span>     destroot.args          \
         --ignore-installed \
         --no-cache-dir     \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,12 +121,5 @@ if {${name} ne ${subport}} {
</span>         ${distpath}/${distfiles}
     destroot.post_args
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[string match "py-*" $subport]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        livecheck.url   ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        livecheck.type  regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        livecheck.regex "${local_name}\ (\\d+(\\.\\d+)+)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        livecheck.type  none
</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:#e0ffe0;'>+    livecheck.type  none
</span> }
</pre><pre style='margin:0'>

</pre>