From ffeb2afe9d5f41d9243da15f2f8b1bc39bded99a Mon Sep 17 00:00:00 2001
From: mudler <mudler@sabayon.org>
Date: Mon, 14 Mar 2016 16:33:17 +0100
Subject: [PATCH] [x11-misc/sddm] revision bump

---
 .../sddm/files/sddm-0.13.0-pam_kwallet.patch  | 10 ++++++
 ...0.13.0-r1.ebuild => sddm-0.13.0-r2.ebuild} | 35 ++++++++++++++-----
 2 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch
 rename x11-misc/sddm/{sddm-0.13.0-r1.ebuild => sddm-0.13.0-r2.ebuild} (62%)

diff --git a/x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch b/x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch
new file mode 100644
index 000000000..ff1c4d2dd
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch
@@ -0,0 +1,10 @@
+--- a/services/sddm.pam	2015-08-17 18:06:19.000000000 +0200
++++ b/services/sddm.pam	2016-02-21 19:54:08.654091951 +0100
+@@ -4,3 +4,7 @@
+ account		include		system-login
+ password	include		system-login
+ session		include		system-login
++-auth		optional	pam_kwallet.so kdehome=.kde4
++-auth		optional	pam_kwallet5.so
++-session	optional	pam_kwallet.so
++-session	optional	pam_kwallet5.so auto_start
diff --git a/x11-misc/sddm/sddm-0.13.0-r1.ebuild b/x11-misc/sddm/sddm-0.13.0-r2.ebuild
similarity index 62%
rename from x11-misc/sddm/sddm-0.13.0-r1.ebuild
rename to x11-misc/sddm/sddm-0.13.0-r2.ebuild
index 4247c5950..e51aeebfb 100644
--- a/x11-misc/sddm/sddm-0.13.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.13.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit cmake-utils user
 
 DESCRIPTION="Simple Desktop Display Manager"
@@ -19,8 +19,6 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtnetwork:5
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
 	>=x11-base/xorg-server-1.15.1
 	x11-libs/libxcb[xkb(-)]
 	consolekit? ( >=sys-auth/consolekit-0.9.4 )
@@ -29,6 +27,8 @@ RDEPEND="dev-qt/qtcore:5
 	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
 
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
 	dev-python/docutils
 	virtual/pkgconfig"
 
@@ -41,19 +41,21 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
 
-	epatch "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
-	use consolekit && epatch "${FILESDIR}/${PN}-0.11.0-consolekit.patch"
+	eapply "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch"
+	# fix for flags handling and bug 563108
+
+	eapply "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
+	use consolekit && eapply "${FILESDIR}/${PN}-0.11.0-consolekit.patch"
 
 	# Sabayon, fixes autologin due to sabayon-live
-	use systemd && epatch "${FILESDIR}/systemd_service.patch"
+	use systemd && eapply "${FILESDIR}/systemd_service.patch"
 }
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable pam PAM)
-		$(cmake-utils_use_no systemd SYSTEMD)
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex '!systemd')
 		-DBUILD_MAN_PAGES=ON
 		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
 		)
@@ -64,4 +66,19 @@ src_configure() {
 pkg_postinst() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+
+	if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
+		local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
+		if [[ -z ${line} ]]; then
+			ewarn
+			ewarn "Erroneous /etc/pam.d/system-login settings detected!"
+			ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
+			ewarn
+			ewarn "session      optional      pam_ck_connector.so nox11"
+			ewarn
+			ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
+			ewarn
+		fi
+	fi
+
 }