[105863] trunk/dports/gnome

[devans at macports.org]

Revision: 105863
          https://trac.macports.org/changeset/105863
Author:   devans at macports.org
Date:     2013-05-08 09:45:12 -0700 (Wed, 08 May 2013)
Log Message:
-----------
gnome-platform-suite, gnome-desktop-suite: make at-spi and dependents optional due to conflict with newer at-spi2-atk, descriptions.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-desktop-suite/Portfile
    trunk/dports/gnome/gnome-platform-suite/Portfile

Modified: trunk/dports/gnome/gnome-desktop-suite/Portfile
===================================================================
--- trunk/dports/gnome/gnome-desktop-suite/Portfile	2013-05-08 16:28:03 UTC (rev 105862)
+++ trunk/dports/gnome/gnome-desktop-suite/Portfile	2013-05-08 16:45:12 UTC (rev 105863)
@@ -9,12 +9,12 @@
 categories      gnome
 license         Permissive
 maintainers     devans openmaintainer
-description     The GNOME desktop environment
+description     The GNOME 2 desktop environment
 long_description \
-                The GNOME desktop environment is the set of libraries, applications and services \
-                that work as a cohesive integrated user interface produced by the GNOME project. \
+                The GNOME 2 desktop environment is the set of libraries, applications and services \
+                that work as a cohesive integrated user interface produced by the GNOME 2 project. \
                 The desktop environment is one of the suites of software packages that form \
-                the complete GNOME project offerings.
+                the complete GNOME 2 project offerings.
 
 homepage        http://live.gnome.org/TwoPointTwentynine/Desktop
 master_sites
@@ -29,8 +29,6 @@
 # The following modules are included in the current GNOME desktop
 # environment specification but have not yet been ported to MacPorts
 #
-# at-spi2-atk
-# at-spi2-core
 # brasero  (no support for darwin Mac OS X, requires Linux SG or BSD CAM)
 # cheese   (requires Video4Linux or  V4L2)
 # deskbar-applet
@@ -70,7 +68,6 @@
 depends_lib     \
                 port:alacarte \
                 port:bug-buddy \
-                port:dasher \
                 port:empathy \
                 port:eog \
                 port:epiphany \
@@ -79,7 +76,6 @@
                 port:file-roller \
                 port:gcalctool \
                 port:gconf-editor \
-                port:gdm \
                 port:gedit \
                 port:gnome-applets \
                 port:gnome-backgrounds \
@@ -89,7 +85,6 @@
                 port:gnome-games \
                 port:gnome-icon-theme \
                 port:gnome-keyring \
-                port:gnome-mag \
                 port:gnome-media \
                 port:gnome-menus \
                 port:gnome-panel \
@@ -109,7 +104,6 @@
                 port:libgtkhtml3 \
                 port:gtksourceview2 \
                 port:gucharmap \
-                port:libgail-gnome \
                 port:libgnome-keyring \
                 port:libgnomekbd \
                 port:libgtop \
@@ -165,6 +159,20 @@
                 port:gnome-system-monitor
 }
 
+#
+# these ports are included in the Desktop spec but conflict with at-spi2-atk
+# used by newer gtk3 based ports and are, therefore, considered optional
+# They will be removed in a future version.
+#
+ 
+variant assist description {Build AT-SPI based ports} {
+    depends_lib-append \
+                port:dasher \
+                port:gdm \
+                port:gnome-mag \
+                port:libgail-gnome \
+}
+
 variant python25 conflicts python26 python27 description {Use python 2.5} {
     depends_lib-append        port:py25-pygtksourceview
 }

Modified: trunk/dports/gnome/gnome-platform-suite/Portfile
===================================================================
--- trunk/dports/gnome/gnome-platform-suite/Portfile	2013-05-08 16:28:03 UTC (rev 105862)
+++ trunk/dports/gnome/gnome-platform-suite/Portfile	2013-05-08 16:45:12 UTC (rev 105863)
@@ -8,18 +8,17 @@
 revision        2
 categories      gnome devel
 maintainers     devans openmaintainer
-description     The GNOME Developer Platform
-long_description    The GNOME Developer Platform is the set of libraries and \
+description     The GNOME 2 Developer Platform
+long_description    ${description} is the set of libraries and \
                     services that developers can rely upon to develop fully \
-                    GNOME compliant applications. The platform is one of the \
-                    suites of software packages that form the complete GNOME \
+                    GNOME 2 compliant applications. The platform is one of the \
+                    suites of software packages that form the complete GNOME 2 \
                     project offerings.
 platforms       darwin
 homepage        http://live.gnome.org/TwoPointTwentynine/Platform
 master_sites
 
-depends_lib     port:at-spi \
-                port:atk \
+depends_lib     port:atk \
                 port:gconf \
                 path:lib/pkgconfig/glib-2.0.pc:glib2 \
                 port:gtk2 \
@@ -58,6 +57,16 @@
 
 build           { }
 
+#
+# these ports are included in the Platform spec but conflict with at-spi2-atk
+# used by newer gtk3 based ports and are, therefore, considered optional.
+# They will be removed in a future version.
+#
+
+variant assist description {Build AT-SPI modules} {
+    depends_lib-append  port:at-spi
+}
+
 destroot        {
         file mkdir ${destroot}${prefix}/share/doc/
         system "echo ${long_description} > ${destroot}${prefix}/share/doc/README.${name}.txt"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130508/2dc968be/attachment.html>