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

Package-Manager: portage-2.1.3.5

5 files changed, 116 insertions, 5 deletions

diff --git a/kde-base/klaptopdaemon/ChangeLog b/kde-base/klaptopdaemon/ChangeLog
index c9999ba58d31..fd3c21e40376 100644
--- a/kde-base/klaptopdaemon/ChangeLog
+++ b/kde-base/klaptopdaemon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/klaptopdaemon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.86 2007/08/11 15:15:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.87 2007/08/17 07:59:42 philantrop Exp $
+
+*klaptopdaemon-3.5.7-r1 (16 Aug 2007)
+
+  16 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/klaptopdaemon-3.5.7-has_acpi_sleep.patch,
+  +klaptopdaemon-3.5.7-r1.ebuild:
+  Added patch to enable hibernating with newer kernels as provided by Sergey
+  Temerkhanov (thanks, Sergey!) on bug 188760.
 
   11 Aug 2007; Raúl Porcel <armin76@gentoo.org> klaptopdaemon-3.5.7.ebuild:
   x86 stable wrt #185823
diff --git a/kde-base/klaptopdaemon/Manifest b/kde-base/klaptopdaemon/Manifest
index febcdfe4df1f..55e7192bc71d 100644
--- a/kde-base/klaptopdaemon/Manifest
+++ b/kde-base/klaptopdaemon/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
@@ -19,14 +26,18 @@ EBUILD klaptopdaemon-3.5.6.ebuild 687 RMD160 e63eacec13ded5fe14630e6aac278a76e66
 MD5 15fb81b2a5c12d79c3bc57eba426a445 klaptopdaemon-3.5.6.ebuild 687
 RMD160 e63eacec13ded5fe14630e6aac278a76e6601e79 klaptopdaemon-3.5.6.ebuild 687
 SHA256 86a07e6144124bbcaf8c3a5e2d031d079e49dd4bfd8e49f1a093c256b56c23de klaptopdaemon-3.5.6.ebuild 687
+EBUILD klaptopdaemon-3.5.7-r1.ebuild 963 RMD160 bd60a436b93c0afc7bfc46b15be71be119be4f1c SHA1 88fb53cad46be9de9c2e31b807c94e54c4b0f58d SHA256 b4921a94b6e35f3eef94ffee3bda498f987125e8b4234dd8c7403b236722b14b
+MD5 7141a9a3bb0c63e1ad5b6fe89fd85f34 klaptopdaemon-3.5.7-r1.ebuild 963
+RMD160 bd60a436b93c0afc7bfc46b15be71be119be4f1c klaptopdaemon-3.5.7-r1.ebuild 963
+SHA256 b4921a94b6e35f3eef94ffee3bda498f987125e8b4234dd8c7403b236722b14b klaptopdaemon-3.5.7-r1.ebuild 963
 EBUILD klaptopdaemon-3.5.7.ebuild 910 RMD160 f32349f452370bf4d1054c5013fa9cde0b047295 SHA1 1d419fd441cab9763db4bf92c1e2b9eee300b504 SHA256 f6bcfffe773bebc66fb0a195ee84044966cd88de05cb3cbc95a50adf43aa3be9
 MD5 0bc9ef47343c8efbd02fe27d2ea82123 klaptopdaemon-3.5.7.ebuild 910
 RMD160 f32349f452370bf4d1054c5013fa9cde0b047295 klaptopdaemon-3.5.7.ebuild 910
 SHA256 f6bcfffe773bebc66fb0a195ee84044966cd88de05cb3cbc95a50adf43aa3be9 klaptopdaemon-3.5.7.ebuild 910
-MISC ChangeLog 11527 RMD160 c1042d5e4bead5dc18ccb4a8848798fe33c01a88 SHA1 dde750cb70cf5190d6009eee2cc136d66bb834cf SHA256 f9c1568647e424f2383404432b2c4b059de9d42b1682d50db83cfee25650d33b
-MD5 71512e5a96125a0a4283d4514ab845e2 ChangeLog 11527
-RMD160 c1042d5e4bead5dc18ccb4a8848798fe33c01a88 ChangeLog 11527
-SHA256 f9c1568647e424f2383404432b2c4b059de9d42b1682d50db83cfee25650d33b ChangeLog 11527
+MISC ChangeLog 11834 RMD160 6d9eca7f642e6d3a87ac1b66013b2cfaa95c93fc SHA1 effca3b96af2c6f50bc3f9e65742b46fe55e1248 SHA256 a202ef3bd4134da89788628ca8fa2047752dada9d088155a52dc3788092f471f
+MD5 ad2682d5162aa65af921f6455d44d7b9 ChangeLog 11834
+RMD160 6d9eca7f642e6d3a87ac1b66013b2cfaa95c93fc ChangeLog 11834
+SHA256 a202ef3bd4134da89788628ca8fa2047752dada9d088155a52dc3788092f471f ChangeLog 11834
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -43,3 +54,13 @@ SHA256 9d6b8cec5ff7bee1a1c29a523b269690a5daa668be616527933902c4b5fd1fda files/di
 MD5 101c735be2be027c3bbf46e9ec13ee3c files/digest-klaptopdaemon-3.5.7 521
 RMD160 e33c42e37807d7b54f80fb8df3d7f244f8be3f54 files/digest-klaptopdaemon-3.5.7 521
 SHA256 bbc34c0763584ef1da811fb4b3dee8d9a0bed32b306d649b67dfdb14b83485fa files/digest-klaptopdaemon-3.5.7 521
+MD5 101c735be2be027c3bbf46e9ec13ee3c files/digest-klaptopdaemon-3.5.7-r1 521
+RMD160 e33c42e37807d7b54f80fb8df3d7f244f8be3f54 files/digest-klaptopdaemon-3.5.7-r1 521
+SHA256 bbc34c0763584ef1da811fb4b3dee8d9a0bed32b306d649b67dfdb14b83485fa files/digest-klaptopdaemon-3.5.7-r1 521
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGxVV1CkvF58q80IkRAnxkAKCcg2jTfF9uhBuu5MtmFVHYfzVisQCgip+l
+4cgOMqn8POiwKVvbQGcy8gI=
+=Ydi5
+-----END PGP SIGNATURE-----
diff --git a/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.5.7-r1 b/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.5.7-r1
new file mode 100644
index 000000000000..58ea39070808
--- /dev/null
+++ b/kde-base/klaptopdaemon/files/digest-klaptopdaemon-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/klaptopdaemon/files/klaptopdaemon-3.5.7-has_acpi_sleep.patch b/kde-base/klaptopdaemon/files/klaptopdaemon-3.5.7-has_acpi_sleep.patch
new file mode 100644
index 000000000000..33b8a448a14f
--- /dev/null
+++ b/kde-base/klaptopdaemon/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/klaptopdaemon/klaptopdaemon-3.5.7-r1.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..69f1b54cf169
--- /dev/null
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.5.7-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.7-r1.ebuild,v 1.1 2007/08/17 07:59:42 philantrop Exp $
+
+KMNAME=kdeutils
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdeutils-3.5-patchset-02.tar.bz2"
+
+DESCRIPTION="KLaptopdaemon - KDE battery monitoring and management for laptops."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kdehiddenvisibility xscreensaver"
+
+RDEPEND="x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	x11-libs/libX11
+	x11-proto/xproto
+	virtual/os-headers"
+
+PATCHES="${FILESDIR}/${P}-libXss-linking.patch
+		${FILESDIR}/${P}-has_acpi_sleep.patch"
+EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff"
+
+src_compile() {
+	myconf="${myconf} $(use_with xscreensaver)"
+
+	kde_src_compile
+}