Remove the global GNOME-2.22 mask in base profiles and the therefore unnecessary per-arch unmasks of GNOME-2.22

13 files changed, 16 insertions, 1013 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 1b3dbb8d2ed3..58b5537db195 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,20 @@
 # ChangeLog for profile directory
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1846 2008/09/07 04:00:47 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1847 2008/09/07 05:14:11 leio Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  07 Sep 2008; Mart Raudsepp <leio@gentoo.org> arch/alpha/package.mask,
+  arch/amd64/package.mask, -arch/ia64/package.mask, arch/sparc/package.mask,
+  arch/x86/package.mask, -base/package.mask,
+  default-linux/alpha/2007.0/package.mask, default-linux/amd64/package.mask,
+  -default-linux/ia64/package.mask, default-linux/sparc/package.mask,
+  default-linux/x86/package.mask, -embedded/package.mask:
+  Remove the global GNOME-2.22 mask in base profiles and the therefore
+  unnecessary per-arch unmasks of GNOME-2.22
+
   07 Sep 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   package.mask:
   Removed kde-base/qimageblitz-0.0.4 from the kde-4 mask as it's required
diff --git a/profiles/arch/alpha/package.mask b/profiles/arch/alpha/package.mask
index 9dbff535b73e..fed81755e8e5 100644
--- a/profiles/arch/alpha/package.mask
+++ b/profiles/arch/alpha/package.mask
@@ -19,86 +19,3 @@ dev-util/jarwizard
 # https://bugs.freedesktop.org/show_bug.cgi?id=16060
 =x11-drivers/xf86-video-glint-1.2.0
 
-# Gilles Dartiguelongue <eva@gentoo.org> (08 Jun 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
-
diff --git a/profiles/arch/amd64/package.mask b/profiles/arch/amd64/package.mask
index d1e23f79d28b..682ec57c030a 100644
--- a/profiles/arch/amd64/package.mask
+++ b/profiles/arch/amd64/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.mask,v 1.7 2008/06/07 08:08:11 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.mask,v 1.8 2008/09/07 05:14:12 leio Exp $
 
 # 2005.0 Jeremy Huddleston <eradicator@gentoo.org>
 # This is a stub file 'cause glibc provides 32bit libs on newer profiles
@@ -8,86 +8,3 @@
 # OpenOffice.org versions prior to 2.0.4 do not work in 64bit mode
 <app-office/openoffice-2.0.4
 
-# Mart Raudsepp <leio@gentoo.org> (03 Apr 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
-
diff --git a/profiles/arch/ia64/package.mask b/profiles/arch/ia64/package.mask
deleted file mode 100644
index e28a1c5a989b..000000000000
--- a/profiles/arch/ia64/package.mask
+++ /dev/null
@@ -1,82 +0,0 @@
-# Gilles Dartiguelongue <eva@gentoo.org> (08 Jun 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
diff --git a/profiles/arch/sparc/package.mask b/profiles/arch/sparc/package.mask
index 259684bff033..c9116a902b0b 100644
--- a/profiles/arch/sparc/package.mask
+++ b/profiles/arch/sparc/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.mask,v 1.4 2008/08/15 11:41:47 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.mask,v 1.5 2008/09/07 05:14:14 leio Exp $
 
 # Jason Wever <weeve@gentoo.org>
 # gradm requires 64 bit support, which doesn't exist in this profile
@@ -37,85 +37,3 @@ dev-lang/mono
 dev-util/mono-tools
 dev-util/monodoc
 
-# Friedrich Olsage <bluebird@gentoo.org> (15 Aug 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index 4e5617ac62ac..3aae0fd74f8b 100644
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -1,90 +1,6 @@
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.mask,v 1.7 2008/06/07 08:08:12 drac Exp $
-
-# Mart Raudsepp <leio@gentoo.org> (03 Apr 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
-
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.mask,v 1.8 2008/09/07 05:14:14 leio Exp $
 
 # Christian Faulhammer <opfer@gentoo.org> (05 Dec 2006)
 # this version is badly broken on x86, see bug #153280
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
deleted file mode 100644
index e108ee662eaa..000000000000
--- a/profiles/base/package.mask
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.5 2008/06/07 08:08:13 drac 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-sound/rhythmbox-0.11.4
->=media-video/totem-2.22
-gnome-base/gnome-settings-daemon
->=gnome-base/gnome-control-center-2.22
->=gnome-base/gnome-session-2.22
->=gnome-base/eel-2.22
-gnome-base/gvfs
->=app-cdr/brasero-0.7.90
->=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
->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 mask
-
-
-
diff --git a/profiles/default-linux/alpha/2007.0/package.mask b/profiles/default-linux/alpha/2007.0/package.mask
index d6606ca23a33..b430a808782d 100644
--- a/profiles/default-linux/alpha/2007.0/package.mask
+++ b/profiles/default-linux/alpha/2007.0/package.mask
@@ -1,86 +1,3 @@
-# Gilles Dartiguelongue <eva@gentoo.org> (08 Jun 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
-
 # Shouldn't be merging these SELinux packages on this profile
 # but this keeps repoman happy since they require >=glibc-2.4
 # 20061008 pebenito
