move Gnome 2.18 mask to arm/alpha/bsd profiles, unmask for all other arches

7 files changed, 264 insertions, 88 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index ad6507c81bbb..5a03bed38578 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.462 2007/06/09 09:43:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.463 2007/06/09 10:22:16 remi Exp $
 
   09 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> package.mask:
   Remove some entries for packages that I have removed from the tree.
 
+  09 Jun 2007; Rémi Cardona <remi@gentoo.org> package.mask:
+  Move Gnome 2.18 mask to arm/alpha/fbsd subprofiles,
+  effectively unmasking it for all other arches
+
   09 Jun 2007; Ryan Hill <dirtyepic@gentoo.org> package.mask:
   Removed wxruby mask since it has been deleted from the tree.
 
diff --git a/profiles/default-bsd/fbsd/package.mask b/profiles/default-bsd/fbsd/package.mask
index 94372bd99e29..8f100bb916ac 100644
--- a/profiles/default-bsd/fbsd/package.mask
+++ b/profiles/default-bsd/fbsd/package.mask
@@ -1,10 +1,93 @@
 # Copyright 2004-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/package.mask,v 1.9 2007/05/09 15:48:59 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/fbsd/package.mask,v 1.10 2007/06/09 10:22:16 remi Exp $
 
 # As soon as the ~x86-fbsd keyword is spread enough, drop the extra masking
 # used to limit usage of unsupported packages.
 
+# Remi Cardona <remi@gentoo.org> (09 Jun 2007)
+# The Great GNOME 2.18.0 mask (moved from global)
+>=gnome-base/gnome-2.18.0
+>=gnome-base/gnome-light-2.18.0
+>=app-admin/sabayon-2.18.0
+>=gnome-base/gconf-2.16.0
+>=gnome-extra/at-spi-1.18.0
+>=dev-libs/atk-1.18.0
+>=gnome-base/gail-1.18.0
+>=gnome-base/gnome-vfs-2.18.0.1
+>=gnome-base/libbonobo-2.18.0
+>=gnome-base/libbonoboui-2.18.0
+>=gnome-base/libgnome-2.18.0
+>=gnome-base/libgnomeui-2.18.1
+>=x11-libs/pango-1.16.1
+>=x11-misc/alacarte-0.11.3
+>=gnome-extra/bug-buddy-2.18.0
+>=gnome-base/control-center-2.18.0
+>=app-accessibility/dasher-4.4.0
+>=gnome-extra/deskbar-applet-2.18.0
+>=gnome-base/eel-2.18.0.1
+>=media-gfx/eog-2.18.0.1
+>=www-client/epiphany-2.18.0
+>=www-client/epiphany-extensions-2.18.0
+>=app-text/evince-0.8.0
+>=mail-client/evolution-2.10.0
+>=gnome-extra/evolution-data-server-1.10.0
+>=gnome-extra/evolution-exchange-2.10.0
+>=gnome-extra/evolution-webcal-2.9.92
+>=gnome-extra/fast-user-switch-applet-2.17.4
+>=app-arch/file-roller-2.18.0
+>=gnome-extra/gcalctool-5.9.14
+>=gnome-extra/gconf-editor-2.18.0
+>=gnome-base/gdm-2.18.0
+>=app-editors/gedit-2.18.0
+>=gnome-base/gnome-applets-2.18.0
+>=gnome-base/gnome-desktop-2.18.0
+>=app-text/gnome-doc-utils-0.10.1
+>=gnome-extra/gnome-games-2.18.0
+>=x11-themes/gnome-icon-theme-2.18.0
+>=gnome-base/gnome-keyring-0.8
+>=gnome-extra/gnome-keyring-manager-2.18.0
+>=gnome-extra/gnome-media-2.18.0
+>=gnome-base/gnome-menus-2.18.0
+>=net-analyzer/gnome-nettool-2.18.0
+>=gnome-base/gnome-panel-2.18.0
+>=gnome-extra/gnome-power-manager-2.18.0
+>=dev-python/gnome-python-desktop-2.18.0
+>=gnome-extra/gnome-screensaver-2.18.0
+>=gnome-base/gnome-session-2.18.0
+>=gnome-extra/gnome-system-monitor-2.18.0
+>=app-admin/gnome-system-tools-2.18.0
+>=x11-terms/gnome-terminal-2.18.0
+>=x11-themes/gnome-themes-2.18.0
+>=gnome-extra/gnome-utils-2.18.0
+>=gnome-base/gnome-volume-manager-2.17.0
+>=x11-themes/gtk-engines-2.10.0
+>=gnome-extra/gtkhtml-3.14.0
+>=gnome-extra/gucharmap-1.10.0
+>=gnome-extra/libgail-gnome-1.18.0
+>=gnome-base/libgnomekbd-2.18.0
+>=gnome-base/libgnomeprint-2.18.0
+>=gnome-base/libgnomeprintui-2.18.0
+>=dev-libs/liboobs-2.18.0
+>=x11-libs/libwnck-2.18.0
+>=x11-wm/metacity-2.18.0
+>=gnome-base/nautilus-2.18.0.1
+>=gnome-extra/nautilus-cd-burner-2.18.0
+>=app-accessibility/orca-2.18.0
+>=media-video/totem-2.18.0
+>=net-misc/vino-2.18.0
+>=x11-libs/vte-0.16.0
+>=gnome-extra/yelp-2.18.0
+>=gnome-extra/zenity-2.18.0
+>=dev-cpp/gconfmm-2.18.0
+>=dev-cpp/gnome-vfsmm-2.18.0
+>=dev-cpp/libgnomemm-2.18.0
+>=dev-cpp/libgnomeuimm-2.18.0
+>=dev-python/gnome-python-2.18.0
+>=gnome-base/gnome-mount-0.5
+=dev-python/gnome-python-extras-2.14.2-r1
+# End of GNOME 2.18.0 mask
+
 # Diego Pettenò <flameeyes@gentoo.org> (27 May 2005)
 # SGI's FAM is dead upstream, and requires mayor changes.
 # Gamin before 0.1.0 is not supported as missed the FreeBSD patches.
