Update masks for gnome-3.4.

4 files changed, 21 insertions, 4 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b2699136a383..0f727a391122 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.6359 2012/03/26 05:19:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6360 2012/03/27 04:42:03 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!
 
+  27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
+  Update the gnome-3.4 mask.
+
   26 Mar 2012; Nirbheek Chauhan <nirbheek@gentoo.org> package.mask:
   Add telepathy-farstream-0.2 to the GNOME 3 mask because it causes a blocker
   with farsight2
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index cbb756f188a0..2a5b98331e20 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.367 2012/03/26 20:22:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.368 2012/03/27 04:42:03 tetromino Exp $
+
+  27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
+  Mask x11-libs/gtk+[wayland], requires libxkbcommon from x11 overlay.
 
   26 Mar 2012; <swift@gentoo.org> package.mask:
   Masking out new selinux-sssd package for non-SELinux systems
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7db87768d39e..042218fea359 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,14 @@
 # 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.326 2012/03/25 00:08:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.327 2012/03/27 04:42:03 tetromino Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
+# Requires libxkbcommon from the x11 overlay
+x11-libs/gtk+ wayland
+
 # Johannes Huber <johu@gentoo.org> (23 Mar 2012)
 # Broken dep, see bug #389833.
 kde-base/kdelibs upnp
diff --git a/profiles/package.mask b/profiles/package.mask
index af7eb183e752..515653513dc5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13619 2012/03/26 05:19:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13620 2012/03/27 04:42:03 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
@@ -44,9 +44,16 @@
 
 # Nirbheek Chauhan <nirbheek@gentoo.org> (25 Mar 2012)
 # This is now the GNOME 3.4 mask
+# Core libraries to be unmasked first:
 =dev-libs/glib-2.32*:2
 =dev-util/gdbus-codegen-2.32*
+=x11-libs/gdk-pixbuf-2.26*:2
 =x11-libs/gtk+-3.4*:3
+=x11-libs/gnome-pty-helper-0.32*
+=x11-libs/pango-1.30*
+=x11-libs/vte-0.32*:2.90
+=x11-themes/gnome-themes-standard-3.4*
+# Other stuff:
 >=net-libs/telepathy-farstream-0.2
 # New clutter API breaks almost everything
 =media-libs/cogl-1.10*