summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2014-05-10 20:25:39 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2014-05-10 20:25:39 +0000
commit2a85aae619f56d16b50e9c735492adff3c587a7d (patch)
tree70b8fc124dcb61be5e7b18064392936eb4238bb9 /profiles
parentVersion bump (bug #487678). Lots of changes, lots of new dependencies, see ht... (diff)
downloadgentoo-2-2a85aae619f56d16b50e9c735492adff3c587a7d.tar.gz
gentoo-2-2a85aae619f56d16b50e9c735492adff3c587a7d.tar.bz2
gentoo-2-2a85aae619f56d16b50e9c735492adff3c587a7d.zip
Unmask Cinnamon 2.2 (bug #487678).
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask16
2 files changed, 5 insertions, 16 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 94a5b37c81a4..fdac86943c82 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8941 2014/05/10 18:08:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8942 2014/05/10 20:25:38 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!
10 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
+ Unmask Cinnamon 2.2 (bug #487678).
+
+ 10 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
Expand cinnamon mask
10 May 2014; Michał Górny <mgorny@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 96b2482a2117..6596ae9d098d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15669 2014/05/10 18:08:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15670 2014/05/10 20:25:39 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
@@ -76,20 +76,6 @@ dev-ruby/fastthread
>=app-emulation/emul-linux-x86-soundlibs-20140506
>=app-emulation/emul-linux-x86-xlibs-20140506
-# Alexandre Rostovtsev <tetromino@gentoo.org> (06 May 2014)
-# Mask individual pieces of Cinnamon 2.2 until it's complete
-gnome-extra/cjs
-gnome-extra/cinnamon-desktop
-gnome-extra/cinnamon-menus
-gnome-extra/cinnamon-session
-gnome-extra/cinnamon-settings-daemon
-gnome-extra/cinnamon-control-center
-gnome-extra/cinnamon-screensaver
-net-wireless/cinnamon-bluetooth
->=x11-wm/muffin-2.2
->=gnome-extra/nemo-2.2
->=gnome-extra/cinnamon-2.2
-
# Brian Evans <grknight@gentoo.org> (05 May 2014)
# Mask erroenous slot for removal in 30 days
dev-db/mysql++:3