Don't run ck-launch-session from xinitrc because latest xfce4-session will start consolekit session on it's own.

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

5 files changed, 39 insertions, 6 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 4596c2988ebb..82dac3bb8b1a 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.160 2010/09/07 02:18:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.161 2010/09/09 12:31:20 ssuominen Exp $
+
+  09 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce-utils-4.7.0.ebuild, +files/xfce-utils-4.7.0-ck-launch-session.patch:
+  Don't run ck-launch-session from xinitrc because latest xfce4-session will
+  start consolekit session on it's own.
 
   07 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   xfce-utils-4.7.0.ebuild:
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 5d5ef31a2a57..92441f53b10c 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -1,9 +1,10 @@
 AUX Gentoo 644 RMD160 29853c59779a2eb685aa4082bf5c312588fbe633 SHA1 01f2135774ead9534fb374cfbeb7eb123d9aff55 SHA256 1ddff80be5707ff8eb888d8f41d9cd0df5c7e0e1bd84c28ed962b4c71028efc1
 AUX xfce-utils-4.6.x-ck-launch-session.patch 364 RMD160 048b6bf13eb734c756e56850cb099d5aeff13de8 SHA1 6f2b60b5a20173bce9291e6f4dd0964ea8939bca SHA256 2ad6a7e4b3be0886fde0d4513c64acb70bd43291e86c124ee2dd62d8b830a7a5
+AUX xfce-utils-4.7.0-ck-launch-session.patch 741 RMD160 d4da0508a3a438991c402b45efb2ed8e88a6bf52 SHA1 7400473049654fdbb19fb9b2a045c076af6da7e5 SHA256 06fab3b27645784e247d087888c3cdcffa55c5d6dffa104754420ff3bd4fccc2
 DIST xfce-utils-4.6.2.tar.bz2 638094 RMD160 06c33863da0f80f16ef154307e4b89085bc3958f SHA1 6373886c3d70e576859741bde747a235567ffd8e SHA256 54efc2038bfbd5acaadfc91ed91fb3dfd6cec64f9402f364accce7bcafe2ba7a
 DIST xfce-utils-4.7.0.tar.bz2 626692 RMD160 565ad3a16d2db54096808f29d87b254ef0caade6 SHA1 69ee8317b0e99adc175a1c5d21003f082ccb854c SHA256 2c76064686d45d8f57faf20b4600da0e1b4638cce8037ab22abba7e559a2b6be
 EBUILD xfce-utils-4.6.2-r1.ebuild 1558 RMD160 ce07ec597c9290e6a84c64a1339b4baeb11c8974 SHA1 51e8fb33995b5ef5c4e4b09349495d267afeb390 SHA256 c9360c5b049d3a303a923824c6a3f804fab535e7ab6688eeeef115a6364224d3
 EBUILD xfce-utils-4.6.2.ebuild 1514 RMD160 ee2634622cbf9fa66a34a0fa2e0708019fbd4c03 SHA1 3c1ce8e49e68c6ba46e3a48db8340e47479448bf SHA256 8e63762eeab2f206cc5ccbc1fc72a765452263995241da48b64937ce3f2f2fcd
-EBUILD xfce-utils-4.7.0.ebuild 1611 RMD160 ea94ae41d539a81383725908e90d6171fcdb6083 SHA1 2225f6bb39185dc487a77108053f02219ae1c031 SHA256 d6eca8dd474855f69ab83c8a3677769f0fa51894a92d2b20bd6644600cb2a109
-MISC ChangeLog 19866 RMD160 a8208cccc26920db82b1d2c12010a4ce15e1b2a1 SHA1 01d6c2496d57dd513fb94edc2ba0bef8e59fb0f3 SHA256 f25139c88a05ba2fc47cb62a7b15db14ab0c884890243c70e20341e9f2b5d45c
+EBUILD xfce-utils-4.7.0.ebuild 1667 RMD160 7c8011abf8143369de14fcde7c7ee68318317f8c SHA1 db1cb3ebe32940f8424f503e132564c584eeeabd SHA256 6067fa9a95cdd2b47b3e17b54316c87d3187cb898c902830e04e1a5d35afa981
+MISC ChangeLog 20114 RMD160 3b93219379111d75db002fb2351fbe1c4085a00c SHA1 1df7163df0f64ff3a0919b1db53252048cd89817 SHA256 9bd65081fbdd48d7d022c6d38ec6acdaa44cccc26f51cb76b456f92c8d51ad02
 MISC metadata.xml 218 RMD160 e064747a2c888959d939ed09a70c242d905c89ea SHA1 8ff18a8acc37d299a3cc7b30663ca3eb0f91032e SHA256 c47df69ae42900828c5afb0aa77ee6f9ddca55a79b3326f69a0bbf8119f3d5df
diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session.patch b/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session.patch
new file mode 100644
index 000000000000..6e111b7b333e
--- /dev/null
+++ b/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session.patch
@@ -0,0 +1,25 @@
+From ea8c4b0db31855cb144cd5b863a045423d4afbfc Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis@xfce.org>
+Date: Wed, 08 Sep 2010 10:04:05 +0000
+Subject: Drop ck-launch-session as CK is handled in xfce4-session (bug #6684).
+
+---
+diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
+index 2aaf1df..2bd43ec 100755
+--- a/scripts/xinitrc.in.in
++++ b/scripts/xinitrc.in.in
+@@ -196,11 +196,7 @@ fi
+ 
+ # Run xfce4-session if installed
+ if which xfce4-session >/dev/null 2>&1; then
+-    if which ck-launch-session >/dev/null 2>&1; then
+-      ck-launch-session xfce4-session
+-    else
+-      xfce4-session
+-    fi
++    xfce4-session
+ 
+     if test "$ssh_agent_kill_cmd"; then
+         echo "running '$ssh_agent_kill_cmd'"
+--
+cgit v0.8.2.1
diff --git a/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild b/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild
index c632e2614c2f..f1eedd591081 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild,v 1.4 2010/09/07 02:18:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild,v 1.5 2010/09/09 12:31:20 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-ck-launch-session.patch )
 	XFCONF="--docdir=${EPREFIX}/usr/share/doc/${PF}
 		--disable-dependency-tracking
 		$(use_enable dbus)
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 140dcc4f62b8..a420ef9930bd 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,6 +1,7 @@
+AUX xfce4-session-4.7.0-ck-launch-session.patch 7659 RMD160 baf60ff92590636b2bdaf329490d123ed587cbbb SHA1 05de9d398df53ee580413ea2efb5c6fb2abae59f SHA256 6c5895d4b1323c3c06da553936dc7dc894f2da96bf4a0142bb17b2e3ee701bc6
 DIST xfce4-session-4.6.2.tar.bz2 1385541 RMD160 3c45028d57aee5950a485d760799d0c74ada735e SHA1 2a5778a1543f97845f118a186e2dbb8a8ea3ff4b SHA256 725e269254c34c530acb670f5ccd0fd69b57cbe9f2176abd8499fc5d6dcd30a8
 DIST xfce4-session-4.7.0.tar.bz2 1430243 RMD160 e8dc56980a40ef71ec02681f15a178db140ad9fd SHA1 500d1ec578f39ece6b34a6525a8ce0f6e78dc86d SHA256 20e5979306566e5b8f6a556fcdbd2624809051250c33e3f2d0eb67b3911ec218
 EBUILD xfce4-session-4.6.2.ebuild 1651 RMD160 63827c6581d8720ba7205fd1fbf9f816d4caabbc SHA1 dae3fc51c7119453f757b1effaebee17b8fbcaa8 SHA256 3a95405ac286b4195e1072414d966eba3b1a3fb4e825f5b9f3a28e6bc9f1a98c
-EBUILD xfce4-session-4.7.0.ebuild 1368 RMD160 0124b98ef7ff956f738524e7c180eb95acea8306 SHA1 f563ae33c333c7b01fe43484077e6db214e4a50a SHA256 454c25ad3e827a9afea13c7da3b5b7a942b552811300d20341de6a6b064da216
-MISC ChangeLog 15025 RMD160 d7b9bdb67b4909d603943880444806ab83600116 SHA1 bf79d3772003d813fe860d144f8f510112d84042 SHA256 5609255e64cdf2b11fe9b383402d4a42a20b89bda4ce902bc6bc64dc3a0f4cc7
+EBUILD xfce4-session-4.7.0.ebuild 1424 RMD160 7bc4c1aee026931435feedd7191a997f30f91eb8 SHA1 15bb0b21e4eeb688cf4b3969a2998e85b6c32972 SHA256 34ffbf0182f2971d01b179b97e080fac22e567fb1cd1f4b2f1b8dd9c7d892ccd
+MISC ChangeLog 15265 RMD160 9f7ff8440302daf2a979c8746599938b3936127c SHA1 1b2aeaa531410af6898956959bd36130af9be09f SHA256 c9a010fcd473938378af403fcaa1689fa47cc9e267f511126384e4bdcaa7293c
 MISC metadata.xml 365 RMD160 f5394f10309125c57f366f5bc00d72b7ed2c187f SHA1 71fa94d2aa83cffa134f23be4ec0736e78bc8a19 SHA256 3dd7350379719051299f2cd5f5501c0b3c5cf699b1bd0b89e0c9e6517a4c1b4d