Merge branch 'master' into x-updates

Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix

30 files changed, 265 insertions, 110 deletions

diff --git a/pkgs/desktops/kde-4.10/applications/kate.nix b/pkgs/desktops/kde-4.10/applications/kate.nix
index a0dbf2aaba92..e8efc87775ab 100644
--- a/pkgs/desktops/kde-4.10/applications/kate.nix
+++ b/pkgs/desktops/kde-4.10/applications/kate.nix
@@ -1,8 +1,8 @@
-{ kde, kdelibs, kactivities, qjson, pyqt4, sip }:
+{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4 }:
 
 kde {
-#todo: PythonLibrary, SIP, PyQt4, PyKDE4
-  buildInputs = [ kdelibs kactivities qjson pyqt4 sip ];
+
+  buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4];
 
   meta = {
     description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix
index 9a682d6b93aa..4ea8b6acd444 100644
--- a/pkgs/desktops/kde-4.10/default.nix
+++ b/pkgs/desktops/kde-4.10/default.nix
@@ -25,12 +25,12 @@ let
     kdesdk = [
       { name="cervisia"; }
       { name="lokalize"; }
-      { name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kioslave"; }
-      { name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kioslave"; }
-      { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
-      { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
-      { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
-      { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
+      { name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kdesdk-kioslaves"; }
+      { name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kdesdk-kioslaves"; }
+      { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins"; }
+      { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins"; }
+      { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins"; }
+      { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins"; }
       { name="kcachegrind"; }
       { name="kapptemplate"; }
       { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers";}
diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix
index a0e58deb0b28..6b642eb0b226 100644
--- a/pkgs/desktops/kde-4.10/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.10/kde-runtime.nix
@@ -1,11 +1,11 @@
 { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
 , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
-, networkmanager, nepomuk_core, kactivities, kdepimlibs
+, networkmanager, kactivities, kdepimlibs
 }:
 
 kde {
   buildInputs = [
-    kdelibs attica xz bzip2 nepomuk_core libssh libjpeg exiv2 ntrack
+    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
     qca2 samba (libcanberra.override { gtk = null; }) pulseaudio
     networkmanager kactivities kdepimlibs
 #todo: add openslp, openexr
diff --git a/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix
index fa140765e7ff..571674a461ad 100644
--- a/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix
+++ b/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix
@@ -1,5 +1,5 @@
-{ kde, kdelibs, kdepimlibs, nepomuk_core }:
+{ kde, kdelibs, kdepimlibs }:
 
 kde {
-  buildInputs = [ kdelibs kdepimlibs nepomuk_core];
+  buildInputs = [ kdelibs kdepimlibs ];
 }
diff --git a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix
index baa5e807236c..7f6973c054bb 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix
+++ b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix
@@ -1,19 +1,21 @@
 { kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
-  boost, lndir }:
+  polkit_qt_1, boost, lndir, pkgconfig }:
 
 let pydir = "lib/python${python.majorVersion}"; in
 
 kde {
-#todo: doesn't build
-  buildInputs = [ python kdepimlibs
-# shared_desktop_ontologies boost 
-];
+
+  # todo: polkit isn't found by the build system
+
+  buildInputs = [
+    python kdepimlibs shared_desktop_ontologies
+    boost polkit_qt_1 pkgconfig
+  ];
 
   propagatedBuildInputs = [ pyqt4 sip ];
 
 #  patches = [ ./pykde4-hardcode-lib-python.patch ];
-
-  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
+#  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
 
   preConfigure =
     ''
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix
index e7e5101c972f..d129686b2de1 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix
@@ -1,5 +1,5 @@
 { kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
-, shared_desktop_ontologies, attica, nepomuk_core }:
+, shared_desktop_ontologies, attica }:
 
 kde {
   # attica, akonadi and kdepimlibs are disabled due to smokegen crash
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kstars.nix b/pkgs/desktops/kde-4.10/kdeedu/kstars.nix
index 0f63afe9e0d7..ce0a13b969df 100644
--- a/pkgs/desktops/kde-4.10/kdeedu/kstars.nix
+++ b/pkgs/desktops/kde-4.10/kdeedu/kstars.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs, eigen, xplanet, indilib }:
 
 kde {
-#todo:wcslib, doesn't build
+#todo:wcslib
   buildInputs = [ kdelibs eigen xplanet indilib ];
 
   meta = {
diff --git a/pkgs/desktops/kde-4.10/kdegames/kajongg.nix b/pkgs/desktops/kde-4.10/kdegames/kajongg.nix
index 609850c3abfb..9a6f5e836955 100644
--- a/pkgs/desktops/kde-4.10/kdegames/kajongg.nix
+++ b/pkgs/desktops/kde-4.10/kdegames/kajongg.nix
@@ -1,6 +1,6 @@
 { kde, kdelibs, libkdegames, pythonPackages, sqlite,  pykde4 }:
 kde rec {
-#todo: doesn't build
+
   buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
 
   pythonPath = [ pythonPackages.twisted pykde4 ];
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
index 1d401aca021a..3907b67c42a5 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
@@ -1,14 +1,14 @@
 { kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
   jasper, libidn, mediastreamer, msilbc, pkgconfig, libxslt, giflib,
   libgadu, boost, qca2, gpgme, sqlite, telepathy_qt, shared_desktop_ontologies,
-  libjpeg, nepomuk_core, libmms }:
+  libjpeg, libmms }:
 
 kde {
 #todo: libmeanwhile, xmms
   buildInputs = [
     kdelibs telepathy_qt shared_desktop_ontologies qca2 gpgme libgadu mediastreamer
     kdepimlibs qimageblitz libktorrent libjpeg sqlite jasper giflib libmsn libotr
-    libxslt libidn speex nepomuk_core boost libmms msilbc
+    libxslt libidn speex boost libmms msilbc
 ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
index 2932fecb1912..1f3ba36aaa1b 100644
--- a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
+++ b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs, libvncserver, libjpeg }:
 
 kde {
-#todo: doesn't build
+
   buildInputs = [ kdelibs libvncserver libjpeg ];
 
   patches = [ ./kdenetwork.patch ];
diff --git a/pkgs/desktops/kde-4.10/kdepim-runtime.nix b/pkgs/desktops/kde-4.10/kdepim-runtime.nix
index 191ce1080b8b..8fdd9fc8fa17 100644
--- a/pkgs/desktops/kde-4.10/kdepim-runtime.nix
+++ b/pkgs/desktops/kde-4.10/kdepim-runtime.nix
@@ -1,10 +1,10 @@
 { kde, fetchurl, cmake, kdelibs, libxslt, boost, kdepimlibs, akonadi
-, shared_desktop_ontologies, nepomuk_core }:
+, shared_desktop_ontologies }:
 
 kde {
   buildInputs = [
     kdepimlibs akonadi boost shared_desktop_ontologies
-    libxslt nepomuk_core
+    libxslt
   ];
 #todo: libkgapi, libkolab, libkolabxml
   meta = {
diff --git a/pkgs/desktops/kde-4.10/kdepim.nix b/pkgs/desktops/kde-4.10/kdepim.nix
index 56d18eab1857..fffab0010e3a 100644
--- a/pkgs/desktops/kde-4.10/kdepim.nix
+++ b/pkgs/desktops/kde-4.10/kdepim.nix
@@ -1,11 +1,11 @@
 { kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
 , akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
-, nepomuk_core, nepomuk_widgets, dblatex }:
+, nepomuk_widgets, dblatex }:
 
 kde {
 #todo: update grantlee to 0.3
   buildInputs =
-    [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_core nepomuk_widgets
+    [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets
       libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex
     ];
 
diff --git a/pkgs/desktops/kde-4.10/kdepimlibs.nix b/pkgs/desktops/kde-4.10/kdepimlibs.nix
index 27ec1de5a611..c9813b19f521 100644
--- a/pkgs/desktops/kde-4.10/kdepimlibs.nix
+++ b/pkgs/desktops/kde-4.10/kdepimlibs.nix
@@ -4,11 +4,11 @@
 
 kde {
   buildInputs =
-    [ boost gpgme libical libxslt nepomuk_core qjson
+    [ boost gpgme libical libxslt qjson
       openldap cyrus_sasl akonadi shared_desktop_ontologies
     ];
 
-  propagatedBuildInputs = [ kdelibs ];
+  propagatedBuildInputs = [ kdelibs nepomuk_core ];
 
   meta = {
     description = "KDE PIM libraries";
diff --git a/pkgs/desktops/kde-4.10/kdeplasma-addons.nix b/pkgs/desktops/kde-4.10/kdeplasma-addons.nix
index 3b30a257ddfe..2bd6f5037db8 100644
--- a/pkgs/desktops/kde-4.10/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-4.10/kdeplasma-addons.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
 , boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
 , kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
-, qjson, qoauth, nepomuk_core }:
+, qjson, qoauth }:
 # TODO: qwt, scim, ibus
 
 kde {
@@ -9,7 +9,7 @@ kde {
   KDEDIRS=marble;
 
   buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
-    eigen qca2 libXtst qimageblitz nepomuk_core
+    eigen qca2 libXtst qimageblitz
     libqalculate shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
 ];
 
diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix
index 9b3a474d3fcc..500dffc809e9 100644
--- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix
+++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix
@@ -1,11 +1,15 @@
 { kde, kdelibs, kde_baseapps }:
 
 kde {
-#todo: doesn't build
+
   # Needs kdebase for libkonq
   buildInputs = [ kdelibs kde_baseapps ];
 
+  patchPhase = ''
+    sed -i 's@macro_optional_add_subdirectory(bazaar)@add_subdirectory(bazaar)@' dolphin-plugins/CMakeLists.txt
+  '';
+
   meta = {
-    description = "Svn plugin for dolphin";
+    description = "Bazaar plugin for dolphin";
   };
 }
diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix
index d28a8d726ccc..2da3603c3bec 100644
--- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix
+++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix
@@ -1,10 +1,14 @@
 { kde, kdelibs, kde_baseapps }:
 
 kde {
-#todo: doesn't build
+
   # Needs kdebase for libkonq
   buildInputs = [ kdelibs kde_baseapps ];
 
+  patchPhase = ''
+    sed -i 's@macro_optional_add_subdirectory(git)@add_subdirectory(git)@' dolphin-plugins/CMakeLists.txt
+  '';
+
   meta = {
     description = "Git plugin for dolphin";
   };
diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix
index 9b3a474d3fcc..20925842a32d 100644
--- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix
+++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix
@@ -1,11 +1,15 @@
 { kde, kdelibs, kde_baseapps }:
 
 kde {
-#todo: doesn't build
+
   # Needs kdebase for libkonq
   buildInputs = [ kdelibs kde_baseapps ];
 
+  patchPhase = ''
+    sed -i 's@macro_optional_add_subdirectory(hg)@add_subdirectory(hg)@' dolphin-plugins/CMakeLists.txt
+  '';
+
   meta = {
-    description = "Svn plugin for dolphin";
+    description = "Mercurial plugin for dolphin";
   };
 }
diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix
index 9b3a474d3fcc..fafdcc55a1f0 100644
--- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix
+++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix
@@ -1,10 +1,14 @@
 { kde, kdelibs, kde_baseapps }:
 
 kde {
-#todo: doesn't build
+
   # Needs kdebase for libkonq
   buildInputs = [ kdelibs kde_baseapps ];
 
+  patchPhase = ''
+    sed -i 's@macro_optional_add_subdirectory(svn)@add_subdirectory(svn)@' dolphin-plugins/CMakeLists.txt
+  '';
+
   meta = {
     description = "Svn plugin for dolphin";
   };
diff --git a/pkgs/desktops/kde-4.10/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.10/kdesdk/find-svn.patch
deleted file mode 100644
index f6f4df942dd9..000000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/find-svn.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake
-index 59bcb96..2eac05d 100644
---- a/cmake/modules/FindSVN.cmake
-+++ b/cmake/modules/FindSVN.cmake
-@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS
- FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS
-    /usr/local/apr/bin
- )
-+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS
-+   /usr/local/apr/bin
-+)
- 
- if(SVNCONFIG_EXECUTABLE)
- 
-@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE)
-       set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-    else(APRCONFIG_EXECUTABLE)
-       FIND_PATH(_INCLUDES apr_pools.h
--         ${SVN_INCLUDES}/apr-0/
--         ${SVN_INCLUDES}/apr-1/
--         ${SVN_INCLUDES}/apr-1.0/
--         /usr/include/apr-0/
--         /usr/include/apr-1/
--         /usr/include/apr-1.0/
--         /usr/local/include/apr-0/
--         /usr/local/include/apr-1/
--         /usr/local/include/apr-1.0/
-+         HINTS ${SVN_INCLUDES}
-+         SUFFIXES apr-0 apr-1 apr-1.0
-       )
-       if(_INCLUDES)
-          set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE)
-          set(SVN_FOUND FALSE) # no apr == can't compile!
-       endif(_INCLUDES)
-    endif(APRCONFIG_EXECUTABLE)
-+
-+   # Use apu-config if it exists
-+   if(APUCONFIG_EXECUTABLE)
-+      EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES)
-+      string(REPLACE "-I" "" _INCLUDES ${_INCLUDES})
-+      string(REPLACE " " ";" _INCLUDES ${_INCLUDES})
-+      set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+   else(APUCONFIG_EXECUTABLE)
-+      FIND_PATH(_INCLUDES apu.h
-+         HINTS ${SVN_INCLUDES}
-+         SUFFIXES apr-0 apr-1 apr-1.0
-+      )
-+      if(_INCLUDES)
-+         set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
-+      else(_INCLUDES)
-+         set(SVN_FOUND FALSE) # no apr == can't compile!
-+      endif(_INCLUDES)
-+   endif(APUCONFIG_EXECUTABLE)
-    FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1)
-    if(SVN_LIBRARIES)
-       FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1)
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix
index 782ef72ce5aa..f96b0df2b955 100644
--- a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix
+++ b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix
@@ -1,9 +1,11 @@
 { kde, kdelibs, gettext }:
 
 kde {
-#todo: doesn't build
+
   buildInputs = [ kdelibs gettext ];
 
+  patches = [ ./thumbnailers-add-subdirectory.patch ];
+
   meta = {
     description = "PO file format thumbnailer";
   };
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix
index 6f1029539f83..4c45be6b4fef 100644
--- a/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix
+++ b/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs, perl }:
 
 kde {
-#todo: doesn't build
+
   buildInputs = [ kdelibs perl ];
 
   cmakeFlags = [ "-DBUILD_perldoc=ON" ];
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix
index 13fc035e6063..0574241353db 100644
--- a/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix
+++ b/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix
@@ -1,10 +1,8 @@
 { kde, kdelibs, subversionClient, apr, aprutil }:
 
 kde {
-#todo: doesn't build
-  buildInputs = [ kdelibs subversionClient apr aprutil ];
 
-  patches = [ ./find-svn.patch ];
+  buildInputs = [ kdelibs subversionClient apr aprutil ];
 
   meta = {
     description = "Subversion kioslave";
diff --git a/pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch b/pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch
new file mode 100644
index 000000000000..5b4f7643bf45
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch
@@ -0,0 +1,12 @@
+diff -Naur kdesdk-4.10.2-upstream/kdesdk-thumbnailers/CMakeLists.txt kdesdk-4.10.2/kdesdk-thumbnailers/CMakeLists.txt
+--- kdesdk-4.10.2-upstream/kdesdk-thumbnailers/CMakeLists.txt	2013-05-02 21:05:56.446226846 -0430
++++ kdesdk-4.10.2/kdesdk-thumbnailers/CMakeLists.txt	2013-05-02 21:09:58.504053136 -0430
+@@ -9,7 +9,7 @@
+ macro_log_feature(GETTEXTPO_FOUND "gettext-po" "A library for processing PO files" "www.gnu.org/software/gettext" FALSE "" "Required to build the PO thumbnailer")
+ 
+ if(GETTEXTPO_FOUND)
+-macro_optional_add_subdirectory(po_thumbnailer)
++add_subdirectory(po_thumbnailer)
+ endif(GETTEXTPO_FOUND)
+ 
+ macro_display_feature_log()
diff --git a/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix
index 3027e2357a49..f3b00a5b968c 100644
--- a/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix
+++ b/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, kdepimlibs, nepomuk_core }:
+{ kde, kdelibs, kdepimlibs }:
 
 kde {
-  buildInputs = [ kdelibs kdepimlibs nepomuk_core ];
+  buildInputs = [ kdelibs kdepimlibs ];
 
   meta = {
     description = "Simple KDE GUI for GPG";
diff --git a/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix
index 1b0d748e6cc5..99feaf3e4f99 100644
--- a/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix
+++ b/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix
@@ -1,5 +1,5 @@
 { kde, kdelibs
-, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
+, pythonPackages, cups, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
 , pythonDBus, makeWrapper }:
 
 let s_c_p = system_config_printer.override { withGUI = false; }; in
@@ -8,7 +8,7 @@ kde rec {
   buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
     ] ++ pythonPath;
 
-  pythonPath = [ pyqt4 pykde4 pycups s_c_p ];
+  pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
 
   passthru.propagatedUserEnvPackages = [ s_c_p ];
 
diff --git a/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix
index 09f409cc4746..21971beb80a0 100644
--- a/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix
+++ b/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix
@@ -1,9 +1,9 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs, nepomuk_core, htmlTidy, boost }:
+{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
 
 kde {
 #todo: ruby is not found. needed for some example scripts
   buildInputs =
-    [ kdelibs kdepimlibs htmlTidy nepomuk_core boost ];
+    [ kdelibs kdepimlibs htmlTidy boost ];
 
   meta = {
     description = "A KDE link checker";
diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch b/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch
new file mode 100644
index 000000000000..96b3b887a8d1
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch
@@ -0,0 +1,91 @@
+commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
+Author: Luca Beltrame <lbeltrame@kde.org>
+Date:   Mon Oct 1 20:47:56 2012 +0200
+
+    Remove duplicated QVector<int> definition, since it's in PyQt now.
+    Simon, if you have time, please review if everything is OK.
+    
+    CCMAIL: simon@simonzone.com
+
+diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
+index 5a0a080..73dad01 100644
+--- a/sip/kdecore/typedefs.sip
++++ b/sip/kdecore/typedefs.sip
+@@ -951,77 +951,3 @@ template <TYPE1>
+ %End
+ };
+ 
+-%MappedType QVector<int>
+-{
+-%TypeHeaderCode
+-#include <qvector.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    for (int i = 0; i < sipCpp->size(); ++i)
+-    {
+-        int t = (sipCpp->at(i));
+-
+-#if PY_MAJOR_VERSION >= 3        
+-        PyObject *tobj = PyLong_FromLong(t);
+-#else
+-        PyObject *tobj = PyInt_FromLong(t);
+-#endif
+-
+-        PyList_SET_ITEM(l, i, tobj);
+-    }
+-
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-
+-        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
+-            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+-#if PY_MAJOR_VERSION >= 3
+-            if (!PyNumber_Check(tobj))
+-#else
+-            if (!PyInt_Check(tobj))
+-#endif
+-                return 0;
+-        }
+-        return 1;
+-    }
+-
+-    QVector<int> *qv = new QVector<int>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-    {
+-        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+- #if PY_MAJOR_VERSION >= 3
+-        int t = PyLong_AsLong (tobj);
+-#else
+-        int t = PyInt_AS_LONG (tobj);
+-#endif
+-
+-        if (*sipIsErr)
+-        {
+-            delete qv;
+-            return 0;
+-        }
+-
+-        qv->append(t);
+-    }
+- 
+-    *sipCppPtr = qv;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};
diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix
index 1ca6efe3b920..030f2fb430ac 100644
--- a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix
+++ b/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix
@@ -10,7 +10,7 @@ kde {
 
 #NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
 
-  patches = [ ./pykde-purity.patch ];
+  patches = [ ./pykde-purity.patch ./pykde4-new-sip.patch ];
 
   cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON";
 
diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch
new file mode 100644
index 000000000000..96b3b887a8d1
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch
@@ -0,0 +1,91 @@
+commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
+Author: Luca Beltrame <lbeltrame@kde.org>
+Date:   Mon Oct 1 20:47:56 2012 +0200
+
+    Remove duplicated QVector<int> definition, since it's in PyQt now.
+    Simon, if you have time, please review if everything is OK.
+    
+    CCMAIL: simon@simonzone.com
+
+diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
+index 5a0a080..73dad01 100644
+--- a/sip/kdecore/typedefs.sip
++++ b/sip/kdecore/typedefs.sip
+@@ -951,77 +951,3 @@ template <TYPE1>
+ %End
+ };
+ 
+-%MappedType QVector<int>
+-{
+-%TypeHeaderCode
+-#include <qvector.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    for (int i = 0; i < sipCpp->size(); ++i)
+-    {
+-        int t = (sipCpp->at(i));
+-
+-#if PY_MAJOR_VERSION >= 3        
+-        PyObject *tobj = PyLong_FromLong(t);
+-#else
+-        PyObject *tobj = PyInt_FromLong(t);
+-#endif
+-
+-        PyList_SET_ITEM(l, i, tobj);
+-    }
+-
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-
+-        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
+-            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+-#if PY_MAJOR_VERSION >= 3
+-            if (!PyNumber_Check(tobj))
+-#else
+-            if (!PyInt_Check(tobj))
+-#endif
+-                return 0;
+-        }
+-        return 1;
+-    }
+-
+-    QVector<int> *qv = new QVector<int>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-    {
+-        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
+- #if PY_MAJOR_VERSION >= 3
+-        int t = PyLong_AsLong (tobj);
+-#else
+-        int t = PyInt_AS_LONG (tobj);
+-#endif
+-
+-        if (*sipIsErr)
+-        {
+-            delete qv;
+-            return 0;
+-        }
+-
+-        qv->append(t);
+-    }
+- 
+-    *sipCppPtr = qv;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};
diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
index e32b7447aea2..eb4d49616c4e 100644
--- a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
+++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
@@ -8,7 +8,7 @@ kde {
 
   propagatedBuildInputs = [ pyqt4 sip ];
 
-  patches = [ ./pykde4-hardcode-lib-python.patch ];
+  patches = [ ./pykde4-hardcode-lib-python.patch ./pykde4-new-sip.patch ];
 
   cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";