Update KDE to 4.2.1.

multimedia/phonon port has been split into phonon itself, phonon-xine
and phono-gstreamer backends. After updating phonon port you have
to install at least one backend. phonon-xine backend is recommended
for KDE.

5 files changed, 5 insertions, 29 deletions

diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 44b9f38ba756..e7b240153c85 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 45abad85ea51..e5ea2fdb2eef 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.2.0.tar.bz2) = a80631de21930b2544c86722138aaa6c
-SHA256 (KDE/kdepim-4.2.0.tar.bz2) = 20f4f22bc9284cefd9c196ba7636c68992c615a976050f43169dd108ebd63788
-SIZE (KDE/kdepim-4.2.0.tar.bz2) = 13549914
+MD5 (KDE/kdepim-4.2.1.tar.bz2) = 2ebc3730aaee53f494e8e6abd26029bd
+SHA256 (KDE/kdepim-4.2.1.tar.bz2) = 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c
+SIZE (KDE/kdepim-4.2.1.tar.bz2) = 13562215
diff --git a/deskutils/kdepim4/files/patch-kmail_kmcommands.cpp b/deskutils/kdepim4/files/patch-kmail_kmcommands.cpp
deleted file mode 100644
index 60247094e79a..000000000000
--- a/deskutils/kdepim4/files/patch-kmail_kmcommands.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../kmail/kmcommands.cpp	2009/02/16 19:10:32	927080
-+++ ../kmail/kmcommands.cpp	2009/02/16 19:12:30	927081
-@@ -2320,8 +2320,10 @@
-           mUrl.pathOrUrl() ), QString(), KGuiItem(i18n("Execute")), KStandardGuiItem::cancel() ) != KMessageBox::Yes)
-         return Canceled;
-     }
--    if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) )
--      (void) new KRun( mUrl, mMainWidget );
-+    if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) ) {
-+      KRun *runner = new KRun( mUrl, mMainWidget ); // will delete itself
-+      runner->setRunExecutables( false );
-+    }
-   }
-   else
-     return Failed;
diff --git a/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc b/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc
deleted file mode 100644
index 2ccddb36fd90..000000000000
--- a/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../kpilot/conduits/todo/todoconduit.cc	2009/01/24 05:11:42	915906
-+++ ../kpilot/conduits/todo/todoconduit.cc	2009/01/24 05:19:21	915907
-@@ -68,6 +68,7 @@
- 	
- 	TodoSettings::self()->readConfig();
- 	d->fCollectionId = TodoSettings::akonadiCollection();
-+	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
- }
- 
- bool TodoConduit::initDataProxies()
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index b68e8a57a049..ac6cd14462c9 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -532,6 +532,7 @@ share/apps/kalarm/kalarmui.rc
 share/apps/kconf_update/kalarm-1.2.1-general.pl
 share/apps/kconf_update/kalarm-1.9.5-defaults.pl
 share/apps/kconf_update/kalarm-2.0.2-general.pl
+share/apps/kconf_update/kalarm-2.1.5-general.pl
 share/apps/kconf_update/kalarm-version.pl
 share/apps/kconf_update/kalarm.upd
 share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
@@ -795,6 +796,7 @@ share/apps/libkholidays/holiday_quebec
 share/apps/libkholidays/holiday_ro
 share/apps/libkholidays/holiday_ru
 share/apps/libkholidays/holiday_se
+share/apps/libkholidays/holiday_sk
 share/apps/libkholidays/holiday_si
 share/apps/libkholidays/holiday_th
 share/apps/libkholidays/holiday_ua