<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/6934a19f7464f8ea289b4794381b051ed4309f6a">https://github.com/macports/macports-ports/commit/6934a19f7464f8ea289b4794381b051ed4309f6a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6934a19f7464f8ea289b4794381b051ed4309f6a
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Sep 7 05:19:13 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnome3-core: revert broken python variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previous attemps to associate python variants with this metaport
</span><span style='display:block; white-space:pre;color:#404040;'> forced python variant conflicts on dependencies. For now, just
</span><span style='display:block; white-space:pre;color:#404040;'> depend on current preferred subports of py-gobject3.
</span>---
gnome/gnome3-core/Portfile | 33 +++++++++------------------------
1 file changed, 9 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome3-core/Portfile b/gnome/gnome3-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 675dfa3..4e06def 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome3-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome3-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name gnome3-core
version 3.24.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories gnome
license Permissive
maintainers {devans @dbevans} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,6 +178,14 @@ depends_lib port:adwaita-icon-theme \
</span> port:yelp-xsl \
port:zenity
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# previous attemps to associate python variants with this metaport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# forced python variant conflicts on dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# for now, just depend on current preferred subports of py-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # ports that require libc++ to build
# skip if default C++ stdlib is not libc++
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,30 +205,6 @@ variant broken description {Build ports that are broken or need work} {
</span> port:gnome-system-monitor
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Build gobjects support for Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-gobject3
</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 python34 description {Build gobjects support for Python 3.4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py34-gobject3
</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 python35 description {Build gobjects support for Python 3.5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py35-gobject3
</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 description {Build gobjects support for Python 3.6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-gobject3
</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;'>-if {![variant_isset python34] && ![variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27 +python36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot {
file mkdir ${destroot}${prefix}/share/doc/gnome
file copy ${filespath}/versions.txt ${destroot}${prefix}/share/doc/gnome/${name}.versions.txt
</pre><pre style='margin:0'>
</pre>