Move the Gnome 2.22 mask to the parent profiles' package.mask files (base, embedded, and selinux); bug #216193

5 files changed, 272 insertions, 87 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 357af3d1c5cc..a3a0280f266d 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for profile directory
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1293 2008/04/05 17:40:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1294 2008/04/05 22:19:26 halcy0n Exp $
+
+  05 Apr 2008; Mark Loeser <halcy0n@gentoo.org> +base/package.mask,
+  +embedded/package.mask, package.mask, selinux/package.mask:
+  Move the Gnome 2.22 mask to the parent profiles' package.mask files (base,
+  embedded, and selinux); bug #216193
 
   05 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
   arch/amd64/package.mask, arch/x86/package.mask,
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
new file mode 100644
index 000000000000..9be947a381c2
--- /dev/null
+++ b/profiles/base/package.mask
@@ -0,0 +1,90 @@
+# Copyright 2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.1 2008/04/05 22:19:27 halcy0n Exp $
+
+# Mart Raudsepp <leio@gentoo.org> (16 Mar 2008)
+# The Great GNOME 2.22 Mask (tm)
+# Will be unmasked when everything is in, everything is ready and
+# there are no big bugs remaining.
+>=app-accessibility/dasher-4.7
+>=app-accessibility/gnome-mag-0.15.0
+>=app-crypt/seahorse-2.22
+>=gnome-base/libgtop-2.22
+>=x11-themes/gtk-engines-2.14
+>=gnome-base/libbonobo-2.22
+>=x11-libs/libwnck-2.22
+>=x11-themes/gnome-backgrounds-2.22
+>=gnome-base/gail-1.22
+>=app-text/rarian-0.8
+>=gnome-base/gnome-menus-2.22
+>=dev-python/pygtksourceview-2.2.0
+>=gnome-base/gconf-2.22
+>=x11-wm/metacity-2.22
+>=gnome-extra/gucharmap-2.22
+>=gnome-extra/gcalctool-5.22
+>=x11-themes/gnome-icon-theme-2.22
+>=x11-themes/gnome-themes-2.22
+>=gnome-extra/zenity-2.22
+>=gnome-extra/at-spi-1.21
+>=gnome-base/libgnomeui-2.22
+>=gnome-base/gnome-desktop-2.22
+>=x11-terms/gnome-terminal-2.22
+>=gnome-base/gnome-vfs-2.22
+>=gnome-base/libgnome-2.22
+dev-libs/libgweather
+>=app-editors/gedit-2.22
+>=gnome-base/libbonoboui-2.22
+>=gnome-base/libgnomekbd-2.21
+>=gnome-extra/gconf-editor-2.22
+>=media-sound/sound-juicer-2.22
+>=gnome-extra/yelp-2.22
+>=app-arch/file-roller-2.22
+>=dev-python/gnome-python-2.22
+>=gnome-extra/gtkhtml-3.18
+>=www-client/epiphany-2.22
+>=www-client/epiphany-extensions-2.22
+>=media-gfx/eog-2.22
+>=app-accessibility/orca-2.22
+>=gnome-base/librsvg-2.22
+>=gnome-extra/gnome-system-monitor-2.22
+>=gnome-base/gnome-keyring-2.22
+>=gnome-extra/evolution-data-server-2.22
+>=net-misc/vino-2.22
+>=app-text/evince-2.22
+>=gnome-base/gnome-panel-2.22
+>=gnome-extra/bug-buddy-2.22
+>=gnome-extra/evolution-webcal-2.21
+>=dev-python/gnome-python-desktop-2.22
+>=gnome-extra/gnome-games-2.22
+>=gnome-extra/deskbar-applet-2.22
+>=net-analyzer/gnome-nettool-2.22
+>=gnome-extra/fast-user-switch-applet-2.22
+>=app-admin/sabayon-2.21
+>=gnome-base/gnome-applets-2.22
+>=gnome-base/gnome-volume-manager-2.22
+>=mail-client/evolution-2.22
+>=gnome-extra/evolution-exchange-2.22
+>=gnome-extra/gnome-screensaver-2.22
+>=gnome-extra/gnome-power-manager-2.22
+dev-libs/totem-pl-parser
+>=media-plugins/gst-plugins-meta-0.10-r2
+>=media-sound/rhythmbox-0.11.4
+>=media-video/totem-2.22
+gnome-base/gnome-settings-daemon
+>=gnome-base/control-center-2.22
+>=gnome-base/gnome-session-2.22
+>=gnome-base/eel-2.22
+gnome-base/gvfs
+>=gnome-base/nautilus-2.22
+>=gnome-extra/nautilus-cd-burner-2.22
+>=gnome-extra/nautilus-open-terminal-0.9
+>=gnome-base/gdm-2.20.4
+>=gnome-extra/gnome-media-2.22
+>=gnome-extra/gnome2-user-docs-2.22
+>=x11-themes/gnome-themes-extras-2.22
+>=gnome-base/gnome-light-2.22
+>=gnome-base/gnome-2.22
+# End of GNOME 2.22 mask
+
+
+
diff --git a/profiles/embedded/package.mask b/profiles/embedded/package.mask
new file mode 100644
index 000000000000..8e7612c5bf07
--- /dev/null
+++ b/profiles/embedded/package.mask
@@ -0,0 +1,90 @@
+# Copyright 2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/embedded/package.mask,v 1.1 2008/04/05 22:19:27 halcy0n Exp $
+
+# Mart Raudsepp <leio@gentoo.org> (16 Mar 2008)
+# The Great GNOME 2.22 Mask (tm)
+# Will be unmasked when everything is in, everything is ready and
+# there are no big bugs remaining.
+>=app-accessibility/dasher-4.7
+>=app-accessibility/gnome-mag-0.15.0
+>=app-crypt/seahorse-2.22
+>=gnome-base/libgtop-2.22
+>=x11-themes/gtk-engines-2.14
+>=gnome-base/libbonobo-2.22
+>=x11-libs/libwnck-2.22
+>=x11-themes/gnome-backgrounds-2.22
+>=gnome-base/gail-1.22
+>=app-text/rarian-0.8
+>=gnome-base/gnome-menus-2.22
+>=dev-python/pygtksourceview-2.2.0
+>=gnome-base/gconf-2.22
+>=x11-wm/metacity-2.22
+>=gnome-extra/gucharmap-2.22
+>=gnome-extra/gcalctool-5.22
+>=x11-themes/gnome-icon-theme-2.22
+>=x11-themes/gnome-themes-2.22
+>=gnome-extra/zenity-2.22
+>=gnome-extra/at-spi-1.21
+>=gnome-base/libgnomeui-2.22
+>=gnome-base/gnome-desktop-2.22
+>=x11-terms/gnome-terminal-2.22
+>=gnome-base/gnome-vfs-2.22
+>=gnome-base/libgnome-2.22
+dev-libs/libgweather
+>=app-editors/gedit-2.22
+>=gnome-base/libbonoboui-2.22
+>=gnome-base/libgnomekbd-2.21
+>=gnome-extra/gconf-editor-2.22
+>=media-sound/sound-juicer-2.22
+>=gnome-extra/yelp-2.22
+>=app-arch/file-roller-2.22
+>=dev-python/gnome-python-2.22
+>=gnome-extra/gtkhtml-3.18
+>=www-client/epiphany-2.22
+>=www-client/epiphany-extensions-2.22
+>=media-gfx/eog-2.22
+>=app-accessibility/orca-2.22
+>=gnome-base/librsvg-2.22
+>=gnome-extra/gnome-system-monitor-2.22
+>=gnome-base/gnome-keyring-2.22
+>=gnome-extra/evolution-data-server-2.22
+>=net-misc/vino-2.22
+>=app-text/evince-2.22
+>=gnome-base/gnome-panel-2.22
+>=gnome-extra/bug-buddy-2.22
+>=gnome-extra/evolution-webcal-2.21
+>=dev-python/gnome-python-desktop-2.22
+>=gnome-extra/gnome-games-2.22
+>=gnome-extra/deskbar-applet-2.22
+>=net-analyzer/gnome-nettool-2.22
+>=gnome-extra/fast-user-switch-applet-2.22
+>=app-admin/sabayon-2.21
+>=gnome-base/gnome-applets-2.22
+>=gnome-base/gnome-volume-manager-2.22
+>=mail-client/evolution-2.22
+>=gnome-extra/evolution-exchange-2.22
+>=gnome-extra/gnome-screensaver-2.22
+>=gnome-extra/gnome-power-manager-2.22
+dev-libs/totem-pl-parser
+>=media-plugins/gst-plugins-meta-0.10-r2
+>=media-sound/rhythmbox-0.11.4
+>=media-video/totem-2.22
+gnome-base/gnome-settings-daemon
+>=gnome-base/control-center-2.22
+>=gnome-base/gnome-session-2.22
+>=gnome-base/eel-2.22
+gnome-base/gvfs
+>=gnome-base/nautilus-2.22
+>=gnome-extra/nautilus-cd-burner-2.22
+>=gnome-extra/nautilus-open-terminal-0.9
+>=gnome-base/gdm-2.20.4
+>=gnome-extra/gnome-media-2.22
+>=gnome-extra/gnome2-user-docs-2.22
+>=x11-themes/gnome-themes-extras-2.22
+>=gnome-base/gnome-light-2.22
+>=gnome-base/gnome-2.22
+# End of GNOME 2.22 mask
+
+
+
diff --git a/profiles/package.mask b/profiles/package.mask
index e1406f2da22e..80cb6f751910 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8473 2008/04/05 17:40:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.8474 2008/04/05 22:19:26 halcy0n Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked
@@ -144,90 +144,6 @@ net-firewall/conntrack
 # Bug #173703
 dev-util/jam
 
