* Some renaming: kde -> kde-3, kde-4 -> kde-4-old (we can delete it

  eventually, but it seems to contain some packages that aren't in
  kde-4.2 yet).

svn path=/nixpkgs/trunk/; revision=14481

39 files changed, 25 insertions, 14 deletions

diff --git a/pkgs/desktops/kde/kdebase/default.nix b/pkgs/desktops/kde-3/kdebase/default.nix
index 814d46291571..814d46291571 100644
--- a/pkgs/desktops/kde/kdebase/default.nix
+++ b/pkgs/desktops/kde-3/kdebase/default.nix
diff --git a/pkgs/desktops/kde/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix
index 86a85ab042bb..86a85ab042bb 100644
--- a/pkgs/desktops/kde/kdelibs/default.nix
+++ b/pkgs/desktops/kde-3/kdelibs/default.nix
diff --git a/pkgs/desktops/kde-4/base/builder.sh b/pkgs/desktops/kde-4-old/base/builder.sh
index 99b357fcf167..99b357fcf167 100755
--- a/pkgs/desktops/kde-4/base/builder.sh
+++ b/pkgs/desktops/kde-4-old/base/builder.sh
diff --git a/pkgs/desktops/kde-4/base/default.nix b/pkgs/desktops/kde-4-old/base/default.nix
index ea4ee603c025..ea4ee603c025 100644
--- a/pkgs/desktops/kde-4/base/default.nix
+++ b/pkgs/desktops/kde-4-old/base/default.nix
diff --git a/pkgs/desktops/kde-4/decibel/default.nix b/pkgs/desktops/kde-4-old/decibel/default.nix
index ff98b48ee6fc..ff98b48ee6fc 100644
--- a/pkgs/desktops/kde-4/decibel/default.nix
+++ b/pkgs/desktops/kde-4-old/decibel/default.nix
diff --git a/pkgs/desktops/kde-4/default.nix b/pkgs/desktops/kde-4-old/default.nix
index 9732d9e2b2b7..9732d9e2b2b7 100644
--- a/pkgs/desktops/kde-4/default.nix
+++ b/pkgs/desktops/kde-4-old/default.nix
diff --git a/pkgs/desktops/kde-4/edu/default.nix b/pkgs/desktops/kde-4-old/edu/default.nix
index 4ee00d765279..4ee00d765279 100644
--- a/pkgs/desktops/kde-4/edu/default.nix
+++ b/pkgs/desktops/kde-4-old/edu/default.nix
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake
index 35701ecf5c68..35701ecf5c68 100644
--- a/pkgs/desktops/kde-4/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake
+++ b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindBoostPython.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindBoostPython.cmake
index b68959d8a9c9..b68959d8a9c9 100644
--- a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindBoostPython.cmake
+++ b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindBoostPython.cmake
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindLibfacile.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindLibfacile.cmake
index 154531dabc11..154531dabc11 100644
--- a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindLibfacile.cmake
+++ b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindLibfacile.cmake
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/PythonLibsUtils.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/PythonLibsUtils.cmake
index df54324712a1..df54324712a1 100644
--- a/pkgs/desktops/kde-4/edu/myCmakeFiles/PythonLibsUtils.cmake
+++ b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/PythonLibsUtils.cmake
diff --git a/pkgs/desktops/kde-4/extragear/default.nix b/pkgs/desktops/kde-4-old/extragear/default.nix
index c67d4b8682cb..c67d4b8682cb 100644
--- a/pkgs/desktops/kde-4/extragear/default.nix
+++ b/pkgs/desktops/kde-4-old/extragear/default.nix
diff --git a/pkgs/desktops/kde-4/games/default.nix b/pkgs/desktops/kde-4-old/games/default.nix
index 4c3c1c115f0f..4c3c1c115f0f 100644
--- a/pkgs/desktops/kde-4/games/default.nix
+++ b/pkgs/desktops/kde-4-old/games/default.nix
diff --git a/pkgs/desktops/kde-4/graphics/default.nix b/pkgs/desktops/kde-4-old/graphics/default.nix
index e67551fddb7f..e67551fddb7f 100644
--- a/pkgs/desktops/kde-4/graphics/default.nix
+++ b/pkgs/desktops/kde-4-old/graphics/default.nix
diff --git a/pkgs/desktops/kde-4/libs/FindIlmBase.cmake b/pkgs/desktops/kde-4-old/libs/FindIlmBase.cmake
index 1511e9509cee..1511e9509cee 100644
--- a/pkgs/desktops/kde-4/libs/FindIlmBase.cmake
+++ b/pkgs/desktops/kde-4-old/libs/FindIlmBase.cmake
diff --git a/pkgs/desktops/kde-4/libs/FindOpenEXR.cmake b/pkgs/desktops/kde-4-old/libs/FindOpenEXR.cmake
index b1f590544fa8..b1f590544fa8 100644
--- a/pkgs/desktops/kde-4/libs/FindOpenEXR.cmake
+++ b/pkgs/desktops/kde-4-old/libs/FindOpenEXR.cmake
diff --git a/pkgs/desktops/kde-4/libs/default.nix b/pkgs/desktops/kde-4-old/libs/default.nix
index d0995429afe6..d0995429afe6 100644
--- a/pkgs/desktops/kde-4/libs/default.nix
+++ b/pkgs/desktops/kde-4-old/libs/default.nix
diff --git a/pkgs/desktops/kde-4/libs/setup.sh b/pkgs/desktops/kde-4-old/libs/setup.sh
index 6f899442d27a..6f899442d27a 100755
--- a/pkgs/desktops/kde-4/libs/setup.sh
+++ b/pkgs/desktops/kde-4-old/libs/setup.sh
diff --git a/pkgs/desktops/kde-4/multimedia/default.nix b/pkgs/desktops/kde-4-old/multimedia/default.nix
index c23439b5fc01..c23439b5fc01 100644
--- a/pkgs/desktops/kde-4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4-old/multimedia/default.nix
diff --git a/pkgs/desktops/kde-4/network/default.nix b/pkgs/desktops/kde-4-old/network/default.nix
index f006c4c5921e..f006c4c5921e 100644
--- a/pkgs/desktops/kde-4/network/default.nix
+++ b/pkgs/desktops/kde-4-old/network/default.nix
diff --git a/pkgs/desktops/kde-4/pim/builder.sh b/pkgs/desktops/kde-4-old/pim/builder.sh
index 8963fae048ca..8963fae048ca 100755
--- a/pkgs/desktops/kde-4/pim/builder.sh
+++ b/pkgs/desktops/kde-4-old/pim/builder.sh
diff --git a/pkgs/desktops/kde-4/pim/default.nix b/pkgs/desktops/kde-4-old/pim/default.nix
index f0f4184d391f..f0f4184d391f 100644
--- a/pkgs/desktops/kde-4/pim/default.nix
+++ b/pkgs/desktops/kde-4-old/pim/default.nix
diff --git a/pkgs/desktops/kde-4/pimlibs/default.nix b/pkgs/desktops/kde-4-old/pimlibs/default.nix
index 6a61374a774c..6a61374a774c 100644
--- a/pkgs/desktops/kde-4/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4-old/pimlibs/default.nix
diff --git a/pkgs/desktops/kde-4/runtime/builder.sh b/pkgs/desktops/kde-4-old/runtime/builder.sh
index 99b357fcf167..99b357fcf167 100755
--- a/pkgs/desktops/kde-4/runtime/builder.sh
+++ b/pkgs/desktops/kde-4-old/runtime/builder.sh
diff --git a/pkgs/desktops/kde-4/runtime/default.nix b/pkgs/desktops/kde-4-old/runtime/default.nix
index 8e31bce32fdb..8e31bce32fdb 100644
--- a/pkgs/desktops/kde-4/runtime/default.nix
+++ b/pkgs/desktops/kde-4-old/runtime/default.nix
diff --git a/pkgs/desktops/kde-4/support/akode.nix b/pkgs/desktops/kde-4-old/support/akode.nix
index 8fdf6736572e..8fdf6736572e 100644
--- a/pkgs/desktops/kde-4/support/akode.nix
+++ b/pkgs/desktops/kde-4-old/support/akode.nix
diff --git a/pkgs/desktops/kde-4/support/default.nix b/pkgs/desktops/kde-4-old/support/default.nix
index 426a5811bd79..426a5811bd79 100644
--- a/pkgs/desktops/kde-4/support/default.nix
+++ b/pkgs/desktops/kde-4-old/support/default.nix
diff --git a/pkgs/desktops/kde-4/support/eigen.nix b/pkgs/desktops/kde-4-old/support/eigen.nix
index 163683a29215..163683a29215 100644
--- a/pkgs/desktops/kde-4/support/eigen.nix
+++ b/pkgs/desktops/kde-4-old/support/eigen.nix
diff --git a/pkgs/desktops/kde-4/support/gmm.nix b/pkgs/desktops/kde-4-old/support/gmm.nix
index 843f9f6aaed5..843f9f6aaed5 100644
--- a/pkgs/desktops/kde-4/support/gmm.nix
+++ b/pkgs/desktops/kde-4-old/support/gmm.nix
diff --git a/pkgs/desktops/kde-4/support/qca.nix b/pkgs/desktops/kde-4-old/support/qca.nix
index fda435c7bffe..fda435c7bffe 100644
--- a/pkgs/desktops/kde-4/support/qca.nix
+++ b/pkgs/desktops/kde-4-old/support/qca.nix
diff --git a/pkgs/desktops/kde-4/support/qimageblitz.nix b/pkgs/desktops/kde-4-old/support/qimageblitz.nix
index 3364b4eac5da..3364b4eac5da 100644
--- a/pkgs/desktops/kde-4/support/qimageblitz.nix
+++ b/pkgs/desktops/kde-4-old/support/qimageblitz.nix
diff --git a/pkgs/desktops/kde-4/support/soprano.nix b/pkgs/desktops/kde-4-old/support/soprano.nix
index 0cb490b9db7e..0cb490b9db7e 100644
--- a/pkgs/desktops/kde-4/support/soprano.nix
+++ b/pkgs/desktops/kde-4-old/support/soprano.nix
diff --git a/pkgs/desktops/kde-4/support/strigi.nix b/pkgs/desktops/kde-4-old/support/strigi.nix
index d1ec98ea25f9..d1ec98ea25f9 100644
--- a/pkgs/desktops/kde-4/support/strigi.nix
+++ b/pkgs/desktops/kde-4-old/support/strigi.nix
diff --git a/pkgs/desktops/kde-4/support/taglib.nix b/pkgs/desktops/kde-4-old/support/taglib.nix
index 9a2acc96636b..9a2acc96636b 100644
--- a/pkgs/desktops/kde-4/support/taglib.nix
+++ b/pkgs/desktops/kde-4-old/support/taglib.nix
diff --git a/pkgs/desktops/kde-4/toys/default.nix b/pkgs/desktops/kde-4-old/toys/default.nix
index b88afded4113..b88afded4113 100644
--- a/pkgs/desktops/kde-4/toys/default.nix
+++ b/pkgs/desktops/kde-4-old/toys/default.nix
diff --git a/pkgs/desktops/kde-4/utils/default.nix b/pkgs/desktops/kde-4-old/utils/default.nix
index 4372bac8758c..4372bac8758c 100644
--- a/pkgs/desktops/kde-4/utils/default.nix
+++ b/pkgs/desktops/kde-4-old/utils/default.nix
diff --git a/pkgs/desktops/kde-4/workspace/builder.sh b/pkgs/desktops/kde-4-old/workspace/builder.sh
index 648d6175f35a..648d6175f35a 100755
--- a/pkgs/desktops/kde-4/workspace/builder.sh
+++ b/pkgs/desktops/kde-4-old/workspace/builder.sh
diff --git a/pkgs/desktops/kde-4/workspace/default.nix b/pkgs/desktops/kde-4-old/workspace/default.nix
index 041cd8977653..041cd8977653 100644
--- a/pkgs/desktops/kde-4/workspace/default.nix
+++ b/pkgs/desktops/kde-4-old/workspace/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9cfa7d11a78..c450f5bb6056 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9161,15 +9161,28 @@ let
       xmlto docbook2x docbook_xsl intltool;
   });
 
