From bcffa9bb34ae7b1678fe0ef278b33f7bfaae41f1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 18 Feb 2008 20:54:39 +0000
Subject: [PATCH] kde-4.0.1

svn path=/nixpkgs/branches/stdenv-updates/; revision=10753
---
 pkgs/desktops/kde-4/base/default.nix        | 10 ++--
 pkgs/desktops/kde-4/decibel/default.nix     | 15 ++++--
 pkgs/desktops/kde-4/default.nix             | 37 +++++++------
 pkgs/desktops/kde-4/edu/default.nix         | 10 ++--
 pkgs/desktops/kde-4/extragear/default.nix   | 15 +++---
 pkgs/desktops/kde-4/games/default.nix       | 10 ++--
 pkgs/desktops/kde-4/graphics/default.nix    | 12 ++---
 pkgs/desktops/kde-4/libs/default.nix        | 57 +++++++++++++++++----
 pkgs/desktops/kde-4/multimedia/default.nix  | 10 ++--
 pkgs/desktops/kde-4/network/default.nix     | 13 +++--
 pkgs/desktops/kde-4/pim/default.nix         | 19 ++++---
 pkgs/desktops/kde-4/pimlibs/default.nix     |  8 +--
 pkgs/desktops/kde-4/runtime/default.nix     | 11 ++--
 pkgs/desktops/kde-4/support/akode.nix       |  2 +-
 pkgs/desktops/kde-4/support/default.nix     |  2 +-
 pkgs/desktops/kde-4/support/eigen.nix       |  2 +-
 pkgs/desktops/kde-4/support/gmm.nix         |  2 +-
 pkgs/desktops/kde-4/support/qca.nix         |  2 +-
 pkgs/desktops/kde-4/support/qimageblitz.nix |  2 +-
 pkgs/desktops/kde-4/support/soprano.nix     |  2 +-
 pkgs/desktops/kde-4/support/strigi.nix      |  5 +-
 pkgs/desktops/kde-4/support/taglib.nix      |  2 +-
 pkgs/desktops/kde-4/toys/default.nix        | 10 ++--
 pkgs/desktops/kde-4/utils/default.nix       | 10 ++--
 pkgs/desktops/kde-4/workspace/default.nix   | 12 ++---
 pkgs/top-level/all-packages.nix             | 11 ++--
 26 files changed, 169 insertions(+), 122 deletions(-)

diff --git a/pkgs/desktops/kde-4/base/default.nix b/pkgs/desktops/kde-4/base/default.nix
index f6a2ca1d92bc..5dd7f6bb0215 100644
--- a/pkgs/desktops/kde-4/base/default.nix
+++ b/pkgs/desktops/kde-4/base/default.nix
@@ -1,13 +1,13 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "kdebase-4.0.0";
+stdenv.mkDerivation rec {
+  name = "kdebase-" + version;
 
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdebase-4.0.0.tar.bz2;
-    sha256 = "1419zijcrx6nk10nay3dbv0vi8525hzcqkm2fw8cvw11i4mk909q";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "1cdswhavhk6wjdxwpsmmvq1qqw2a5mdyvvxk9fnxn9fnic7q0603";
   };
 
-  propagatedBuildInputs = [kdepimlibs libusb];
+  propagatedBuildInputs = [kde4.pimlibs kde4.support.qimageblitz libusb];
   buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/decibel/default.nix b/pkgs/desktops/kde-4/decibel/default.nix
index ff98b48ee6fc..3025e2968819 100644
--- a/pkgs/desktops/kde-4/decibel/default.nix
+++ b/pkgs/desktops/kde-4/decibel/default.nix
@@ -1,11 +1,16 @@
 args: with args;