diff --git a/profiles/default-linux/alpha/ChangeLog b/profiles/default-linux/alpha/ChangeLog
index 3dd0dbea83bf..1211bdb71a90 100644
--- a/profiles/default-linux/alpha/ChangeLog
+++ b/profiles/default-linux/alpha/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/ChangeLog,v 1.47 2007/06/04 06:44:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/ChangeLog,v 1.48 2007/06/09 10:22:16 remi Exp $
+
+  09 Jun 2007; Rémi Cardona <remi@gentoo.org> package.mask:
+  Move Gnome 2.18 mask to alpha subprofile
 
   04 Jun 2007; Michael Sterrett <mr_bones_@gentoo.org> package.mask:
   games-action/koth needs ggi so mask that as well.
diff --git a/profiles/default-linux/alpha/package.mask b/profiles/default-linux/alpha/package.mask
index 6f7a34073480..2687b96b40c0 100644
--- a/profiles/default-linux/alpha/package.mask
+++ b/profiles/default-linux/alpha/package.mask
@@ -1,3 +1,86 @@
+# Remi Cardona <remi@gentoo.org> (09 Jun 2007)
+# The Great GNOME 2.18.0 mask (moved from global)
+>=gnome-base/gnome-2.18.0
+>=gnome-base/gnome-light-2.18.0
+>=app-admin/sabayon-2.18.0
+>=gnome-base/gconf-2.16.0
+>=gnome-extra/at-spi-1.18.0
+>=dev-libs/atk-1.18.0
+>=gnome-base/gail-1.18.0
+>=gnome-base/gnome-vfs-2.18.0.1
+>=gnome-base/libbonobo-2.18.0
+>=gnome-base/libbonoboui-2.18.0
+>=gnome-base/libgnome-2.18.0
+>=gnome-base/libgnomeui-2.18.1
+>=x11-libs/pango-1.16.1
+>=x11-misc/alacarte-0.11.3
+>=gnome-extra/bug-buddy-2.18.0
+>=gnome-base/control-center-2.18.0
+>=app-accessibility/dasher-4.4.0
+>=gnome-extra/deskbar-applet-2.18.0
+>=gnome-base/eel-2.18.0.1
+>=media-gfx/eog-2.18.0.1
+>=www-client/epiphany-2.18.0
+>=www-client/epiphany-extensions-2.18.0
+>=app-text/evince-0.8.0
+>=mail-client/evolution-2.10.0
+>=gnome-extra/evolution-data-server-1.10.0
+>=gnome-extra/evolution-exchange-2.10.0
+>=gnome-extra/evolution-webcal-2.9.92
+>=gnome-extra/fast-user-switch-applet-2.17.4
+>=app-arch/file-roller-2.18.0
+>=gnome-extra/gcalctool-5.9.14
+>=gnome-extra/gconf-editor-2.18.0
+>=gnome-base/gdm-2.18.0
+>=app-editors/gedit-2.18.0
+>=gnome-base/gnome-applets-2.18.0
+>=gnome-base/gnome-desktop-2.18.0
+>=app-text/gnome-doc-utils-0.10.1
+>=gnome-extra/gnome-games-2.18.0
+>=x11-themes/gnome-icon-theme-2.18.0
+>=gnome-base/gnome-keyring-0.8
+>=gnome-extra/gnome-keyring-manager-2.18.0
+>=gnome-extra/gnome-media-2.18.0
+>=gnome-base/gnome-menus-2.18.0
+>=net-analyzer/gnome-nettool-2.18.0
+>=gnome-base/gnome-panel-2.18.0
+>=gnome-extra/gnome-power-manager-2.18.0
+>=dev-python/gnome-python-desktop-2.18.0
+>=gnome-extra/gnome-screensaver-2.18.0
+>=gnome-base/gnome-session-2.18.0
+>=gnome-extra/gnome-system-monitor-2.18.0
+>=app-admin/gnome-system-tools-2.18.0
+>=x11-terms/gnome-terminal-2.18.0
+>=x11-themes/gnome-themes-2.18.0
+>=gnome-extra/gnome-utils-2.18.0
+>=gnome-base/gnome-volume-manager-2.17.0
+>=x11-themes/gtk-engines-2.10.0
+>=gnome-extra/gtkhtml-3.14.0
+>=gnome-extra/gucharmap-1.10.0
+>=gnome-extra/libgail-gnome-1.18.0
+>=gnome-base/libgnomekbd-2.18.0
+>=gnome-base/libgnomeprint-2.18.0
+>=gnome-base/libgnomeprintui-2.18.0
+>=dev-libs/liboobs-2.18.0
+>=x11-libs/libwnck-2.18.0
+>=x11-wm/metacity-2.18.0
+>=gnome-base/nautilus-2.18.0.1
+>=gnome-extra/nautilus-cd-burner-2.18.0
+>=app-accessibility/orca-2.18.0
+>=media-video/totem-2.18.0
+>=net-misc/vino-2.18.0
+>=x11-libs/vte-0.16.0
+>=gnome-extra/yelp-2.18.0
+>=gnome-extra/zenity-2.18.0
+>=dev-cpp/gconfmm-2.18.0
+>=dev-cpp/gnome-vfsmm-2.18.0
+>=dev-cpp/libgnomemm-2.18.0
+>=dev-cpp/libgnomeuimm-2.18.0
+>=dev-python/gnome-python-2.18.0
+>=gnome-base/gnome-mount-0.5
+=dev-python/gnome-python-extras-2.14.2-r1
+# End of GNOME 2.18.0 mask
+
 # Raúl Porcel <armin76@gentoo.org> (2 Jun 2007)
 # Doesn't compile, needs newer linux-headers
 media-libs/libgii
