Remove unneeded patches.

(Portage version: 2.1.2-r7)

4 files changed, 7 insertions, 98 deletions

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 25a2dcfdcf18..2650b2c0dae5 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.85 2007/02/04 02:00:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.86 2007/02/05 12:35:30 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.4.1-configure.patch,
+  -files/kdebase-kioslaves-3.5.4-dbuscrash.patch,
+  -files/configure-fix-kdebase-openexr.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kdebase-kioslaves-3.5.2.ebuild:
diff --git a/kde-base/kdebase-kioslaves/files/configure-fix-kdebase-openexr.patch b/kde-base/kdebase-kioslaves/files/configure-fix-kdebase-openexr.patch
deleted file mode 100644
index 064bc9dd3a8e..000000000000
--- a/kde-base/kdebase-kioslaves/files/configure-fix-kdebase-openexr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: kioslave/thumbnail/configure.in.in
-===================================================================
---- kioslave/thumbnail/configure.in.in	(revision 434549)
-+++ kioslave/thumbnail/configure.in.in	(working copy)
-@@ -95,6 +95,18 @@
-   AC_SUBST(EXR_FLAGS)
- ])
- 
--AC_FIND_LIBEXR
-+AC_ARG_WITH(openexr,
-+  [AS_HELP_STRING(--with-openexr,
-+    [enable support for OpenEXR @<:@default=check@:>@])],
-+  [], with_openexr=check)
-+
-+if test "x$with_openexr" != xno; then
-+  AC_FIND_LIBEXR
-+
-+  if test "x$with_openexr" != xcheck && test -z "$LIB_EXR"; then
-+    AC_MSG_FAILURE([--with-openexr was given, but test for OpenEXR failed])
-+  fi
-+fi
-+
- AM_CONDITIONAL(include_EXR_MODULES, test -n "$LIB_EXR")
- 
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-3.4.1-configure.patch b/kde-base/kdebase-kioslaves/files/kdebase-3.4.1-configure.patch
deleted file mode 100644
index 80cf050b7a45..000000000000
--- a/kde-base/kdebase-kioslaves/files/kdebase-3.4.1-configure.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: kioslave/smb/configure.in.bot
-===================================================================
---- kioslave/smb/configure.in.bot	(revision 420060)
-+++ kioslave/smb/configure.in.bot	(working copy)
-@@ -1,4 +1,4 @@
--if test "$have_libsmbclient" = no; then
-+if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
-   echo ""
-   echo "You're missing libsmbclient from samba 3.0"
-   echo "KDE will not be able to browse windows shares without it,"
-Index: kioslave/smb/configure.in.in
-===================================================================
---- kioslave/smb/configure.in.in	(revision 420060)
-+++ kioslave/smb/configure.in.in	(working copy)
-@@ -1,20 +1,34 @@
- AC_DEFUN([SMB_CHECK],
- [
- AC_REQUIRE([KDE_CHECK_LARGEFILE])
--have_libsmbclient=yes
--KDE_CHECK_HEADER(libsmbclient.h, ,[have_libsmbclient=no] )
--KDE_CHECK_LIB(smbclient, smbc_new_context, [] ,[have_libsmbclient=no])
- 
--AM_CONDITIONAL(include_kioslave_smb, test "$have_libsmbclient" = yes)
-+AC_ARG_WITH(samba,
-+  [AS_HELP_STRING(--with-samba,
-+    [enable the samba ioslave @<:@default=check@:>@])],
-+  [], with_samba=check)
- 
--SMBCLIENT_EXTRA_LIBS=""
--AC_CHECK_FUNC(yp_get_default_domain, [],
-+have_libsmbclient=no
-+if test "x$with_samba" != xno; then
-+  have_libsmbclient=yes
-+  KDE_CHECK_HEADER(libsmbclient.h, [], [have_libsmbclient=no])
-+  KDE_CHECK_LIB(smbclient, smbc_new_context, [], [have_libsmbclient=no])
-+
-+  SMBCLIENT_EXTRA_LIBS=""
-+  AC_CHECK_FUNC(yp_get_default_domain, [],
-   [
-      KDE_CHECK_LIB(nsl, yp_get_default_domain, 
-            [SMBCLIENT_EXTRA_LIBS="-lnsl"] )
-   ])
- 
--AC_SUBST(SMBCLIENT_EXTRA_LIBS)
-+  AC_SUBST(SMBCLIENT_EXTRA_LIBS)
-+
-+  if test "x$with_samba" != xcheck && test "x$have_libsmbclient" = xno; then
-+    AC_MSG_FAILURE([--with-samba was given, but test for libsmbclient failed])
-+  fi
-+fi
-+
-+AM_CONDITIONAL(include_kioslave_smb, test "x$have_libsmbclient" = xyes)
-+
- ])
- 
- SMB_CHECK
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.4-dbuscrash.patch b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.4-dbuscrash.patch
deleted file mode 100644
index bb0746cd58f0..000000000000
--- a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.4-dbuscrash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp	2006/06/21 08:56:19	553501
-+++ branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp	2006/07/26 08:18:37	566466
-@@ -112,6 +112,14 @@
-     DBusError error;
-     dbus_error_init(&error);
-     dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error);
-+
-+    if (!dbus_connection || dbus_error_is_set(&error)) {
-+        dbus_error_free(&error);
-+        libhal_ctx_free(m_halContext);
-+        m_halContext = NULL;
-+        return false;
-+    }
-+
-     dbus_bus_register(dbus_connection, &error);
- 
-     if (dbus_error_is_set(&error)) {