temporary fix for bug #511484, thanks to Samuli Suominen

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB2EFA1D4

5 files changed, 111 insertions, 17 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/Manifest b/x11-misc/sddm/Manifest
index d946ef3f5b70..77f7be6bbee9 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -3,24 +3,26 @@ Hash: SHA256
 
 AUX sddm-0.1.0-clang.patch 2759 SHA256 78c0711149f7f8734476379b75aafcacd0d8bd99494cd61206e1098971cb8a0f SHA512 d7c99e9a46f832b756c5d748853b5726c0d4d075a0c14c86d45fd14c5b0a520f9a3e0352a222079258c2c7701b5227a72d34c73425bdd80c0654e582585d335d WHIRLPOOL ba63c47cd84bcaf1d6f3fbbd24828945c1750e49f485924b9bbb84e4f3f12540646fa47160264718f467555826d51e69934be110d45d1df3f9403a95b1bb8160
 AUX sddm-0.1.0-cmake.patch 1266 SHA256 e34eedffe8d48cd5b3c6c8ae1778e57a4275a3756ae7436f12349403a77303db SHA512 7b9f57d77184a3a81a81f31e3da5d98766edb551376b943a337edd942e9891eb427c3f932ff568ad56096cdec6336f2f5611e0fa86bafd6122c508100486681b WHIRLPOOL c10fd3f106aa262425ba16a784c52fb065605322342c98cb010613605a2cf269b1eccbeca3e291df4ef142d24975d63565ccbb0405576c1be521e7a18d4f2671
+AUX sddm-0.1.0-consolekit.patch 1404 SHA256 5b9216630c3a1a885119be939c15cb102ce314dde23fe1ca4780a783ce592807 SHA512 05e4a43f32f25411b82207c2d760607160958f1c57589ac6f8e48bd7ebd1eae6a636ddf9a0ffd82e214d7dbd0077ff896aa0eb55e95f616e0747e4e10f92cd29 WHIRLPOOL a8fa3e03f0f25c24b043b7ae68990a1551891b6991268b296f802f8ee8bbdc8ce923b60fa6ed335125203ed2246221d2a71c230da9d10f9de4ce0fb5144e984a
 DIST sddm-0.1.0.tar.gz 4710358 SHA256 586b87331663d2c389e27fc6cda7cfb83adcd7015aebd1dc683e4adcbe1bfc45 SHA512 b6ea89d9874e5b07f7a00b455cf1362590f0596cf521ebf13d5927b9181c316bbe8fce9d11715f6d1454f905b75681cb681bac4b7f642ffbac29b1b8ca4b6705 WHIRLPOOL d551b0c68a89c70a5255d79905db0676f01585da159819ecace6a394cf32a1c4dc395dc9a145dcfe89d046615cffdc1ef834c8064df3945fe4e647ceb748548a
+EBUILD sddm-0.1.0-r1.ebuild 1244 SHA256 f6b7a1e7d265b6be98614fb6ab3d2ca7ca85e07b0fbeceec7e1837974aae8fce SHA512 1793ee9a645e83019ec2bac0da0ee7b7f0f8e2fa0bb248838cc276b3e72df96e2a40e53588659df673cea4b674a11fb9c98921d359427935d11c3689834c29d5 WHIRLPOOL 10738a075b801f1342657651e17117b40096dddc87b4b5b5dfa6e84e7adf6551600b682c3db039daece576ce1329a47b10232f843ec414323cfa97e37b74f1bf
 EBUILD sddm-0.1.0.ebuild 1146 SHA256 b6791625596a8856a573e5793cc1c33fd98efc6705c8ccb20030f7654b1eaf9c SHA512 3846415da30db0b0d1ce0a82ddfaaa558c4f628f2951b722d1a7a08209f6be5aa8022105ede93f70ae19fc7b3ee4689e223ba8c2d79caf9de8c34672aaae132e WHIRLPOOL 9f4c91c19e165842ddbdec42aee04eb97c45d350459cbd7670c38fb53b87d6f0737dc1649f540141b8f871f0def59e30306c7895dc74df86ecaac859021eef67
