From 1f558f78dffdb10c7ef577c7212a7ebf96de37da Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 6 Dec 2010 12:04:16 +0000
Subject: [PATCH] There will be no kdepim-4.5.x

svn path=/nixpkgs/trunk/; revision=24992
---
 pkgs/desktops/kde-4.5/default.nix              |  4 ----
 .../desktops/kde-4.5/pim-runtime45/default.nix | 15 ---------------
 pkgs/desktops/kde-4.5/pim45/boost-1.44.diff    | 12 ------------
 pkgs/desktops/kde-4.5/pim45/default.nix        | 18 ------------------
 4 files changed, 49 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.5/pim-runtime45/default.nix
 delete mode 100644 pkgs/desktops/kde-4.5/pim45/boost-1.44.diff
 delete mode 100644 pkgs/desktops/kde-4.5/pim45/default.nix

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 8ff7e970199..23be3c98129 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -152,10 +152,6 @@ recurseIntoAttrs rec {
   kdepim_runtime = callPackage ./pim-runtime { };
   kdepim = callPackage ./pim { };
 
-  # Experimental 4.5 versions
-  kdepim_runtime45 = callPackage ./pim-runtime45 { };
-  kdepim45 = callPackage ./pim45 { };
-  
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
diff --git a/pkgs/desktops/kde-4.5/pim-runtime45/default.nix b/pkgs/desktops/kde-4.5/pim-runtime45/default.nix
deleted file mode 100644
index c5952120628..00000000000
--- a/pkgs/desktops/kde-4.5/pim-runtime45/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
-
-kde.package rec {
-	buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
-
-  meta = {
-    description = "Runtime files for KDE PIM: akonadi agents etc.";
-    kde = rec {
-      name = "kdepim-runtime";
-      version = "4.4.93";
-      subdir = "kdepim/${version}/src/src";
-      stable = false;
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff b/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff
deleted file mode 100644
index 7c5ab9ef31b..00000000000
--- a/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/kleopatra/crypto/gui/newresultpage.cpp b/kleopatra/crypto/gui/newresultpage.cpp
-index 96d1cb2..5c7281a 100644
---- a/kleopatra/crypto/gui/newresultpage.cpp
-+++ b/kleopatra/crypto/gui/newresultpage.cpp
-@@ -40,6 +40,7 @@
- #include <crypto/taskcollection.h>
- 
- #include <utils/stl_util.h>
-+#include <boost/mem_fn.hpp>
- 
- #include <KLocalizedString>
- 
diff --git a/pkgs/desktops/kde-4.5/pim45/default.nix b/pkgs/desktops/kde-4.5/pim45/default.nix
deleted file mode 100644
index 1c390e4c820..00000000000
--- a/pkgs/desktops/kde-4.5/pim45/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi,
-  shared_mime_info, soprano, grantlee, libassuan, perl, libxslt }:
-
-kde.package {
-  buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi
-    shared_mime_info soprano grantlee libassuan perl libxslt ];
-
-  patches = [ ./boost-1.44.diff ];
-
-  meta = {
-    kde = rec {
-      name = "kdepim";
-      version = "4.4.93";
-      subdir = "kdepim/${version}/src/src";
-      stable = false;
-    };
-  };
-}