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

(Portage version: 2.1.3.5)

4 files changed, 114 insertions, 1 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/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
+}