<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f3c4645a8353da681ad9713c01f64accd3c01b38">https://github.com/macports/macports-ports/commit/f3c4645a8353da681ad9713c01f64accd3c01b38</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 f3c4645a835 py-bootstrap-modules: update, split off py36
</span>f3c4645a835 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f3c4645a8353da681ad9713c01f64accd3c01b38
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jul 29 21:21:58 2024 +1000
<span style='display:block; white-space:pre;color:#404040;'> py-bootstrap-modules: update, split off py36
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update modules in main port to latest versions compatible with python
</span><span style='display:block; white-space:pre;color:#404040;'> 3.7. Create py36-bootstrap-modules subport and adopt in py36 dependents.
</span>---
python/py-bootstrap-modules/Portfile | 229 +++++++++++++++++++++++-----------
python/py-importlib-metadata/Portfile | 9 +-
python/py-parsing/Portfile | 6 +-
python/py-pep517/Portfile | 6 +-
python/py-python-install/Portfile | 18 +--
python/py-tomli/Portfile | 9 +-
python/py-typing_extensions/Portfile | 7 +-
python/py-wheel/Portfile | 6 +-
python/py-zipp/Portfile | 9 +-
9 files changed, 190 insertions(+), 109 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-bootstrap-modules/Portfile b/python/py-bootstrap-modules/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d65a01018f..07219b0def2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-bootstrap-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-bootstrap-modules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name py-bootstrap-modules
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2022-12-23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2024-07-29
</span> maintainers {jmr @jmroot}
categories python
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,84 +19,152 @@ long_description This is a set of Python modules that are needed \
</span>
homepage https://www.macports.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set build_vers 0.9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set flit_core_vers 3.8.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set installer_vers 0.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set packaging_vers 21.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pep517_vers 0.13.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pyparsing_vers 3.0.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python-install_vers 0.0.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set setuptools_scm_vers 6.4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set tomli_vers 1.2.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set wheel_vers 0.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set flit_core_vers 3.9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Latest that still support python 3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_vers 1.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set importlib_metadata_vers 6.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installer_vers 0.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set packaging_vers 24.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyproject_hooks_vers 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set setuptools_scm_vers 7.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tomli_vers 2.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set typing_extensions_vers 4.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wheel_vers 0.42.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set zipp_vers 3.15.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport py36-bootstrap-modules {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set build_vers 0.9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set packaging_vers 21.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pep517_vers 0.13.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyparsing_vers 3.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python-install_vers 0.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set setuptools_scm_vers 6.4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tomli_vers 1.2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wheel_vers 0.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
master_sites pypi:b/build:build \
pypi:f/flit_core:flit_core \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pypi:i/importlib_metadata:importlib_metadata \
</span> pypi:i/installer:installer \
pypi:p/packaging:packaging \
pypi:p/pep517:pep517 \
pypi:p/pyparsing:pyparsing \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pypi:p/pyproject_hooks:pyproject_hooks \
</span> pypi:p/python-install:install \
pypi:s/setuptools_scm:setuptools_scm \
pypi:t/tomli:tomli \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pypi:w/wheel:wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pypi:t/typing_extensions:typing_extensions \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pypi:w/wheel:wheel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pypi:z/zipp:zipp
</span>
distfiles build-${build_vers}.tar.gz:build \
flit_core-${flit_core_vers}.tar.gz:flit_core \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- installer-${installer_vers}.tar.gz:installer \
</span> packaging-${packaging_vers}.tar.gz:packaging \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pep517-${pep517_vers}.tar.gz:pep517 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyparsing-${pyparsing_vers}.tar.gz:pyparsing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python-install-${python-install_vers}.tar.gz:install \
</span> setuptools_scm-${setuptools_scm_vers}.tar.gz:setuptools_scm \
tomli-${tomli_vers}.tar.gz:tomli \
wheel-${wheel_vers}.tar.gz:wheel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums build-${build_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 f2dc1823b0eff7037e19be18e354b2f1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d431de8027e33f1c21dd35b8852defd590ac5198 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1a07724e891cbd898923145eb7752ee7653674c511378eb9c7691aab1612bc3c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flit_core-${flit_core_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 7c41da13273f7787709a24f74e0f5a99 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 33b542a424bdccc186af59b39ce4c2f1e6608783 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installer-${installer_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 ac5fee994b04f228c151306f5ad96b04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7f9c5425ffe393459cd64860ef3d7bec828c2888 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f3bd36cd261b440a88a1190b1becca0578fee90b4b62decc796932fdd5ae8839 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- packaging-${packaging_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 e713c1939f294fd729af4a7be40dd141 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 45ed4b85bf4ef2069e07dd2922849f7edf98363a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pep517-${pep517_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 7fd08b11215256601a8a4940c1ba3d34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b52f92cb3a3d6d8ae6892f8df4c144eb2c698e49 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ae69927c5c172be1add9203726d4b84cf3ebad1edcd5f71fcdc746e66e829f59 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyparsing-${pyparsing_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 fadc2f3bf5872bf6310576a86c3566e0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c450c72db367849469516a28bcbf208cdb2e3d27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python-install-${python-install_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 c591174ae1f14c05ddcc84483381aa7e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 203ac0ef46cfcfb6e531548a50cc5a05deb9f049 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 926f9e0cb959203629ba6ffdc889f96e1a075c36ca6e7528ba7be96ade189a7d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setuptools_scm-${setuptools_scm_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 b4e02bf8e62ed49142ea7b42a68671d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6876656de603d15079102abf2f9ed18f2937f7db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tomli-${tomli_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 807cc80e6a2697375f431b757994b7c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 cbdb7cfc45e9183147842cd799b5e4bbb0aef34b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wheel-${wheel_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 f490f1399e5903706cb1d4fbed9ecb28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6c4df8aa7c6d59f8b97cf85cce9e362c81b0c523 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append importlib_metadata-${importlib_metadata_vers}.tar.gz:importlib_metadata \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installer-${installer_vers}.tar.gz:installer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyproject_hooks-${pyproject_hooks_vers}.tar.gz:pyproject_hooks \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typing_extensions-${typing_extensions_vers}.tar.gz:typing_extensions \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zipp-${zipp_vers}.tar.gz:zipp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {$subport eq "py36-bootstrap-modules"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append pep517-${pep517_vers}.tar.gz:pep517 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyparsing-${pyparsing_vers}.tar.gz:pyparsing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python-install-${python-install_vers}.tar.gz:install
</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;'>+checksums flit_core-${flit_core_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 3bc52f1952b9a78361114147da63c35b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 78d21c84e0922e6e7a136735d807be2942e38124 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append build-${build_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 45f216f02135c6acb486ba325e8f8da3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 057ba87fa7012e52bd7617fc15d8954b80b8b125 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 538aab1b64f9828977f84bc63ae570b060a8ed1be419e7870b8b4fc5e6ea553b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ importlib_metadata-${importlib_metadata_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 6e172200302e694a03358126fe7554cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8c61967b759c5b5a97acba81fe6973f389b47f73 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installer-${installer_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 d961d1105c9270049528b1167ed021bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ce7feaab4cab0fe465e6a5fe142bc32dcdd1e938 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a26d3e3116289bb08216e0d0f7d925fcef0b0194eedfa0c944bcaaa106c4b631 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ packaging-${packaging_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 8e3bc7b152efc9ffadabddc9f8465b02 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1b7def1a451aa6d6f1b5626a8c9c81b3904c0898 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyproject_hooks-${pyproject_hooks_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 1963f68105b77c6d4be0a769c6d43779 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ddd81f2957bad479700637d286f6b2b86098ca01 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4b37730834edbd6bd37f26ece6b44802fb1c1ee2ece0e54ddff8bfc06db86965 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setuptools_scm-${setuptools_scm_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 158dc741637fb4fa4b955c62bd2c08be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b1eb6c49bb96267da40c145264609934da10df8a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tomli-${tomli_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 d4341621d423a7ca6822e23d6d52bb9a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 08391b8bdece5ba4b13e0e67e0bb3f0a3de9cc55 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typing_extensions-${typing_extensions_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 06e7fff4b1d51f8dc6f49b16e71de54e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d952e5255e5c9dc0203e6fe82f83591e3837b5c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wheel-${wheel_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 802ad6e5f9336fcb1c76b7593f0cd22d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 25c120a08158cb9c9d642a6a900e49dab44b0c12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c45be39f7882c9d34243236f2d63cbd58039e360f85d0913425fbd7ceea617a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zipp-${zipp_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 6e06bc2894588451a9787b9f22f9b0ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1b019c27f6f26c21b2aa514c5836c9495402a761 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {$subport eq "py36-bootstrap-modules"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append build-${build_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 f2dc1823b0eff7037e19be18e354b2f1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d431de8027e33f1c21dd35b8852defd590ac5198 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1a07724e891cbd898923145eb7752ee7653674c511378eb9c7691aab1612bc3c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pep517-${pep517_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 7fd08b11215256601a8a4940c1ba3d34 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b52f92cb3a3d6d8ae6892f8df4c144eb2c698e49 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ae69927c5c172be1add9203726d4b84cf3ebad1edcd5f71fcdc746e66e829f59 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ packaging-${packaging_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 e713c1939f294fd729af4a7be40dd141 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 45ed4b85bf4ef2069e07dd2922849f7edf98363a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyparsing-${pyparsing_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 2bfafdb2d02d19ca4a3dfd02a9dbdfa7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 582e08deb5f7ef2a4c94544c33c6fbdb3bfa4230 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a1bac0ce561155ecc3ed78ca94d3c9378656ad4c94c1270de543f621420f94ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python-install-${python-install_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 c591174ae1f14c05ddcc84483381aa7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 203ac0ef46cfcfb6e531548a50cc5a05deb9f049 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 926f9e0cb959203629ba6ffdc889f96e1a075c36ca6e7528ba7be96ade189a7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setuptools_scm-${setuptools_scm_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 b4e02bf8e62ed49142ea7b42a68671d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6876656de603d15079102abf2f9ed18f2937f7db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tomli-${tomli_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 807cc80e6a2697375f431b757994b7c5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cbdb7cfc45e9183147842cd799b5e4bbb0aef34b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wheel-${wheel_vers}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 f490f1399e5903706cb1d4fbed9ecb28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6c4df8aa7c6d59f8b97cf85cce9e362c81b0c523 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
patch {
system -W ${workpath}/flit_core-${flit_core_vers} "patch -p0 < ${filespath}/zip-timestamps.patch"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/python-install-${python-install_vers} "patch -p0 < ${filespath}/patch-install-__init__.py.diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/python-install-${python-install_vers} "patch -p0 < ${filespath}/installer_scripts.py.patch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq "py36-bootstrap-modules"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/python-install-${python-install_vers} "patch -p0 < ${filespath}/patch-install-__init__.py.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/python-install-${python-install_vers} "patch -p0 < ${filespath}/installer_scripts.py.patch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,24 +173,41 @@ destroot {
</span> set instdir ${prefix}/share/${subport}
xinstall -d ${destroot}${instdir}
copy ${workpath}/build-${build_vers}/src/build \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/build-${build_vers}/src/build.egg-info \
</span> ${workpath}/flit_core-${flit_core_vers}/flit_core \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/installer-${installer_vers}/src/installer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/packaging-${packaging_vers}/packaging \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/packaging-${packaging_vers}/packaging.egg-info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/pep517-${pep517_vers}/pep517 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/pyparsing-${pyparsing_vers}/pyparsing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/python-install-${python-install_vers}/install \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/python-install-${python-install_vers}/python_install.egg-info \
</span> ${workpath}/setuptools_scm-${setuptools_scm_vers}/src/setuptools_scm \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/setuptools_scm-${setuptools_scm_vers}/src/setuptools_scm.egg-info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/tomli-${tomli_vers}/tomli \
</span> ${workpath}/wheel-${wheel_vers}/src/wheel \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/wheel-${wheel_vers}/src/wheel.egg-info \
</span> ${destroot}${instdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach pkg {flit_core installer pep517 pyparsing tomli} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${instdir}/${pkg}.egg-info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${workpath}/${pkg}-[set ${pkg}_vers]/PKG-INFO ${destroot}${instdir}/${pkg}.egg-info/PKG-INFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/importlib_metadata-${importlib_metadata_vers}/importlib_metadata \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/installer-${installer_vers}/src/installer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/packaging-${packaging_vers}/src/packaging \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/pyproject_hooks-${pyproject_hooks_vers}/src/pyproject_hooks \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/tomli-${tomli_vers}/src/tomli \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/typing_extensions-${typing_extensions_vers}/src/typing_extensions.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/zipp-${zipp_vers}/zipp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${instdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pkg {build flit_core importlib_metadata installer packaging pyproject_hooks setuptools_scm tomli typing_extensions wheel zipp} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pkgvers [set ${pkg}_vers]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${instdir}/${pkg}-${pkgvers}.dist-info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${workpath}/${pkg}-${pkgvers}/PKG-INFO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${instdir}/${pkg}-${pkgvers}.dist-info/METADATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$subport eq "py36-bootstrap-modules"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/build-${build_vers}/src/build.egg-info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/packaging-${packaging_vers}/packaging \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/packaging-${packaging_vers}/packaging.egg-info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/pep517-${pep517_vers}/pep517 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/pyparsing-${pyparsing_vers}/pyparsing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/python-install-${python-install_vers}/install \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/python-install-${python-install_vers}/python_install.egg-info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/setuptools_scm-${setuptools_scm_vers}/src/setuptools_scm.egg-info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/tomli-${tomli_vers}/tomli \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/wheel-${wheel_vers}/src/wheel.egg-info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${instdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pkg {flit_core pep517 pyparsing tomli} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${instdir}/${pkg}.egg-info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${workpath}/${pkg}-[set ${pkg}_vers]/PKG-INFO ${destroot}${instdir}/${pkg}.egg-info/PKG-INFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-importlib-metadata/Portfile b/python/py-importlib-metadata/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7dc6a3dec29..ea52752ea0e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-importlib-metadata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-importlib-metadata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,15 +67,14 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-typing_extensions
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} >= 36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.pep517 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # break circular dependency with python-install and setuptools_scm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} in {37 38 39}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # break circular dependency with py-build
</span> python.add_dependencies no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py-bootstrap-modules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-installer
</span> depends_lib-append port:python${python.version}
build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
build.args --skip-dependency-check
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span> } else {
depends_build-append \
port:py${python.version}-setuptools_scm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-parsing/Portfile b/python/py-parsing/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a5f64734c5..820c08b868d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-parsing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-parsing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,11 +46,11 @@ if {${name} ne ${subport}} {
</span> if {${python.version} == 36} {
# break circular dependency with py36-build
python.add_dependencies no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py36-bootstrap-modules
</span> depends_lib-append port:python${python.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PYTHONPATH=${prefix}/share/py36-bootstrap-modules
</span> build.args --skip-dependency-check
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PYTHONPATH=${prefix}/share/py36-bootstrap-modules
</span> }
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pep517/Portfile b/python/py-pep517/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6bc444a3b46..1a4e9e4bf75 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pep517/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pep517/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,15 +26,15 @@ python.add_dependencies no
</span>
if {$subport ne $name && ${python.version} == 36} {
python.pep517 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:py36-bootstrap-modules
</span> depends_lib port:python${python.version} \
port:py${python.version}-tomli \
port:py${python.version}-importlib-metadata \
port:py${python.version}-zipp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PYTHONPATH=${prefix}/share/py36-bootstrap-modules
</span> build.args --skip-dependency-check
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PYTHONPATH=${prefix}/share/py36-bootstrap-modules
</span> } else {
replaced_by py-pyproject_hooks
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-python-install/Portfile b/python/py-python-install/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71dc8b96ed6..fcbfbb45bdf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-python-install/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-python-install/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,24 +23,18 @@ checksums md5 c591174ae1f14c05ddcc84483381aa7e \
</span>
patchfiles patch-install-__init__.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 36 37 38 39 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 36
</span>
if {$subport ne $name} {
python.pep517 yes
python.add_dependencies no
depends_build port:py${python.version}-setuptools \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:python${python.version}
</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:#ffe0e0;'>- port:py${python.version}-importlib-metadata
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} <= 36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:python${python.version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-importlib-metadata \
</span> port:py${python.version}-importlib-resources
<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;'>- build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PYTHONPATH=${prefix}/share/py36-bootstrap-modules
</span> build.args --skip-dependency-check
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PYTHONPATH=${prefix}/share/py36-bootstrap-modules
</span> livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tomli/Portfile b/python/py-tomli/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08a29e47d08..9c4f52b1a80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tomli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tomli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +28,9 @@ if {${name} ne ${subport}} {
</span> checksums rmd160 cbdb7cfc45e9183147842cd799b5e4bbb0aef34b \
sha256 05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f \
size 15094
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bootstrap_portname py36-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bootstrap_portname py-bootstrap-modules
</span> }
python.pep517 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +40,11 @@ if {${name} ne ${subport}} {
</span> # Break circular dependencies with py-build and friends when
# there is no tomllib in the stdlib.
python.add_dependencies no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:${bootstrap_portname}
</span> depends_lib port:python${python.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PYTHONPATH=${prefix}/share/${bootstrap_portname}
</span> build.args --skip-dependency-check
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PYTHONPATH=${prefix}/share/${bootstrap_portname}
</span> }
livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-typing_extensions/Portfile b/python/py-typing_extensions/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de56de85561..431b8aea661 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-typing_extensions/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-typing_extensions/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,12 +33,13 @@ python.pep517_backend flit
</span> if {${name} ne ${subport}} {
if {${python.version} in {36 37}} {
# break circular dependency with py-build/py-python-install
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bootstrap_portname [expr {${python.version} >= 37 ? "py-bootstrap-modules" : "py36-bootstrap-modules"}]
</span> python.add_dependencies no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:${bootstrap_portname}
</span> depends_lib-append port:python${python.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PYTHONPATH=${prefix}/share/${bootstrap_portname}
</span> build.args --skip-dependency-check
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PYTHONPATH=${prefix}/share/${bootstrap_portname}
</span> }
if {${python.version} == 36} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wheel/Portfile b/python/py-wheel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b5796c3de31..21fbed89dfe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wheel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-wheel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,13 +38,13 @@ if {${name} ne ${subport}} {
</span> depends_build-append port:py${python.version}-importlib-resources
# break circular dependency with py36-build
python.add_dependencies no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py36-bootstrap-modules
</span>
depends_lib-append port:python${python.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PYTHONPATH=${prefix}/share/py36-bootstrap-modules
</span> build.args --skip-dependency-check
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PYTHONPATH=${prefix}/share/py36-bootstrap-modules
</span> }
if {${python.version} == 34} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-zipp/Portfile b/python/py-zipp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cfa27f9c1c4..13fa235764d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-zipp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-zipp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,15 +55,14 @@ if {${name} ne ${subport}} {
</span> size 18454
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} >= 36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.pep517 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # break circular dependencies with python-install and setuptools_scm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} in {37 38 39}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # break circular dependency with py-build
</span> python.add_dependencies no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py-bootstrap-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py-bootstrap-modules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-installer
</span> depends_lib-append port:python${python.version}
build.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
build.args --skip-dependency-check
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PYTHONPATH=${prefix}/share/py-bootstrap-modules
</span> }
livecheck.type none
</pre><pre style='margin:0'>
</pre>