Mask g-d-u -r300 with the rest of Gnome3 stuff, letting us to drop nautilus use mask.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 2e22723fe36fc1821c30248680f20c9917f08112..073b3c926e3d7ce917ab7e3d890174cdacfd11f3 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +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.5749 2011/10/04 19:18:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5750 2011/10/04 21:02:08 pacho 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!
 
+  04 Oct 2011; Pacho Ramos <pacho@gentoo.org> base/package.use.mask,
+  package.mask:
+  Mask g-d-u -r300 with the rest of Gnome3 stuff, letting us to drop nautilus
+  use mask.
+
   04 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> +updates/4Q-2011:
   Move libtextcat to libexttextcat.
 

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 87b1a3bf730e95a70e8f3371ad4f921884b70a3e..7a305a29547eaee5797fece4929b4c0d86d6c517 100644 (file)
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,14 +1,10 @@
 # Copyright 1999-2011 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.270 2011/10/01 21:20:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.271 2011/10/04 21:02:09 pacho Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
-# Samuli Suominen <ssuominen@gentoo.org> (02 Oct 2011)
-# This entry can be removed when nautilus >= 3 is in testing
->=sys-apps/gnome-disk-utility-3 nautilus
-
 # Nirbheek Chauhan <nirbheek@gentoo.org> (17 Sep 2011)
 # Systemtap is not keyworded on anything except amd64/x86
 # Temporarily mask instead of dropping keywords, bug 384647

diff --git a/profiles/package.mask b/profiles/package.mask
index d8b68b7b61baffe4aebc0cd661d1f47c4719ea02..2103f0a31c9f596d7923412012b4a28817803ce0 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13103 2011/10/04 18:32:06 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13104 2011/10/04 21:02:08 pacho 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
@@ -580,6 +580,7 @@ dev-tex/pdftex
 >=net-misc/vinagre-3.0
 >=net-misc/vino-3.0
 >=net-wireless/gnome-bluetooth-3.0
+>=sys-apps/gnome-disk-utility-3.0.2-r300
 >=www-client/epiphany-3.0
 >=www-client/epiphany-extensions-3.0
 >=x11-terms/gnome-terminal-3.0