Add at-spi2-* to gnome-3.6 mask, and unmask vte-0.34. Mask gtk+[egl] since it's only useful with wayland.

4 files changed, 14 insertions, 6 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 3cd504e9580e..fc6526657497 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6986 2012/09/25 12:33:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6987 2012/09/25 15:15:44 tetromino 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!
 
+  25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
+  Add at-spi2-* to gnome-3.6 mask, and unmask vte-0.34.
+
   25 Sep 2012; Ulrich Müller <ulm@gentoo.org> license_groups:
   Add man-pages to FREE-DOCUMENTS license group.
 
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index a3d993b5b6e6..ec2f1e3f5b85 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.438 2012/09/19 23:44:56 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.439 2012/09/25 15:15:45 tetromino Exp $
+
+  25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Mask gtk+[egl] since it's only useful with wayland.
 
   19 Sep 2012; Matt Turner <mattst88@gentoo.org> package.use.force:
   Add media-libs/glu -multilib to package.use.force
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 093abb7ebbf0..0a7fe562405c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.392 2012/09/20 11:42:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.393 2012/09/25 15:15:45 tetromino Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -136,7 +136,7 @@ media-sound/pulseaudio webrtc-aec xen
 # Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
 # Requires libxkbcommon from the x11 overlay
 dev-cpp/gtkmm wayland
-x11-libs/gtk+ wayland
+x11-libs/gtk+ egl wayland
 
 # Johannes Huber <johu@gentoo.org> (23 Mar 2012)
 # Broken dep upnp, see bug #389833.
diff --git a/profiles/package.mask b/profiles/package.mask
index 945d9ff88b75..3fbb0fb6fdb8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14113 2012/09/25 11:40:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14114 2012/09/25 15:15:44 tetromino 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. Please be extremely
@@ -34,18 +34,20 @@
 # Alexandre Rostovtsev <tetromino@gentoo.org> (25 Sep 2012)
 # GNOME 3.6 mask
 # Core libraries to be unmasked first:
+=app-accessibility/at-spi2-atk-2.6*:2
+=app-accessibility/at-spi2-core-2.6*:2
 =dev-libs/atk-2.6*
 =dev-libs/gjs-1.34*
 =dev-libs/glib-2.34*:2
 =dev-libs/gobject-introspection-1.34*
 =dev-libs/gobject-introspection-common-1.34*
+=dev-python/pyatspi-2.6*
 =dev-python/pygobject-3.4*:3
 =dev-util/gdbus-codegen-2.34*
 =gnome-base/dconf-0.14*
 =gnome-base/gvfs-1.14*
 =net-libs/glib-networking-2.34*
 =x11-libs/gtk+-3.6*:3
-=x11-libs/vte-0.34*:2.90
 =x11-themes/gnome-themes-standard-3.6*
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (18 Sep 2012)