From 318092ea225b3d6ad7192e8ae024a631e482b266 Mon Sep 17 00:00:00 2001
From: Johannes Huber <johu@gentoo.org>
Date: Tue, 3 Dec 2013 22:36:09 +0000
Subject: Version bump KDE SC 4.11.4

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
---
 kde-base/ksmserver/ChangeLog                       |  8 ++++-
 .../files/ksmserver-4.11.97-noplasmalock.patch     | 21 +++++++++++++
 kde-base/ksmserver/ksmserver-4.11.4.ebuild         | 36 ++++++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch
 create mode 100644 kde-base/ksmserver/ksmserver-4.11.4.ebuild

(limited to 'kde-base/ksmserver')

diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index c067a82ab041..6da64579ca4e 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.281 2013/11/05 22:22:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.282 2013/12/03 22:35:49 johu Exp $
+
+*ksmserver-4.11.4 (03 Dec 2013)
+
+  03 Dec 2013; Johannes Huber <johu@gentoo.org> +ksmserver-4.11.4.ebuild,
+  +files/ksmserver-4.11.97-noplasmalock.patch:
+  Version bump KDE SC 4.11.4
 
 *ksmserver-4.11.3 (05 Nov 2013)
 
diff --git a/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch
new file mode 100644
index 000000000000..e41d58bbe693
--- /dev/null
+++ b/kde-base/ksmserver/files/ksmserver-4.11.97-noplasmalock.patch
@@ -0,0 +1,21 @@
+diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
+index 6490145..2403b45 100644
+--- a/ksmserver/screenlocker/ksldapp.cpp
++++ b/ksmserver/screenlocker/ksldapp.cpp
+@@ -286,16 +286,11 @@ void KSldApp::lockProcessReady()
+ 
+ bool KSldApp::startLockProcess(bool immediateLock)
+ {
+-    if (m_plasmaEnabled) {
+-        m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")),
+-                             QStringList() << QLatin1String("--nofork"));
+-    } else {
+         QStringList args;
+         if (immediateLock) {
+             args << "--immediateLock";
+         }
+         m_lockProcess->start(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet")), args);
+-    }
+     // we wait one minute
+     if (!m_lockProcess->waitForStarted(60000)) {
+         m_lockProcess->kill();
diff --git a/kde-base/ksmserver/ksmserver-4.11.4.ebuild b/kde-base/ksmserver/ksmserver-4.11.4.ebuild
new file mode 100644
index 000000000000..b7b5ff1a07a9
--- /dev/null
+++ b/kde-base/ksmserver/ksmserver-4.11.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.11.4.ebuild,v 1.1 2013/12/03 22:35:49 johu Exp $
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kcminit)
+	$(add_kdebase_dep libkworkspace)
+	media-libs/qimageblitz
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXrender
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kcminit/main.h
+	libs/kdm/kgreeterplugin.h
+	kcheckpass/
+	libs/kephal/
+	libs/kworkspace/
+"
+
+KMLOADLIBS="libkworkspace"
+
+PATCHES=( "${FILESDIR}/${PN}-4.11.97-noplasmalock.patch" )
-- 
cgit v1.2.3-65-gdbad