clucene: upgrade, kde4: remove

clucene-core upgraded to 0.9.20
clucene-contrib removed (can't find any version later than 0.9.16a and don't
know whether it's compatible with new clucene-core)
kde4: old staff removed, will add new tonight

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

3 files changed, 15 insertions, 104 deletions

diff --git a/pkgs/development/libraries/clucene-contrib/default.nix b/pkgs/development/libraries/clucene-contrib/default.nix
deleted file mode 100644
index 8938256dec462..0000000000000
--- a/pkgs/development/libraries/clucene-contrib/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, cluceneCore}:
-
-stdenv.mkDerivation {
-  name = "clucene-contrib-0.9.16a";
-
-  src = fetchurl {
-    url = ftp://ftp.chg.ru/pub/sourceforge/c/cl/clucene/clucene-contrib-0.9.16a.tar.bz2;
-    sha256 = "1apk867pggxsflhgvsnhcmy5vz2cvc1b914g4inkcj6s5vn1a1jx";
-  };
-  inherit cluceneCore;
-  buildInputs=[cluceneCore];
-  configureFlags = "--disable-static --with-clucene=${cluceneCore}";
-
-  meta = {
-    description = "CLucene is a port of the very popular Java Lucene text search engine API. Contrib package.";
-    homepage = http://clucene.sourceforge.net;
-  };
-}
diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index 3d5734d6c2d57..24e133a5de3c4 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchurl }:
+args: with args;
+stdenv.mkDerivation rec {
+	name = "clucene-core-0.9.20";
 
-stdenv.mkDerivation {
-  name = "clucene-core-0.9.16a";
+	src = fetchurl {
+		url = "mirror://sf/clucene/${name}.tar.bz2";
+		sha256 = "1hwq3b4qp1dgygmypgpg3blj68wnksq2rbqkwyxvl5dldn12q7rg";
+	};
+	configureFlags = "--disable-static";
 
-  src = fetchurl {
-    url = ftp://ftp.chg.ru/pub/sourceforge/c/cl/clucene/clucene-core-0.9.16a.tar.bz2;
-    sha256 = "0hv7sp1lbicnj2984hiki8qwrvz5zwn1zhj6azhavgjklanhihjr";
-  };
-
-  meta = {
-    description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package.";
-    homepage = http://clucene.sourceforge.net;
-  };
-  configureFlags = "--disable-static";
+	meta = {
+		description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package.";
+		homepage = http://clucene.sourceforge.net;
+	};
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 584f8bde09895..fe5c28da4747b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1613,13 +1613,9 @@ rec {
     inherit fetchurl stdenv python;
   };
 
-  cluceneContrib = (import ../development/libraries/clucene-contrib) {
-    inherit fetchurl stdenv cluceneCore;
-   };
-
-   cluceneCore = (import ../development/libraries/clucene-core) {
-     inherit fetchurl stdenv;
-   };
+  cluceneCore = (import ../development/libraries/clucene-core) {
+    inherit fetchurl stdenv;
+  };
 
   coredumper = import ../development/libraries/coredumper {
     inherit fetchurl stdenv;
@@ -4357,72 +4353,6 @@ rec {
     qt = qt3;
   };
   
-  kdelibs4 = import ../desktops/kde-4/kdelibs {
-    inherit
-      fetchurl stdenv zlib perl openssl pcre pkgconfig
-      libjpeg libpng libtiff libxml2 libxslt libtool
-	  expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups;
-	inherit (xlibs)
-	  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;
-    qt = qt4;
-  };
-
-  kdepimlibs4 = import ../desktops/kde-4/kdepimlibs {
-    inherit
-      fetchurl stdenv zlib perl openssl pcre pkgconfig
-      libjpeg libpng libtiff libxml2 libxslt libtool
-	  expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups
-	  boost gpgme;
-	inherit (xlibs)
-	  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;
-    qt = qt4;
-	kdelibs = kdelibs4;
-  };
-
-  kdepim4 = import ../desktops/kde-4/kdepim {
-    inherit
-      fetchurl stdenv zlib perl openssl pcre pkgconfig
-      libjpeg libpng libtiff libxml2 libxslt libtool libusb
-	  expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups
-	  mesa gpgme boost;
-	inherit (xlibs)
-	  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 libXinerama;
-	inherit (gtkLibs) glib;
-    qt = qt4;
-	kdelibs = kdelibs4;
-	kdepimlibs = kdepimlibs4;
-  };
-
-  kdebase4 = import ../desktops/kde-4/kdebase {
-    inherit
-      fetchurl stdenv zlib perl openssl pcre pkgconfig
-      libjpeg libpng libtiff libxml2 libxslt libtool libusb
-	  expat freetype bzip2 cmake strigi shared_mime_info alsaLib libungif cups
-	  mesa;
-	inherit (xlibs)
-	  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 libXinerama;
-	inherit (gtkLibs) glib;
-    qt = qt4;
-	kdelibs = kdelibs4;
-	kdepimlibs = kdepimlibs4;
-  };
-
   kdebase = import ../desktops/kde/kdebase {
     inherit
       fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl