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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 100 insertions, 15 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/Manifest b/kde-base/powerdevil/Manifest
index 046da53c5f46..dc8cb7508f7a 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX powerdevil-4.11.6-systemd.patch 1578 SHA256 e267c257d3343474513adab814f0bfb1fe5f66c252a2e2d96fd27ecfa95531d2 SHA512 d16d362e0fc172a8258baddbb7953256774a3d6b8a5e351037238d31108e3a11eaa992da49cee7023d444145f38b444a0c4d52c0f648fc479d2d4e1bf0e59884 WHIRLPOOL c8cd6cb408694b039cd90e3e256082b383a070502ebe43251bafa516b01d0b04c8a0906132a175c0472fbd90cd790c7171112317986153c7eb4c01f19e9a69b8
 DIST kde-workspace-4.11.5.tar.xz 13714748 SHA256 3b99a3991d6d8b1aa4158da67ead30cabb815c07a6c8ee10751307f97d8613cf SHA512 311ef4f13a35f5e5d4b2eb60491d76aa8a47a25c7a565d7378c653b4d01d0d21d867deef9c658dff9bd14a02f1834d4781fed80129b5dc05d1490d34c656a281 WHIRLPOOL 3a853bc77e4beed8e1524a34061ba518b3ebe429e7873d58b30705516b743bcabc79124d01e59a2b9e1dc83cfd5128e8fc2d9fa5f2addb362a44ee53b4685c2d
 DIST kde-workspace-4.11.6.tar.xz 13531288 SHA256 e1b3cb78dc94f3fab61c588ee610f143a1fd8a70f5f08b5ba19174427f9a6352 SHA512 059877a8f5bb6df47bf043a9f89be6a827b56a0fc11104b189041eb4e08e40d6f9375c1268afcfcee329735d2c62e3959589751b5281603ff1bcc637cec38cd6 WHIRLPOOL ba5f0e277f6abbb502088ac9bdb420a221e570b140dd4a2dd6dccb1dfcf93efd2fceecb075f5a66fbe6c61346a2dfd7290124036f2e0f58091119a00ce7b8346
 EBUILD powerdevil-4.11.5.ebuild 801 SHA256 7e9832177cc04c28ad3aa728d16cf263cdf6fc8cc19e10da3ece30c4c93a3e4a SHA512 463dcb3b74c1dafad1fc00d8139aae54c1c54c7061b40ba7c994c48647be4f857572f06c0d8831a653cae00af412e00c488a03fc95db12c5e95a97b80b4990f3 WHIRLPOOL bbc8d7b229b423645776fcd577160bd59c8776d7ae33477816c894420f0379d9b0447fdf9686ed3159bcb10d85a812f62fd9b36318f780f5bf8165504932bd0d
+EBUILD powerdevil-4.11.6-r1.ebuild 862 SHA256 3ea939e3db69a1d4558172c494dc82795e246d6b322b1f12f12919a4beb45b29 SHA512 1d1be0336e8ee6f4395df0ad4fce24d01836bcbd3bc9550ae879ce4a32afed0bf880f1c947b78d7559f01c54a8c53ac2f22e7a91cecadda23d2683ab04c5f2ca WHIRLPOOL 7b8d4879fe3656434899f0d4ed4a24fc41d644e4912b963a3196c0462a3f87c7c86f2fac05dd843127599292e80159d0782ff303d05f5e96c4a58df3c6c36913
 EBUILD powerdevil-4.11.6.ebuild 812 SHA256 491e1db6c6e72ab224ceee2a4c2b7aa6b62deb57d5ba876e7380dd26798eea78 SHA512 d60cb8f8dc2248ee5c0cfcdc84251a587725d9b6d7e91a9fb0446f98275a3c8854c68ebc3ed71c1ccb44509b0ad1a0fd2cf3e218782cda8ebef88f9b24a0d697 WHIRLPOOL 2be7faee1e25104054a95ce0c02d0dcd8ddc03ccf322464bcf1380c22267ed961322a19147b9cf8268fd70180fda3f90c3bd747ce757bc5ad8d10cd510ca8536