-MISC ChangeLog 679 SHA256 dd82f4c04bfbb35ee73c4547b36c97443157ea537b6be21c2c4fcc84e826362b SHA512 d2643174b41ff9764d07ede400b9a477bffa52c174c371da225d1996e0e5571c1617388b598b602f960fd056bbbda58f7bc3c8a6bbc570430e5beb61c8506374 WHIRLPOOL 61387e309c31b8f2e7120054b1d6d46347a18402e55445b1d026b473ee64e8a6e74efe478c8b8ab75c441bca5ed942442b5dafc79419e4780d4298d10099bda8
-MISC metadata.xml 643 SHA256 4e852cfec9e35fd1355d5b1ee27c216849f20c4198a0cc57d1691bd29d143876 SHA512 1a2c7eb419e6e03115bfda37babdf168bd96972286978872ea9ff2f6de93192a555027eb6f907a47374f1fd90399f1f27c8eb21b39a1249e90d20989b96cd078 WHIRLPOOL 570ecea118ff010d80a09867a17061ec9f824f2b4ffb81704d632af2d8c97820e41a87486080bdc8360a4594fdc914e428853448806832d0a86c5c8f22d20a46
+MISC ChangeLog 898 SHA256 9fafb5ba4c690271e90a2dc24cb51253835115d29cee9b4467d523354dc03cda SHA512 021f4229fd8ccf25be06df1dec740c89af58e2b18db69679e18fdaf11c168b7f4740927540ba577a98d0c815594e38e0d197ddaf41225dcef9abf315b0ff18cb WHIRLPOOL 5c4de4798c7115e69136bd5846788ec13042177f9447cdce5c950a1208f2333286f084b93253271abd524af5bb1d5fa2db5a8632d17b7bf0997c7d63212a2780
+MISC metadata.xml 708 SHA256 a4aa75a8aaa4c4570d5bc5df6b5c7b2a5db3740e867001601e78525fa33d7246 SHA512 0737002e407ef258dac967e81bc2b6572b6a71d44a6ce3bcc87a3aa584a0ace1dd25e8df5f415082a0af25130b530bedccae22dba1d926cd24de9ef55d14d8ce WHIRLPOOL 347ae231f7569f211662c7ad4fb67edb41bd2f138a49f6d2be884fe398e167bb6c055f92b6024a30bfb7687b2c8687d552e6d55d212e878abe7b5126a3fa711b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTgcu3AAoJELvuk32y76HUJlAQAJrkGWOvOOHopoQkdEegp2DR
-muAJYrbgmAEJ0B0P7+ctPbpShT2uqBvGcayu8FAvy+EaaHctTeTkWtD2VgswyOb5
-FdFIPOdMrZcZrWSwUeZd1OxXlHBPKlCFPtI4DXfZOhqzzgH0qYGqzZwGLOF0ifda
-V027lyeH+NTZFXC0fawECrtPFeG/VW8892hMCCDGJde2IzJFwtwTLJ1gnPD/hH13
-sjZvJg6Fhza6QhrVvJs+26LBlP72VzI6v04n7Z9cm6Pl/KTMk1QIs1s9HbO+faZu
-hIEJ/Nq72RLpgvug8WcxEw32/6Zjakgso2itBYwqGxKyWXZzEhhqpOt2vmATEhGn
-2S4LV5WpDI+7RoVSQhzfoVSID1gttrJNqUSYtXKDUq+FCSF3FphbvAohXzyBp83E
-88uFULPx5lgQWdb/hiS8AjW5QrXGcH3NYBn0mgw0fjG8+bbKCpyyVc+Ni3HCW9fD
-d0aHkz8wkGUZhD5MM1/H0fNH9EXhb9Wplpu3uyklV8aC181bV/Sso8a59BAXwPCe
-vCsaCG7LbvWSRFQ9VpQschDDYeJvtPc4sz/ibwDTkltllK9JMQoUai+Xw4+IE9H2
-wnr7dDALIa/VVHDNCFN4MpY70Ypdg6OqgtLe6FXHmIU4vwZM/k3P1xE13wCaC1z+
-Nu/OB+GflP7h1FKC6dd6
-=h880
+iQIcBAEBCAAGBQJTg7kSAAoJELvuk32y76HUISoQAIuSz3M/WY230QY0DNxdwm6H
+brm0lcQ/9IoQocnSvKQvkPXKOvdIn2rqyh9Gh32AzdIC2gSg7GArsy0ZNrg6gOeX
+ane6MAiuluerPK4IrD5SpIjnCJi52xhfbEMot69CMdXWFzRaOqVA03rnu0EIEIrF
+RLQHq7jhkp+mzd891G1aPimFXp4urvJ2arZNb3JRGDzq+1hxxv1dpFbw7m3PC+Er
+1iuE1LCnkleAJpYLj1cYViesoca2RexC91I4PEXyCvYex5hqsrtrnBmJ0keNQNZm
+wLegB/KUI0/UFIe+81kUXlQ6D9KtkSP96e8yRRTkzNPoDpH9+Nx2XqVE7l0m0Ty/
+Z3qEXgYPjKhthyxsJBHh1XPIykYrl7GY6ZGuYK2tbxYPJdGLr/LUdYVIUE3RHKpK
+CUtbAtm+AkqEPXw9SOi7dZjYYTjmoySZ9xrFX89/buINuhPTZPOb+oNw1q+2jLhi
+bEzMomSPnUX08uWI8UMF/XIF3VVX3Pt+xCQCTjSn4yEZ1QsUP6IHapVhaWG7n446
+3dnthaxoG+ADoTZzEFiBb35UpAT/5Qd4VaKWt4VtlCJf600y++VGS5kvmxYsUxBZ
+w3V4+pgOfr66yuy0sJdSyoFeSoFS9Aq1/rkhc+lPOVW0gGbB5srGAGAt/72T7w1u
+yk3N5VlOOUwEmEyeseMW
+=B9DX
 -----END PGP SIGNATURE-----
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
+}