[kde-base/powerdevil] Add patch from upstream bug #205453, remove 4.4.2.

11 files changed, 42 insertions, 76 deletions

diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index 86639cbfb5c..06ef38e8a81 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,15 +1,12 @@
-AUX powerdevil-4.4.2-backport-bug-221637.patch 712 RMD160 a624b98fb1dfdb882468a10e4ed643dd0f8880c3 SHA1 e7a4cf17cdfee3b61d0b224064379f5d396b8d95 SHA256 056da4b3757d646b7e608498d65490ca7800c20c66dd922693fe722fc7389eac
-AUX powerdevil-4.4.2-backport-bug-221648.patch 436 RMD160 f9c360ab73f8a7f14f6cf7b928417f7125299e9b SHA1 6e8952f353204b9a2917549bb728e8300824a5b3 SHA256 5edafdc883503baf15806143822e91f71b35349dcb7c638b9ceda2a6a9126e4d
-DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69ccb90f656266c SHA1 5fd38e48c6ddcf551bb49cf8841ba23b7682ee5b SHA256 8c32bda86e9ec67244ea2996a7e710ed04f0bb532c691af7d366c278f9b519bd
+AUX powerdevil-4.4.3-fix-sleep-205453.patch 431 RMD160 21dc46c060f7804f10413cbee49ae6fc8d990cf5 SHA1 2041e88c60fc950d835e683984a0e7990cf7bf5a SHA256 85bf67a7c60ff7406b681752762d408d1ba20a3ca3178b2874ca44b76102291b
 DIST kdebase-workspace-4.4.4.tar.bz2 77036111 RMD160 26df3ddc22611f50d29818d27079dfe4bacf6910 SHA1 7b20bc91a5969b4c42c83076926cf6838b2ba47b SHA256 132df024801fff623d3e97f366dff0ed0fae7a653ac483184c0c65f8ea4adee7
 DIST kdebase-workspace-4.4.75.tar.xz 70004520 RMD160 576bb5be092e24f7656b105ce800e88fad3c67fd SHA1 fd4f1f918bedc268930c1eb98f1c6e8f7d381483 SHA256 05c108c79ae2e1fa3203467b89c5171ed48bb3370ce07abb184e7912f5680d9d
 DIST kdebase-workspace-4.4.80.tar.bz2 72711719 RMD160 b3a08fed15fc8bfce9a00153ed54ba748bf491b6 SHA1 a31fcf38d6779139f01cab3116940789078d62fd SHA256 ab090e1dbddd2c563bed0c894186907bf80fc0cc180d596a6e0d19443b23d096
 DIST kdebase-workspace-4.4.81.tar.xz 66602744 RMD160 dfe3b9d88dd2e9debca6410addbabdb3ae36a2f1 SHA1 bd4fc369ba62b2a9baabf0147d9fe4c3e9315772 SHA256 3d95d4040af534da4af3f2b6051e95aa7f95f178b1891c3eabbc66c24c391ec5
