From 9105d0546dd2bd9ca7ac05dac3d4710da1924873 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 4 Apr 2012 16:14:57 +0000
Subject: [PATCH] Drop old kdevplatform/kdevelop

svn path=/nixpkgs/trunk/; revision=33571
---
 pkgs/applications/editors/kdevelop/4.3.0.nix  | 34 -------------------
 .../applications/editors/kdevelop/default.nix | 14 ++++----
 .../libraries/kdevplatform/1.3.0.nix          | 27 ---------------
 .../libraries/kdevplatform/default.nix        | 21 ++++++------
 pkgs/top-level/all-packages.nix               |  4 ---
 5 files changed, 16 insertions(+), 84 deletions(-)
 delete mode 100644 pkgs/applications/editors/kdevelop/4.3.0.nix
 delete mode 100644 pkgs/development/libraries/kdevplatform/1.3.0.nix

diff --git a/pkgs/applications/editors/kdevelop/4.3.0.nix b/pkgs/applications/editors/kdevelop/4.3.0.nix
deleted file mode 100644
index 92b4da5280a..00000000000
--- a/pkgs/applications/editors/kdevelop/4.3.0.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
-  kdebase_workspace, gettext, perl, okteta }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  version = "4.3.0";
-  pname = "kdevelop";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
-  };
-
-  buildInputs = [ kdevplatform kdebase_workspace okteta ];
-
-  buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
-
-  NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
-
-  meta = with stdenv.lib; {
-    maintainers = [ maintainers.urkud ];
-    platforms = platforms.linux;
-    description = "KDE official IDE";
-    longDescription =
-      ''
-        A free, opensource IDE (Integrated Development Environment)
-        for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
-        feature-full, plugin extendable IDE for C/C++ and other
-        programing languages. It is based on KDevPlatform, KDE and Qt
-        libraries and is under development since 1998.
-      '';
-    homepage = http://www.kdevelop.org;
-  };
-}
diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix
index e5b749c3794..92b4da5280a 100644
--- a/pkgs/applications/editors/kdevelop/default.nix
+++ b/pkgs/applications/editors/kdevelop/default.nix
@@ -1,21 +1,19 @@
 { stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
-  kdebase_workspace, gettext, perl, kdeutils, kdesdk }:
+  kdebase_workspace, gettext, perl, okteta }:
 
-let
-  okteta = if kdeutils ? okteta then kdeutils.okteta else kdesdk.okteta;
-in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "4.2.3";
+  version = "4.3.0";
   pname = "kdevelop";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "0ay3d2s5442pvdsx9lyfzb986kh6848qhbls9ff982f0glzqdcya";
+    sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr";
   };
 
-  buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info
-    kdebase_workspace gettext stdenv.gcc.libc perl okteta ];
+  buildInputs = [ kdevplatform kdebase_workspace okteta ];
+
+  buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
 
   NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
 
diff --git a/pkgs/development/libraries/kdevplatform/1.3.0.nix b/pkgs/development/libraries/kdevplatform/1.3.0.nix
deleted file mode 100644
index 10aa4c02028..00000000000
--- a/pkgs/development/libraries/kdevplatform/1.3.0.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon,
-  gettext, pkgconfig, apr, aprutil, boost, qjson }:
-
-stdenv.mkDerivation rec {
-  name = "kdevplatform-1.3.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/4.3.0/src/${name}.tar.bz2";
-    sha256 = "0afka8999csyj8hbgmcsbn8h2by04v7n8k4mrwkl0b79crdvwbcd";
-  };
-
-  propagatedBuildInputs = [ kdelibs qt4 phonon ];
-  buildInputs = [ apr aprutil subversion boost qjson ];
-
-  buildNativeInputs = [ cmake automoc4 gettext pkgconfig ];
-
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    platforms = stdenv.lib.platforms.linux;
-    description = "KDE libraries for IDE-like programs";
-    longDescription = ''
-      A free, opensource set of libraries that can be used as a foundation for
-      IDE-like programs. It is programing-language independent, and is planned
-      to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc."
-    '';
-  };
-}
diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix
index 7f28877b9f4..10aa4c02028 100644
--- a/pkgs/development/libraries/kdevplatform/default.nix
+++ b/pkgs/development/libraries/kdevplatform/default.nix
@@ -2,22 +2,21 @@
   gettext, pkgconfig, apr, aprutil, boost, qjson }:
 
 stdenv.mkDerivation rec {
-  name = "kdevplatform-1.2.3";
+  name = "kdevplatform-1.3.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/4.2.3/src/${name}.tar.bz2";
-    sha256 = "1h55lh7kkb8d9qgf4yyzmdwn7vq8l49lzlq92jccz7p79lxb2s08";
+    url = "mirror://kde/stable/kdevelop/4.3.0/src/${name}.tar.bz2";
+    sha256 = "0afka8999csyj8hbgmcsbn8h2by04v7n8k4mrwkl0b79crdvwbcd";
   };
 
-  propagatedBuildInputs = [ kdelibs subversion qt4 phonon ];
-  buildInputs =
-    [ cmake automoc4 perl gettext pkgconfig apr aprutil boost
-      stdenv.gcc.libc qjson
-    ];
+  propagatedBuildInputs = [ kdelibs qt4 phonon ];
+  buildInputs = [ apr aprutil subversion boost qjson ];
 
-  meta = with stdenv.lib; {
-    maintainers = [ maintainers.urkud ];
-    platforms = platforms.linux;
+  buildNativeInputs = [ cmake automoc4 gettext pkgconfig ];
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.linux;
     description = "KDE libraries for IDE-like programs";
     longDescription = ''
       A free, opensource set of libraries that can be used as a foundation for
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ffdc96502d..e795a5caa9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8048,12 +8048,8 @@ let
       kdesvn = callPackage ../applications/version-management/kdesvn { };
 
       kdevelop = callPackage ../applications/editors/kdevelop { };
-      kdevelop_4_3 = callPackage ../applications/editors/kdevelop/4.3.0.nix {
-        kdevplatform = self.kdevplatform_1_3;
-      };
 
       kdevplatform = callPackage ../development/libraries/kdevplatform { };
-      kdevplatform_1_3 = callPackage ../development/libraries/kdevplatform/1.3.0.nix { };
 
       kdiff3 = callPackage ../tools/text/kdiff3 { };