* Updated kdesdk.

svn path=/nixpkgs/branches/kde-4.7/; revision=27999

22 files changed, 48 insertions, 81 deletions

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 58741a86e99f0..7b329ec5a095c 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -115,18 +115,17 @@ recurseIntoAttrs rec {
   kdegraphics = callPackage ./graphics { };
   kdenetwork = callPackage ./network { };
   kdeplasma_addons = callPackage ./plasma-addons { };
+  */
   
   kdesdk = combinePkgs "kdesdk" {
     cervisia = callPackage ./sdk/cervisia.nix { };
     kapptemplate = callPackage ./sdk/kapptemplate.nix { };
-    kate = callPackage ./sdk/kate.nix { };
     kcachegrind = callPackage ./sdk/kcachegrind.nix { };
     kdeaccounts_plugin = callPackage ./sdk/kdeaccounts-plugin.nix { };
     dolphin_plugins = callPackage ./sdk/dolphin-plugins.nix { };
     kioslave_perldoc = callPackage ./sdk/kioslave-perldoc.nix { };
     kioslave_svn = callPackage ./sdk/kioslave-svn.nix { };
     strigi_analyzer = callPackage ./sdk/strigi-analyzer.nix { };
-    kbugbuster = callPackage ./sdk/kbugbuster.nix { };
     kmtrace = callPackage ./sdk/kmtrace.nix { };
     kompare = callPackage ./sdk/kompare.nix { };
     kpartloader = callPackage ./sdk/kpartloader.nix { };
@@ -137,9 +136,8 @@ recurseIntoAttrs rec {
     poxml = callPackage ./sdk/poxml.nix { };
     scripts = callPackage ./sdk/scripts.nix { };
     umbrello = callPackage ./sdk/umbrello.nix { };
-    okteta = callPackage ./utils/okteta.nix { };
+    okteta = callPackage ./sdk/okteta.nix { };
   };
-  */
 
   kdetoys = combinePkgs "kdetoys" {
     amor = callPackage ./toys/amor.nix { };
diff --git a/pkgs/desktops/kde-4.7/sdk/cervisia.nix b/pkgs/desktops/kde-4.7/sdk/cervisia.nix
index 98a45eae1d507..1fab0d56b5b90 100644
--- a/pkgs/desktops/kde-4.7/sdk/cervisia.nix
+++ b/pkgs/desktops/kde-4.7/sdk/cervisia.nix
@@ -1,14 +1,14 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "A KDE CVS frontend";
     kde = {
       name = "cervisia";
       module = "kdesdk";
-      version = "3.5.0";
+      version = "3.7.0";
       versionFile = "cervisia/version.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix
index e216bfaea2a0f..777581bca9184 100644
--- a/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix
+++ b/pkgs/desktops/kde-4.7/sdk/dolphin-plugins.nix
@@ -1,9 +1,11 @@
-{ kde, cmake, kdelibs, automoc4, kdebase }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, kde_baseapps, kdepimlibs }:
 
 kde.package {
   # Needs kdebase for libkonq
-  buildInputs = [ cmake kdelibs automoc4 kdebase ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi kde_baseapps ];
 
+  cmakeFlags = "-DBUILD_dolphin-plugins/svn=TRUE -DBUILD_dolphin-plugins/git=TRUE";
+  
   meta = {
     description = "Git and Svn plugins for dolphin";
     kde = {
diff --git a/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix
index 12445cb9f9b8b..e0069e5d7af47 100644
--- a/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kapptemplate.nix
@@ -1,8 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "A KDE 4 project template generator";
diff --git a/pkgs/desktops/kde-4.7/sdk/kate.nix b/pkgs/desktops/kde-4.7/sdk/kate.nix
deleted file mode 100644
index 95b0fbfcdc4f8..0000000000000
--- a/pkgs/desktops/kde-4.7/sdk/kate.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, shared_mime_info }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 shared_mime_info ];
-
-
-  meta = {
-    description = "Kate - Advanced Text Editor";
-    kde = {
-      name = "kate";
-      module = "kdesdk";
-      version = "3.5.2"; # (release.major-1).(release.minor).(release.patch)
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/sdk/kbugbuster.nix b/pkgs/desktops/kde-4.7/sdk/kbugbuster.nix
deleted file mode 100644
index dffb064f01baf..0000000000000
--- a/pkgs/desktops/kde-4.7/sdk/kbugbuster.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, kdelibs, automoc4, kdepimlibs }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs automoc4 kdepimlibs ];
-
-  meta = {
-    description = "KDE bugzilla client";
-    kde = {
-      name = "kbugbuster";
-      module = "kdesdk";
-      version = "3.80.3";
-      versionFile = "version.h";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix b/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix
index b32f46135dbba..13c010fffb7ca 100644
--- a/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kcachegrind.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "KDE Frontend for Callgrind/Cachegrind";
diff --git a/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix
index beac8a6d8f476..df5d45bc6214b 100644
--- a/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kdeaccounts-plugin.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, kdepimlibs }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, kdepimlibs }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 kdepimlibs ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi kdepimlibs ];
 
   meta = {
     description = "KDE accounts akonadi agent";
diff --git a/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix
index 5c996243b524d..a490920561dc1 100644
--- a/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kioslave-perldoc.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, perl }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, perl }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 perl ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi perl ];
 
   cmakeFlags = "-DBUILD_kioslave=ON -DBUILD_perldoc=ON";
 
diff --git a/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix
index d58d915a7f225..af6c98f91182f 100644
--- a/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kioslave-svn.nix
@@ -1,13 +1,13 @@
-{ kde, cmake, kdelibs, automoc4, subversion, apr, aprutil }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, subversion, apr, aprutil }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 subversion apr aprutil ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi subversion apr aprutil ];
 
   patches = [ ./find-svn.patch ];
   cmakeFlags = "-DBUILD_kioslave=ON";
 
   meta = {
-    description = "svn:/ kioslave";
+    description = "Subversion kioslave";
     kde = {
       name = "kioslave-svn";
       module = "kdesdk";
diff --git a/pkgs/desktops/kde-4.7/sdk/kmtrace.nix b/pkgs/desktops/kde-4.7/sdk/kmtrace.nix
index 190a86bc2b526..e5a3392645e38 100644
--- a/pkgs/desktops/kde-4.7/sdk/kmtrace.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kmtrace.nix
@@ -1,12 +1,12 @@
-{ kde, cmake, kdelibs, automoc4, gcc }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, gcc }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
-  preConfigure="export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
+  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
 
   meta = {
-    description = "KDE mtrace-based malloc debuger";
+    description = "KDE mtrace-based malloc debugger";
     kde = {
       name = "kmtrace";
       module = "kdesdk";
diff --git a/pkgs/desktops/kde-4.7/sdk/kompare.nix b/pkgs/desktops/kde-4.7/sdk/kompare.nix
index e20fc585dd27a..aa07dbb1039ad 100644
--- a/pkgs/desktops/kde-4.7/sdk/kompare.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kompare.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "A program to view the differences between files and optionally generate a diff";
diff --git a/pkgs/desktops/kde-4.7/sdk/kpartloader.nix b/pkgs/desktops/kde-4.7/sdk/kpartloader.nix
index 25eb100dd5368..6391ab145f521 100644
--- a/pkgs/desktops/kde-4.7/sdk/kpartloader.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kpartloader.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "A test application for KParts";
diff --git a/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix b/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix
index 39640f9218577..c87e047145794 100644
--- a/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kprofilemethod.nix
@@ -1,11 +1,10 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
-    description = "A macros for profiling using QTime";
-    longDescription = "Don't commit any code using kprofilemethod.h to KDE repositories.";
+    description = "A macro for profiling using QTime";
     kde = {
       name = "kprofilemethod";
       module = "kdesdk";
diff --git a/pkgs/desktops/kde-4.7/sdk/kstartperf.nix b/pkgs/desktops/kde-4.7/sdk/kstartperf.nix
index 0887531fdec26..56d4c8bcb3f98 100644
--- a/pkgs/desktops/kde-4.7/sdk/kstartperf.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kstartperf.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, libtool }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, libtool }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libtool ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi libtool ];
 
   meta = {
     description = "Measures start up time of a KDE application";
diff --git a/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix b/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix
index 377a1563d64e6..c1b4f6fe08c8f 100644
--- a/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix
+++ b/pkgs/desktops/kde-4.7/sdk/kuiviewer.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "Displays Qt Designer's UI files";
diff --git a/pkgs/desktops/kde-4.7/sdk/lokalize.nix b/pkgs/desktops/kde-4.7/sdk/lokalize.nix
index ec5381ee55dd3..f5d3aa0e0f994 100644
--- a/pkgs/desktops/kde-4.7/sdk/lokalize.nix
+++ b/pkgs/desktops/kde-4.7/sdk/lokalize.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, hunspell }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, hunspell }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 hunspell ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi hunspell ];
 
   meta = {
     description = "KDE 4 Computer-aided translation system";
@@ -12,7 +12,7 @@ kde.package {
     kde = {
       name = "lokalize";
       module = "kdesdk";
-      version = "1.1";
+      version = "1.2";
       versionFile = "src/version.h";
     };
   };
diff --git a/pkgs/desktops/kde-4.7/sdk/okteta.nix b/pkgs/desktops/kde-4.7/sdk/okteta.nix
index c6f1168b4e975..ef590ab50c44c 100644
--- a/pkgs/desktops/kde-4.7/sdk/okteta.nix
+++ b/pkgs/desktops/kde-4.7/sdk/okteta.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, automoc4, phonon, shared_mime_info, qca2 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, shared_mime_info, qca2 }:
 
 kde.package {
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon /* shared_mime_info qca2 */ ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi shared_mime_info qca2 ];
 
   meta = {
     description = "KDE byte editor";
diff --git a/pkgs/desktops/kde-4.7/sdk/poxml.nix b/pkgs/desktops/kde-4.7/sdk/poxml.nix
index 683fa77debd90..ae09217066872 100644
--- a/pkgs/desktops/kde-4.7/sdk/poxml.nix
+++ b/pkgs/desktops/kde-4.7/sdk/poxml.nix
@@ -1,8 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, antlr }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, antlr }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 antlr ];
-
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi antlr ];
 
   meta = {
     description = "Po<->xml tools";
diff --git a/pkgs/desktops/kde-4.7/sdk/scripts.nix b/pkgs/desktops/kde-4.7/sdk/scripts.nix
index 2bbb926259710..70fdb8b606b1b 100644
--- a/pkgs/desktops/kde-4.7/sdk/scripts.nix
+++ b/pkgs/desktops/kde-4.7/sdk/scripts.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "Various scripts to ease KDE development";
diff --git a/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix
index 0215a24608a51..cacabdcb3267a 100644
--- a/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix
+++ b/pkgs/desktops/kde-4.7/sdk/strigi-analyzer.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4 }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi ];
 
   meta = {
     description = "Strigi analyzers for diff, po and ts";
diff --git a/pkgs/desktops/kde-4.7/sdk/umbrello.nix b/pkgs/desktops/kde-4.7/sdk/umbrello.nix
index 85e63c66e1bdc..9785d6c3146d1 100644
--- a/pkgs/desktops/kde-4.7/sdk/umbrello.nix
+++ b/pkgs/desktops/kde-4.7/sdk/umbrello.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, boost }:
+{ kde, cmake, kdelibs, qt4, automoc4, phonon, strigi, libxml2, libxslt, boost }:
 
 kde.package {
-  buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt boost ];
+  buildInputs = [ cmake kdelibs qt4 automoc4 phonon strigi libxml2 libxslt boost ];
 
   meta = {
     description = "Umbrello UML modeller";