diff --git a/profiles/default-linux/arm/ChangeLog b/profiles/default-linux/arm/ChangeLog
index c9a18483110e..1b9968b8887c 100644
--- a/profiles/default-linux/arm/ChangeLog
+++ b/profiles/default-linux/arm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/ChangeLog,v 1.6 2007/06/09 09:37:12 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/ChangeLog,v 1.7 2007/06/09 10:22:16 remi Exp $
+
+  09 Jun 2007; Rémi Cardona <remi@gentoo.org> +package.mask:
+  Move Gnome 2.18 mask to arm subprofile
 
   09 Jun 2007; Samuli Suominen <drac@gentoo.org> +package.use.mask:
   Mask cpufreq on xfce4-extras.
diff --git a/profiles/default-linux/arm/package.mask b/profiles/default-linux/arm/package.mask
new file mode 100644
index 000000000000..37bdc24c1184
--- /dev/null
+++ b/profiles/default-linux/arm/package.mask
@@ -0,0 +1,83 @@
+# Remi Cardona <remi@gentoo.org> (09 Jun 2007)
+# The Great GNOME 2.18.0 mask (moved from global)
+>=gnome-base/gnome-2.18.0
+>=gnome-base/gnome-light-2.18.0
+>=app-admin/sabayon-2.18.0
+>=gnome-base/gconf-2.16.0
+>=gnome-extra/at-spi-1.18.0
+>=dev-libs/atk-1.18.0
+>=gnome-base/gail-1.18.0
+>=gnome-base/gnome-vfs-2.18.0.1
+>=gnome-base/libbonobo-2.18.0
+>=gnome-base/libbonoboui-2.18.0
+>=gnome-base/libgnome-2.18.0
+>=gnome-base/libgnomeui-2.18.1
+>=x11-libs/pango-1.16.1
+>=x11-misc/alacarte-0.11.3
+>=gnome-extra/bug-buddy-2.18.0
+>=gnome-base/control-center-2.18.0
+>=app-accessibility/dasher-4.4.0
+>=gnome-extra/deskbar-applet-2.18.0
+>=gnome-base/eel-2.18.0.1
+>=media-gfx/eog-2.18.0.1
+>=www-client/epiphany-2.18.0
+>=www-client/epiphany-extensions-2.18.0
+>=app-text/evince-0.8.0
+>=mail-client/evolution-2.10.0
+>=gnome-extra/evolution-data-server-1.10.0
+>=gnome-extra/evolution-exchange-2.10.0
+>=gnome-extra/evolution-webcal-2.9.92
+>=gnome-extra/fast-user-switch-applet-2.17.4
+>=app-arch/file-roller-2.18.0
+>=gnome-extra/gcalctool-5.9.14
+>=gnome-extra/gconf-editor-2.18.0
+>=gnome-base/gdm-2.18.0
+>=app-editors/gedit-2.18.0
+>=gnome-base/gnome-applets-2.18.0
+>=gnome-base/gnome-desktop-2.18.0
+>=app-text/gnome-doc-utils-0.10.1
+>=gnome-extra/gnome-games-2.18.0
+>=x11-themes/gnome-icon-theme-2.18.0
+>=gnome-base/gnome-keyring-0.8
+>=gnome-extra/gnome-keyring-manager-2.18.0
+>=gnome-extra/gnome-media-2.18.0
+>=gnome-base/gnome-menus-2.18.0
+>=net-analyzer/gnome-nettool-2.18.0
+>=gnome-base/gnome-panel-2.18.0
+>=gnome-extra/gnome-power-manager-2.18.0
+>=dev-python/gnome-python-desktop-2.18.0
+>=gnome-extra/gnome-screensaver-2.18.0
+>=gnome-base/gnome-session-2.18.0
+>=gnome-extra/gnome-system-monitor-2.18.0
+>=app-admin/gnome-system-tools-2.18.0
+>=x11-terms/gnome-terminal-2.18.0
+>=x11-themes/gnome-themes-2.18.0
+>=gnome-extra/gnome-utils-2.18.0
+>=gnome-base/gnome-volume-manager-2.17.0
+>=x11-themes/gtk-engines-2.10.0
+>=gnome-extra/gtkhtml-3.14.0
+>=gnome-extra/gucharmap-1.10.0
+>=gnome-extra/libgail-gnome-1.18.0
+>=gnome-base/libgnomekbd-2.18.0
+>=gnome-base/libgnomeprint-2.18.0
+>=gnome-base/libgnomeprintui-2.18.0
+>=dev-libs/liboobs-2.18.0
+>=x11-libs/libwnck-2.18.0
+>=x11-wm/metacity-2.18.0
+>=gnome-base/nautilus-2.18.0.1
+>=gnome-extra/nautilus-cd-burner-2.18.0
+>=app-accessibility/orca-2.18.0
+>=media-video/totem-2.18.0
+>=net-misc/vino-2.18.0
+>=x11-libs/vte-0.16.0
+>=gnome-extra/yelp-2.18.0
+>=gnome-extra/zenity-2.18.0
+>=dev-cpp/gconfmm-2.18.0
+>=dev-cpp/gnome-vfsmm-2.18.0
+>=dev-cpp/libgnomemm-2.18.0
+>=dev-cpp/libgnomeuimm-2.18.0
+>=dev-python/gnome-python-2.18.0
+>=gnome-base/gnome-mount-0.5
+=dev-python/gnome-python-extras-2.14.2-r1
+# End of GNOME 2.18.0 mask
+
diff --git a/profiles/package.mask b/profiles/package.mask
index 6511cd444b15..403c4f3c2bfa 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.7348 2007/06/09 09:43:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.7349 2007/06/09 10:22:16 remi Exp $
 # When you add an entry to this file, add your name, the date, and an
 # explanation of why something is getting masked
 #
