From 798c14d10c7e00b16ea07aa2ca34859748277e39 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Tue, 15 May 2012 12:10:31 +0000
Subject: Enable USE="udisks upower" and move USE="gdu" to package.use for
 <gnome-base/gvfs-1.12.

---
 profiles/ChangeLog                     | 7 ++++++-
 profiles/targets/desktop/make.defaults | 4 ++--
 profiles/targets/desktop/package.use   | 7 ++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'profiles')

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 431533af8307..38d142a3e6fe 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6551 2012/05/15 09:13:39 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6552 2012/05/15 12:10:30 ssuominen 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!
 
+  15 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  targets/desktop/make.defaults, targets/desktop/package.use:
+  Enable USE="udisks upower" and move USE="gdu" to package.use for
+  <gnome-base/gvfs-1.12.
+
   15 May 2012; Alistair Bush <ali_bush@gentoo.org> package.mask:
   Add additional mono related packages to packages.mask.
 
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 214fb4fc1d2d..f1bfc566f21a 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/make.defaults,v 1.22 2012/04/16 08:38:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/make.defaults,v 1.23 2012/05/15 12:10:31 ssuominen Exp $
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit dbus dts dvd dvdr emboss encode exif fam firefox flac gdu gif gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 sdl spell startup-notification svg tiff truetype vorbis udev unicode usb wxwidgets X xcb x264 xml xulrunner xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit dbus dts dvd dvdr emboss encode exif fam firefox flac gif gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xulrunner xv xvid"
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 47f72fb8b62c..f7fe86f5afcd 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.18 2012/03/15 08:00:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.19 2012/05/15 12:10:31 ssuominen Exp $
+
+# Samuli Suominen <ssuominen@gentoo.org> (15 May 2012)
+# Replaced by USE="udisks" in make.defaults. Remove this line after
+# >=gnome-base/gvfs-1.12 has stabilized.
+<gnome-base/gvfs-1.12 gdu
 
 # Jeremy Olexa <darkside@gentoo.org> (07 Oct 2011)
 # Required by mesa, ultimately by xorg-server (every desktop) bug 385843
-- 
cgit v1.2.3-65-gdbad