Mask USE="nautilus" for gnome-disk-utility >= 3 pending on nautilus >= 3 unmasking.

diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index e47f686ce5b452ab5a54d5731aef09ef0a827525..c9ab77967babe56b48e71405edcea0c9a5335f62 100644 (file)
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.299 2011/09/27 12:11:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.300 2011/10/01 21:20:07 ssuominen Exp $
+
+  01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> package.use.mask:
+  Mask USE="nautilus" for gnome-disk-utility >= 3 pending on nautilus >= 3
+  unmasking.
 
   27 Sep 2011; Nirbheek Chauhan <nirbheek@gentoo.org> package.use.mask:
   Mask dev-libs/glib[systemtap] and unmask for amd64/x86, bug 384647

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0b3c08e70302426782bc087880d28f3ac1a42585..87b1a3bf730e95a70e8f3371ad4f921884b70a3e 100644 (file)
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,14 @@
 # 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.269 2011/09/27 12:11:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.270 2011/10/01 21:20:07 ssuominen 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