<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/e29c98837c763fd5abd54ed5043e113a25caa8c4">https://github.com/macports/macports-ports/commit/e29c98837c763fd5abd54ed5043e113a25caa8c4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e29c98837c763fd5abd54ed5043e113a25caa8c4
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sat Jan 13 21:43:29 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-demjson: fix build, drop py3{6,7} subports
</span>---
 python/py-demjson/Portfile           | 13 ++++++++-----
 python/py-demjson/files/no_2to3.diff | 11 +++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-demjson/Portfile b/python/py-demjson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 254438b9a95..90c2798ee06 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-demjson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-demjson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ platforms           {darwin any}
</span> supported_archs     noarch
 maintainers         nomaintainer
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     27 36 37 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     27 38
</span> 
 description         encoder, decoder, and lint/validator for JSON compliant with RFC 4627
 long_description    encoder, decoder, and lint/validator for JSON (JavaScript \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,14 +29,19 @@ long_description    encoder, decoder, and lint/validator for JSON (JavaScript \
</span>                     compliance to the standard.
 
 homepage            http://deron.meranda.us/python/demjson/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        pypi:d/demjson/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname            demjson-${version}
</span> 
 checksums           rmd160  2d5f60a791671465dc91ab370a8ad7480ed81a26 \
                     sha256  31de2038a0fdd9c4c11f8bf3b13fe77bc2a128307f965c8d5fb4dc6d6f6beb79 \
                     size    131457
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} >= 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   no_2to3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            system -W ${worksrcpath} "${prefix}/bin/2to3-${python.branch} --write --nobackups test demjson.py"
</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;'>+
</span>     depends_build-append \
                     port:py${python.version}-setuptools
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +50,4 @@ if {${name} ne ${subport}} {
</span>         xinstall -m 0644 -W ${worksrcpath} README.txt LICENSE.txt \
             ${destroot}${prefix}/share/doc/${subport}
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    livecheck.type  none
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-demjson/files/no_2to3.diff b/python/py-demjson/files/no_2to3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4a2a369560c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-demjson/files/no_2to3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig  2024-01-13 21:47:34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2024-01-13 21:47:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if py_major >= 3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # Make sure 2to3 gets run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if distmech == 'setuptools':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        py3extra['use_2to3'] = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        py3extra['use_2to3'] = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         #py3extra['convert_2to3_doctests'] = ['src/your/module/README.txt']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         #py3extra['use_2to3_fixers'] = ['your.fixers']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     elif distmech == 'distutils':
</span></pre><pre style='margin:0'>

</pre>