<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/96ad8f76b66f73afe32532178f11e7c4cc584f33">https://github.com/macports/macports-ports/commit/96ad8f76b66f73afe32532178f11e7c4cc584f33</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 96ad8f76b66 pypy: unbreak build failures caused by late invocation of gitlab.setup
</span>96ad8f76b66 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 96ad8f76b66f73afe32532178f11e7c4cc584f33
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Thu Sep 17 12:07:51 2020 +0200

<span style='display:block; white-space:pre;color:#404040;'>    pypy: unbreak build failures caused by late invocation of gitlab.setup
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/61193
</span>---
 lang/pypy/Portfile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 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 579879b4c47..f43cf05fcc2 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;'>@@ -14,7 +14,6 @@ maintainers         {danchr @danchr} openmaintainer
</span> platforms           darwin
 
 homepage            http://pypy.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2           yes
</span> 
 depends_build       port:pkgconfig \
                     port:py27-docutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +70,12 @@ if {$subport == ${name}} {
</span>     select.entries-append [list python2 python2-$subport $subport]
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# delayed until ${python.branch} is set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance     https://foss.heptapod.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup        pypy pypy 7.3.1 release-pypy${python.branch}-v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname            pypy${python.branch}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${python.branch} == 2.7} {
     patchfiles-append   pypy2-darwin.py.diff
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,6 +118,11 @@ destroot.args       --builddir ${destroot}${prefix}/lib \
</span> destroot.target     package.py
 destroot.post_args
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # work around oddness caused by late invocation of gitlab.setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    file link ${workpath}/${name}-${version} ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
     # sanity check, useful when upgrading, as upstream tends to move these around
     if { ![catch {exec grep --exclude "*.orig" -Ilwre /sw -e ${prefix} ${worksrcpath}} result] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,13 +266,8 @@ if {${os.major} < ${min_darwin} && ${os.platform} eq "darwin"} {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# this is at the end; otherwise ${python.branch} isn't set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gitlab.instance     https://foss.heptapod.net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gitlab.setup        pypy pypy 7.3.1 release-pypy${python.branch}-v
</span> gitlab.livecheck.regex (\[0-9.]+)
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname            pypy${python.branch}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[regexp \- $subport]} {
     # don't check the tkinter subports
     livecheck.type none
</pre><pre style='margin:0'>

</pre>