summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask12
2 files changed, 15 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e52a5deb60d1..9d507a9c2870 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,16 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5844 2011/10/30 05:11:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5845 2011/10/30 06:56:12 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!
30 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
+ Final (hopefully) update for the gnome-3.2 mask. Also, unmask yelp-xsl: it
+ doesn't depend on anything masked and shouldn't collide with gnome-2.
+
+ 30 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
Add >=libgdata-0.9 to the gnome-3.2 mask (significant API changes).
30 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 53e13e4684cb..961c7dc7576b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13186 2011/10/30 05:11:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13187 2011/10/30 06:56:12 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
@@ -647,7 +647,6 @@ gnome-extra/office-runner
>=x11-terms/gnome-terminal-3.0
# Documentation
>=gnome-extra/yelp-3.0
->=gnome-extra/yelp-xsl-3.0
>=dev-util/gnome-devel-docs-3.0
>=gnome-extra/gnome-user-docs-3.0
# NetworkManager
@@ -748,19 +747,28 @@ sci-chemistry/webmo
# Nirbheek Chauhan <nirbheek@gentoo.org> (14 Jun 2011)
# GNOME 3.2 mask
+>=app-accessibility/caribou-0.4
+app-admin/eselect-gnome-shell-extensions
>=app-misc/tracker-0.12
+>=dev-libs/folks-0.6
>=dev-libs/gobject-introspection-1.29
>=dev-libs/gjs-1.29
>=dev-libs/libgdata-0.9
>=dev-libs/libpeas-1.2
+>=dev-python/pyatspi-2.2
>=dev-python/pygobject-2.28.6-r50
+>=gnome-base/gconf-3.2
+>=gnome-extra/at-spi-2.2
gnome-extra/gnome-contacts
gnome-extra/gnome-documents
+gnome-extra/gnome-shell-extensions
>=gnome-extra/nautilus-tracker-tags-0.12
gnome-extra/sushi
>=media-libs/clutter-1.7
>=media-libs/cogl-1.7
>=net-libs/gnome-online-accounts-3
+>=x11-libs/libcryptui-3
+>=x11-misc/alacarte-0.13.2-r50
# Diego E. Pettenò <flameeyes@gentoo.org> (8 Jun 2011)
# Broken upstream