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, 31 insertions, 9 deletions

diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 978a0c7565b7..757adc44b3f0 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepimlibs-4.2.0.tar.bz2) = 8a91677e2dca7d4db26b33c78e239e5e
-SHA256 (KDE/kdepimlibs-4.2.0.tar.bz2) = e6a6c5c1eb69141a6925b182e94704cda37ef48eb488bb71dc224bc00583b254
-SIZE (KDE/kdepimlibs-4.2.0.tar.bz2) = 1589202
+MD5 (KDE/kdepimlibs-4.2.1.tar.bz2) = 5f220939f33c38992f419d5dfc6874df
+SHA256 (KDE/kdepimlibs-4.2.1.tar.bz2) = bc5dd2ce77608beea061ca6c243a33fa53b02c386672a684da3864bf761a2042
+SIZE (KDE/kdepimlibs-4.2.1.tar.bz2) = 1592673
diff --git a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..312ff0638d1d
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ../CMakeLists.txt.orig	2009-02-26 17:15:42.000000000 +0300
++++ ../CMakeLists.txt	2009-03-07 09:57:33.000000000 +0300
+@@ -127,7 +127,7 @@
+ macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfigVersion.cmake 
+                                      ${KDEPIMLIBS_VERSION_MAJOR} ${KDEPIMLIBS_VERSION_MINOR} ${KDEPIMLIBS_VERSION_PATCH})
+ 
+-set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
++set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs/cmake)
+ # places where find_package() looks for FooConfig.cmake files:
+ # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in
+ # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR
diff --git a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
new file mode 100644
index 000000000000..efbbb2725999
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
@@ -0,0 +1,11 @@
+--- ../cmake/modules/FindLibical.cmake.orgi	2009-02-27 17:59:51.000000000 +0100
++++ ../cmake/modules/FindLibical.cmake	2009-02-27 18:00:20.000000000 +0100
+@@ -52,7 +52,7 @@
+ 
+ if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+   set(FIND_LIBICAL_VERSION_SOURCE
+-    "#include <libical/ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
++    "#include <ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
+   set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx)
+   file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}")
+ 
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index faa899b0ccd5..5a5c45511002 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -333,10 +333,10 @@ include/syndication/specificitem.h
 include/syndication/specificitemvisitor.h
 include/syndication/syndication.h
 include/syndication/tools.h
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KDEPimLibsLibraryTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KDEPimLibsLibraryTargetsWithPrefix.cmake
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KdepimLibsConfig.cmake
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KdepimLibsConfigVersion.cmake
+lib/KdepimLibs/cmake/KDEPimLibsLibraryTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
+lib/KdepimLibs/cmake/KDEPimLibsLibraryTargetsWithPrefix.cmake
+lib/KdepimLibs/cmake/KdepimLibsConfig.cmake
+lib/KdepimLibs/cmake/KdepimLibsConfigVersion.cmake
 lib/gpgmepp/GpgmeppConfig.cmake
 lib/gpgmepp/GpgmeppLibraryDepends.cmake
 lib/kde4/kabc_directory.so
@@ -483,8 +483,8 @@ share/kde4/servicetypes/kresources_plugin.desktop
 @dirrm share/doc/HTML/en/kcontrol/kresources
 @dirrm share/apps/akonadi-kde
 @dirrm lib/gpgmepp
-@dirrm lib/KdepimLibs-%%KDE4_VERSION%%/cmake
-@dirrm lib/KdepimLibs-%%KDE4_VERSION%%
+@dirrm lib/KdepimLibs/cmake
+@dirrm lib/KdepimLibs
 @dirrm include/syndication/rss2
 @dirrm include/syndication/rdf
 @dirrm include/syndication/atom