From a654ed12ed22318891a14ab5367192df3ce57c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?=
 <atratsevskiy@atratsevskiy.local.calculate.ru>
Date: Tue, 7 Sep 2010 16:28:41 +0400
Subject: [PATCH] Added USE="consolekit policykit" for desktops (IsueID #174),
 added USE="gnome-keyring" for passwords storage for CLDG and CLDX.

---
 profiles/calculate/desktop/CLD/package.use              | 1 -
 profiles/calculate/desktop/CLDG/make.conf/make.defaults | 2 +-
 profiles/calculate/desktop/CLDG/package.use             | 2 --
 profiles/calculate/desktop/CLDX/make.conf/make.defaults | 3 +++
 profiles/calculate/desktop/make.conf/make.defaults      | 2 +-
 profiles/calculate/desktop/package.use                  | 7 -------
 profiles/calculate/package.use                          | 2 --
 7 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/profiles/calculate/desktop/CLD/package.use b/profiles/calculate/desktop/CLD/package.use
index c855a5f70..278125ccf 100644
--- a/profiles/calculate/desktop/CLD/package.use
+++ b/profiles/calculate/desktop/CLD/package.use
@@ -17,5 +17,4 @@ net-print/gutenprint gimp
 media-sound/phonon gstreamer
 
 dev-lang/lua deprecated
-sys-auth/pambase consolekit
 
diff --git a/profiles/calculate/desktop/CLDG/make.conf/make.defaults b/profiles/calculate/desktop/CLDG/make.conf/make.defaults
index 5b81dae8d..6ba8953d1 100644
--- a/profiles/calculate/desktop/CLDG/make.conf/make.defaults
+++ b/profiles/calculate/desktop/CLDG/make.conf/make.defaults
@@ -1,7 +1,7 @@
 USE=""
 
 # System
-USE="${USE} networkmanager"
+USE="${USE} gnome-keyring networkmanager"
 
 # Window manager and speciality
 USE="${USE} gnome -kde"
diff --git a/profiles/calculate/desktop/CLDG/package.use b/profiles/calculate/desktop/CLDG/package.use
index 948fa9421..e4f93ad63 100644
--- a/profiles/calculate/desktop/CLDG/package.use
+++ b/profiles/calculate/desktop/CLDG/package.use
@@ -6,9 +6,7 @@ gnome-base/gvfs archive fuse gdu
 gnome-extra/nm-applet -bluetooth
 net-wireless/blueman network
 sys-fs/udev extras
-sys-auth/consolekit policykit
 sys-block/gparted dmraid fat jfs ntfs reiserfs xfs
 gnome-base/gnome-applets gstreamer
-gnome-base/gnome-session policykit
 sys-block/parted device-mapper
 dev-lang/python sqlite
diff --git a/profiles/calculate/desktop/CLDX/make.conf/make.defaults b/profiles/calculate/desktop/CLDX/make.conf/make.defaults
index f61028e13..f3c1ecd9a 100644
--- a/profiles/calculate/desktop/CLDX/make.conf/make.defaults
+++ b/profiles/calculate/desktop/CLDX/make.conf/make.defaults
@@ -3,6 +3,9 @@ USE=""
 # Network protocols
 USE="${USE} ldap rdesktop"
 
+# System
+USE="${USE} gnome-keyring"
+
 # Window manager and specialities
 USE="${USE} -eds -gnome -kde"
 
diff --git a/profiles/calculate/desktop/make.conf/make.defaults b/profiles/calculate/desktop/make.conf/make.defaults
index 9ad4fae83..ca343c5dc 100644
--- a/profiles/calculate/desktop/make.conf/make.defaults
+++ b/profiles/calculate/desktop/make.conf/make.defaults
@@ -36,7 +36,7 @@ USE="${USE} mbox"
 USE="${USE} gphoto2"
 
 # System
-USE="${USE} nsplugin"
+USE="${USE} consolekit nsplugin policykit"
 
 # Video
 USE="${USE} a52 aac aalib avi cddb dv encode fbcon ffmpeg flash ggi libcaca lzo matroska mplayer musepack real sdl speex srt svga tga quicktime theora v4l v4l2 vidix win32codecs xanim x264 xine xinerama xv xvid xvmc"
diff --git a/profiles/calculate/desktop/package.use b/profiles/calculate/desktop/package.use
index 22cb29984..6361e3efc 100644
--- a/profiles/calculate/desktop/package.use
+++ b/profiles/calculate/desktop/package.use
@@ -39,11 +39,6 @@ x11-misc/xscreensaver -opengl -jpeg
 #added support flash in amd64
 www-plugins/adobe-flash nspluginwrapper
 
-#for compile with sys-auth/pambase
-net-wireless/bluez -consolekit
-
-#for compile with gnome-base/gdm
-sys-auth/pambase consolekit
 app-misc/cls-meta kernel
 
 #for media-video/openshot-1.0.0
@@ -52,5 +47,3 @@ media-libs/mlt frei0r
 #for www-client/firefox-3.6
 dev-db/sqlite fts3
 
-#support mount flash
-sys-apps/hal -policykit
diff --git a/profiles/calculate/package.use b/profiles/calculate/package.use
index ce6a312aa..df6779416 100644
--- a/profiles/calculate/package.use
+++ b/profiles/calculate/package.use
@@ -7,8 +7,6 @@ sys-kernel/calculate-sources symlink vmlinuz
 
 #fix update xorg
 sys-fs/udev extras
-sys-auth/consolekit policykit
-sys-apps/hal policykit
 
 #disable Xorg dependence
 media-fonts/terminus-font -pcf -X