Add backport for correct detection of systemd-210, bug 502440

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

3 files changed, 84 insertions, 1 deletions

diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index 0bad2448cc01..833fa13d7846 100644
--- a/kde-base/powerdevil/ChangeLog
+++ b/kde-base/powerdevil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/powerdevil
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.199 2014/02/23 10:01:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.200 2014/02/25 23:57:16 dilfridge Exp $
+
+*powerdevil-4.11.6-r1 (26 Feb 2014)
+
+  26 Feb 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/powerdevil-4.11.6-systemd.patch, +powerdevil-4.11.6-r1.ebuild:
+  Add backport for correct detection of systemd-210, bug 502440
 
   23 Feb 2014; Agostino Sarubbo <ago@gentoo.org> -powerdevil-4.11.2.ebuild:
   Remove old
diff --git a/kde-base/powerdevil/files/powerdevil-4.11.6-systemd.patch b/kde-base/powerdevil/files/powerdevil-4.11.6-systemd.patch
new file mode 100644
index 000000000000..0550028969db
--- /dev/null
+++ b/kde-base/powerdevil/files/powerdevil-4.11.6-systemd.patch
@@ -0,0 +1,41 @@
+From 5dc2b9a5c09d95ba9a17ac00056213082feb8d90 Mon Sep 17 00:00:00 2001
+From: Raymond Wooninck <tittiatcoke@gmail.com>
+Date: Tue, 25 Feb 2014 19:59:36 +0100
+Subject: [PATCH] Perform the systemd version evaluation through a regular
+ expression to be more flexible for changes in the version string that systemd
+ returns
+
+REVIEW: 115271
+---
+ .../daemon/backends/upower/powerdevilupowerbackend.cpp       | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+index eae5436..94b20f1 100644
+--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
++++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+@@ -40,13 +40,17 @@
+ 
+ bool checkSystemdVersion(uint requiredVersion)
+ {
+-    bool ok;
+ 
+     QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
+                                 QDBusConnection::systemBus(), 0);
+-    const uint version = systemdIface.property("Version").toString().section(' ', 1).toUInt(&ok);
+-    if (ok) {
+-       return (version >= requiredVersion);
++
++    const QString reply = systemdIface.property("Version").toString();
++
++    QRegExp expsd("(systemd )?([0-9]+)");
++
++    if (expsd.exactMatch(reply)) {
++        const uint version = expsd.cap(2).toUInt();
++        return (version >= requiredVersion);
+     }
+ 
+     // Since version 1.11 Upstart user sessions implement the exact same API as logind
+-- 
+1.9.0
+
diff --git a/kde-base/powerdevil/powerdevil-4.11.6-r1.ebuild b/kde-base/powerdevil/powerdevil-4.11.6-r1.ebuild
new file mode 100644
index 000000000000..5bc3675c87ce
--- /dev/null
+++ b/kde-base/powerdevil/powerdevil-4.11.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.11.6-r1.ebuild,v 1.1 2014/02/25 23:57:16 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
+HOMEPAGE="http://solid.kde.org"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +pm-utils"
+
+DEPEND="
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep libkworkspace)
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+	)
+"
+RDEPEND="${DEPEND}
+	pm-utils? ( sys-power/pm-utils )
+"
+
+KMEXTRACTONLY="
+	krunner/
+	ksmserver/org.kde.KSMServerInterface.xml
+	ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-systemd.patch"
+)