-# Mart Raudsepp <leio@gentoo.org> (16 Mar 2008)
-# The Great GNOME 2.22 Mask (tm)
-# Will be unmasked when everything is in, everything is ready and
-# there are no big bugs remaining.
->=app-accessibility/dasher-4.7
->=app-accessibility/gnome-mag-0.15.0
->=app-crypt/seahorse-2.22
->=gnome-base/libgtop-2.22
->=x11-themes/gtk-engines-2.14
->=gnome-base/libbonobo-2.22
->=x11-libs/libwnck-2.22
->=x11-themes/gnome-backgrounds-2.22
->=gnome-base/gail-1.22
->=app-text/rarian-0.8
->=gnome-base/gnome-menus-2.22
->=dev-python/pygtksourceview-2.2.0
->=gnome-base/gconf-2.22
->=x11-wm/metacity-2.22
->=gnome-extra/gucharmap-2.22
->=gnome-extra/gcalctool-5.22
->=x11-themes/gnome-icon-theme-2.22
->=x11-themes/gnome-themes-2.22
->=gnome-extra/zenity-2.22
->=gnome-extra/at-spi-1.21
->=gnome-base/libgnomeui-2.22
->=gnome-base/gnome-desktop-2.22
->=x11-terms/gnome-terminal-2.22
->=gnome-base/gnome-vfs-2.22
->=gnome-base/libgnome-2.22
-dev-libs/libgweather
->=app-editors/gedit-2.22
->=gnome-base/libbonoboui-2.22
->=gnome-base/libgnomekbd-2.21
->=gnome-extra/gconf-editor-2.22
->=media-sound/sound-juicer-2.22
->=gnome-extra/yelp-2.22
->=app-arch/file-roller-2.22
->=dev-python/gnome-python-2.22
->=gnome-extra/gtkhtml-3.18
->=www-client/epiphany-2.22
->=www-client/epiphany-extensions-2.22
->=media-gfx/eog-2.22
->=app-accessibility/orca-2.22
->=gnome-base/librsvg-2.22
->=gnome-extra/gnome-system-monitor-2.22
->=gnome-base/gnome-keyring-2.22
->=gnome-extra/evolution-data-server-2.22
->=net-misc/vino-2.22
->=app-text/evince-2.22
->=gnome-base/gnome-panel-2.22
->=gnome-extra/bug-buddy-2.22
->=gnome-extra/evolution-webcal-2.21
->=dev-python/gnome-python-desktop-2.22
->=gnome-extra/gnome-games-2.22
->=gnome-extra/deskbar-applet-2.22
->=net-analyzer/gnome-nettool-2.22
->=gnome-extra/fast-user-switch-applet-2.22
->=app-admin/sabayon-2.21
->=gnome-base/gnome-applets-2.22
->=gnome-base/gnome-volume-manager-2.22
->=mail-client/evolution-2.22
->=gnome-extra/evolution-exchange-2.22
->=gnome-extra/gnome-screensaver-2.22
->=gnome-extra/gnome-power-manager-2.22
-dev-libs/totem-pl-parser
->=media-plugins/gst-plugins-meta-0.10-r2
->=media-sound/rhythmbox-0.11.4
->=media-video/totem-2.22
-gnome-base/gnome-settings-daemon
->=gnome-base/control-center-2.22
->=gnome-base/gnome-session-2.22
->=gnome-base/eel-2.22
-gnome-base/gvfs
->=gnome-base/nautilus-2.22
->=gnome-extra/nautilus-cd-burner-2.22
->=gnome-extra/nautilus-open-terminal-0.9
->=gnome-base/gdm-2.20.4
->=gnome-extra/gnome-media-2.22
->=gnome-extra/gnome2-user-docs-2.22
->=x11-themes/gnome-themes-extras-2.22
->=gnome-base/gnome-light-2.22
->=gnome-base/gnome-2.22
-# End of GNOME 2.22 mask
-
 # Denis Dupeyron <calchan@gentoo.org> (15 Mar 2008)
 # Masked for removal in 30 days. Requires Tcl 8.3 which
 # isn't in the tree anymore. See bugs 172356 and 173467.
