Move generic USE flags like "policykit" from desktop/gnome to desktop. Remove "hal" from default USE flags.

5 files changed, 27 insertions, 25 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index add5f9286f56..426b04325951 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4871 2010/12/18 23:01:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4872 2010/12/18 23:53:58 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!
 
+  18 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  targets/desktop/gnome/make.defaults, targets/desktop/gnome/package.use,
+  targets/desktop/make.defaults, targets/desktop/package.use:
+  Move generic USE flags like "policykit" from desktop/gnome to desktop. Remove
+  "hal" from default USE flags.
+
   18 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
   Lastrite rox-base/devtray wrt #313431.
 
diff --git a/profiles/targets/desktop/gnome/make.defaults b/profiles/targets/desktop/gnome/make.defaults
index ba730678c4e9..9fccba1d6833 100644
--- a/profiles/targets/desktop/gnome/make.defaults
+++ b/profiles/targets/desktop/gnome/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/make.defaults,v 1.3 2010/04/09 15:23:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/make.defaults,v 1.4 2010/12/18 23:53:59 ssuominen Exp $
 
-USE="eds evo gdu gnome gnome-keyring gstreamer nautilus policykit startup-notification"
+USE="eds evo gnome gnome-keyring gstreamer nautilus"
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index 63342224369f..58b83c8ac596 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -1,17 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/package.use,v 1.2 2010/09/23 20:00:01 jer Exp $
-
-# Pacho Ramos <pacho@gentoo.org> (09 Apr 2010)
-# Required by gnome-base/gvfs and sys-apps/devicekit-disks. Enabling them,
-# people emerging gnome-base/gnome won't need to change USE flags as will get
-# proper defaults.
-sys-fs/udev extras
-sys-block/parted device-mapper
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/package.use,v 1.3 2010/12/18 23:53:59 ssuominen Exp $
 
 # The following are required by ekiga-3
 net-libs/opal sip
 net-libs/ptlib wav
 
 # Required by app-admin/sabayon
-x11-base/xorg-server kdrive
\ No newline at end of file
+x11-base/xorg-server kdrive
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 00cbd20831b4..b3980b51fd66 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,12 +1,5 @@
 # Copyright 1999-2010 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.17 2010/03/30 11:42:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/make.defaults,v 1.18 2010/12/18 23:53:59 ssuominen Exp $
 
-USE="a52 aac acpi alsa branding cairo cdr dbus dts dvd dvdr emboss encode exif
-fam firefox flac gif gpm gtk hal jpeg lcms ldap libnotify mad mikmod mng mp3
-mp4 mpeg ogg opengl pango pdf png ppds qt3support qt4 sdl spell
-startup-notification svg tiff truetype vorbis unicode usb X xcb x264 xml
-xulrunner xv xvid"
-
-# Adding this for bluetooth support
-USE="${USE} bluetooth consolekit"
+USE="a52 aac acpi alsa bluetooth branding cairo cdr consolekit dbus dts dvd dvdr emboss encode exif fam firefox flac gdu gif gpm gtk jpeg lcms ldap libnotify mad mikmod mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 sdl spell startup-notification svg tiff truetype vorbis unicode usb X xcb x264 xml xulrunner xv xvid"
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 42b47062461a..852107ac4638 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,10 +1,20 @@
 # Copyright 1999-2010 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.6 2010/08/23 22:33:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.7 2010/12/18 23:53:59 ssuominen Exp $
 
-xfce-base/xfdesktop thunar xfce_plugins_menu
-xfce-base/thunar xfce_plugins_trash
-xfce-extra/xfce4-power-manager xfce_plugins_brightness
+# Samuli Suominen <ssuominen@gentoo.org> (19 Dec 2010)
+# Still using obsolete sys-auth/policykit, bugs 340331 and 340337.
+sys-apps/hal -policykit
+
+# Samuli Suominen <ssuominen@gentoo.org> (19 Dec 2010)
+# Required by gnome-base/gvfs, sys-fs/udisks, xfce-base/thunar, x11-misc/pcmanfm, etc.
+sys-fs/udev extras
+sys-block/parted device-mapper
+
+# Samuli Suominen <ssuominen@gentoo.org> (19 Dec 2010)
+# Required for desktop icons integration. Only desktop users should get this
+# dependency hell.
+xfce-base/xfdesktop thunar
 
 # Chris Gianelloni <wolf31o2@gentoo.org> (26 Mar 2008)
 # While we may need LDAP client support, who needs the server on a desktop?