rm old files

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

3 files changed, 6 insertions, 66 deletions

diff --git a/kde-base/powerdevil/ChangeLog b/kde-base/powerdevil/ChangeLog
index 74606c0673d0..2fe9aca3f6b6 100644
--- a/kde-base/powerdevil/ChangeLog
+++ b/kde-base/powerdevil/ChangeLog
@@ -1,6 +1,11 @@
 # 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.94 2011/12/11 18:52:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/powerdevil/ChangeLog,v 1.95 2011/12/12 01:34:01 abcd Exp $
+
+  12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/powerdevil-4.4.3-fix-sleep-205453.patch,
+  -files/powerdevil-4.6.2-global-key-shortcuts-fix.patch:
+  rm old files
 
 *powerdevil-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/powerdevil/files/powerdevil-4.4.3-fix-sleep-205453.patch b/kde-base/powerdevil/files/powerdevil-4.4.3-fix-sleep-205453.patch
deleted file mode 100644
index b34add249724..000000000000
--- a/kde-base/powerdevil/files/powerdevil-4.4.3-fix-sleep-205453.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp.orig	2010-04-29 21:54:40.000000000 +0200
-+++ kdebase-workspace-4.4.3/powerdevil/daemon/PowerDevilDaemon.cpp	2010-05-09 17:06:54.000000000 +0200
-@@ -571,7 +571,7 @@
- 
- void PowerDevilDaemon::buttonPressed(int but)
- {
--    if (!checkIfCurrentSessionActive() || d->screenSaverIface->GetActive()) {
-+    if (!checkIfCurrentSessionActive()) {
-         return;
-     }
- 
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
deleted file mode 100644
index 9f984d8907aa..000000000000
--- a/kde-base/powerdevil/files/powerdevil-4.6.2-global-key-shortcuts-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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()));
- }
-