[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

[Davide Pesavento]

commit:     9d5fba9a8ff1a3a5a4d964776348d906d9291cdd
Author:     Mika Kobayashi <wjn <AT> inter7 <DOT> jp>
AuthorDate: Mon Jun  2 22:05:32 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun  2 22:09:45 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9d5fba9a

[x11-misc/sddm] added the patch for consolekit (equally official gentoo repository)

---
 x11-misc/sddm/files/sddm-9999-consolekit.patch | 19 +++++++++++++++++++
 x11-misc/sddm/sddm-9999.ebuild                 |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/x11-misc/sddm/files/sddm-9999-consolekit.patch b/x11-misc/sddm/files/sddm-9999-consolekit.patch
new file mode 100644
index 0000000..a5ac62a
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-9999-consolekit.patch
@@ -0,0 +1,19 @@
+--- data/scripts/Xsession
++++ data/scripts/Xsession
+@@ -74,13 +74,13 @@
+     exec xterm -geometry 80x24-0-0
+     ;;
+   custom)
+-    exec $HOME/.xsession
++    exec ck-launch-session $HOME/.xsession
+     ;;
+   default)
+-    exec /usr/bin/startkde
++    exec ck-launch-session /usr/bin/startkde
+     ;;
+   *)
+-    eval exec "$session"
++    eval ck-launch-session "$session"
+     ;;
+ esac
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."

diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 89850bc..b5bf554 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
 SLOT="0"
-IUSE="+qt4 qt5 systemd +upower"
+IUSE="consolekit +qt4 qt5 systemd +upower"
 REQUIRED_USE="^^ ( qt4 qt5 )
 	?? ( upower systemd )"
 
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+        use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
+
 	# respect user's cflags
 	sed -e 's|-Wall -march=native||' \
 		-e 's|-O2||' \