Run xfce4-session with ck-launch-session if found.

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

4 files changed, 83 insertions, 2 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 7d6fefed619b..299b62418e58 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,13 @@
 # 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.153 2010/08/01 18:56:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.154 2010/08/06 19:43:42 ssuominen Exp $
+
+*xfce-utils-4.6.2-r1 (06 Aug 2010)
+
+  06 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce-utils-4.6.2-r1.ebuild,
+  +files/xfce-utils-4.6.x-ck-launch-session.patch:
+  Run xfce4-session with ck-launch-session if found.
 
   23 Jul 2010; Markus Meier <maekke@gentoo.org> xfce-utils-4.6.2.ebuild:
   arm stable, bug #323729
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 96974ecee718..5a2c3a38fec3 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -1,7 +1,9 @@
 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
 DIST xfce-utils-4.6.1.tar.bz2 614143 RMD160 4446c3882716e841c00e398df62b9d54046b9d26 SHA1 0bdb5b6e494f15372d8c0826ac93baca476c9f16 SHA256 8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
 DIST xfce-utils-4.6.2.tar.bz2 638094 RMD160 06c33863da0f80f16ef154307e4b89085bc3958f SHA1 6373886c3d70e576859741bde747a235567ffd8e SHA256 54efc2038bfbd5acaadfc91ed91fb3dfd6cec64f9402f364accce7bcafe2ba7a
 EBUILD xfce-utils-4.6.1.ebuild 1456 RMD160 bc64c69a9ab896d604abfc26c4cf02b381a46276 SHA1 2295379a2f9844777fd22e1e073c9722c79ace73 SHA256 02f3f6d9999b39e8bd93229a0663b6e46fc80b9fe1c6b3d4c1a9f7b906e854df
+EBUILD xfce-utils-4.6.2-r1.ebuild 1558 RMD160 4175ad1a67c832e5f5b963ebbfc031922cdf7b6b SHA1 5a1eb90d5723c4087eb976a3299451c5a0072cff SHA256 f41cf2537b9abc1a2d2d70a79ff34886472ea3880687d656387b423229a8a368
 EBUILD xfce-utils-4.6.2.ebuild 1516 RMD160 e8488ebd19febc36b121ee03fad59b0c08a61e25 SHA1 c048bea0cbf3155b3d1f1fb160c06c70f409d6db SHA256 e86edabfd0e0dc0e4319fba36ebb588b9635c7a84e6a0d6951eeb38c4c43cb67
-MISC ChangeLog 18967 RMD160 8d1782fb8df158dbe693cc578c2074108dc8983a SHA1 7653e29d672c2beeb6415964f8675ab359b6e76c SHA256 1f3c72e1cda8b76d6261d1379edb04c3b90aeea23e6d4b69dc5c102afdcd47d9
+MISC ChangeLog 19195 RMD160 558933c9309346483c6c8550bbc5b248d5c51023 SHA1 0e95d330281adf43230debba946552e58f486a5c SHA256 9702c2a97fe51c6496d0969d965a4adff200435468abe96074dd7b6d16946c25
 MISC metadata.xml 218 RMD160 e064747a2c888959d939ed09a70c242d905c89ea SHA1 8ff18a8acc37d299a3cc7b30663ca3eb0f91032e SHA256 c47df69ae42900828c5afb0aa77ee6f9ddca55a79b3326f69a0bbf8119f3d5df
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
new file mode 100644
index 000000000000..daf4bf82e720
--- /dev/null
+++ b/xfce-base/xfce-utils/files/xfce-utils-4.6.x-ck-launch-session.patch
@@ -0,0 +1,17 @@
+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/xfce-utils-4.6.2-r1.ebuild b/xfce-base/xfce-utils/xfce-utils-4.6.2-r1.ebuild
new file mode 100644
index 000000000000..0452f888c4f5
--- /dev/null
+++ b/xfce-base/xfce-utils/xfce-utils-4.6.2-r1.ebuild
@@ -0,0 +1,55 @@
+# 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.1 2010/08/06 19:43:42 ssuominen Exp $
+
+EAPI=2
+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() {
+	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"
+}