3 files changed, 6 insertions, 126 deletions
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index e4efaa71e804..65f507fc20e4 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.196 2007/02/04 17:46:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.197 2007/02/05 12:22:11 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdeutils-3.4.3-klaptopdaemon.patch,
+  -files/kdeutils-3.4-configure.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdeutils-3.5.6.ebuild:
   Marked ~hppa.
diff --git a/kde-base/kdeutils/files/kdeutils-3.4-configure.patch b/kde-base/kdeutils/files/kdeutils-3.4-configure.patch
deleted file mode 100644
index 939faa527246..000000000000
--- a/kde-base/kdeutils/files/kdeutils-3.4-configure.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Nur kdeutils-3.4.2.orig/kmilo/configure.in.in kdeutils-3.4.2/kmilo/configure.in.in
---- kdeutils-3.4.2.orig/kmilo/configure.in.in	2005-05-23 14:09:22.000000000 +0200
-+++ kdeutils-3.4.2/kmilo/configure.in.in	2005-07-26 14:42:57.000000000 +0200
-@@ -9,6 +9,15 @@
- dnl ---------------------------------------------------------------------
- dnl PowerBook IPC Library
- 
-+AC_ARG_WITH(powerbook,
-+  [AC_HELP_STRING(--with-powerbook,
-+    [enable support for PPC PowerBook @<:@default=check@:>@])],
-+  [], with_powerbook=check)
-+
-+have_pbbipc=""
-+have_pbb=""
-+if test "x$with_powerbook" != xno; then
-+
- KDE_CHECK_LIB(pbbipc, create_msgport,
- [
- KEYBOARD_LIBS="-lpbbipc $KEYBOARD_LIBS"
-@@ -23,6 +32,10 @@
- have_pbb=true
- ])
- 
-+if test "x$with_powerbook" != xcheck && test -z "$have_pbbipc$have_pbb"; then
-+  AC_MSG_ERROR([--with-powerbook was given, but test for libpbb failed])
-+fi
-+fi
- 
- AM_CONDITIONAL(include_kmilo_powerbook, test x$have_pbbipc = xtrue)
- AM_CONDITIONAL(include_kmilo_pbb, test x$have_pbb = xtrue)
-diff -Nur kdeutils-3.4.2.orig/ksim/monitors/snmp/configure.in.in kdeutils-3.4.2/ksim/monitors/snmp/configure.in.in
---- kdeutils-3.4.2.orig/ksim/monitors/snmp/configure.in.in	2005-05-23 14:09:17.000000000 +0200
-+++ kdeutils-3.4.2/ksim/monitors/snmp/configure.in.in	2005-07-26 14:43:14.000000000 +0200
-@@ -1,17 +1,20 @@
-+AC_ARG_WITH(snmp,
-+  [AC_HELP_STRING(--with-snmp,
-+    [enable support for SNMP @<:@default=check@:>@])],
-+  [], with_snmp=check)
-+
-+enable_snmp=no
-+if test "x$with_snmp" != xno; then
-+  KDE_CHECK_HEADER( net-snmp/library/snmp_api.h, [ have_netsnmp_h=yes ], [ have_netsnmp_h=no ] )
- 
--KDE_CHECK_HEADER( net-snmp/library/snmp_api.h, [ have_netsnmp_h=yes ], [ have_netsnmp_h=no ] )
--
--enable_snmp=
--
--if test "$have_netsnmp_h" = yes; then
-+  if test "$have_netsnmp_h" = yes; then
-     KDE_CHECK_LIB( netsnmp, snmp_sess_init, [
-         AC_SUBST( LIBSNMP, "-lnetsnmp" )
-         enable_snmp=yes
-     ], [], [] )
--fi
--
--if test "$enable_snmp" != yes; then
-+  fi
- 
-+  if test "$enable_snmp" != yes; then
-     AC_MSG_CHECKING([if libnetsnmp needs -lcrypto])
- 
-     dnl use a different symbol to prevent autoconf from caching
-@@ -22,7 +25,11 @@
-     ], [
-         AC_MSG_RESULT(no)
-     ], [-lcrypto] )
--fi
-+  fi
- 
--AM_CONDITIONAL(include_ksim_monitors_snmp, test -n "$enable_snmp")
-+  if test "x$with_snmp" != xcheck && test "x$enable_snmp" != xyes; then
-+    AC_MSG_ERROR([--with-snmp was given, but test for net-snmp failed])
-+  fi
-+fi
- 
-+AM_CONDITIONAL(include_ksim_monitors_snmp, test "x$enable_snmp" = xyes)
diff --git a/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch b/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch
deleted file mode 100644
index 28344217e647..000000000000
--- a/kde-base/kdeutils/files/kdeutils-3.4.3-klaptopdaemon.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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;