Remove unneeded patches.

(Portage version: 2.1.2-r7)

5 files changed, 8 insertions, 393 deletions

diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 9afe4cbef0dc..5f86bdfe5840 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.200 2007/02/04 18:11:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.201 2007/02/05 12:30:08 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdeaddons-3.2.0-kvim.diff,
+  -files/noatun-oblique-db-location-3.4.0.diff,
+  -files/kdeaddons-3.4-configure.patch,
+  -files/konq-plugins-3.5.2-arkplugin-crash-fix.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdeaddons-3.5.6-r1.ebuild:
   Marked ~hppa.
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.2.0-kvim.diff b/kde-base/kdeaddons/files/kdeaddons-3.2.0-kvim.diff
deleted file mode 100644
index 6b1aaa827def..000000000000
--- a/kde-base/kdeaddons/files/kdeaddons-3.2.0-kvim.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- vimpart/kcmvim/kcmvim.cpp.agriffis	2003-12-07 23:27:22.000000000 -0500
-+++ vimpart/kcmvim/kcmvim.cpp	2003-12-07 23:27:29.000000000 -0500
-@@ -224,7 +224,7 @@
- 
- void KCMVim::defaults()
- {
--	base->executable->setURL("/usr/bin/vim");
-+	base->executable->setURL("/usr/bin/kvim");
- 	base->menubar->setChecked(false);
- 	base->toolbar->setChecked(false);
- 	reset();
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.4-configure.patch b/kde-base/kdeaddons/files/kdeaddons-3.4-configure.patch
deleted file mode 100644
index 948cd77631bb..000000000000
--- a/kde-base/kdeaddons/files/kdeaddons-3.4-configure.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nur kdeaddons-3.4.2.orig/kicker-applets/mediacontrol/configure.in.in kdeaddons-3.4.2/kicker-applets/mediacontrol/configure.in.in
---- kdeaddons-3.4.2.orig/kicker-applets/mediacontrol/configure.in.in	2005-07-20 18:42:57.000000000 +0200
-+++ kdeaddons-3.4.2/kicker-applets/mediacontrol/configure.in.in	2005-07-26 12:54:48.000000000 +0200
-@@ -32,6 +32,18 @@
-   fi
- ])
- 
--AC_CHECK_XMMS
-+AC_ARG_WITH(xmms,
-+  [AC_HELP_STRING(--with-xmms,
-+    [enable XMMS control applet @<:@default=check@:>@])],
-+  [], with_xmms=check)
-+
-+if test "x$with_xmms" != xno; then
-+  AC_CHECK_XMMS
-+
-+  if test "x$with_xmms" != xcheck && test "x$ac_cv_have_xmms" != xyes; then
-+    AC_MSG_ERROR([--with-xmms was given, but test for XMMS failed])
-+  fi
-+fi
-+
- AC_SUBST(XMMS_LIBS)
- AC_SUBST(XMMS_INCLUDES)
-diff -Nur kdeaddons-3.4.2.orig/noatun-plugins/configure.in.in kdeaddons-3.4.2/noatun-plugins/configure.in.in
---- kdeaddons-3.4.2.orig/noatun-plugins/configure.in.in	2005-07-20 18:42:41.000000000 +0200
-+++ kdeaddons-3.4.2/noatun-plugins/configure.in.in	2005-07-26 12:54:18.000000000 +0200
-@@ -173,14 +173,20 @@
- noatun_sdl=no
- dnl Check for SDL
- dnl require SDL 1.2 just because it's the new stable version, and it's what I have
--NOATUN_PATH_SDL(
--[1.2.0],
--[
--noatun_sdl=yes
--],
--[
--]
--)
-+
-+AC_ARG_WITH(sdl,
-+  [AC_HELP_STRING(--with-sdl,
-+    [enable SDL Noatun plugins @<:@default=check@:>@])],
-+  [], with_sdl=check)
-+
-+if test "x$with_sdl" != xno; then
-+  NOATUN_PATH_SDL([1.2.0], [noatun_sdl=yes], [])
-+
-+  if test "x$with_sdl" != xcheck && test "x$noatun_sdl" != xyes; then
-+    AC_MSG_ERROR([--with-sdl was given, but test for SDL failed])
-+  fi
-+fi
-+
- AM_CONDITIONAL(include_SDL, test "$noatun_sdl" = yes)
- 
- AC_CHECK_HEADERS(endian.h)
-diff -Nur kdeaddons-3.4.2.orig/noatun-plugins/oblique/configure.in.in kdeaddons-3.4.2/noatun-plugins/oblique/configure.in.in
---- kdeaddons-3.4.2.orig/noatun-plugins/oblique/configure.in.in	2005-07-20 18:42:35.000000000 +0200
-+++ kdeaddons-3.4.2/noatun-plugins/oblique/configure.in.in	2005-07-26 12:53:34.000000000 +0200
-@@ -1,19 +1,31 @@
-+AC_ARG_WITH(berkeley-db,
-+  [AC_HELP_STRING(--with-berkeley-db,
-+    [enable support for Berkeley DB++ @<:@default=check@:>@])],
-+  [], with_berkeley_db=check)
-+
-+AC_ARG_WITH(db-lib,
-+  [AC_HELP_STRING([--with-db-lib=NAME],[name of the Berkeley DB++ library @<:@default=db_cxx@:>@])],
-+    [ac_db_name="$withval"], [ac_db_name="db_cxx"])
- 
--AC_MSG_CHECKING(for Berkeley DB++)
- berkeley_db=no
--AC_LANG_PUSH(C++)
--AC_TRY_COMPILE([
--		#include <db_cxx.h>
--	],[
--	],[
--		berkeley_db=yes
--	])
--AC_MSG_RESULT($berkeley_db)
--AC_DEFINE(BERKELEY_DB,1,[Define if you have Berkeley DB++ installed])
--BERKELEY_DB_LIBS="-ldb_cxx"
--AC_SUBST(BERKELEY_DB_LIBS)
--AC_LANG_POP(C++)
-+if test "x$with_berkeley_db" != xno; then
-+  berkeley_db=yes
- 
--AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
-+  KDE_CHECK_HEADER([db_cxx.h],
-+    [:], [berkeley_db=no])
-+
-+  AC_CHECK_LIB([$ac_db_name], [main],
-+    [:], [berkeley_db=no])
- 
-+  if test "x$berkeley_db" = xyes; then
-+    AC_DEFINE(BERKELEY_DB, 1, [Define if you have Berkeley DB++ installed])
-+    BERKELEY_DB_LIBS="-l$ac_db_name"
-+    AC_SUBST(BERKELEY_DB_LIBS)
-+  fi
- 
-+  if test "x$with_berkeley_db" != xcheck && test "x$berkeley_db" != xyes; then
-+    AC_MSG_ERROR([--with-berkeley-db was given, but test for Berkeley DB++ failed])
-+  fi
-+fi
-+
-+AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
diff --git a/kde-base/kdeaddons/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff b/kde-base/kdeaddons/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff
deleted file mode 100644
index ed846c8ee850..000000000000
--- a/kde-base/kdeaddons/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff
+++ /dev/null
@@ -1,253 +0,0 @@
---- kdeaddons/konq-plugins/arkplugin/arkplugin.cpp	2006/03/12 01:18:18	517743
-+++ kdeaddons/konq-plugins/arkplugin/arkplugin.cpp	2006/04/01 23:42:40	525413
-@@ -58,10 +58,15 @@
-     KGlobal::locale()->insertCatalogue("ark_plugin");
- 
-     extMimeTypes();
--    m_list = popupmenu->fileItemList();
-+    KFileItemList itemList = popupmenu->fileItemList();
-+    for ( KFileItem *item = itemList.first(); item; item = itemList.next() )
-+    {
-+        m_urlList.append( item->url() );
-+        m_urlStringList.append( item->url().url() );
-+    }
-     m_dir = popupmenu->url().url() + "/";
--    unsigned int itemCount = m_list.count();
--    KFileItemListIterator it( m_list );
-+    unsigned int itemCount = m_urlList.count();
-+    KFileItemListIterator it( itemList );
-     KFileItem * item;
-     bool hasArchives = false;
-     bool hasOther = false;
-@@ -84,15 +89,15 @@
-     QString ext;
-     KActionMenu * actionMenu;
-     KAction * action;
--    if ( hasOther &&  m_list.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() )	// don't try to compress if we right click on a folder without files selected
-+    if ( hasOther &&  itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() )	// don't try to compress if we right click on a folder without files selected
-     {
-         compMimeTypes();
-         actionMenu = new KActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu"  );
-         m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" );
-         if ( itemCount == 1 )
-         {
--            item = m_list.first();
--            m_name = m_list.first()->name();
-+            item = itemList.first();
-+            m_name = itemList.first()->name();
-             action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
-                                     SLOT( slotCompressAsDefault() ), actionCollection() );
-         }
-@@ -109,7 +114,7 @@
- 
- 
-         m_addToMenu = new KActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" );
--        if ( m_list.first()->url().isLocalFile() )
-+        if ( itemList.first()->url().isLocalFile() )
-             actionMenu->insert( m_addToMenu );
- 
-         connect( m_compAsMenu->popupMenu(), SIGNAL( aboutToShow() ),
-@@ -136,7 +141,7 @@
-             // stolen from arkwidget.cpp
-             if ( itemCount == 1 )
-             {
--                QString targetName = m_list.first()->name();
-+                QString targetName = itemList.first()->name();
-                 stripExtension( targetName );
-                 action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
-                                         SLOT( slotExtractToSubfolders() ), actionCollection() );
-@@ -187,7 +192,7 @@
-         (*eit).remove( '*' );
-         if ( *eit == ".tar.bz" )                   // tbz mimetype, has tar.bz as first entry :}
-             *eit = ".tar.bz2";
--        if ( m_list.count() == 1 )
-+        if ( m_urlList.count() == 1 )
-         {
-             action = new KAction( m_name + (*eit), 0, m_compAsMapper,
-                     SLOT( map() ), actionCollection() );
-@@ -231,7 +236,7 @@
-     QCString actionName;
-     QStringList::Iterator mit;
-     KURL archive;
--    QDir dir( m_list.first()->url().directory() );
-+    QDir dir( m_urlList.first().directory() );
-     QStringList entries = dir.entryList();
-     QStringList::Iterator uit = entries.begin();
-     for ( ; uit != entries.end(); ++uit )
-@@ -254,7 +259,7 @@
- 
- void ArkMenu::compMimeTypes()
- {
--    unsigned int itemCount = m_list.count();
-+    unsigned int itemCount = m_urlList.count();
- 
-     bool havegz = false;
-     if ( !KStandardDirs::findExe( "gzip" ).isNull() && m_conf->readBoolEntry( "UseGz", true ) )
-@@ -401,14 +406,8 @@
-     QCString name;
-     QString extension, mimeType;
-     KURL target;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    QStringList filelist;
--    while (  ( item = it.current() ) != 0 )
--    {
--         ++it;
--         filelist.append( item->url().url() );
--    }
-+    QStringList filelist( m_urlStringList );
-+
-     //if KMimeType returns .ZIP or .RAR. convert them to lowercase
-     if ( m_extensionList[ pos ].contains ( ".ZIP" ) )
-          m_extensionList[ pos ] = ".zip";
-@@ -458,17 +457,10 @@
- 
- void ArkMenu::slotCompressAsDefault()
- {
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
-     KURL name;
--    QStringList filelist;
--    while (  ( item = it.current() ) != 0 )
--    {
--         ++it;
--         filelist.append( item->url().url() );
--    }
--    if ( filelist.count() == 1)
--         name = filelist.first() + m_ext;
-+
-+    if ( m_urlStringList.count() == 1)
-+         name = m_urlStringList.first() + m_ext;
-     else
-     {
-         name = m_dir + i18n("Archive") + m_ext;
-@@ -479,7 +471,7 @@
-             i++;
-         }
-     }
--    compressAs( filelist, name );
-+    compressAs( m_urlStringList, name );
- }
- 
- // make work for URLs
-@@ -494,16 +486,10 @@
- 
- void ArkMenu::slotAddTo( int pos )
- {
--    QStringList args;
--    args << "--add-to";
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
--    {
--        ++it;
--        args << item->url().url();
--    }
--    KURL archive( m_list.first()->url() );
-+    QStringList args( m_urlStringList );
-+    args.prepend( "--add-to" );
-+
-+    KURL archive( m_urlStringList.first() );
-     archive.setPath( archive.directory( false ) );
-     archive.setFileName( m_archiveList[ pos ].fileName() );
- 
-@@ -513,63 +499,53 @@
- 
- void ArkMenu::slotAdd()
- {
--    QStringList args;
--    args << "--add";
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
--    {
--        ++it;
--        args << item->url().url();
--    }
-+    QStringList args( m_urlStringList );
-+    args.prepend( "--add" );
-+
-     kapp->kdeinitExec( "ark", args );
- }
- 
- void ArkMenu::slotExtractHere()
- {
--    QStringList args;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
-+    for ( QValueList<KURL>::ConstIterator it = m_urlList.constBegin();
-+          it != m_urlList.constEnd();
-+          ++it )
-     {
--        args.clear();
--        ++it;
--        KURL targetDirectory = item->url();
-+        QStringList args;
-+        KURL targetDirectory = ( *it ).url();
-         targetDirectory.setPath( targetDirectory.directory() );
--        args << "--extract-to"  << targetDirectory.url() << item->url().url();
-+        args << "--extract-to"  << targetDirectory.url() << ( *it ).url();
-         kapp->kdeinitExec( "ark", args );
-     }
- }
- 
- void ArkMenu::slotExtractToSubfolders()
- {
--    QStringList args;
--    QString dirName;
--    KURL targetDir;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
--    {
--        args.clear();
--        ++it;
--        targetDir = item->url();
-+    for ( QStringList::ConstIterator it = m_urlStringList.constBegin();
-+          it != m_urlStringList.constEnd();
-+          ++it )
-+    {
-+        KURL targetDir;
-+        QString dirName;
-+        QStringList args;
-+
-+        targetDir = *it;
-         dirName = targetDir.path();
-         stripExtension( dirName );
-         targetDir.setPath( dirName );
--        args << "--extract-to"  << targetDir.url() << item->url().url();
-+        args << "--extract-to"  << targetDir.url() << *it;
-         kapp->kdeinitExec( "ark", args );
-     }
- }
- 
- void ArkMenu::slotExtractTo()
- {
--    QStringList args;
--    KFileItemListIterator it( m_list );
--    KFileItem * item;
--    while (  ( item = it.current() ) != 0 )
-+    for ( QStringList::ConstIterator it = m_urlStringList.constBegin();
-+          it != m_urlStringList.constEnd();
-+          ++it )
-     {
--        ++it;
--        args << "--extract"  << item->url().url();
-+        QStringList args;
-+        args << "--extract" << *it;
-         kapp->kdeinitExec( "ark", args );
-     }
- }
---- kdeaddons/konq-plugins/arkplugin/arkplugin.h	2005/09/29 14:33:08	465369
-+++ kdeaddons/konq-plugins/arkplugin/arkplugin.h	2006/04/01 23:42:40	525413
-@@ -54,7 +54,8 @@
- 
- private:
-     QString m_name, m_ext;
--    KFileItemList m_list;
-+    QValueList<KURL> m_urlList;
-+    QStringList m_urlStringList;
-     KURL::List m_archiveList;
-     QStringList m_archiveMimeTypes;
-     QStringList m_extractMimeTypes;
diff --git a/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.diff b/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.diff
deleted file mode 100644
index bf3f954f57af..000000000000
--- a/kde-base/kdeaddons/files/noatun-oblique-db-location-3.4.0.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- noatun-plugins/oblique/configure.in.in.orig	2004-10-09 11:41:38.000000000 +0200
-+++ noatun-plugins/oblique/configure.in.in	2005-02-11 20:29:38.760533256 +0200
-@@ -1,19 +1,4 @@
--
--AC_MSG_CHECKING(for Berkeley DB++)
--berkeley_db=no
--AC_LANG_PUSH(C++)
--AC_TRY_COMPILE([
--		#include <db_cxx.h>
--	],[
--	],[
--		berkeley_db=yes
--	])
--AC_MSG_RESULT($berkeley_db)
--AC_DEFINE(BERKELEY_DB,1,[Define if you have Berkeley DB++ installed])
--BERKELEY_DB_LIBS="-ldb_cxx"
-+berkeley_db=yes
-+BERKELEY_DB_LIBS="-ldb_cxx-4.2"
- AC_SUBST(BERKELEY_DB_LIBS)
--AC_LANG_POP(C++)
--
- AM_CONDITIONAL(include_BERKELEY_DB, test "$berkeley_db" = yes)
--
--