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.

4 files changed, 10 insertions, 35 deletions

diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index d6a2f78a3236..b37826a60f10 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 94fa7bb63013..93e4d6a3947a 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 8ef48aae16a6dddb3055d81d7e5c375f
-SHA256 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 5bb18a691915f42dc2a836422ce913405b5c51463caa236f2474293feead51d8
-SIZE (KDE/kdebase-runtime-4.2.0.tar.bz2) = 69901790
+MD5 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 93ef480ed5376ce02324d1b85b8bae0f
+SHA256 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 0eba1fd2f9b453b4e60033ff4f969218ed3c42c71a37277ac88c4f3e6f7edd14
+SIZE (KDE/kdebase-runtime-4.2.1.tar.bz2) = 70247291
diff --git a/x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake b/x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake
deleted file mode 100644
index a71e40083978..000000000000
--- a/x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../cmake/modules/FindPulseAudio.cmake.orig	2008-09-03 11:24:24.000000000 +0000
-+++ ../cmake/modules/FindPulseAudio.cmake	2008-12-27 14:20:09.000000000 +0000
-@@ -16,16 +16,16 @@
-    set(PULSEAUDIO_FIND_QUIETLY TRUE)
- endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
- 
--if (NOT WIN32)
--   include(FindPkgConfig)
--   pkg_check_modules(PULSEAUDIO libpulse)
--   if(PULSEAUDIO_FOUND)
--      set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library")
--      set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes")
--      #  PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio
--      #  set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS})
--   endif(PULSEAUDIO_FOUND)
--endif (NOT WIN32)
-+# if (NOT WIN32)
-+#    include(FindPkgConfig)
-+#    pkg_check_modules(PULSEAUDIO libpulse)
-+#    if(PULSEAUDIO_FOUND)
-+#       set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library")
-+#       set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes")
-+#       #  PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio
-+#       #  set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS})
-+#    endif(PULSEAUDIO_FOUND)
-+# endif (NOT WIN32)
- 
- if (NOT PULSEAUDIO_INCLUDE_DIR)
-    FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h)
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index 0083d1aa44fa..50e29ca19d03 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -44,7 +44,6 @@ lib/kde4/kcm_knotify.so
 lib/kde4/kcm_locale.so
 lib/kde4/kcm_nepomuk.so
 lib/kde4/kcm_phonon.so
-lib/kde4/kcm_phononxine.so
 lib/kde4/kcm_trash.so
 lib/kde4/kcmspellchecking.so
 lib/kde4/kded_desktopnotifier.so
@@ -839,6 +838,7 @@ share/icons/oxygen/128x128/apps/preferences-system-windows.png
 share/icons/oxygen/128x128/apps/preferences-web-browser-identification.png
 share/icons/oxygen/128x128/apps/scribus.png
 share/icons/oxygen/128x128/apps/semn.png
+share/icons/oxygen/128x128/apps/showfoto.png
 share/icons/oxygen/128x128/apps/strigi.png
 share/icons/oxygen/128x128/apps/system-diagnosis.png
 share/icons/oxygen/128x128/apps/system-file-manager.png
@@ -1678,6 +1678,7 @@ share/icons/oxygen/16x16/apps/preferences-web-browser-shortcuts.png
 share/icons/oxygen/16x16/apps/preferences-web-browser-stylesheets.png
 share/icons/oxygen/16x16/apps/scribus.png
 share/icons/oxygen/16x16/apps/semn.png
+share/icons/oxygen/16x16/apps/showfoto.png
 share/icons/oxygen/16x16/apps/strigi.png
 share/icons/oxygen/16x16/apps/system-file-manager.png
 share/icons/oxygen/16x16/apps/system-software-update.png
@@ -2553,6 +2554,7 @@ share/icons/oxygen/22x22/apps/preferences-web-browser-shortcuts.png
 share/icons/oxygen/22x22/apps/preferences-web-browser-stylesheets.png
 share/icons/oxygen/22x22/apps/scribus.png
 share/icons/oxygen/22x22/apps/semn.png
+share/icons/oxygen/22x22/apps/showfoto.png
 share/icons/oxygen/22x22/apps/strigi.png
 share/icons/oxygen/22x22/apps/system-file-manager.png
 share/icons/oxygen/22x22/apps/system-software-update.png
@@ -3440,6 +3442,7 @@ share/icons/oxygen/32x32/apps/preferences-web-browser-shortcuts.png
 share/icons/oxygen/32x32/apps/preferences-web-browser-stylesheets.png
 share/icons/oxygen/32x32/apps/scribus.png
 share/icons/oxygen/32x32/apps/semn.png
+share/icons/oxygen/32x32/apps/showfoto.png
 share/icons/oxygen/32x32/apps/strigi.png
 share/icons/oxygen/32x32/apps/system-file-manager.png
 share/icons/oxygen/32x32/apps/system-software-update.png
@@ -4315,6 +4318,7 @@ share/icons/oxygen/48x48/apps/preferences-web-browser-shortcuts.png
 share/icons/oxygen/48x48/apps/preferences-web-browser-stylesheets.png
 share/icons/oxygen/48x48/apps/scribus.png
 share/icons/oxygen/48x48/apps/semn.png
+share/icons/oxygen/48x48/apps/showfoto.png
 share/icons/oxygen/48x48/apps/strigi.png
 share/icons/oxygen/48x48/apps/system-file-manager.png
 share/icons/oxygen/48x48/apps/system-software-update.png
@@ -4942,6 +4946,7 @@ share/icons/oxygen/64x64/apps/preferences-system-windows-move.png
 share/icons/oxygen/64x64/apps/preferences-system-windows.png
 share/icons/oxygen/64x64/apps/scribus.png
 share/icons/oxygen/64x64/apps/semn.png
+share/icons/oxygen/64x64/apps/showfoto.png
 share/icons/oxygen/64x64/apps/strigi.png
 share/icons/oxygen/64x64/apps/system-file-manager.png
 share/icons/oxygen/64x64/apps/system-software-update.png
@@ -6220,6 +6225,7 @@ share/icons/oxygen/scalable/apps/preferences-web-browser-shortcuts.svgz
 share/icons/oxygen/scalable/apps/preferences-web-browser-stylesheets.svgz
 share/icons/oxygen/scalable/apps/scribus.svgz
 share/icons/oxygen/scalable/apps/semn.svg
+share/icons/oxygen/scalable/apps/showfoto.svgz
 share/icons/oxygen/scalable/apps/small/16x16/accessories-calculator.svgz
 share/icons/oxygen/scalable/apps/small/16x16/accessories-character-map.svgz
 share/icons/oxygen/scalable/apps/small/16x16/accessories-dictionary.svgz
@@ -7442,7 +7448,6 @@ share/kde4/services/jpegthumbnail.desktop
 share/kde4/services/kcm_kdnssd.desktop
 share/kde4/services/kcm_nepomuk.desktop
 share/kde4/services/kcm_phonon.desktop
-share/kde4/services/kcm_phononxine.desktop
 share/kde4/services/kcmcgi.desktop
 share/kde4/services/kcmkded.desktop
 share/kde4/services/kcmnotify.desktop