Add patch to fix error messages in klaptopdaemon (#109421).

Package-Manager: portage-2.0.51.22-r3

7 files changed, 120 insertions, 22 deletions

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 9891aa995dd9..af6269fd233e 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.133 2005/10/17 23:25:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.134 2005/10/19 14:34:28 greg_g Exp $
+
+*kdeutils-3.4.3-r1 (19 Oct 2005)
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeutils-3.4.3-klaptopdaemon.patch, +kdeutils-3.4.3-r1.ebuild,
+  kdeutils-3.5.0_beta2.ebuild:
+  Add patch to fix error messages in klaptopdaemon (#109421).
 
   17 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdeutils-3.4.1.ebuild:
   Mark 3.4.1 stable on alpha
diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index eba2f782a4f0..f4f43b1b3cfc 100644
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 9981cd5b2ebaac3d28a6158e5f4b05c0 kdeutils-3.4.1.ebuild 556
-MD5 d66758faf6f5acb722211615afe4c566 kdeutils-3.5_beta1.ebuild 780
-MD5 6d40233e55f09e93f79f032448671eb5 ChangeLog 15398
+MD5 099f54744999df3ab45b0c402fd8aabe kdeutils-3.4.3-r1.ebuild 985
 MD5 41ded646b6eaf390c425e03bb9d21df1 kdeutils-3.3.2.ebuild 395
-MD5 326614fcd8c1c2f949a93435d1ae2965 kdeutils-3.4.2.ebuild 869
 MD5 195b86327e8bd5a018eba7ff40e80bda kdeutils-3.4.3.ebuild 875
-MD5 49129eb5aee80df72a2ea49e043ec92c kdeutils-3.5.0_beta2.ebuild 779
-MD5 ba38338e687742fb5a9e7458de260898 files/digest-kdeutils-3.5_beta1 69
-MD5 5ec470abb58c9e1fe99f0410cb14dffd files/digest-kdeutils-3.4.2 68
+MD5 d66758faf6f5acb722211615afe4c566 kdeutils-3.5_beta1.ebuild 780
+MD5 2a0756c0b28f0aef1e43d2185b05c1b9 ChangeLog 15646
+MD5 326614fcd8c1c2f949a93435d1ae2965 kdeutils-3.4.2.ebuild 869
+MD5 93a37675dcf8f312f34d3b4d892bee0d kdeutils-3.5.0_beta2.ebuild 920
+MD5 9981cd5b2ebaac3d28a6158e5f4b05c0 kdeutils-3.4.1.ebuild 556
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kdeutils-3.4.3-r1 68
+MD5 0ebe4d00a1fd5845db2172027d12f531 files/kdeutils-3.4.3-klaptopdaemon.patch 1895
+MD5 4534ccb147438685553826778c267aac files/digest-kdeutils-3.4.1 68
+MD5 e733c7ad1c42938d7b945ea0f6f563ab files/kdeutils-3.4-configure.patch 2539
 MD5 fca6164743bb92c10536a5d235d30a34 files/digest-kdeutils-3.5.0_beta2 69
 MD5 95a30bd883c334e2f6c5f417ac53c9c9 files/digest-kdeutils-3.3.2 68
 MD5 7693585dde083d1c2cc205db10692163 files/digest-kdeutils-3.4.3 68
-MD5 e733c7ad1c42938d7b945ea0f6f563ab files/kdeutils-3.4-configure.patch 2539
-MD5 4534ccb147438685553826778c267aac files/digest-kdeutils-3.4.1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDVDLrJrHF4yAQTrARAh5xAKCwK7eIdvl9UF4uynEylfGH8FWxPACgg/Ll
-hH/lzrKkiRAhD9FCrDcTq9E=
-=OGyB
------END PGP SIGNATURE-----
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kdeutils-3.5_beta1 69
+MD5 5ec470abb58c9e1fe99f0410cb14dffd files/digest-kdeutils-3.4.2 68
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.4.3-r1 b/kde-base/kdeutils/files/digest-kdeutils-3.4.3-r1
new file mode 100644
index 000000000000..0b8cb3d8d2fe
--- /dev/null
+++ b/kde-base/kdeutils/files/digest-kdeutils-3.4.3-r1
@@ -0,0 +1 @@
+MD5 d467284b523bb1268da776cd016ede4d kdeutils-3.4.3.tar.bz2 2257060
diff --git a/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch b/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch
new file mode 100644
index 000000000000..28344217e647
--- /dev/null
+++ b/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch
@@ -0,0 +1,49 @@
+diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp
+--- kdeutils-3.4.3.orig/klaptopdaemon/laptop_daemon.cpp	2005-10-05 15:26:42.000000000 +0200
++++ kdeutils-3.4.3/klaptopdaemon/laptop_daemon.cpp	2005-10-18 15:38:21.000000000 +0200
+@@ -919,7 +919,7 @@
+ 	// the lid button turns stuff on when it's down and back off again when it's raised
+ 	// 	(kind of like the fridge door light)
+ 	//
+-	if (lid_state != laptop_portable::get_button(laptop_portable::LidButton)) {
++	if (s.enable_lid_button && (lid_state != laptop_portable::get_button(laptop_portable::LidButton))) {
+ 		lid_state = !lid_state;
+ 		if (lid_state) {
+ 			if (s.button_lid_bright_enabled) {
+@@ -982,7 +982,7 @@
+ 	//
+ 	// the power button on the other hand is an off/on switch for non-suspend type ops
+ 	//
+-	if (power_state != laptop_portable::get_button(laptop_portable::PowerButton)) {
++	if (s.enable_power_button && (power_state != laptop_portable::get_button(laptop_portable::PowerButton))) {
+ 		power_state = !power_state;
+ 		if (power_state) {
+ 			if (power_button_off) {
+diff -Nur kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp kdeutils-3.4.3/klaptopdaemon/portable.cpp
+--- kdeutils-3.4.3.orig/klaptopdaemon/portable.cpp	2005-10-05 15:26:42.000000000 +0200
++++ kdeutils-3.4.3/klaptopdaemon/portable.cpp	2005-10-18 15:38:21.000000000 +0200
+@@ -1937,19 +1937,19 @@
+ laptop_portable::get_button(LaptopButton l)	// true if a button is pressed
+ {
+ 	if (::has_acpi()) {
+-		QString *name=0;
++		QString name;
+ 		switch (l) {
+ 		case LidButton:
+-			name = &acpi_lid_name;
++			name = acpi_lid_name;
+ 			break;
+ 		case PowerButton:
+-			name = &acpi_power_name;
++			name = acpi_power_name;
+ 			break;
+ 		default:
+ 			break;
+ 		}
+-		if (name) {
+-			QFile f(*name);
++		if (!name.isNull()) {
++			QFile f(name);
+ 			if (f.open(IO_ReadOnly)) {
+ 				while (!f.atEnd()) {
+ 					QString l;
diff --git a/kde-base/kdeutils/kdeutils-3.4.3-r1.ebuild b/kde-base/kdeutils/kdeutils-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..b9b6a8e0ab11
--- /dev/null
+++ b/kde-base/kdeutils/kdeutils-3.4.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.4.3-r1.ebuild,v 1.1 2005/10/19 14:34:28 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE utilities"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="crypt snmp pbbuttonsd"
+
+DEPEND="~kde-base/kdebase-${PV}
+	snmp? ( net-analyzer/net-snmp )
+	pbbuttonsd? ( app-laptop/pbbuttonsd )"
+
+RDEPEND="${DEPEND}
+	crypt? ( app-crypt/gnupg )"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/kdeutils-3.4-configure.patch"
+
+	# Fix output of klaptopdaemon (kde bug 103437).
+	epatch "${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
+
+	# For the configure patch.
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)"
+
+	use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
+
+	kde_src_compile
+}
diff --git a/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild b/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild
index ecea50427d9d..d1cf4023016c 100644
--- a/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild,v 1.2 2005/10/19 14:34:28 greg_g Exp $
 
 inherit kde-dist
 
@@ -20,6 +20,13 @@ RDEPEND="${DEPEND}
 	crypt? ( app-crypt/gnupg )
 	!x11-misc/superkaramba"
 
+src_unpack() {
+	kde_src_unpack
+
+	# Fix output of klaptopdaemon (kde bug 103437).
+	epatch "${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
+}
+
 src_compile() {
 	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)
 	              $(use_with xmms)"
diff --git a/kde-base/klaptopdaemon/Manifest b/kde-base/klaptopdaemon/Manifest
index 5d6fd9157c94..12a6d39c4c2f 100644
--- a/kde-base/klaptopdaemon/Manifest
+++ b/kde-base/klaptopdaemon/Manifest
@@ -2,11 +2,14 @@ MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 80958e2866ab15b1fd020d2bbdeaeb94 klaptopdaemon-3.5_beta1.ebuild 430
 MD5 ea3bc9741dfa723bfb69fc5a2dcc55a1 klaptopdaemon-3.4.2.ebuild 454
 MD5 0320d9f781bb671bfdff8e5f0109af90 klaptopdaemon-3.4.1.ebuild 441
-MD5 ef0ffc9f97de5403f252461a1b61048d klaptopdaemon-3.5.0_beta2.ebuild 431
+MD5 2621c52ed7a407538d08a31865139b80 klaptopdaemon-3.5.0_beta2.ebuild 534
 MD5 95827ef4f8cf59415e039b43c89c85cc ChangeLog 2989
 MD5 ab6083b48166c84be09c79a163caa182 klaptopdaemon-3.4.3.ebuild 456
+MD5 c513a72b552cc77026b1b7217c172ebc klaptopdaemon-3.4.3-r1.ebuild 562
 MD5 7693585dde083d1c2cc205db10692163 files/digest-klaptopdaemon-3.4.3 68
 MD5 ba38338e687742fb5a9e7458de260898 files/digest-klaptopdaemon-3.5_beta1 69
+MD5 0ebe4d00a1fd5845db2172027d12f531 files/kdeutils-3.4.3-klaptopdaemon.patch 1895
 MD5 444e9ea16b9f6261077667552887b9bb files/digest-klaptopdaemon-3.5.0_beta2 216
+MD5 7693585dde083d1c2cc205db10692163 files/digest-klaptopdaemon-3.4.3-r1 68
 MD5 e29bbb2db20451106f7980c7008328fa files/digest-klaptopdaemon-3.4.1 212
 MD5 062bb93297f13fe72d1e78a55a449788 files/digest-klaptopdaemon-3.4.2 288