Backport patch from upstream fixing issue where suspend options are not offered, wrt bug #460728.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 120 insertions, 9 deletions

diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index 1561523bba7b..c62069dcbaad 100644
--- a/kde-base/powerdevil/ChangeLog
+++ b/kde-base/powerdevil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/powerdevil
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.144 2013/03/06 13:41:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.145 2013/03/10 18:17:33 kensington Exp $
+
+*powerdevil-4.10.1-r1 (10 Mar 2013)
+
+  10 Mar 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/powerdevil-4.10.1-suspend.patch, +powerdevil-4.10.1-r1.ebuild:
+  Backport patch from upstream fixing issue where suspend options are not
+  offered, wrt bug #460728.
 
 *powerdevil-4.10.1 (06 Mar 2013)
 
diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index f38d04892c6f..c014777a761e 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX powerdevil-4.10.1-suspend.patch 3146 SHA256 825c6bbaa46a970fe01aa669e06f22556978e677611eac5886086650b8755f16 SHA512 4ec10dc0a83019756a737e6921f5332a675038e601672db94c3f3bd911b6ebe6dfd7f2743f51cd386439af024c653707aa377e7748538ad62a0577cf5f5232dc WHIRLPOOL 379f389fc0bd7195a722a4f8250cbad48ecb0fbba367db176baeaf6abc239371a3e467674858c00aae8ba9c22a7667c0d000109e40acc871bdd22ccc0e495350
 DIST kde-workspace-4.10.0.tar.xz 13378604 SHA256 88c90fef1b8ad81eea75ee04b2a9bae91a38e51425a0ec373ca21bedebef1b46 SHA512 d83210abbfc9cf0bb11f5a7c1fcab52aa512b6ecde7712467a74f5dc03a3dec683386408c3e613cb4bb69e215a0129c44aa935cef59f64c594b43bc2dcf739d9 WHIRLPOOL bdf0b7ce8c1a48c43bb593cbdae3620ef597e83844b7c967dc372539767a1597169894b10daf32de316d41f659e156a0ad44cd5f20dfe2deedb48e129a12b1a6
 DIST kde-workspace-4.10.1.tar.xz 13560944 SHA256 19ca159dc6cec2b8cb6a09d7a87ec5f541e35ed0f03c185c7ea5cfe959b212b7 SHA512 efa7cc41bca306a39dc609453af843886b4cce197098524e2842976c5906a78cd8950f9ea03ffc51c1aa72ba52a19d6f943d53a76b32387c953b4d9cb679bb71 WHIRLPOOL d63d6193644fb879b502338d251117975aa71a77dd19bcf53e0e06f2dbacdee68fe5c078217664fa12e470f71fa312752ad5ca578f23cf0ec1b2b710c49507de
 DIST kde-workspace-4.9.5.tar.xz 22520656 SHA256 073e495c4ef4eb4689c5c666c86fb6f24f57f2c00801f965c60bf8b32adb014a SHA512 1a8802e8c9dcaf1e81276c962dce7d321a26f205f60ccd27fa00780c4c09a8cd404a67b037265a4dd5efdc4ffc386cc31f571ac5ca10c1a14bc59259683a5e54 WHIRLPOOL f6ba18b30f7a5c454c9304d42f50238eac9a90abfc29fb6f7e873675eca89d206045f7277e5732e3faf669d36ec822cae0849813c66d72f7ba3af25bac3130ef
 EBUILD powerdevil-4.10.0.ebuild 728 SHA256 b059ce372ed648817cdd6056043c94d57419787766dbef43d1f76c6a7dd3aaee SHA512 b5f3a3c4b3ee5671f0d0d32cb1faeef1214aea3bfc1b36304f70ab39cd659cbb251160cedf79d9729475be0fceb6a660083d3a60ad6cc190ce2c10e1ac15d3dc WHIRLPOOL 53e83326f108876c6a8f9a04f552c4366ad48e9272b4caeb727f35f026fbe058736fc625254098c38c7614e968755a6d9118838ffeae26f7ad3339f17d50df6b
