Don't mess with ck-launch-session from xinitrc.

(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)

5 files changed, 8 insertions, 118 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index cf2796156916..a96ec33616b6 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,17 +1,15 @@
 # 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.162 2010/09/10 07:27:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.163 2010/10/28 16:38:06 ssuominen Exp $
 
-  10 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
-  xfce-utils-4.7.0.ebuild,
-  +files/xfce-utils-4.7.0-ck-launch-session-2.patch:
-  Run ck-launch-session again to restore functionality with Thunar disk
-  handling wrt upstream #6690.
+  28 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce-utils-4.6.2-r1.ebuild,
+  -files/xfce-utils-4.6.x-ck-launch-session.patch:
+  Don't mess with ck-launch-session from xinitrc.
 
   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.
+  Don't mess with ck-launch-session from xinitrc.
 
   07 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   xfce-utils-4.7.0.ebuild:
diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.6.x-ck-launch-session.patch b/xfce-base/xfce-utils/files/xfce-utils-4.6.x-ck-launch-session.patch
deleted file mode 100644
index daf4bf82e720..000000000000
--- a/xfce-base/xfce-utils/files/xfce-utils-4.6.x-ck-launch-session.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://git.xfce.org/xfce/xfce-utils/patch/?id=96af982828d767763640c84f38b80bf0d3eb52b1
-
---- scripts/xinitrc.in.in
-+++ scripts/xinitrc.in.in
-@@ -131,7 +131,11 @@
- 	x|xno*)
- 		;;
- 	*)
--		$xfcesm
-+		if type ck-launch-session >/dev/null 2>&1; then
-+			ck-launch-session $xfcesm
-+		else
-+			$xfcesm
-+		fi
- 
- 		if test $kill_sshagent -eq 1; then
- 			eval `$sshagent -k`
diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch b/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch
deleted file mode 100644
index c446cda18e48..000000000000
--- a/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ad0a04125051a4638a31e6e0c2d1dc711676e1ef Mon Sep 17 00:00:00 2001
-From: Mike Massonnet <mmassonnet@xfce.org>
-Date: Wed, 8 Sep 2010 22:01:50 +0200
-Subject: [PATCH] Launch xfce4-session with ck-launch-session and dbus-launch.
-
-Makes shutdown/reboot and mount/unmount work for gvfs when login through
-a tty.
----
- scripts/xinitrc.in.in |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
-index 2bd43ec..241d00f 100755
---- a/scripts/xinitrc.in.in
-+++ b/scripts/xinitrc.in.in
-@@ -196,7 +196,11 @@ fi
- 
- # Run xfce4-session if installed
- if which xfce4-session >/dev/null 2>&1; then
--    xfce4-session
-+    if test -z "$XDG_SESSION_COOKIE" -a x"`which ck-launch-session 2>/dev/null`" != x""; then
-+        ck-launch-session dbus-launch --sh-syntax --exit-with-session xfce4-session
-+    else
-+        xfce4-session
-+    fi
- 
-     if test "$ssh_agent_kill_cmd"; then
-         echo "running '$ssh_agent_kill_cmd'"
--- 
-1.7.2.3
-
diff --git a/xfce-base/xfce-utils/xfce-utils-4.6.2-r1.ebuild b/xfce-base/xfce-utils/xfce-utils-4.6.2-r1.ebuild
deleted file mode 100644
index 3e338707f7cc..000000000000
--- a/xfce-base/xfce-utils/xfce-utils-4.6.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.6.2-r1.ebuild,v 1.3 2010/10/21 13:57:51 ssuominen Exp $
-
-EAPI=3
-inherit xfconf
-
-DESCRIPTION="Collection of utils for Xfce4"
-HOMEPAGE="http://www.xfce.org/projects/xfce-utils/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbus debug +lock"
-
-RDEPEND="x11-apps/xrdb
-	x11-libs/libX11
-	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-4.6
-	>=xfce-base/libxfcegui4-4.6
-	>=xfce-base/xfconf-4.6
-	dbus? ( >=dev-libs/dbus-glib-0.70 )
-	lock? ( || ( x11-misc/xscreensaver
-		gnome-extra/gnome-screensaver
-		x11-misc/xlockmore ) )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	# This patch is bogus, drop it from next version or revision
-	PATCHES=( "${FILESDIR}"/${PN}-4.6.x-ck-launch-session.patch )
-	XFCONF="--disable-dependency-tracking
-		$(use_enable dbus)
-		$(xfconf_use_debug)
-		--with-vendor-info=Gentoo
-		--with-xsession-prefix=${EPREFIX}/usr"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_install() {
-	xfconf_src_install
-	insinto /usr/share/xfce4
-	doins "${FILESDIR}"/Gentoo || die
-	echo startxfce4 > "${T}"/Xfce4
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/Xfce4 || die
-}
-
-pkg_postinst() {
-	elog "Run Xfce4 from your favourite Display Manager by using"
-	elog "XSESSION=\"Xfce4\" in /etc/rc.conf"
-}
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 c0123805f0fa..3b700ae7e87d 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.7 2010/10/21 13:57:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.7.0.ebuild,v 1.8 2010/10/28 16:38:06 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -33,11 +33,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 pkg_setup() {
-	# These patches are bogus, drop them from next version or revision
-	PATCHES=(
-		"${FILESDIR}"/${P}-ck-launch-session.patch
-		"${FILESDIR}"/${P}-ck-launch-session-2.patch
-		)
+	PATCHES=( "${FILESDIR}"/${P}-ck-launch-session.patch )
 	XFCONF="--docdir=${EPREFIX}/usr/share/doc/${PF}
 		--disable-dependency-tracking
 		$(use_enable dbus)