From 46ba5a30b767209129592d3377934ec434d4e36f Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 4 Oct 2011 21:02:09 +0000 Subject: [PATCH] Mask g-d-u -r300 with the rest of Gnome3 stuff, letting us to drop nautilus use mask. --- profiles/ChangeLog | 7 ++++++- profiles/base/package.use.mask | 6 +----- profiles/package.mask | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 2e22723fe36f..073b3c926e3d 100644 --- 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 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 +updates/4Q-2011: Move libtextcat to libexttextcat. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 87b1a3bf730e..7a305a29547e 100644 --- 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 (02 Oct 2011) -# This entry can be removed when nautilus >= 3 is in testing ->=sys-apps/gnome-disk-utility-3 nautilus - # Nirbheek Chauhan (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 d8b68b7b61ba..2103f0a31c9f 100644 --- 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 -- 2.26.2