+EBUILD powerdevil-4.10.1-r1.ebuild 784 SHA256 cc9fe8f4cf796e35c3a71c1626e6fd3ab886f2b2c011d879272551f0e467f64c SHA512 6c11f5b0c4b661f2407996eff3fa4cfe63f025a7147520ab43cfe92f62bfb4d79c9390bda56f42a277149cbcb08315c222de21ce44c5cec38007a670909387bc WHIRLPOOL 04df79a4df65d6a2b49f841581c58035cca143a098ef57c2fec2b975d3471e3a222d23bbe282798a55efc737a264b2a42b08c29bd6f951445d68493cef3f7fec
 EBUILD powerdevil-4.10.1.ebuild 734 SHA256 2ef240c23277eba92a5dc33a0099cafc19d5ac6b12cdaa9718c0bee52767dd7d SHA512 17784cc59ab21058044934b45efdaea0ab6b02c071d44632b6ec9d87dea809157c0d9c8d3dafd6b93695725bfd77ec24f5d83a3df638b771278484ab1f0b7569 WHIRLPOOL da0e2337f4ef424a466ba90feea0c9e936413802a751076dfa111361aece27848df71d475a2501d690ce09c57a3c67d9f770d33681138f0098b50827b124757a
 EBUILD powerdevil-4.9.5.ebuild 663 SHA256 b102f606915dca52b79047e122f6535b6a548e48faef0769d29042fc8d74ea14 SHA512 e4d20866d797f05b6f79de75f57da2c68504795523904da75ed4e8c60c47b47cb7782562eec4e084f5aa6cdf9fae30796308a901d640d7a116a1ced626e072a0 WHIRLPOOL 4ef5be5cb94b17b72c2750c9eb33c1acf2331f4607bf78f4580bf5464e3ca4ad9e4a82009386cf8b933e1dfe4c609a200547822dce29869f1b2f52c36d2ef993
-MISC ChangeLog 18382 SHA256 b6fea6755895e27acd9c36c2e50792f1f54077d16f57fb1759e3e734d01999fc SHA512 ff9958fbca805535ca7d791c00cf0b6b55846c3c9856cc86b41ee07541c5c1751a82b25058190d8de5a086419ad75a9e69fdf90b39e7cd4bfa0fa1aa0b8f02fe WHIRLPOOL 2f0b2dfe42970f826121a51e8b16e8bc0290aa866c2cfd19983ecbe9388fb47e0b0911d9436734e6011b2f84cf8014ca63b47d1f0381b5c296a1cce6501e2b24
+MISC ChangeLog 18651 SHA256 71a5caa4e6184aeb889005ea7b59440b7e2d458457ab99281458e7b058a5d8b8 SHA512 fe339ec36abc0801aa89edf793d4064dcdcbc9718a222af5c9872ef9e602536480038b9f9264ebce282f342dbfc03b8f568cc6666a7ebc3abf8a68b3b5a59c96 WHIRLPOOL fa1e4dd4f200aa05481e2ab5101422ecfc6c13e4bbc42a2b8083f14ab599614ebba54b02ace7e330f84a5f77020d2260630d0d1ecfdb7d32562ddd302db84882
 MISC metadata.xml 281 SHA256 f42f84b6cbe3862afd6839a2da268b563bbac43ed8d39f127db2bd1ad5b53c88 SHA512 f6cce8b406a331c504e14e7a0a3ad481c6db498df596a22e0f773e4d2a20ea7ea6fe36861dce6add8f1ca24a1227b743b52e2bedbf3e358517933ec951f1484f WHIRLPOOL 6108846e39dd17664d406fe7a090fa8f89d9e44d1f3e88f1b0ef3d71c90900fed9b427eaec24813e1be20ecaa1583dce5566e5ee6270df2e7ef37355d19b2eeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRN4aYAAoJEMbwO6tnXQ0sr94H/2nZ69aS626hyLSaRpNoCXzl
-hnLQ1ohBbV7i0oM3SJzynw0WsW/4bPTlyfdl4MCpJvzZVB8XQ0pH+hygFd3bEi+u
-XCPhbPehHXYSa4L7O0cJCfe0HSUcCyREYIZnpTT1xOvAwGBYtxlGzCnN2aXHfh5P
-ELtcO0VIdV+iLj6pLzBAsvCQV4FHcHUYWuzy63K3/8NjI2Tbp0bzp82GgMCV0AVA
-/XZfDRS3kQ2SqQt4GwN8TY9ubUxO10xCl1wsjCrfozvCDcF+sDHgJSMTUNFxXYRE
-AtGjhhckISvtN5RF+okCqlrB9YfFFxY8UTEPT5sVEliOsTEvhNyBUXsk85BNaZM=
-=pFhX
+iQEcBAEBCAAGBQJRPM4pAAoJEMbwO6tnXQ0s4iMH+gNnM+8npC7FXnENnTTi1+dw
+5kzSi5i2X73V5i0jiUQt4HTvV+UVczHU5Tp1xhxzbl3zDXE20tftNDn+G4LAe+xG
+HWYi3GBmB4iUTMXHsHtQ90iqceUIaFFUEAT4PUSdHp550okqsv+eI32vKOmfLCZE
+WQlTe/Vm0okF+gzicLWL7OQjhd5YS+nvknqaY+6pTaDE4u4lOsINtUbjukvRAqv6
+Rkn4BMwhg6FcrN4oq1HDA26cTGP1j0VwjAL8dJz7iRbb4Av4IKDDk6D9efJ1rbho
+Ym9yEreNDxtgNRtTiOTjnsyUpeXy7tLdYJ3OCxA1QuBUxvNg/Wjt2+MzmI3Nvu0=
+=RKdb
 -----END PGP SIGNATURE-----
diff --git a/kde-base/powerdevil/files/powerdevil-4.10.1-suspend.patch b/kde-base/powerdevil/files/powerdevil-4.10.1-suspend.patch
new file mode 100644
index 000000000000..6e97ab27cacd
--- /dev/null
+++ b/kde-base/powerdevil/files/powerdevil-4.10.1-suspend.patch
@@ -0,0 +1,73 @@
+From d56bf9cf8ae4b7fa84abeb005c9ebd467909dd49 Mon Sep 17 00:00:00 2001
+From: Raymond Wooninck <tittiatcoke@gmail.com>
+Date: Thu, 7 Mar 2013 12:46:03 +0100
+Subject: [PATCH] Also check if the version of systemd is supporting the upower
+ functions
+
+BUG: 316219
+REVIEW: 109336
+FIXED-IN: 4.10.2
+---
+ .../backends/upower/powerdevilupowerbackend.cpp    | 25 ++++++++++++++++------
+ 1 file changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+index f9503b3..6a50b66 100644
+--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
++++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+@@ -35,6 +35,21 @@
+ 
+ #define HELPER_ID "org.kde.powerdevil.backlighthelper"
+ 
++bool checkSystemdVersion(uint requiredVersion)
++{
++    bool ok;
++
++    QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
++                                QDBusConnection::systemBus(), 0);
++    uint version = systemdIface.property("Version").toString().section(' ', 1).toUInt(&ok);
++    if (ok) {
++       return (version >= requiredVersion);
++    } else {
++       kDebug() << "Unknown version string from Systemd";
++       return false;
++    }
++}
++
+ PowerDevilUPowerBackend::PowerDevilUPowerBackend(QObject* parent)
+     : BackendInterface(parent),
+       m_brightnessControl(0),
+@@ -123,7 +138,7 @@ void PowerDevilUPowerBackend::init()
+ 
+     // Supported suspend methods
+     SuspendMethods supported = UnknownSuspendMethod;
+-    if (m_login1Interface) {
++    if (m_login1Interface && checkSystemdVersion(195)) {
+         QDBusPendingReply<QString> canSuspend = m_login1Interface.data()->asyncCall("CanSuspend");
+         canSuspend.waitForFinished();
+         if (canSuspend.isValid() && (canSuspend.value() == "yes" || canSuspend.value() == "challenge"))
+@@ -151,11 +166,7 @@ void PowerDevilUPowerBackend::init()
+     }
+ 
+     // "resuming" signal
+-    QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
+-                                QDBusConnection::systemBus(), this);
+-    int version = systemdIface.property("Version").toString().section(' ', 1).toInt();
+-
+-    if (m_login1Interface && version > 197) {
++    if (m_login1Interface && checkSystemdVersion(198)) {
+         connect(m_login1Interface.data(), SIGNAL(PrepareForSleep(bool)), this, SLOT(slotLogin1Resuming(bool)));
+     } else {
+         connect(m_upowerInterface, SIGNAL(Resuming()), this, SIGNAL(resumeFromSuspend()));
+@@ -280,7 +291,7 @@ bool PowerDevilUPowerBackend::setBrightness(float brightnessValue, PowerDevil::B
+ 
+ KJob* PowerDevilUPowerBackend::suspend(PowerDevil::BackendInterface::SuspendMethod method)
+ {
+-    if (m_login1Interface) {
++    if (m_login1Interface && checkSystemdVersion(195)) {
+         return new Login1SuspendJob(m_login1Interface.data(), method, supportedSuspendMethods());
+     } else {
+         return new UPowerSuspendJob(m_upowerInterface, method, supportedSuspendMethods());
+-- 
+1.8.1.5
+
diff --git a/kde-base/powerdevil/powerdevil-4.10.1-r1.ebuild b/kde-base/powerdevil/powerdevil-4.10.1-r1.ebuild
new file mode 100644
index 000000000000..248e16ea67d5
--- /dev/null
+++ b/kde-base/powerdevil/powerdevil-4.10.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.10.1-r1.ebuild,v 1.1 2013/03/10 18:17:33 kensington Exp $
+
+EAPI=5
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +pm-utils"
+
+DEPEND="
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+"
+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}-suspend.patch" )