-MISC ChangeLog 24986 SHA256 c53aefa97375266b2239284eb4d2aa676d922d26821f303151921d562f79e3cc SHA512 b88056613083987e297a44693a3c98eda9571ebf09c7aa4df78f15644d9ff229e98df6e977d095ee90fd4e2b363c9b7301fcd2e3ce705c67bbc63e0b3337f207 WHIRLPOOL 5907b17341fc35cede9fe6881f8e4b55be65c7c9a9235d4945a21eb1d0bd952ad55b84b5356b05f1e9fb5985f1062f54334fa09b0b70ba1537c1abaee0b14345
+MISC ChangeLog 25223 SHA256 5bb8215f0fd8e5e7e01102baf91b4c35390ee66d6547f6600bef60328f214106 SHA512 cb69aae97fc7c9f090dfe573550e0cfd40ebe5bc445d02aa9e357c794112a733c0ee9539b5cf3c16d1b0eaf65e29d3822ed1eb57b498022857d13678f9d91142 WHIRLPOOL b9c3a293c81abd799f10fc6b98cc17f05312c2355aebe075255efa936fb490d069a9d1f9398b8ffb88b79b1940ab72354e03f0390b0a224cd0e03e99a117bf95
 MISC metadata.xml 281 SHA256 f42f84b6cbe3862afd6839a2da268b563bbac43ed8d39f127db2bd1ad5b53c88 SHA512 f6cce8b406a331c504e14e7a0a3ad481c6db498df596a22e0f773e4d2a20ea7ea6fe36861dce6add8f1ca24a1227b743b52e2bedbf3e358517933ec951f1484f WHIRLPOOL 6108846e39dd17664d406fe7a090fa8f89d9e44d1f3e88f1b0ef3d71c90900fed9b427eaec24813e1be20ecaa1583dce5566e5ee6270df2e7ef37355d19b2eeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTCccyAAoJELp701BxlEWfv4cP/0gvtaTZ7sBRDkNUtBNAzkE8
-QjcSk7iPjrXjJd+CEeO1hfqbiWitYJgRNvK+bpRObfvDQhhEg0e6O/5JvMo3F+Uk
-65pYMswZl0cTCsmzLvSlAxLTY0zR2rDIjCU2Hs/xOjPNHqL9BKCYorj6zDh2jJ9c
-2sAkyadAxYqR73sg4ZHZSDQ0hRNsIso2Ym4YU2oWXDMfcUXxtNh4gUvld7I67LEm
-mT3sCF6PX09XHz7clvwd+umbntCERAPs4/PwfydTv8Gr152r/xqm+tj1iZrDGDVX
-+UgGwlAUGM/ShW4QwwnmEp80xLma0lvszDTgs2DkONenCH+qaQH90HfIpr67lhXF
-FtLXcnievxcwwpXiBVFxWYEftgCTs4Fnuo9+qtMYtrxjg4C8jKxbOA4TcaKj+qq+
-Jlrq0t7AhktentUX0vWGz8mkhlnegCit/LrW3s8yveqtDhRPYRlzV2hafu8yrC8i
-+keG0X2OdiyfGdz9CD+ltxKhq+daGj6Kreh2APXWX4sb9NU9j/8plmZx2keBeEEV
-EftnWgP6fXn7F3W79SG2CdWks9VrGT6eqaOPbEFEY5Vuz2HSQEOTFfcPchvI+4Cv
-LTPCeYqk2WYMKGWBIqIaPvI9hWSPmT9WLhYL06HibJTSMX4qW/Uto13TA+TmAH1z
-zbpCQ3cEt0jJreLhJFGA
-=EnSO
+iQIcBAEBCAAGBQJTDS6qAAoJEJS/30SErRQv0lAP/jppk2aBstEzCspbSgCBjUw9
+w9K0K67VHSH3uKOQT/F+MDKynmgsrisX6E13VGRW/KorHa13OHCjd4gO/UPNxrC5
+DEWajKKINZ23XDV0fUs5gaFU/XiYtStm+TBVj4sAc8rZ4Mn0buZyI96o+uXSM1/+
+gwYg8wmpPm4hYlHwLKLQrmek7RZ6d1QJPnybpA0D4R1P2FWhBAqa0jua5qrZkH0M
+i5dhhvjEHfJLLXA0hlAJ48UQO3F+8wizD/JFN6YRK5KNcYvxAsWg/NYHVsZwGzKu
+B0rvnqLEQf8vDr0Rdj7XbqpSkw9v1qZ/3EJAyHkmriX5+W6FEcyNC/YrOytFvZEE
+LNCwmvvOWJYRZ8W2jswN/LD4qK4PZdlucC3R2NU0cnUFojtU6EMy6xumlPEb0RWd
+4hh/YpFJNrhAMKVpVNghBYuBUSes6qBYBBH0R7u6Kh6KPHxPOT68w3jZnIFLKr3b
+KAKfvs76k0TDGFarTay0y4Mq8Lv0VdfDlidYaH1jAdGk1/v0tTjz8cJRVTnIZKpL
+mTGlxL0JsdHw9gHPQgK8hEMiD8YFa8Sr/wV7u7WCyFD80SOfManChNaAtLa4cHKN
+5eko7pRJum0F4CS1n1LH6eESLHdkoV638VvBdhaNMGqWczWsAmnhEuUstGqPW3k7
+zwhYAnvwBi7Gdje33+Jz
+=emRb
 -----END PGP SIGNATURE-----
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"
+)