<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e4874a5177c7272921be45c17c6c9d7a5bc0f34a">https://github.com/macports/macports-ports/commit/e4874a5177c7272921be45c17c6c9d7a5bc0f34a</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 e4874a5177c gexiv2: update to version 0.12.1
</span>e4874a5177c is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e4874a5177c7272921be45c17c6c9d7a5bc0f34a
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Aug 30 18:31:00 2020 -0700

<span style='display:block; white-space:pre;color:#404040;'>    gexiv2: update to version 0.12.1
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * port build to meson
</span><span style='display:block; white-space:pre;color:#404040;'>    * adapt python configuration to meson
</span><span style='display:block; white-space:pre;color:#404040;'>    * drop variant +python35 (EOL 2020-09-13)
</span><span style='display:block; white-space:pre;color:#404040;'>    * enable build of gtk-doc API docs
</span>---
 gnome/gexiv2/Portfile                     | 77 ++++++++++++++++++++-----------
 gnome/gexiv2/files/patch-python-bins.diff | 20 ++++++++
 2 files changed, 69 insertions(+), 28 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gexiv2/Portfile b/gnome/gexiv2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dccb2e8df47..4492af2f4c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gexiv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gexiv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           meson 1.0
</span> 
 name                gexiv2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             0.10.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             0.12.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> license             GPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         gexiv2 is a GObject-based wrapper around the exiv2 library.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,54 +22,75 @@ master_sites        gnome:sources/${name}/${branch}/
</span> 
 use_xz              yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  95a0cf86e1100605c32cb5ea9fa861b54f4259f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  7d9ad7147ab51ab691edf043c44a0a44de4088c48a12d9c23c26939710e66ce1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    638168
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  174717b7098fa545a60e05252c0568023dfdbab8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    372104
</span> 
 depends_build       port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:libtool \
</span>                     port:gtk-doc
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:vala \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:exiv2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args      --enable-compile-warnings=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         port:exiv2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:gobject-introspection \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:vala
</span> 
 # one each of python2 python3 allowed
 
 variant python27 description {Build Python2 bindings using Python 2.7} {
     depends_lib-append      port:py27-gobject3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env-append    PYTHON2_PATH=${prefix}/bin/python2.7
</span> }
 
 default_variants +python27
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python36 python37 python38 description {Build Python3 bindings using Python 3.5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:py35-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env-append    PYTHON3_PATH=${prefix}/bin/python3.5
</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:#ffe0e0;'>-variant python36 conflicts python35 python37 python38 description {Build Python3 bindings using Python 3.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python37 python38 description {Build Python3 bindings using Python 3.6} {
</span>     depends_lib-append      port:py36-gobject3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env-append    PYTHON3_PATH=${prefix}/bin/python3.6
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python35 python36 python38 description {Build Python3 bindings using Python 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python36 python38 description {Build Python3 bindings using Python 3.7} {
</span>     depends_lib-append      port:py37-gobject3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env-append    PYTHON3_PATH=${prefix}/bin/python3.7
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python35 python36 python37 description {Build Python3 bindings using Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python36 python37 description {Build Python3 bindings using Python 3.8} {
</span>     depends_lib-append      port:py38-gobject3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env-append    PYTHON3_PATH=${prefix}/bin/python3.8
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python35] && ![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python36] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ![variant_isset python37] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ![variant_isset python38]} {
</span>     default_variants +python38
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-python-bins.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PYTHON2_BIN@@|${prefix}/bin/python2.7|" ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append -Dpython2_girdir=no
</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;'>+    if {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PYTHON3_BIN@@|${prefix}/bin/python3.6|" ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PYTHON3_BIN@@|${prefix}/bin/python3.7|" ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PYTHON3_BIN@@|${prefix}/bin/python3.8|" ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append -Dpython3_girdir=no
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -Dgtk_doc=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# uses g-ir-scanner, which uses $CC from env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lappend merger_build_env(${arch})  "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lappend merger_destroot_env(${arch})  "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.env-append       "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.env-append    "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type      gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gexiv2/files/patch-python-bins.diff b/gnome/gexiv2/files/patch-python-bins.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4e8f607fefc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gexiv2/files/patch-python-bins.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig       2020-08-30 20:01:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build    2020-08-30 20:02:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if introspection_available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if python2_girdir != 'no'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    python2 = find_program('python2', required : false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    python2 = find_program('@@PYTHON2_BIN@@', required : false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if python2.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       py2gi = run_command(python2, python_gi_test_args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if py2gi.returncode() == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if python3_girdir != 'no'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    python3 = find_program('python3', required : false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    python3 = find_program('@@PYTHON3_BIN@@', required : false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if python3.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       py3gi = run_command(python3, python_gi_test_args)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       if py3gi.returncode() == 0
</span></pre><pre style='margin:0'>

</pre>