diff --git a/profiles/selinux/package.mask b/profiles/selinux/package.mask
index ef8b56c003a2..ccef7956d985 100644
--- a/profiles/selinux/package.mask
+++ b/profiles/selinux/package.mask
@@ -1,4 +1,88 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.28 2008/04/01 15:40:38 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/package.mask,v 1.29 2008/04/05 22:19:28 halcy0n Exp $
+
+# Mart Raudsepp <leio@gentoo.org> (16 Mar 2008)
+# The Great GNOME 2.22 Mask (tm)
+# Will be unmasked when everything is in, everything is ready and
+# there are no big bugs remaining.
+>=app-accessibility/dasher-4.7
+>=app-accessibility/gnome-mag-0.15.0
+>=app-crypt/seahorse-2.22
+>=gnome-base/libgtop-2.22
+>=x11-themes/gtk-engines-2.14
+>=gnome-base/libbonobo-2.22
+>=x11-libs/libwnck-2.22
+>=x11-themes/gnome-backgrounds-2.22
+>=gnome-base/gail-1.22
+>=app-text/rarian-0.8
+>=gnome-base/gnome-menus-2.22
+>=dev-python/pygtksourceview-2.2.0
+>=gnome-base/gconf-2.22
+>=x11-wm/metacity-2.22
+>=gnome-extra/gucharmap-2.22
+>=gnome-extra/gcalctool-5.22
+>=x11-themes/gnome-icon-theme-2.22
+>=x11-themes/gnome-themes-2.22
+>=gnome-extra/zenity-2.22
+>=gnome-extra/at-spi-1.21
+>=gnome-base/libgnomeui-2.22
+>=gnome-base/gnome-desktop-2.22
+>=x11-terms/gnome-terminal-2.22
+>=gnome-base/gnome-vfs-2.22
+>=gnome-base/libgnome-2.22
+dev-libs/libgweather
+>=app-editors/gedit-2.22
+>=gnome-base/libbonoboui-2.22
+>=gnome-base/libgnomekbd-2.21
+>=gnome-extra/gconf-editor-2.22
+>=media-sound/sound-juicer-2.22
+>=gnome-extra/yelp-2.22
+>=app-arch/file-roller-2.22
+>=dev-python/gnome-python-2.22
+>=gnome-extra/gtkhtml-3.18
+>=www-client/epiphany-2.22
+>=www-client/epiphany-extensions-2.22
+>=media-gfx/eog-2.22
+>=app-accessibility/orca-2.22
+>=gnome-base/librsvg-2.22
+>=gnome-extra/gnome-system-monitor-2.22
+>=gnome-base/gnome-keyring-2.22
+>=gnome-extra/evolution-data-server-2.22
+>=net-misc/vino-2.22
+>=app-text/evince-2.22
+>=gnome-base/gnome-panel-2.22
+>=gnome-extra/bug-buddy-2.22
+>=gnome-extra/evolution-webcal-2.21
+>=dev-python/gnome-python-desktop-2.22
+>=gnome-extra/gnome-games-2.22
+>=gnome-extra/deskbar-applet-2.22
+>=net-analyzer/gnome-nettool-2.22
+>=gnome-extra/fast-user-switch-applet-2.22
+>=app-admin/sabayon-2.21
+>=gnome-base/gnome-applets-2.22
+>=gnome-base/gnome-volume-manager-2.22
+>=mail-client/evolution-2.22
+>=gnome-extra/evolution-exchange-2.22
+>=gnome-extra/gnome-screensaver-2.22
+>=gnome-extra/gnome-power-manager-2.22
+dev-libs/totem-pl-parser
+>=media-plugins/gst-plugins-meta-0.10-r2
+>=media-sound/rhythmbox-0.11.4
+>=media-video/totem-2.22
+gnome-base/gnome-settings-daemon
+>=gnome-base/control-center-2.22
+>=gnome-base/gnome-session-2.22
+>=gnome-base/eel-2.22
+gnome-base/gvfs
+>=gnome-base/nautilus-2.22
+>=gnome-extra/nautilus-cd-burner-2.22
+>=gnome-extra/nautilus-open-terminal-0.9
+>=gnome-base/gdm-2.20.4
+>=gnome-extra/gnome-media-2.22
+>=gnome-extra/gnome2-user-docs-2.22
+>=x11-themes/gnome-themes-extras-2.22
+>=gnome-base/gnome-light-2.22
+>=gnome-base/gnome-2.22
+# End of GNOME 2.22 mask
 
 # Chris PeBenito <pebenito@gentoo.org> (11 Oct 2006)
 # Requires old GDM, which will not work with SELinux.  All