Added patch to enable hibernating using klaptopdaemon with newer kernels as provided by Sergey Temerkhanov (thanks, Sergey!) on bug 188760.

Package-Manager: portage-2.1.3.5

5 files changed, 139 insertions, 5 deletions

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index a24b61f7e5b2..428fce2fc704 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.212 2007/08/15 05:01:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.213 2007/08/17 08:57:02 philantrop Exp $
+
+*kdeutils-3.5.7-r1 (17 Aug 2007)
+
+  17 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/klaptopdaemon-3.5.7-has_acpi_sleep.patch,
+  +kdeutils-3.5.7-r1.ebuild:
+  Added patch to enable hibernating using klaptopdaemon with newer kernels as
+  provided by Sergey Temerkhanov (thanks, Sergey!) on bug 188760.
 
   15 Aug 2007; Jeroen Roovers <jer@gentoo.org> kdeutils-3.5.7.ebuild:
   Stable for HPPA (bug #176297).
diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index 2e41d674c45b..c7bfaa6be41c 100644
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX klaptopdaemon-3.5.7-has_acpi_sleep.patch 1138 RMD160 b0962ab67f13688c7bf169b3337b8e34ddfb9c99 SHA1 24d51da049f13bf4ea1927b2d10be6e6a828dd69 SHA256 40df6cc42c49ae615c27f1ea8b8ae7f4d1cd9dcd5e295c1396b00e3daae083b7
+MD5 4071a9d553ac1ff2c7b5f64652b49cf0 files/klaptopdaemon-3.5.7-has_acpi_sleep.patch 1138
+RMD160 b0962ab67f13688c7bf169b3337b8e34ddfb9c99 files/klaptopdaemon-3.5.7-has_acpi_sleep.patch 1138
+SHA256 40df6cc42c49ae615c27f1ea8b8ae7f4d1cd9dcd5e295c1396b00e3daae083b7 files/klaptopdaemon-3.5.7-has_acpi_sleep.patch 1138
 AUX klaptopdaemon-3.5.7-libXss-linking.patch 629 RMD160 49f69d98b3addf18d264aba8f10f7286e8726a20 SHA1 892b9b6178ba8667d771cdfbb12f9a96a5ad2336 SHA256 356c94da4a3e4c94c0097d65db4dc6203d582dacf225b87c4181f554031ad80b
 MD5 98d40e51d61be53e054fcd4d608fb590 files/klaptopdaemon-3.5.7-libXss-linking.patch 629
 RMD160 49f69d98b3addf18d264aba8f10f7286e8726a20 files/klaptopdaemon-3.5.7-libXss-linking.patch 629
@@ -23,14 +30,18 @@ EBUILD kdeutils-3.5.6.ebuild 1183 RMD160 b3495e5f7e638411911172c57fe7dcdbec9c865
 MD5 e1275d672e07c682216ea3cced95ba78 kdeutils-3.5.6.ebuild 1183
 RMD160 b3495e5f7e638411911172c57fe7dcdbec9c865d kdeutils-3.5.6.ebuild 1183
 SHA256 41dfacc22d6447a37b78d0ecd9ddb3d80c4b601c3ace6950d4d3410c634b923f kdeutils-3.5.6.ebuild 1183
+EBUILD kdeutils-3.5.7-r1.ebuild 1528 RMD160 aa7feb76b9b9f802dcae920656ee2730d14c97a5 SHA1 22a8ec125f60718047b9e2bf9d7d25c33ab99e16 SHA256 95ad2ee8dab683fb840c99efefd2d426dfa7832247b5a0109858d003e9b8320b
+MD5 c30cea3bf0eebe1f82d8a143d9635c11 kdeutils-3.5.7-r1.ebuild 1528
+RMD160 aa7feb76b9b9f802dcae920656ee2730d14c97a5 kdeutils-3.5.7-r1.ebuild 1528
+SHA256 95ad2ee8dab683fb840c99efefd2d426dfa7832247b5a0109858d003e9b8320b kdeutils-3.5.7-r1.ebuild 1528
 EBUILD kdeutils-3.5.7.ebuild 1456 RMD160 31b571f3d9e971c0f7b6d8434b049d7448346c91 SHA1 aa5ff2cf8d748e131d901697852c71297c64a39e SHA256 faacdb17b467d04c707749b9c980d9af622dd44718cbc602061c5e45aad847d5
 MD5 c5919a58518f6bb5fbdcd51b1b21df22 kdeutils-3.5.7.ebuild 1456
 RMD160 31b571f3d9e971c0f7b6d8434b049d7448346c91 kdeutils-3.5.7.ebuild 1456
 SHA256 faacdb17b467d04c707749b9c980d9af622dd44718cbc602061c5e45aad847d5 kdeutils-3.5.7.ebuild 1456
-MISC ChangeLog 25214 RMD160 2c453aa7501e7363d61137db5f85bd1924275fe9 SHA1 bd432cbfeed6e175183f871ef8b5ad79627f8e23 SHA256 5e49bdeb231226b291466051d87b9ecea10a1b8e383936e5b817a3b080b500b3
-MD5 64fdda6541df322c792a4f44c44716c0 ChangeLog 25214
-RMD160 2c453aa7501e7363d61137db5f85bd1924275fe9 ChangeLog 25214
-SHA256 5e49bdeb231226b291466051d87b9ecea10a1b8e383936e5b817a3b080b500b3 ChangeLog 25214
+MISC ChangeLog 25535 RMD160 202138070a4009d29eb3cfab1df6425b35601cca SHA1 278eddcf39ec317a4258132e4b46575af38d0413 SHA256 a6b9d68350405d342d7f1ff302f936fca1c7ff0296496ad33744ae7ff25962f6
+MD5 ce9dc9ce79392c1d1ab0a9cd1cc8f75c ChangeLog 25535
+RMD160 202138070a4009d29eb3cfab1df6425b35601cca ChangeLog 25535
+SHA256 a6b9d68350405d342d7f1ff302f936fca1c7ff0296496ad33744ae7ff25962f6 ChangeLog 25535
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -47,3 +58,13 @@ SHA256 9d6b8cec5ff7bee1a1c29a523b269690a5daa668be616527933902c4b5fd1fda files/di
 MD5 101c735be2be027c3bbf46e9ec13ee3c files/digest-kdeutils-3.5.7 521
 RMD160 e33c42e37807d7b54f80fb8df3d7f244f8be3f54 files/digest-kdeutils-3.5.7 521
 SHA256 bbc34c0763584ef1da811fb4b3dee8d9a0bed32b306d649b67dfdb14b83485fa files/digest-kdeutils-3.5.7 521
+MD5 101c735be2be027c3bbf46e9ec13ee3c files/digest-kdeutils-3.5.7-r1 521
+RMD160 e33c42e37807d7b54f80fb8df3d7f244f8be3f54 files/digest-kdeutils-3.5.7-r1 521
+SHA256 bbc34c0763584ef1da811fb4b3dee8d9a0bed32b306d649b67dfdb14b83485fa files/digest-kdeutils-3.5.7-r1 521
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGxWLlCkvF58q80IkRAp/zAJ9vE/IhtT6RQNVDYGTVG6BMR2RkUwCfYziM
+didKuVMn7zW0sZTtn78r7Xw=
+=erkG
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.5.7-r1 b/kde-base/kdeutils/files/digest-kdeutils-3.5.7-r1
new file mode 100644
index 000000000000..58ea39070808
--- /dev/null
+++ b/kde-base/kdeutils/files/digest-kdeutils-3.5.7-r1
@@ -0,0 +1,6 @@
+MD5 4a5500af2f0170c9f74501093d5393ad kdeutils-3.5-patchset-02.tar.bz2 3019
+RMD160 b4598488995ed7dc7a86349cd68da426e2238773 kdeutils-3.5-patchset-02.tar.bz2 3019
+SHA256 54ddfbec990e3bff3139abf42755be24a450a8969eb77d41a5b0da4dc72580d6 kdeutils-3.5-patchset-02.tar.bz2 3019
+MD5 5f167f53bdbf0b8c71c2d0f0ff7593fd kdeutils-3.5.7.tar.bz2 3068596
+RMD160 0382278d69e71ff77178902f06126bda0f771ee8 kdeutils-3.5.7.tar.bz2 3068596
+SHA256 e72de75dd40e1422e4da5957acafc06278418f60850aea21524d857abb97adf8 kdeutils-3.5.7.tar.bz2 3068596
diff --git a/kde-base/kdeutils/files/klaptopdaemon-3.5.7-has_acpi_sleep.patch b/kde-base/kdeutils/files/klaptopdaemon-3.5.7-has_acpi_sleep.patch
new file mode 100644
index 000000000000..33b8a448a14f
--- /dev/null
+++ b/kde-base/kdeutils/files/klaptopdaemon-3.5.7-has_acpi_sleep.patch
@@ -0,0 +1,43 @@
+--- ./klaptopdaemon/portable.cpp.old	2007-05-14 11:40:45.000000000 +0400
++++ ./klaptopdaemon/portable.cpp	2007-08-14 01:52:30.775790879 +0400
+@@ -690,15 +690,16 @@ has_acpi_sleep(int state) 
+ 		mask = 0;
+ 
+ 		QFile p("/sys/power/state");
+-		QFile f("/proc/acpi/sleep");
+ 
+ 		if (p.open(IO_ReadOnly)) {
++			QTextStream stream(&p);
+ 			QString l;
+-			p.readLine(l,500);
++			l = stream.readLine();
++
+ 			QStringList ll = QStringList::split(' ',l,false);
+ 			for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) {
+ 				QString s = *i;
+-				
++
+ 				if (s.compare("standby")==0)
+ 				mask |= (1<<1);
+ 				else if (s.compare("mem")==0)
+@@ -708,20 +709,6 @@ has_acpi_sleep(int state) 
+ 			}
+ 			p.close();
+ 		}
+-		else if (f.open(IO_ReadOnly)) {
+-			QString l;
+-			f.readLine(l, 500);
+-			QStringList ll = QStringList::split(' ',l,false);
+-			for (QValueListIterator<QString> i = ll.begin(); i!=ll.end(); i++) {
+-				QString s = *i;
+-				if (s[0] == 'S') {
+-					int c = s[1].digitValue();
+-					if (c >= 0 && c <= 9)
+-						mask |= 1<<c;
+-				}
+-			}
+-			f.close();
+-		}
+ 	}
+ 	return((mask&acpi_sleep_enabled&(1<<state)) != 0);
+ }
diff --git a/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild b/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..45335a87b38f
--- /dev/null
+++ b/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7-r1.ebuild,v 1.1 2007/08/17 08:57:02 philantrop Exp $
+
+inherit kde-dist eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdeutils-3.5-patchset-02.tar.bz2"
+
+DESCRIPTION="KDE utilities."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt kdehiddenvisibility pbbuttonsd snmp xscreensaver"
+
+BOTH_DEPEND="~kde-base/kdebase-${PV}
+	snmp? ( net-analyzer/net-snmp )
+	pbbuttonsd? ( app-laptop/pbbuttonsd )
+	dev-lang/python
+	dev-libs/gmp
+	x11-libs/libXtst"
+
+RDEPEND="${BOTH_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	!x11-misc/superkaramba"
+
+DEPEND="${BOTH_DEPEND}
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	x11-libs/libX11
+	x11-proto/xproto
+	virtual/os-headers"
+
+PATCHES="${FILESDIR}/klaptopdaemon-3.5.7-libXss-linking.patch
+		${FILESDIR}/superkaramba-3.5.7-network_sensor.patch
+		${FILESDIR}/klaptopdaemon-3.5.7-has_acpi_sleep.patch"
+EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff"
+
+src_unpack() {
+	kde_src_unpack
+	sed -i -e "s:Hidden=true:Hidden=false:" ksim/ksim.desktop || die "sed failed"
+}
+
+src_compile() {
+	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)
+					--without-xmms"
+	myconf="${myconf} $(use_with xscreensaver)"
+
+	use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	# see bug 144731
+	rm ${D}${KDEDIR}/share/applications/kde/ksim.desktop
+}