Remove unneeded patches.

Package-Manager: portage-2.1.2-r7

3 files changed, 6 insertions, 75 deletions

diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 50956d2bca0d..06d2e2143475 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.70 2007/02/04 01:41:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.71 2007/02/05 12:14:46 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/configure-fix-kdepim-gnokii-3.4.patch,
+  -files/kaddressbook-3.5.2-addressee-hompage-fix.diff:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -kaddressbook-3.5.2-r1.ebuild:
diff --git a/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch b/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch
deleted file mode 100644
index ecb73ecee065..000000000000
--- a/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: kaddressbook/xxport/configure.in.in
-===================================================================
---- kaddressbook/xxport/configure.in.in	(revision 433932)
-+++ kaddressbook/xxport/configure.in.in	(working copy)
-@@ -1,6 +1,2 @@
- # $Id: configure-fix-kdepim-gnokii-3.4.patch,v 1.1 2005/07/28 21:16:10 danarmak Exp $
--
--KDE_CHECK_BLUETOOTH
--KDE_CHECK_GNOKII
--
- AM_CONDITIONAL(compile_GNOKIIXXPORT, test -n "$LIB_GNOKII")
-Index: kaddressbook/xxport/configure.in.bot
-===================================================================
---- kaddressbook/xxport/configure.in.bot	(revision 433932)
-+++ kaddressbook/xxport/configure.in.bot	(working copy)
-@@ -1,4 +1,4 @@
--if test -z "$LIB_GNOKII"; then
-+if test "x$with_gnokii" = xcheck && test -z "$LIB_GNOKII"; then
-   echo ""
-   echo "libgnokii (http://www.gnokii.org) is missing. The KDE Addressbook mobile phone import/export filter will not be available."
-   echo ""
-Index: configure.in.in
-===================================================================
---- configure.in.in	(revision 433932)
-+++ configure.in.in	(working copy)
-@@ -46,7 +46,6 @@
- [
-   KDE_CHECK_HEADERS(gnokii.h)
-   AC_REQUIRE([AC_HAVE_XPM])
--  LIB_GNOKII=
-   AC_CHECK_LIB(gnokii, gn_cfg_read,
-        [ LIB_GNOKII="-lgnokii $LIB_BLUETOOTH" ],
-        [
-@@ -58,7 +57,22 @@
-   AC_SUBST(LIB_GNOKII)
- ])
- 
-+AC_ARG_WITH(gnokii,
-+  [AS_HELP_STRING(--with-gnokii,
-+    [enable support for mobile phones through gnokii @<:@default=check@:>@])],
-+  [], with_gnokii=check)
- 
-+LIB_GNOKII=
-+if test "x$with_gnokii" != xno; then
-+  # for kaddressbook/xxport/ and kmobile/devices/gnokii/
-+  KDE_CHECK_BLUETOOTH
-+  KDE_CHECK_GNOKII
-+
-+  if test "x$with_gnokii" != xcheck && test -z "$LIB_GNOKII"; then
-+    AC_MSG_FAILURE([--with-gnokii was given, but test for gnokii failed])
-+  fi
-+fi
-+
- dnl the below is copied from kdenetwork's configure as too many apps moved
- dnl and noone can say which tests are needed and which are obsolete for kdepim ;(
- 
diff --git a/kde-base/kaddressbook/files/kaddressbook-3.5.2-addressee-hompage-fix.diff b/kde-base/kaddressbook/files/kaddressbook-3.5.2-addressee-hompage-fix.diff
deleted file mode 100644
index 47ce51e754e9..000000000000
--- a/kde-base/kaddressbook/files/kaddressbook-3.5.2-addressee-hompage-fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- kdepim/kaddressbook/addresseeeditorwidget.cpp	2005/08/22 20:40:57	452218
-+++ kdepim/kaddressbook/addresseeeditorwidget.cpp	2006/04/17 19:42:19	530843
-@@ -572,7 +572,14 @@
- 
-   mAddressee.setRole( mRoleEdit->text() );
-   mAddressee.setOrganization( mOrgEdit->text() );
--  mAddressee.setUrl( KURL( mURLEdit->text().stripWhiteSpace() ) );
-+  QString homepage = mURLEdit->text().stripWhiteSpace();
-+  if ( homepage.isEmpty() )
-+     mAddressee.setUrl( KURL() );
-+  else {
-+     if( !homepage.startsWith("http") )
-+       homepage = "http://" + homepage;
-+     mAddressee.setUrl( KURL( homepage ) );
-+  }
-   if ( !mBlogEdit->text().isEmpty() )
-     mAddressee.insertCustom( "KADDRESSBOOK", "BlogFeed", mBlogEdit->text() );
-   else