From d3df8a30859fdd71d88b335062f4493569afc5eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jul 2011 14:30:07 +0000
Subject: [PATCH] * Updated kdeaccessibility.

svn path=/nixpkgs/branches/kde-4.7/; revision=28001
---
 .../kde-4.7/accessibility/color-schemes.nix        | 13 -------------
 .../desktops/kde-4.7/accessibility/icon-themes.nix | 14 --------------
 pkgs/desktops/kde-4.7/accessibility/jovie.nix      |  4 ++--
 .../desktops/kde-4.7/accessibility/kaccessible.nix | 14 ++++++++++++++
 pkgs/desktops/kde-4.7/accessibility/kmag.nix       |  4 ++--
 pkgs/desktops/kde-4.7/accessibility/kmousetool.nix |  4 ++--
 pkgs/desktops/kde-4.7/accessibility/kmouth.nix     |  5 ++---
 pkgs/desktops/kde-4.7/default.nix                  |  7 +++----
 8 files changed, 25 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.7/accessibility/color-schemes.nix
 delete mode 100644 pkgs/desktops/kde-4.7/accessibility/icon-themes.nix
 create mode 100644 pkgs/desktops/kde-4.7/accessibility/kaccessible.nix

diff --git a/pkgs/desktops/kde-4.7/accessibility/color-schemes.nix b/pkgs/desktops/kde-4.7/accessibility/color-schemes.nix
deleted file mode 100644
index 0be6cf2c6d5..00000000000
--- a/pkgs/desktops/kde-4.7/accessibility/color-schemes.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE Accessibility color schemes";
-    kde = {
-      name = "ColorSchemes";
-      module = "kdeaccessibility";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/accessibility/icon-themes.nix b/pkgs/desktops/kde-4.7/accessibility/icon-themes.nix
deleted file mode 100644
index 40e8a21d0e6..00000000000
--- a/pkgs/desktops/kde-4.7/accessibility/icon-themes.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
-
-kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
-
-  meta = {
-    description = "KDE mono icon theme";
-    kde = {
-      name = "IconThemes";
-      module = "kdeaccessibility";
-    };
-  };
-}
-
diff --git a/pkgs/desktops/kde-4.7/accessibility/jovie.nix b/pkgs/desktops/kde-4.7/accessibility/jovie.nix
index 5fc138ca5c3..6b270534e44 100644
--- a/pkgs/desktops/kde-4.7/accessibility/jovie.nix
+++ b/pkgs/desktops/kde-4.7/accessibility/jovie.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
 #TODO: working backend: speechd or opentts
   meta = {
diff --git a/pkgs/desktops/kde-4.7/accessibility/kaccessible.nix b/pkgs/desktops/kde-4.7/accessibility/kaccessible.nix
new file mode 100644
index 00000000000..80878db4ecc
--- /dev/null
+++ b/pkgs/desktops/kde-4.7/accessibility/kaccessible.nix
@@ -0,0 +1,14 @@
+{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
+
+kde.package {
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
+
+  meta = {
+    description = "Bridge that provides accessibility services to applications";
+    kde = {
+      name = "kaccessible";
+      module = "kdeaccessibility";
+    };
+  };
+}
+  
\ No newline at end of file
diff --git a/pkgs/desktops/kde-4.7/accessibility/kmag.nix b/pkgs/desktops/kde-4.7/accessibility/kmag.nix
index 84cad4d1e54..b8ddf55cea6 100644
--- a/pkgs/desktops/kde-4.7/accessibility/kmag.nix
+++ b/pkgs/desktops/kde-4.7/accessibility/kmag.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "Screen magnifier for KDE";
diff --git a/pkgs/desktops/kde-4.7/accessibility/kmousetool.nix b/pkgs/desktops/kde-4.7/accessibility/kmousetool.nix
index 308aaad07e1..cbde5728ef7 100644
--- a/pkgs/desktops/kde-4.7/accessibility/kmousetool.nix
+++ b/pkgs/desktops/kde-4.7/accessibility/kmousetool.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs, libXtst }:
+{ kde, cmake, qt4, kdelibs, automoc4, phonon, libXtst }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 libXtst ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon libXtst ];
 
   meta = {
     description = "A program that clicks the mouse for you";
diff --git a/pkgs/desktops/kde-4.7/accessibility/kmouth.nix b/pkgs/desktops/kde-4.7/accessibility/kmouth.nix
index e576dfb6823..ad6a565e1b6 100644
--- a/pkgs/desktops/kde-4.7/accessibility/kmouth.nix
+++ b/pkgs/desktops/kde-4.7/accessibility/kmouth.nix
@@ -1,7 +1,7 @@
-{ kde, cmake, qt4, perl, automoc4, kdelibs }:
+{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
 
 kde.package {
-  buildInputs = [ cmake qt4 perl kdelibs automoc4 ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
 
   meta = {
     description = "A type-and-say front end for speech synthesizers";
@@ -12,4 +12,3 @@ kde.package {
     };
   };
 }
-
diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index 91b672f7b15..f3e3dfa5071 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -87,16 +87,15 @@ recurseIntoAttrs rec {
   
   kdemultimedia = callPackage ./multimedia.nix { };
 
-  /*
   kdeaccessibility = combinePkgs "kdeaccessibility" {
-    colorSchemes = callPackage ./accessibility/color-schemes.nix { };
-    iconThemes = callPackage ./accessibility/icon-themes.nix { };
-    jovie = callPackage ./accessibility/jovie.nix { };
+    #jovie = callPackage ./accessibility/jovie.nix { };
     kmag = callPackage ./accessibility/kmag.nix { };
     kmousetool = callPackage ./accessibility/kmousetool.nix { };
     kmouth = callPackage ./accessibility/kmouth.nix { };
+    kaccessible = callPackage ./accessibility/kaccessible.nix { };
   };
 
+  /*
   kdeartwork = combinePkgs "kdeartwork" {
     aurorae = callPackage ./artwork/aurorae.nix { };
     colorSchemes = callPackage ./artwork/color-schemes.nix { };