+let
+  rev = "773861";
+in
 stdenv.mkDerivation {
-	name = "decibel-0.5.0";
+	name = "decibel-r${rev}";
 
-	src = fetchurl {
-		url = http://decibel.kde.org/fileadmin/downloads/decibel/releases/decibel-0.5.0.tar.gz;
-		sha256 = "07visasid4mpzm0ba5j9qy0lxxb6451lvbr2gnc1vzfvjagffqz4";
+	src = fetchsvn {
+		url = svn://anonsvn.kde.org/home/kde/trunk/playground/pim/decibel;
+    sha256 = "073fksn5dl7vkkiwvl9s56n9ymnlxy27kbz1h1fryq6r8x924vjc";
+    inherit rev;
 	};
 
-	buildInputs = [kdelibs kdebase ];
+	propagatedBuildInputs = [ kde4.libs tapioca_qt ];
+  buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/default.nix b/pkgs/desktops/kde-4/default.nix
index 11554c9955ea..43e85fc08d6b 100644
--- a/pkgs/desktops/kde-4/default.nix
+++ b/pkgs/desktops/kde-4/default.nix
@@ -1,24 +1,27 @@
-args:
+origArgs:
+let
+  args = origArgs // { version = "4.0.1"; };
+in
 rec {
   fullargs = args // { kdelibs = libs; kdepimlibs = pimlibs; kdebase = base; kderuntime = runtime; };
-  libs = import ./libs (args // { kdesupport = support; });
+  libs = import ./libs args;
   l10n = import ./l10n (args // {kdelibs = libs;});
-  pimlibs = import ./pimlibs (args // { kdelibs = libs; });
-  graphics = import ./graphics (fullargs // { kdeworkspace = workspace; } );
-  multimedia = import ./multimedia (fullargs // { kdeworkspace = workspace; } );
-  toys = import ./toys (fullargs // { kdeworkspace = workspace; } );
-  network = import ./network (fullargs // { kdeworkspace = workspace; } );
-  utils = import ./utils (fullargs // { kdeworkspace = workspace; } );
-  games = import ./games (fullargs // { kdeworkspace = workspace; } );
-  edu = import ./edu (fullargs // { kdeworkspace = workspace; } );
-  base = import ./base fullargs;
-  runtime = import ./runtime fullargs;
-  workspace = import ./workspace fullargs;
-  extragear_plasma = import ./extragear (fullargs // { kdeworkspace = workspace; });
+  pimlibs = import ./pimlibs args;
+  graphics = import ./graphics args;
+  multimedia = import ./multimedia args;
+  toys = import ./toys args;
+  network = import ./network args;
+  utils = import ./utils args;
+  games = import ./games args;
+  edu = import ./edu args;
+  base = import ./base args;
+  runtime = import ./runtime args;
+  workspace = import ./workspace args;
+  extragear_plasma = import ./extragear args;
   support = import ./support args;
-  decibel = import ./decibel fullargs;
-# kdepim is not included in KDE-4.0.0
-  #pim = import ./pim (fullargs // {kdeworkspace = workspace; });
+  decibel = import ./decibel args;
+# kdepim is not included in KDE-4.0.1, building from svn
+  pim = import ./pim args;
 
   env = kde_pkgs: with args; [ (runCommand "kde-env"
   {
diff --git a/pkgs/desktops/kde-4/edu/default.nix b/pkgs/desktops/kde-4/edu/default.nix
index 7f9648c6f8ff..cd1d6353fbf8 100644
--- a/pkgs/desktops/kde-4/edu/default.nix
+++ b/pkgs/desktops/kde-4/edu/default.nix
@@ -1,15 +1,15 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "kdeedu-4.0.0";
+  name = "kdeedu-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdeedu-4.0.0.tar.bz2;
-    sha256 = "1wjy1rm7aiib1lv61wx7mcbkbpkk6phcz1q6dy51x0hfrc3rdkg4";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "1j0swj38qdx0azm2dnx4l7if5dxak1pmcr90ynfjrcifkm68mm3k";
   };
 
-  propagatedBuildInputs = [kdepimlibs boost readline openbabel ocaml libusb
-  facile python indilib libnova];
+  propagatedBuildInputs = [kde4.pimlibs boost readline openbabel ocaml libusb
+  facile python indilib libnova kde4.support.eigen];
   buildInputs = [cmake];
   myCmakeFiles = ./myCmakeFiles;
   patchPhase = "
diff --git a/pkgs/desktops/kde-4/extragear/default.nix b/pkgs/desktops/kde-4/extragear/default.nix
index 8ad2ef0540fc..25c1bce91b55 100644
--- a/pkgs/desktops/kde-4/extragear/default.nix
+++ b/pkgs/desktops/kde-4/extragear/default.nix
@@ -1,17 +1,16 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "extragear-plasma-4.0.0";
+stdenv.mkDerivation rec {
+  name = "extragear-plasma-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/extragear/extragear-plasma-4.0.0.tar.bz2;
-    sha256 = "19gmvqkal11gg67gfmdivxbhwvggm2i6ad642984d97yicms7s9k";
+    url = "mirror://kde/stable/${version}/src/extragear/${name}.tar.bz2";
+    sha256 = "1pwvsmdb4z9av6bqh1yk23wgss1wc07rwq47gyxvvi54idpgirx9";
   };
 
-  buildInputs = [ kdeworkspace cmake ];
+  buildInputs = [ kde4.workspace cmake ];
   patchPhase = ''
-  sed -e 's@<Plasma@<KDE/Plasma@' -i ../applets/*/*.h
-  echo ${kdeworkspace}
-  fixCmakeDbusCalls ${kdeworkspace}
+    sed -e '/^#include/s@<Plasma@<KDE/Plasma@' -i ../applets/*/*.{h,cpp} 
+    fixCmakeDbusCalls ${kde4.workspace}
   '';
 }
diff --git a/pkgs/desktops/kde-4/games/default.nix b/pkgs/desktops/kde-4/games/default.nix
index 0963d2837c9f..40078406b6c1 100644
--- a/pkgs/desktops/kde-4/games/default.nix
+++ b/pkgs/desktops/kde-4/games/default.nix
@@ -1,13 +1,13 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "kdegames-4.0.0";
+stdenv.mkDerivation rec {
+  name = "kdegames-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdegames-4.0.0.tar.bz2;
-    sha256 = "09ilgi6l5sq4gavskyhfrv8ra3n3r6xdn8cdc7fm2fi3zah4innn";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "11am026l68dm3v8mxa1phsizsy73c999493dkqc2kpff2kvhbxvs";
   };
 
-  propagatedBuildInputs = [kdepimlibs];
+  propagatedBuildInputs = [kde4.pimlibs];
   buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/graphics/default.nix b/pkgs/desktops/kde-4/graphics/default.nix
index 9fe45f5aadef..1c6b18004a7f 100644
--- a/pkgs/desktops/kde-4/graphics/default.nix
+++ b/pkgs/desktops/kde-4/graphics/default.nix
@@ -1,14 +1,14 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "kdegraphics-4.0.0";
+stdenv.mkDerivation rec {
+  name = "kdegraphics-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdegraphics-4.0.0.tar.bz2;
-    sha256 = "00np19mzmg8zs8j89g1f47h3kj5azgnv3nspb8lw880zg682yp2f";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "1cvxika98i9xv7fy3drhivixmmm0zd44bfgk5fjfc9ibkcs1fjz7";
   };
 
-  propagatedBuildInputs = [kdepimlibs libgphoto2 saneBackends djvulibre exiv2
-  poppler chmlib libXxf86vm];
+  propagatedBuildInputs = [kde4.pimlibs libgphoto2 saneBackends djvulibre exiv2
+  poppler chmlib libXxf86vm kde4.support.qimageblitz];
   buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/libs/default.nix b/pkgs/desktops/kde-4/libs/default.nix
index 1628e5d185a2..c3c3310d25ce 100644
--- a/pkgs/desktops/kde-4/libs/default.nix
+++ b/pkgs/desktops/kde-4/libs/default.nix
@@ -1,22 +1,22 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "kdelibs-4.0.0";
+  name = "kdelibs-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdelibs-4.0.0.tar.bz2;
-    sha256 = "0bfcrb34kl2md77k9rbr924n5bc7chc5wkr10jjvq98742yh0rza";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "0c4s1677fa3d1dknz0z0qacsx47sx0spnz0wdw1zycirwbcids7s";
   };
 
   propagatedBuildInputs = [
-	inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
-	xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
-	libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
-	libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile zlib
-	perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
-    libtool freetype bzip2 shared_mime_info alsaLib libungif cups
-	gettext enchant openexr aspell stdenv.gcc.libc jasper kerberos fam
-  ] ++ kdesupport.all;
+    inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
+    xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
+    libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
+    libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile zlib
+    perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
+    libtool freetype bzip2 shared_mime_info alsaLib libungif cups avahi
+    gettext enchant openexr aspell stdenv.gcc.libc jasper kerberos fam
+  ] ++ (with kde4.support; [soprano strigi]);
   buildInputs = [ cmake ];
   patchPhase = "cp ${findIlmBase} ../cmake/modules/FindIlmBase.cmake;
   cp $findOpenEXR ../cmake/modules/FindOpenEXR.cmake;
@@ -26,3 +26,38 @@ stdenv.mkDerivation rec {
   findOpenEXR = ./FindOpenEXR.cmake;
   setupHook=./setup.sh;
 }
+/*
+   propagated, but not referenced:
+/nix/store/ww1bjw6fiabfsn56h2cx65v7rpkh3cmv-inputproto-1.4.2.1
+/nix/store/nqxdqmbwclw6233lpjavahbnv84cfjr5-kbproto-1.0.3
+/nix/store/6a3dxmym07f5may0z25qj1dgpj3l6qyn-scrnsaverproto-1.1.0
+/nix/store/vjsc1ljsvc6rn7g6hfbaq1r0hw96yv3k-xextproto-7.0.2
+/nix/store/dm9hi43nh91ndfa8sgpl24jqr77v92w1-xf86miscproto-0.9.2
+/nix/store/j4xl965n8r5cd72bmawc0k1vsayf93ws-xf86vidmodeproto-2.2.2
+/nix/store/wc94gcwc3r218vjn1sx809pv8kck22ba-xineramaproto-1.1.2
+/nix/store/n2dhcd6c9mszzyv0ndra2cjpi2lgx3b2-xproto-7.0.10
+/nix/store/ms4pk7h5xba8q29is2q9c04s8q8zq49n-libXcomposite-0.4.0
+/nix/store/cdnnv706cq8iwjn7qgasyn84j2n6hv13-libXdamage-1.0.4
+/nix/store/4cxf36jhfvgr3n6bhs4hyhps2jhr5jv6-libXi-1.1.3
+/nix/store/sz14chn1d6w1f9ij0b1v58q9ynkg3ngb-libXrandr-1.2.2
+/nix/store/4yfl5kw66c6dwny9asppj9hayp9mcfkv-libXScrnSaver-1.1.2
+/nix/store/jxj0gw060xpi9hdkwimnm8lmwhmgkfl5-libXt-1.0.4
+/nix/store/czqsrjh3qmi1vh95ln89hd0xizfkqr2p-libXv-1.0.3
+/nix/store/r7cc3mdwpr6v98am12j01ni2apjvnb4d-libXxf86misc-1.0.1
+/nix/store/vchnj0hkvwndnmz8qm19sx851q55jqca-libxkbfile-1.0.4
+/nix/store/fcwjqhwq2hzl813n1yhbg3c16877192p-perl-5.8.8
+/nix/store/vn0h5gxpqba7a5wygx2i4y6kph28nyqx-pkgconfig-0.22
+/nix/store/wq5jzrwixqgwwbay3g6wyml899xq0sjl-libtiff-3.8.2
+/nix/store/33p2bjmvvlidiqm9f7kj5fi9l9njfyvy-expat-2.0.1
+/nix/store/b0p33yl24m9b8l0pdbn2ws7x8kqqvr12-libtool-1.5.22
+/nix/store/p3kbqjdij0faffsxzlsa0r6cx0244ckz-freetype-2.3.1
+/nix/store/i2wz2sh2svlbf105sn0513hgxc3fd2hm-shared-mime-info-0.23
+/nix/store/c0jbrrw31az5vqc8rawyl6cx3mbb4m2i-cups-1.2.10
+/nix/store/mw7ycjzji2zkmv82ig9lyxsk4zxab488-avahi-0.6.22
+/nix/store/wm4xdf13rpikl0vs03bfrq6cgjc2caf9-gettext-0.17
+/nix/store/jbyj4fyfpqsl8v04v98md64cpv4gr0l5-qca-2.0.0dev
+/nix/store/qylkj2031zhki3sxg59h07d0bpisfl7v-gmm-svn
+/nix/store/b743sdkbwfq1imfid54vwhv41m6qh6sr-eigen-1.0.5
+/nix/store/pzjba22xmrbh2cdsaybdr2rg5srqknrz-taglib-1.4svn
+/nix/store/asb1vki40g0wppbazagpbvr51g8lf7gg-qimageblitz-4.0.0svn
+*/
diff --git a/pkgs/desktops/kde-4/multimedia/default.nix b/pkgs/desktops/kde-4/multimedia/default.nix
index 0727369e0429..2363c8e798e6 100644
--- a/pkgs/desktops/kde-4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4/multimedia/default.nix
@@ -1,13 +1,13 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "kdemultimedia-4.0.0";
+stdenv.mkDerivation rec {
+  name = "kdemultimedia-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdemultimedia-4.0.0.tar.bz2;
-    sha256 = "14axr1x09k67vb3vaw4g9zg4mq7j14xn9d90kifwap7b76iljbi5";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "0njp8s4vmph6p0h740ynhfvnysmvin2ddpxwvxs9vzh7nd37izf0";
   };
 
-  propagatedBuildInputs = [kdeworkspace libogg flac cdparanoia lame libvorbis];
+  propagatedBuildInputs = [kde4.workspace libogg flac cdparanoia lame libvorbis];
   buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/network/default.nix b/pkgs/desktops/kde-4/network/default.nix
index da2479bf0eeb..99195809a509 100644
--- a/pkgs/desktops/kde-4/network/default.nix
+++ b/pkgs/desktops/kde-4/network/default.nix
@@ -1,12 +1,15 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "kdenetwork-4.0.0";
+stdenv.mkDerivation rec {
+  name = "kdenetwork-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdenetwork-4.0.0.tar.bz2;
-    sha256 = "04vigr2z0md64khjdriwslsyaf6mpqxd2iwsnr82g53x4kh0i061";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "0ykmrxhjkark82fbdvv8vx421h4lfzylas5jv4wx8z858dlx2rn1";
   };
 
-  buildInputs = [kdelibs kdepimlibs kdeworkspace sqlite libidn];
+  configureFlags = "-DWITH_telepathy=ON";
+  propagatedBuildInputs = [kde4.pimlibs kde4.workspace kde4.support.qca
+    kde4.decibel sqlite libidn avahi];
+  buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/pim/default.nix b/pkgs/desktops/kde-4/pim/default.nix
index 0e4932bcc350..c5ad64e92837 100644
--- a/pkgs/desktops/kde-4/pim/default.nix
+++ b/pkgs/desktops/kde-4/pim/default.nix
@@ -1,15 +1,18 @@
 args: with args;
-
+let
+rev = "774960";
+in
 stdenv.mkDerivation {
-  name = "kdepim-4.0.0";
+  name = "kdepim-r${rev}";
   
-  src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdepim-4.0.0.tar.bz2;
-    sha256 = "kdepim is not included";
+  src = fetchsvn {
+    url = svn://anonsvn.kde.org/home/kde/trunk/KDE/kdepim;
+    inherit rev;
+    sha256 = "0596vaxzp1yh53c9q16is8j0010b8calbmd7fv3f5y8qv5w83b18";
   };
 
-  buildInputs = [libXinerama mesa stdenv.gcc.libc alsaLib kdelibs kdepimlibs
-  kdeworkspace libusb glib];
+  propagatedBuildInputs = [libXinerama mesa stdenv.gcc.libc alsaLib kde4.pimlibs
+  kde4.workspace libusb glib mysql libassuan libgpgerror kde4.support.qca];
+  buildInputs = [cmake];
   qt4BadIncludes = true;
-  inherit qt kdelibs;
 }
diff --git a/pkgs/desktops/kde-4/pimlibs/default.nix b/pkgs/desktops/kde-4/pimlibs/default.nix
index f121a8492d61..24c76929bdce 100644
--- a/pkgs/desktops/kde-4/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4/pimlibs/default.nix
@@ -1,13 +1,13 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "kdepimlibs-4.0.0";
+  name = "kdepimlibs-" + version;
   
   src = fetchurl {
-    url = "mirror://kde/stable/4.0.0/src/${name}.tar.bz2";
-	sha256 = "0vixx2vh7qgysnbzvykf20362p22jzvl8snpqaknay3v3b2k0br0";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "0naqx0dwpabnxx1w498lnnypj369z5k5djnhwawlnlb9xmd1r7sw";
   };
 
-  propagatedBuildInputs = [kdelibs boost gpgme cyrus_sasl openldap];
+  propagatedBuildInputs = [kde4.libs boost gpgme cyrus_sasl openldap];
   buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/runtime/default.nix b/pkgs/desktops/kde-4/runtime/default.nix
index 0be4a3bbc593..960795201116 100644
--- a/pkgs/desktops/kde-4/runtime/default.nix
+++ b/pkgs/desktops/kde-4/runtime/default.nix
@@ -1,16 +1,15 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "kdebase-runtime-4.0.0";
+  name = "kdebase-runtime-" + version;
   
   src = fetchurl {
-    url = "mirror://kde/stable/4.0.0/src/${name}.tar.bz2";
-    sha256 = "0svsn9gzg3ka77j7z71fy502a09w9gp9jd2q2y1w07ahpdil5p7h";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "05f5z705483509i1z6z0kgj0226smhp4cpj733h29bvwa76yi3b4";
   };
 
-  propagatedBuildInputs = [kdepimlibs libusb xineLib samba];
+  propagatedBuildInputs = [kde4.pimlibs libusb xineLib samba];
   buildInputs = [cmake];
-  phononPatch = ./phonon.patch;
-  patchPhase = "fixCmakeDbusCalls; patch -p0 < ${phononPatch}";
+  patchPhase = "fixCmakeDbusCalls";
 }
 
diff --git a/pkgs/desktops/kde-4/support/akode.nix b/pkgs/desktops/kde-4/support/akode.nix
index 8fdf6736572e..93af5b5c79af 100644
--- a/pkgs/desktops/kde-4/support/akode.nix
+++ b/pkgs/desktops/kde-4/support/akode.nix
@@ -2,6 +2,6 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "akode-2.0.0dev";
-  src = svnSrc "akode" "0xkzv386wvh16njjv8z84mg3czp7j7n60lwhwns5fwqhx1s30h5y";
+  src = svnSrc "akode" "4d72a9aa9d74a8576a8d19edd09f7e1fd3630958b7598586ed8483888f61f975";
   buildInputs = [ cmake qt openssl gettext cyrus_sasl alsaLib ];
 }
diff --git a/pkgs/desktops/kde-4/support/default.nix b/pkgs/desktops/kde-4/support/default.nix
index 4ad2143a7001..598e309d843d 100644
--- a/pkgs/desktops/kde-4/support/default.nix
+++ b/pkgs/desktops/kde-4/support/default.nix
@@ -4,7 +4,7 @@ let
 	svnSrc = name: hash:
 	oldArgs.fetchsvn {
 		url = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/${name}";
-		rev = 761061;
+		rev = 772114;
 		sha256 = hash;
 	};
 	};
diff --git a/pkgs/desktops/kde-4/support/eigen.nix b/pkgs/desktops/kde-4/support/eigen.nix
index 2b3520eb942f..d024c1d76249 100644
--- a/pkgs/desktops/kde-4/support/eigen.nix
+++ b/pkgs/desktops/kde-4/support/eigen.nix
@@ -2,6 +2,6 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "eigen-1.0.5";
-  src = svnSrc "eigen" "1wh6kdmzsxmk6byp4rq91pz4rfr7hnh17g8f415p0ywxalg6pfkg";
+  src = svnSrc "eigen" "6fba6b1e559d7b704b200ebd13a08527bb4cfe0d096772fd32b376fd6b9b06f2";
   buildInputs = [ cmake ];
 }
diff --git a/pkgs/desktops/kde-4/support/gmm.nix b/pkgs/desktops/kde-4/support/gmm.nix
index 768df83c8df4..3006efecca37 100644
--- a/pkgs/desktops/kde-4/support/gmm.nix
+++ b/pkgs/desktops/kde-4/support/gmm.nix
@@ -2,6 +2,6 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "gmm-svn";
-  src = svnSrc "gmm" "1hxc6ymrjccz4mnix44fwpkmv8fvg5y5a9j3y6liz37wj87snnxd";
+  src = svnSrc "gmm" "e206834b273e271c174940a2bef7b899729d79bf78f0f63a759174b0ec121b10";
   buildInputs = [ cmake ];
 }
diff --git a/pkgs/desktops/kde-4/support/qca.nix b/pkgs/desktops/kde-4/support/qca.nix
index a9b697879652..42fd1988c8d3 100644
--- a/pkgs/desktops/kde-4/support/qca.nix
+++ b/pkgs/desktops/kde-4/support/qca.nix
@@ -2,7 +2,7 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "qca-2.0.0dev";
-  src = svnSrc "qca" "1dm7q9v54ps0iix55hx4y51k379gqiwai5ym7avafis9j0py28aj";
+  src = svnSrc "qca" "204ffa1c50525be4c3b1a4ef9c91f745e412340afad538cbf7d1d587453a28d7";
   buildInputs = [ cmake qt openssl gettext cyrus_sasl libgcrypt gnupg ];
   patchPhase = "sed -e '/set(qca_PLUGINSDIR/s@\${QT_PLUGINS_DIR}@\${CMAKE_INSTALL_PREFIX}/plugins@' -i ../CMakeLists.txt";
 }
diff --git a/pkgs/desktops/kde-4/support/qimageblitz.nix b/pkgs/desktops/kde-4/support/qimageblitz.nix
index a4a88afa7e78..9814d7e60f05 100644
--- a/pkgs/desktops/kde-4/support/qimageblitz.nix
+++ b/pkgs/desktops/kde-4/support/qimageblitz.nix
@@ -2,6 +2,6 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "qimageblitz-4.0.0svn";
-  src = svnSrc "qimageblitz" "0vsan536qv8hj8l8ghmji62xzc75xm896h7fpwk48vq9f8w9fn4q";
+  src = svnSrc "qimageblitz" "530ff28d52fef632642be1879c5b190ac9183013a08969b135b4823bab48e8bc";
   buildInputs = [cmake qt];
 }
diff --git a/pkgs/desktops/kde-4/support/soprano.nix b/pkgs/desktops/kde-4/support/soprano.nix
index 4b0e78f91cfc..f4cbff479b57 100644
--- a/pkgs/desktops/kde-4/support/soprano.nix
+++ b/pkgs/desktops/kde-4/support/soprano.nix
@@ -2,7 +2,7 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "soprano-1.9.0svn";
-  src = svnSrc "soprano" "1j61jf8vzamknmzmrxpwba9v7c0vnb8zmlh9n0sgawjgbzfgq2zn";
+  src = svnSrc "soprano" "3d487cf96f03ab34353ca1547bb60025b5bb67354f1fe63ddb4822d14a78fc7c";
   CLUCENE_HOME=cluceneCore;
   buildInputs = [ cmake qt cluceneCore redland ];
 }
diff --git a/pkgs/desktops/kde-4/support/strigi.nix b/pkgs/desktops/kde-4/support/strigi.nix
index 0ed955ed7108..dd5a57b2d82f 100644
--- a/pkgs/desktops/kde-4/support/strigi.nix
+++ b/pkgs/desktops/kde-4/support/strigi.nix
@@ -2,8 +2,9 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "strigi-svn";
-  src = svnSrc "strigi" "0zmfy7ga4y49hl3rgw8ypqag36k78k2wfkkxka8xskrd249516ha";
+  src = svnSrc "strigi" "0741b264c50d505b5e3a10b3de3ae35f4728aa6ca1fdc639268e6557dbbaa5ff";
   CLUCENE_HOME=cluceneCore;
+  configureFlags = "-DENABLE_FAM=true";
   buildInputs = [ cmake zlib cluceneCore bzip2 libxml2 qt dbus.libs
-  log4cxx stdenv.gcc.libc exiv2 bison cppunit perl ];
+    stdenv.gcc.libc exiv2 bison perl fam jdk ];
 }
diff --git a/pkgs/desktops/kde-4/support/taglib.nix b/pkgs/desktops/kde-4/support/taglib.nix
index 5a5a26e09c32..5bf5b70a5c17 100644
--- a/pkgs/desktops/kde-4/support/taglib.nix
+++ b/pkgs/desktops/kde-4/support/taglib.nix
@@ -2,6 +2,6 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "taglib-1.4svn";
-  src = svnSrc "taglib" "1wszymg4r3mm06wbxviqmnxra120kc1rxbk0a6kjrxjpyr8qcn2k";
+  src = svnSrc "taglib" "8921c905eb0273929c9ee5cf11e271fe12b443dabb2370e1471dfbdbbb75f853";
   buildInputs = [ cmake zlib ];
 }
diff --git a/pkgs/desktops/kde-4/toys/default.nix b/pkgs/desktops/kde-4/toys/default.nix
index 47fad5f46204..b48b58a07435 100644
--- a/pkgs/desktops/kde-4/toys/default.nix
+++ b/pkgs/desktops/kde-4/toys/default.nix
@@ -1,13 +1,13 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "kdetoys-4.0.0";
+stdenv.mkDerivation rec {
+  name = "kdetoys-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdetoys-4.0.0.tar.bz2;
-    sha256 = "0j7kk4ripg2sw4m8ym96aiyi8rsfb4p7kqp9kmik850flqighhsk";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "0jvmjbnc79adgf7g70s1vz2lvwpl6fx2520lmzc6pnrvl0qhcs4i";
   };
 
-  propagatedBuildInputs = [kdeworkspace];
+  propagatedBuildInputs = [kde4.workspace];
   buildInputs = [cmake];
 }
diff --git a/pkgs/desktops/kde-4/utils/default.nix b/pkgs/desktops/kde-4/utils/default.nix
index f9d76e3e6fc8..47e21c74eda3 100644
--- a/pkgs/desktops/kde-4/utils/default.nix
+++ b/pkgs/desktops/kde-4/utils/default.nix
@@ -1,14 +1,14 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "kdeutils-4.0.0";
+stdenv.mkDerivation rec {
+  name = "kdeutils-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdeutils-4.0.0.tar.bz2;
-    sha256 = "0ha31z79ikkbknhyklihzys0w4jfz4qx8jiyja0gwh428f7mxqj4";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "1zp6czjxpjvqb3z81k45bv4pqb9pj4snc35xx8bnish829fhnncy";
   };
 
-  propagatedBuildInputs = [kdeworkspace gmp libzip python libarchive];
+  propagatedBuildInputs = [kde4.workspace gmp libzip python libarchive];
   buildInputs = [cmake];
 # TODO : tpctl
   patchPhase="fixCmakeDbusCalls";
diff --git a/pkgs/desktops/kde-4/workspace/default.nix b/pkgs/desktops/kde-4/workspace/default.nix
index 5b16dee4d2e5..afb9e4a7f95e 100644
--- a/pkgs/desktops/kde-4/workspace/default.nix
+++ b/pkgs/desktops/kde-4/workspace/default.nix
@@ -1,15 +1,15 @@
 args: with args;
 
-stdenv.mkDerivation {
-  name = "kdebase-workspace-4.0.0";
+stdenv.mkDerivation rec {
+  name = "kdebase-workspace-" + version;
   
   src = fetchurl {
-    url = mirror://kde/stable/4.0.0/src/kdebase-workspace-4.0.0.tar.bz2;
-    sha256 = "08sgp7jaqljdxwsgr5lyyfd6w734yv24zswps1mchmhj01vz1fcg";
+    url = "mirror://kde/stable/${version}/src/${name}.tar.bz2";
+    sha256 = "0mnww5j7v381xf763gcfqp41klng40hb3283blnxcw2p5fp13b3k";
   };
 
-  propagatedBuildInputs = [kdelibs kdepimlibs stdenv.gcc.libc libusb
-  libpthreadstubs];
+  propagatedBuildInputs = [kde4.pimlibs kde4.support.qimageblitz stdenv.gcc.libc
+    libusb libpthreadstubs libxklavier];
   buildInputs = [cmake];
   patchPhase = "fixCmakeDbusCalls";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 644fab02a8a8..436a3701125c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5078,13 +5078,12 @@ rec {
     inherit
       fetchurl fetchsvn zlib perl openssl pcre pkgconfig libjpeg libpng libtiff
       libxml2 libxslt libtool libusb expat freetype bzip2 cmake cluceneCore libgcrypt gnupg
-	  cppunit cyrus_sasl openldap enchant exiv2 samba nss log4cxx aspell kerberos
+      cppunit cyrus_sasl openldap enchant exiv2 samba nss log4cxx aspell kerberos
       shared_mime_info alsaLib libungif cups mesa boost gpgme gettext redland
-	  xineLib libgphoto2 djvulibre libogg lame libvorbis poppler readline
-	  saneBackends chmlib python libzip gmp sqlite libidn runCommand lib
-	  openbabel ocaml facile stdenv jasper fam indilib libnova
-	  libarchive dbus;
-	flac = builtins.getAttr "1.1.2" flacAlts;
+      xineLib libgphoto2 djvulibre libogg lame libvorbis poppler readline
+      saneBackends chmlib python libzip gmp sqlite libidn runCommand lib
+      openbabel ocaml facile stdenv jasper fam indilib libnova libxklavier
+      libarchive dbus jdk kde4 avahi tapioca_qt flac mysql libassuan libgpgerror;
 	cdparanoia = cdparanoiaIII;
     inherit (xlibs)
       inputproto kbproto scrnsaverproto xextproto xf86miscproto