Move kipi-plugins to apps/graphics

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

pkgs/applications/graphics/kipi-plugins/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2,
+kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod}:
+
+stdenv.mkDerivation rec {
+  name = "kipi-plugins-1.4.0";
+
+  src = fetchurl { 
+    url = "mirror://sourceforge/kipi/${name}.tar.bz2";
+    sha256 = "1ybxhp4rs6c5xlrs0q765vrx4mvw4k0kq6n42dyk3kxvmcb9iq34";
+  };
+
+  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs 
+    libxml2 libxslt gettext opencv libgpod ];
+
+  KDEDIRS = kdegraphics;
+
+  meta = {
+    description = "Photo Management Program";
+    license = "GPL";
+    homepage = http://www.kipi-plugins.org;
+    inherit (kdelibs.meta) platforms;
+    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
+  };
+}

pkgs/desktops/kde-4.4/default.nix

@@ -247,12 +247,6 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon;
   };
 
-  kipiplugins = import ./extragear/kipi-plugins {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 libxml2 libxslt gettext;
-    inherit kdelibs kdepimlibs kdegraphics;
-    inherit automoc4 phonon qimageblitz qca2;
-  };
-  
   kmplayer = import ./extragear/kmplayer {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext dbus_glib;
     inherit (pkgs.gtkLibs) pango gtk;
@@ -267,7 +261,7 @@ pkgs.recurseIntoAttrs (rec {
   };
   
   inherit (pkgs) konversation yakuake ktorrent koffice amarok kdevplatform
-    kdevelop;
+    kdevelop kipi_plugins;
   
   gtk_qt_engine = import ./extragear/gtk-qt-engine {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;

pkgs/desktops/kde-4.4/extragear/kipi-plugins/default.nix

@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2,
-kdegraphics, kdepimlibs, libxml2, libxslt, gettext}:
-
-stdenv.mkDerivation rec {
-  name = "kipi-plugins-1.1.0";
-
-  src = fetchurl { 
-    url = "mirror://sourceforge/kipi/${name}.tar.bz2";
-    sha256 = "0vclb906g2jgzfl9f2qapaxcqq412j01yn7686682xx8iwrxm2cy";
-  };
-
-  buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs 
-    libxml2 libxslt gettext ];
-  cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
-  meta = {
-    description = "Photo Management Program";
-    license = "GPL";
-    homepage = http://www.kipi-plugins.org;
-    maintainers = [ lib.maintainers.viric ];
-    platforms = with lib.platforms; linux;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -5807,6 +5807,8 @@ let
     inherit (xlibs) libXv libX11;
   };
 
+  kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { };
+
   koffice = newScope pkgs.kde4 ../applications/office/koffice { };
 
   konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };