Revision bump, apply upstream patch to fix global key shortcuts being reset to their default value at each login, bug 365039

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 94 insertions, 1 deletions

diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index 12bca1a07e37..d7d0f7732a95 100644
--- a/kde-base/powerdevil/ChangeLog
+++ b/kde-base/powerdevil/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/powerdevil
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.68 2011/04/07 21:41:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.69 2011/04/27 17:21:35 tampakrap Exp $
+
+*powerdevil-4.6.2-r1 (27 Apr 2011)
+
+  27 Apr 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +powerdevil-4.6.2-r1.ebuild,
+  +files/powerdevil-4.6.2-global-key-shortcuts-fix.patch:
+  Revision bump, apply upstream patch to fix global key shortcuts being reset
+  to their default value at each login, bug 365039
 
   07 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> powerdevil-4.6.2.ebuild:
   Dylink scanner does not point linking to XScrnSaver.
diff --git a/kde-base/powerdevil/files/powerdevil-4.6.2-global-key-shortcuts-fix.patch b/kde-base/powerdevil/files/powerdevil-4.6.2-global-key-shortcuts-fix.patch
new file mode 100644
index 000000000000..9f984d8907aa
--- /dev/null
+++ b/kde-base/powerdevil/files/powerdevil-4.6.2-global-key-shortcuts-fix.patch
@@ -0,0 +1,54 @@
+commit b6087c028016409c73e8b96c3600369edc89817b
+Author: Björn Ruberg <bjoern@ruberg-wegener.de>
+Date:   Wed Apr 27 07:14:24 2011 +0200
+
+    Fix global key shortcuts (powermanagement: suspend, hibernate, ...) being resetted to their default value at each login.
+    BUG: 262908
+
+diff --git a/powerdevil/daemon/powerdevilcore.cpp b/powerdevil/daemon/powerdevilcore.cpp
+index 3d08b02..5f7fab5 100644
+--- a/powerdevil/daemon/powerdevilcore.cpp
++++ b/powerdevil/daemon/powerdevilcore.cpp
+@@ -151,37 +151,27 @@ void Core::onBackendReady()
+ 
+     KAction* globalAction = actionCollection->addAction("Increase Screen Brightness");
+     globalAction->setText(i18nc("Global shortcut", "Increase Screen Brightness"));
+-    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessUp),
+-                                    KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
+-                                    KAction::NoAutoloading);
++    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessUp));
+     connect(globalAction, SIGNAL(triggered(bool)), SLOT(increaseBrightness()));
+ 
+     globalAction = actionCollection->addAction("Decrease Screen Brightness");
+     globalAction->setText(i18nc("Global shortcut", "Decrease Screen Brightness"));
+-    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessDown),
+-                                    KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
+-                                    KAction::NoAutoloading);
++    globalAction->setGlobalShortcut(KShortcut(Qt::Key_MonBrightnessDown));
+     connect(globalAction, SIGNAL(triggered(bool)), SLOT(decreaseBrightness()));
+ 
+     globalAction = actionCollection->addAction("Sleep");
+     globalAction->setText(i18nc("Global shortcut", "Sleep"));
+-    globalAction->setGlobalShortcut(KShortcut(Qt::Key_Sleep),
+-                                    KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
+-                                    KAction::NoAutoloading);
++    globalAction->setGlobalShortcut(KShortcut(Qt::Key_Sleep));
+     connect(globalAction, SIGNAL(triggered(bool)), SLOT(suspendToRam()));
+ 
+     globalAction = actionCollection->addAction("Hibernate");
+     globalAction->setText(i18nc("Global shortcut", "Hibernate"));
+-    globalAction->setGlobalShortcut(KShortcut(Qt::Key_Hibernate),
+-                                    KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
+-                                    KAction::NoAutoloading);
++    globalAction->setGlobalShortcut(KShortcut(Qt::Key_Hibernate));
+     connect(globalAction, SIGNAL(triggered(bool)), SLOT(suspendToDisk()));
+ 
+     globalAction = actionCollection->addAction("PowerOff");
+     //globalAction->setText(i18nc("Global shortcut", "Power Off button"));
+-    globalAction->setGlobalShortcut(KShortcut(Qt::Key_PowerOff),
+-                                    KAction::ShortcutTypes(KAction::ActiveShortcut | KAction::DefaultShortcut),
+-                                    KAction::NoAutoloading);
++    globalAction->setGlobalShortcut(KShortcut(Qt::Key_PowerOff));
+     connect(globalAction, SIGNAL(triggered(bool)), SLOT(powerOffButtonTriggered()));
+ }
+ 
diff --git a/kde-base/powerdevil/powerdevil-4.6.2-r1.ebuild b/kde-base/powerdevil/powerdevil-4.6.2-r1.ebuild
new file mode 100644
index 000000000000..eb8e01537144
--- /dev/null
+++ b/kde-base/powerdevil/powerdevil-4.6.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/powerdevil-4.6.2-r1.ebuild,v 1.1 2011/04/27 17:21:35 tampakrap Exp $
+
+EAPI=3
+
+KMNAME="kdebase-workspace"
+inherit kde4-meta
+
+DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."
+HOMEPAGE="http://www.kde-apps.org/content/show.php/PowerDevil?content=85078"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +pm-utils"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+"
+RDEPEND="${DEPEND}
+	!sys-power/powerdevil
+	pm-utils? ( sys-power/pm-utils )
+"
+
+KMEXTRACTONLY="
+	krunner/
+	ksmserver/org.kde.KSMServerInterface.xml
+"
+
+PATCHES=( "${FILESDIR}/${P}-global-key-shortcuts-fix.patch" )