diff --git a/profiles/default-linux/amd64/package.mask b/profiles/default-linux/amd64/package.mask
index 62a516d9b2f5..2029048aab0b 100644
--- a/profiles/default-linux/amd64/package.mask
+++ b/profiles/default-linux/amd64/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/package.mask,v 1.15 2008/06/07 08:08:13 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/package.mask,v 1.16 2008/09/07 05:14:16 leio Exp $
 
 # 2005.0 Jeremy Huddleston <eradicator@gentoo.org>
 # This is a stub file 'cause glibc provides 32bit libs on newer profiles
@@ -8,85 +8,3 @@
 # OpenOffice.org versions prior to 2.0.4 do not work in 64bit mode
 <app-office/openoffice-2.0.4
 
-# Mart Raudsepp <leio@gentoo.org> (03 Apr 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
diff --git a/profiles/default-linux/ia64/package.mask b/profiles/default-linux/ia64/package.mask
deleted file mode 100644
index e28a1c5a989b..000000000000
--- a/profiles/default-linux/ia64/package.mask
+++ /dev/null
@@ -1,82 +0,0 @@
-# Gilles Dartiguelongue <eva@gentoo.org> (08 Jun 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
diff --git a/profiles/default-linux/sparc/package.mask b/profiles/default-linux/sparc/package.mask
index 142dff985ef5..ef0e5fcd3f96 100644
--- a/profiles/default-linux/sparc/package.mask
+++ b/profiles/default-linux/sparc/package.mask
@@ -1,90 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/package.mask,v 1.2 2008/06/08 21:11:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/package.mask,v 1.3 2008/09/07 05:14:17 leio Exp $
 
 # Gustavo Zacarias <gustavoz@gentoo.org>
 # Broken, no way to test it, see bug #155887 and bug #186958
 app-accessibility/brltty
 
-# Gilles Dartiguelongue <eva@gentoo.org> (08 Jun 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
diff --git a/profiles/default-linux/x86/package.mask b/profiles/default-linux/x86/package.mask
index 6505ac69b129..89639340e892 100644
--- a/profiles/default-linux/x86/package.mask
+++ b/profiles/default-linux/x86/package.mask
@@ -1,89 +1,6 @@
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/package.mask,v 1.12 2008/06/07 08:08:14 drac Exp $
-
-# Mart Raudsepp <leio@gentoo.org> (03 Apr 2008)
-# The Great GNOME 2.22 Unmask (tm)
-->=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-sound/rhythmbox-0.11.4
-->=media-video/totem-2.22
--gnome-base/gnome-settings-daemon
-->=gnome-base/gnome-control-center-2.22
-->=gnome-base/gnome-session-2.22
-->=gnome-base/eel-2.22
--gnome-base/gvfs
-->=app-cdr/brasero-0.7.90
-->=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
-->=net-im/telepathy-mission-control-4.65
-# End of GNOME 2.22 unmask
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/package.mask,v 1.13 2008/09/07 05:14:18 leio Exp $
 
 # Christian Faulhammer <opfer@gentoo.org> (05 Dec 2006)
 # this version is badly broken on x86, see bug #153280
diff --git a/profiles/embedded/package.mask b/profiles/embedded/package.mask
deleted file mode 100644
index 1da97329ffa0..000000000000
--- a/profiles/embedded/package.mask
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.3 2008/06/06 08:16:11 remi 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-sound/rhythmbox-0.11.4
->=media-video/totem-2.22
-gnome-base/gnome-settings-daemon
->=gnome-base/gnome-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
-
-
-