@@ -441,89 +441,6 @@ virtual/x11
 media-video/spca5xx
 media-video/gspca
 
-# Daniel Gryniewicz <dang@gentoo.org> (23 Mar 2007)
-# The Great GNOME 2.18.0 mask
->=gnome-base/gnome-2.18.0
->=gnome-base/gnome-light-2.18.0
->=app-admin/sabayon-2.18.0
->=gnome-base/gconf-2.16.0
->=gnome-extra/at-spi-1.18.0
->=dev-libs/atk-1.18.0
->=gnome-base/gail-1.18.0
->=gnome-base/gnome-vfs-2.18.0.1
->=gnome-base/libbonobo-2.18.0
->=gnome-base/libbonoboui-2.18.0
->=gnome-base/libgnome-2.18.0
->=gnome-base/libgnomeui-2.18.1
->=x11-libs/pango-1.16.1
->=x11-misc/alacarte-0.11.3
->=gnome-extra/bug-buddy-2.18.0
->=gnome-base/control-center-2.18.0
->=app-accessibility/dasher-4.4.0
->=gnome-extra/deskbar-applet-2.18.0
->=gnome-base/eel-2.18.0.1
->=media-gfx/eog-2.18.0.1
->=www-client/epiphany-2.18.0
->=www-client/epiphany-extensions-2.18.0
->=app-text/evince-0.8.0
->=mail-client/evolution-2.10.0
->=gnome-extra/evolution-data-server-1.10.0
->=gnome-extra/evolution-exchange-2.10.0
->=gnome-extra/evolution-webcal-2.9.92
->=gnome-extra/fast-user-switch-applet-2.17.4
->=app-arch/file-roller-2.18.0
->=gnome-extra/gcalctool-5.9.14
->=gnome-extra/gconf-editor-2.18.0
->=gnome-base/gdm-2.18.0
->=app-editors/gedit-2.18.0
->=gnome-base/gnome-applets-2.18.0
->=gnome-base/gnome-desktop-2.18.0
->=app-text/gnome-doc-utils-0.10.1
->=gnome-extra/gnome-games-2.18.0
->=x11-themes/gnome-icon-theme-2.18.0
->=gnome-base/gnome-keyring-0.8
->=gnome-extra/gnome-keyring-manager-2.18.0
->=gnome-extra/gnome-media-2.18.0
->=gnome-base/gnome-menus-2.18.0
->=net-analyzer/gnome-nettool-2.18.0
->=gnome-base/gnome-panel-2.18.0
->=gnome-extra/gnome-power-manager-2.18.0
->=dev-python/gnome-python-desktop-2.18.0
->=gnome-extra/gnome-screensaver-2.18.0
->=gnome-base/gnome-session-2.18.0
->=gnome-extra/gnome-system-monitor-2.18.0
->=app-admin/gnome-system-tools-2.18.0
->=x11-terms/gnome-terminal-2.18.0
->=x11-themes/gnome-themes-2.18.0
->=gnome-extra/gnome-utils-2.18.0
->=gnome-base/gnome-volume-manager-2.17.0
->=x11-themes/gtk-engines-2.10.0
->=gnome-extra/gtkhtml-3.14.0
->=gnome-extra/gucharmap-1.10.0
->=gnome-extra/libgail-gnome-1.18.0
->=gnome-base/libgnomekbd-2.18.0
->=gnome-base/libgnomeprint-2.18.0
->=gnome-base/libgnomeprintui-2.18.0
->=dev-libs/liboobs-2.18.0
->=x11-libs/libwnck-2.18.0
->=x11-wm/metacity-2.18.0
->=gnome-base/nautilus-2.18.0.1
->=gnome-extra/nautilus-cd-burner-2.18.0
->=app-accessibility/orca-2.18.0
->=media-video/totem-2.18.0
->=net-misc/vino-2.18.0
->=x11-libs/vte-0.16.0
->=gnome-extra/yelp-2.18.0
->=gnome-extra/zenity-2.18.0
->=dev-cpp/gconfmm-2.18.0
->=dev-cpp/gnome-vfsmm-2.18.0
->=dev-cpp/libgnomemm-2.18.0
->=dev-cpp/libgnomeuimm-2.18.0
->=dev-python/gnome-python-2.18.0
->=gnome-base/gnome-mount-0.5
-=dev-python/gnome-python-extras-2.14.2-r1
-# End of GNOME 2.18.0 mask
-
 # Michael Sterrett <mr_bones_@gentoo.org> (19 Mar 2007)
 # masked for removal when there's a good excuse.
 # Old and nasty.  Not supported by upstream.