temporary fix for bug #511484, thanks to Samuli Suominen

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB2EFA1D4)

4 files changed, 94 insertions, 2 deletions

diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog
index 4cf58bc7f7da..f27e54c5d80a 100644
--- a/x11-misc/sddm/ChangeLog
+++ b/x11-misc/sddm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/sddm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.3 2014/05/25 10:53:42 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.4 2014/05/26 21:58:35 jauhien Exp $
+
+*sddm-0.1.0-r1 (26 May 2014)
+
+  26 May 2014; Jauhien Piatlicki <jauhien@gentoo.org>
+  +files/sddm-0.1.0-consolekit.patch, +sddm-0.1.0-r1.ebuild, metadata.xml:
+  temporary fix for bug #511484, thanks to Samuli Suominen
 
   25 May 2014; Jauhien Piatlicki <jauhien@gentoo.org> sddm-0.1.0.ebuild:
   fix dependencies as qt-5 is not in tree still
diff --git a/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch
new file mode 100644
index 000000000000..42ebf67671d0
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch
@@ -0,0 +1,36 @@
+diff -r -u sddm-0.1.0/data/scripts/Xsession sddm-0.1.0.patched/data/scripts/Xsession
+--- sddm-0.1.0/data/scripts/Xsession	2013-03-19 21:23:36.000000000 +0100
++++ sddm-0.1.0.patched/data/scripts/Xsession	2014-05-26 23:40:09.654374811 +0200
+@@ -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 -r -u sddm-0.1.0/services/sddm.pam sddm-0.1.0.patched/services/sddm.pam
+--- sddm-0.1.0/services/sddm.pam	2013-03-19 21:23:36.000000000 +0100
++++ sddm-0.1.0.patched/services/sddm.pam	2014-05-26 23:39:52.484616252 +0200
+@@ -3,4 +3,11 @@
+ auth		include		system-login
+ account		include		system-login
+ password	include		system-login
+-session		include		system-login
++
++session         optional        pam_loginuid.so
++session         required        pam_env.so
++session         optional        pam_lastlog.so silent
++session         include         system-auth
++-session        optional        pam_ck_connector.so
++session         optional        pam_motd.so motd=/etc/motd
++session         optional        pam_mail.so
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index c39ebd780634..b7968723b426 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -7,7 +7,9 @@
     <name>Jauhien Piatlicki</name>
   </maintainer>
   <use>
-    <flag name="upower">Use <pkg>sys-power/upower</pkg> for power management</flag>
+    <flag name="upower">Use <pkg>sys-power/upower</pkg> for power
+    management</flag>
+    <flag name="consolekit">Enable ConsoleKit support</flag>
   </use>
   <longdescription lang="en">
     SDDM is a modern display manager for X11 aiming to be fast, simple
diff --git a/x11-misc/sddm/sddm-0.1.0-r1.ebuild b/x11-misc/sddm/sddm-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..97065c36650b
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.1.0-r1.ebuild,v 1.1 2014/05/26 21:58:34 jauhien Exp $
+
+EAPI=5
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit systemd +upower"
+REQUIRED_USE="?? ( upower systemd )"
+
+RDEPEND="sys-libs/pam
+	x11-libs/libxcb[xkb(-)]
+	dev-qt/qtdeclarative:4
+	dev-qt/qtdbus:4
+	systemd? ( sys-apps/systemd:= )
+	upower? ( sys-power/upower:= )"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.7.0
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-version) < 4.7 ]] && \
+			die 'The active compiler needs to be gcc 4.7 (or newer)'
+	fi
+}
+
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}/${P}-cmake.patch" "${FILESDIR}/${P}-clang.patch"
+	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use systemd)
+		$(cmake-utils_use_use upower)
+	)
+	cmake-utils_src_configure
+}