-  kdelibs = import ../desktops/kde/kdelibs {
-    inherit
-      fetchurl stdenv xlibs zlib perl openssl pcre pkgconfig
-      libjpeg libpng libtiff libxml2 libxslt libtool
-      expat freetype bzip2 cups attr acl;
-    qt = qt3;
+  kde3 = {
+
+    kdelibs = import ../desktops/kde-3/kdelibs {
+      inherit
+        fetchurl stdenv xlibs zlib perl openssl pcre pkgconfig
+        libjpeg libpng libtiff libxml2 libxslt libtool
+        expat freetype bzip2 cups attr acl;
+      qt = qt3;
+    };
+
+    kdebase = import ../desktops/kde-3/kdebase {
+      inherit
+        fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl
+        kdelibs openssl bzip2 fontconfig pam hal dbus;
+      inherit (gtkLibs) glib;
+      qt = qt3;
+    };
+
   };
 
-  kde4 = recurseIntoAttrs (import ../desktops/kde-4 {
+  /*
+  kde4 = recurseIntoAttrs (import ../desktops/kde-4-old {
     inherit
       fetchurl fetchsvn zlib perl openssl pcre pkgconfig libjpeg libpng libtiff
       libxml2 libxslt libtool libusb expat freetype bzip2 cmake cluceneCore libgcrypt gnupg
@@ -9190,18 +9203,16 @@ let
     qt = qt4;
     openexr = openexr_1_6_1 ;
   });
+  */
+
+  kde4 = kde42;
 
   kde42 = import ../desktops/kde-4.2 (pkgs // {
     openexr = openexr_1_6_1;
   });
 
-  kdebase = import ../desktops/kde/kdebase {
-    inherit
-      fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl
-      kdelibs openssl bzip2 fontconfig pam hal dbus;
-    inherit (gtkLibs) glib;
-    qt = qt3;
-  };
+  kdelibs = kde3.kdelibs;
+  kdebase = kde3.kdebase;
 
   ### SCIENCE/GEOMETRY