-EBUILD powerdevil-4.4.2.ebuild 896 RMD160 a0b5b6d1b80b869a06b35e93bff311a3454734e0 SHA1 17b1c1afd80a7819a72d99bbba32ecf84b40e472 SHA256 df64748e60f8e9c3ab3b078017d23c5fa772c4146f0a0795ac1e60414fa08a39
-EBUILD powerdevil-4.4.4.ebuild 791 RMD160 4098a4ba93886532928de2cb74ec4c52e9fb85ee SHA1 71e0b9f9405ccfb816b9836de8b3b9dd157791da SHA256 56b4df6f19c12f5c74a7b91b2041a2931f01d8d353abd16aee027f764f13748e
-EBUILD powerdevil-4.4.75.ebuild 791 RMD160 4098a4ba93886532928de2cb74ec4c52e9fb85ee SHA1 71e0b9f9405ccfb816b9836de8b3b9dd157791da SHA256 56b4df6f19c12f5c74a7b91b2041a2931f01d8d353abd16aee027f764f13748e
-EBUILD powerdevil-4.4.80.ebuild 791 RMD160 4098a4ba93886532928de2cb74ec4c52e9fb85ee SHA1 71e0b9f9405ccfb816b9836de8b3b9dd157791da SHA256 56b4df6f19c12f5c74a7b91b2041a2931f01d8d353abd16aee027f764f13748e
-EBUILD powerdevil-4.4.81.ebuild 791 RMD160 4098a4ba93886532928de2cb74ec4c52e9fb85ee SHA1 71e0b9f9405ccfb816b9836de8b3b9dd157791da SHA256 56b4df6f19c12f5c74a7b91b2041a2931f01d8d353abd16aee027f764f13748e
-EBUILD powerdevil-4.4.9999.ebuild 713 RMD160 2166aa21f6be3a5ce971dc8974f5b8ecae1e7032 SHA1 b4e78e25ee9ee85b0b45b2ba31aca8a31cf0d948 SHA256 5d704b3bd8402c4e4b7b1261a442baf8bc272dd573c9d9988e655a0f69e27da8
-EBUILD powerdevil-9999.ebuild 713 RMD160 2166aa21f6be3a5ce971dc8974f5b8ecae1e7032 SHA1 b4e78e25ee9ee85b0b45b2ba31aca8a31cf0d948 SHA256 5d704b3bd8402c4e4b7b1261a442baf8bc272dd573c9d9988e655a0f69e27da8
+EBUILD powerdevil-4.4.4.ebuild 854 RMD160 836d4836493cc38f3171fdd451879dd74076552c SHA1 240d4ed64cf9664ba53d89435c9ed430cfd6ea22 SHA256 ee6a61085b02a3d00c3d390dd3650d31dacd2a1698650069e5a2a9af041fd853
+EBUILD powerdevil-4.4.75.ebuild 854 RMD160 836d4836493cc38f3171fdd451879dd74076552c SHA1 240d4ed64cf9664ba53d89435c9ed430cfd6ea22 SHA256 ee6a61085b02a3d00c3d390dd3650d31dacd2a1698650069e5a2a9af041fd853
+EBUILD powerdevil-4.4.80.ebuild 854 RMD160 836d4836493cc38f3171fdd451879dd74076552c SHA1 240d4ed64cf9664ba53d89435c9ed430cfd6ea22 SHA256 ee6a61085b02a3d00c3d390dd3650d31dacd2a1698650069e5a2a9af041fd853
+EBUILD powerdevil-4.4.81.ebuild 854 RMD160 836d4836493cc38f3171fdd451879dd74076552c SHA1 240d4ed64cf9664ba53d89435c9ed430cfd6ea22 SHA256 ee6a61085b02a3d00c3d390dd3650d31dacd2a1698650069e5a2a9af041fd853
+EBUILD powerdevil-4.4.9999.ebuild 776 RMD160 a1d2b49b53ab4a3a21a9c265c52c225b9e2b5ba8 SHA1 9fdf470c4b3afc33350566f81df748736778ac44 SHA256 61eb0f6b3cd935473981ddb265e161057b96b7697009fc9be94daa08da8866f6
+EBUILD powerdevil-9999.ebuild 776 RMD160 a1d2b49b53ab4a3a21a9c265c52c225b9e2b5ba8 SHA1 9fdf470c4b3afc33350566f81df748736778ac44 SHA256 61eb0f6b3cd935473981ddb265e161057b96b7697009fc9be94daa08da8866f6
 MISC metadata.xml 281 RMD160 81ae5951c6f8387eb7c87bf07d7c136d4c3f7589 SHA1 e1e397b43276333f8c5a5f1300977fca84c39920 SHA256 f42f84b6cbe3862afd6839a2da268b563bbac43ed8d39f127db2bd1ad5b53c88
