<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/de7f24c20c8c6df799769694de5dcbdcd4345ae1">https://github.com/macports/macports-ports/commit/de7f24c20c8c6df799769694de5dcbdcd4345ae1</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 de7f24c pypy: update to 7.3.1; move off of bitbucket
</span>de7f24c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit de7f24c20c8c6df799769694de5dcbdcd4345ae1
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Thu Apr 16 19:26:31 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> pypy: update to 7.3.1; move off of bitbucket
</span>---
lang/pypy/Portfile | 35 ++++++++++++++++++++---------------
lang/pypy/files/no-embed.diff | 12 ++++++------
2 files changed, 26 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/Portfile b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 373e39a..5dedf17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Please remember to keep this file in sync with the pypy-tkinter port!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup bitbucket 1.0
</span> PortGroup select 1.0
name pypy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.setup pypy pypy 7.3.0 {release-pypy${python.branch}-v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.3.1
</span> revision 0
categories lang python devel
license MIT PSF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +14,6 @@ platforms darwin
</span>
homepage http://pypy.org/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-bitbucket.tarball_from \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- downloads
</span>
depends_build port:pkgconfig \
port:py27-docutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,19 +73,21 @@ if {$subport == ${name}} {
</span> if {${python.branch} == 2.7} {
patchfiles-append pypy2-darwin.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 acb601481958888d11c7007e8d749c9035ff7d22 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b0b25c7f8938ab0fedd8dedf26b9e73c490913b002b484c1b2f19d5844a518de \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20328540
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a9b587b014ac64ec4499fd93b0be2171dab5c501 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fc4fcf1007f91acec4b832f16a25862e42b06dbdd9b0ea72bc3313c8b975969a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20725620
</span> } else {
patchfiles-append pypy3-darwin.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3032a53eb9fb8d226a1a0075472407ce3e6c7734 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 48d12c15fbcbcf4a32882a883195e1f922997cde78e7a16d4342b9b521eefcfa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21937786
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c2ea7aaf5d64d805fa76dc7fa604e7e2648195ec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 437abe7575827be2f5e519e7f77fe634d4c9f5d3c9f5b7a269ac4c8c8aa7f0e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22347476
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname pypy${python.branch}-v${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://foss.heptapod.net/pypy/pypy/repository/release-pypy${python.branch}-v${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${name}/pypy${python.branch}-v${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description A fast interpreter for Python ${python.branch}
long_description \
PyPy is a replacement for CPython ${python.branch}. The main reason to use it \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +112,7 @@ destroot.env-append CC=${configure.cc} \
</span> destroot.dir ${worksrcpath}/pypy/tool/release
destroot.args --builddir ${destroot}${prefix}/lib \
--archive-name ${subport} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-tk --no-embedded-dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-_tkinter --no-embedded-dependencies
</span> destroot.target package.py
destroot.post_args
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,3 +245,11 @@ if {[string match "pypy*-tkinter" ${subport}]} {
</span>
post-destroot { }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[regexp \- $subport]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # don't check the tkinter subports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://foss.heptapod.net/api/v4/projects/76/repository/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex \"release-pypy${python.branch}-v(\[0-9.\]+)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/files/no-embed.diff b/lang/pypy/files/no-embed.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 226d6f2..3bebc41 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/files/no-embed.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/files/no-embed.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git pypy/tool/build_cffi_imports.py pypy/tool/build_cffi_imports.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pypy/tool/build_cffi_imports.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pypy/tool/build_cffi_imports.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -165,7 +165,7 @@ def create_cffi_import_libraries(pypy_c,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env = os.environ.copy()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib_pypy/tools/build_cffi_imports.py lib_pypy/tools/build_cffi_imports.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib_pypy/tools/build_cffi_imports.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib_pypy/tools/build_cffi_imports.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -198,7 +198,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cwd = None
</span>
print('*', ' '.join(args), file=sys.stderr)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if embed_dependencies:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if embed_dependencies and key in cffi_dependencies:
</span> + if False:
status, stdout, stderr = _build_dependency(key)
if status != 0:
</pre><pre style='margin:0'>
</pre>