diff --git a/kde-base/powerdevil/files/powerdevil-4.4.2-backport-bug-221637.patch b/kde-base/powerdevil/files/powerdevil-4.4.2-backport-bug-221637.patch
deleted file mode 100644
index 9d260bafc6a..00000000000
--- a/kde-base/powerdevil/files/powerdevil-4.4.2-backport-bug-221637.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: workspace/powerdevil/daemon/PowerDevilDaemon.cpp
-===================================================================
---- workspace/powerdevil/daemon/PowerDevilDaemon.cpp	(revision 1115242)
-+++ workspace/powerdevil/daemon/PowerDevilDaemon.cpp	(revision 1115243)
-@@ -985,10 +985,6 @@
- void PowerDevilDaemon::emitNotification(const QString &evid, const QString &message,
-                                         const char *slot, const QString &iconname)
- {
--    if (slot) {
--        QTimer::singleShot(0, this, slot);
--    }
--
-     if (!slot) {
-         KNotification::event(evid, message, KIcon(iconname).pixmap(20, 20),
-                              0, KNotification::CloseOnTimeout, d->applicationData);
diff --git a/kde-base/powerdevil/files/powerdevil-4.4.2-backport-bug-221648.patch b/kde-base/powerdevil/files/powerdevil-4.4.2-backport-bug-221648.patch
deleted file mode 100644
index 7c729fb19c0..00000000000
--- a/kde-base/powerdevil/files/powerdevil-4.4.2-backport-bug-221648.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: workspace/powerdevil/daemon/PowerDevilDaemon.cpp
-===================================================================
---- workspace/powerdevil/daemon/PowerDevilDaemon.cpp	(revision 1115251)
-+++ workspace/powerdevil/daemon/PowerDevilDaemon.cpp	(revision 1115252)
-@@ -280,6 +280,8 @@
-     }
- 
-     Solid::Control::PowerManager::setBrightness(d->brightness);
-+
-+    d->status = NoAction;
- }
- 
- void PowerDevilDaemon::refreshStatus()
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
new file mode 100644
index 00000000000..b34add24972
--- /dev/null
+++ b/kde-base/powerdevil/files/powerdevil-4.4.3-fix-sleep-205453.patch
@@ -0,0 +1,11 @@
+--- 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/powerdevil-4.4.2.ebuild b/kde-base/powerdevil/powerdevil-4.4.2.ebuild
deleted file mode 100644
index e05f6b84a73..00000000000
--- a/kde-base/powerdevil/powerdevil-4.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +pm-utils"
-
-COMMONDEPEND="
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep solid)
-	!aqua? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${COMMONDEPEND}
-	!aqua? ( x11-proto/scrnsaverproto )
-"
-RDEPEND="${COMMONDEPEND}
-	!sys-power/powerdevil
-	pm-utils? ( sys-power/pm-utils )
-"
-
-KMEXTRACTONLY="
-	krunner/
-	ksmserver/org.kde.KSMServerInterface.xml
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-backport-bug-221637.patch"
-	"${FILESDIR}/${P}-backport-bug-221648.patch"
-)
diff --git a/kde-base/powerdevil/powerdevil-4.4.4.ebuild b/kde-base/powerdevil/powerdevil-4.4.4.ebuild
index d556f85eeb8..ae155b033a1 100644
--- a/kde-base/powerdevil/powerdevil-4.4.4.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.4.4.ebuild
@@ -31,3 +31,7 @@ KMEXTRACTONLY="
 	krunner/
 	ksmserver/org.kde.KSMServerInterface.xml
 "
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
+)
diff --git a/kde-base/powerdevil/powerdevil-4.4.75.ebuild b/kde-base/powerdevil/powerdevil-4.4.75.ebuild
index d556f85eeb8..ae155b033a1 100644
--- a/kde-base/powerdevil/powerdevil-4.4.75.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.4.75.ebuild
@@ -31,3 +31,7 @@ KMEXTRACTONLY="
 	krunner/
 	ksmserver/org.kde.KSMServerInterface.xml
 "
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
+)
diff --git a/kde-base/powerdevil/powerdevil-4.4.80.ebuild b/kde-base/powerdevil/powerdevil-4.4.80.ebuild
index d556f85eeb8..ae155b033a1 100644
--- a/kde-base/powerdevil/powerdevil-4.4.80.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.4.80.ebuild
@@ -31,3 +31,7 @@ KMEXTRACTONLY="
 	krunner/
 	ksmserver/org.kde.KSMServerInterface.xml
 "
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
+)
diff --git a/kde-base/powerdevil/powerdevil-4.4.81.ebuild b/kde-base/powerdevil/powerdevil-4.4.81.ebuild
index d556f85eeb8..ae155b033a1 100644
--- a/kde-base/powerdevil/powerdevil-4.4.81.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.4.81.ebuild
@@ -31,3 +31,7 @@ KMEXTRACTONLY="
 	krunner/
 	ksmserver/org.kde.KSMServerInterface.xml
 "
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
+)
diff --git a/kde-base/powerdevil/powerdevil-4.4.9999.ebuild b/kde-base/powerdevil/powerdevil-4.4.9999.ebuild
index 4c067f1de0a..262c5830e16 100644
--- a/kde-base/powerdevil/powerdevil-4.4.9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.4.9999.ebuild
@@ -31,3 +31,7 @@ KMEXTRACTONLY="
 	krunner/
 	ksmserver/org.kde.KSMServerInterface.xml
 "
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
+)
diff --git a/kde-base/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-9999.ebuild
index 4c067f1de0a..262c5830e16 100644
--- a/kde-base/powerdevil/powerdevil-9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-9999.ebuild
@@ -31,3 +31,7 @@ KMEXTRACTONLY="
 	krunner/
 	ksmserver/org.kde.KSMServerInterface.xml
 "
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-fix-sleep-205453.patch"
+)