Remove kde4.ktorrent

- Already updated to KDE 5 in Nixpkgs

4 files changed, 22 insertions, 85 deletions

diff --git a/pkgs/applications/networking/p2p/ktorrent/5.nix b/pkgs/applications/networking/p2p/ktorrent/5.nix
deleted file mode 100644
index 7e47838c4f98..000000000000
--- a/pkgs/applications/networking/p2p/ktorrent/5.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, cmake
-, ecm, qtbase, qtscript
-, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
-, libktorrent, boost, taglib
-}:
-
-stdenv.mkDerivation rec {
-  name = pname + "-" + version;
-
-  pname = "ktorrent";
-  version = "5.0.1";
-
-  src = fetchurl {
-    url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz;
-    sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh";
-  };
-
-  patches =
-    [ (fetchurl {
-        url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc;
-        sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v";
-      })
-    ];
-
-  nativeBuildInputs = [ kdoctools ecm ];
-
-  buildInputs =
-    [ cmake qtbase qtscript
-      ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
-      libktorrent taglib
-    ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "KDE integrated BtTorrent client";
-    homepage = https://www.kde.org/applications/internet/ktorrent/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index e53fda089111..7e47838c4f98 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -1,32 +1,41 @@
-{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost
-, gettext, kdebase_workspace, qt4, kdelibs, phonon }:
+{ stdenv, fetchurl, cmake
+, ecm, qtbase, qtscript
+, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
+, libktorrent, boost, taglib
+}:
 
 stdenv.mkDerivation rec {
   name = pname + "-" + version;
 
   pname = "ktorrent";
-  version = "4.3.1";
+  version = "5.0.1";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
-    sha256 = "66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1";
+    url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz;
+    sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh";
   };
 
-  patches = [ ./find-workspace.diff ];
+  patches =
+    [ (fetchurl {
+        url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc;
+        sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v";
+      })
+    ];
 
-  KDEDIRS = libktorrent;
+  nativeBuildInputs = [ kdoctools ecm ];
 
   buildInputs =
-    [ cmake qt4 kdelibs automoc4 phonon libktorrent boost taglib kdepimlibs
-      gettext kdebase_workspace
+    [ cmake qtbase qtscript
+      ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
+      libktorrent taglib
     ];
 
   enableParallelBuilding = true;
 
   meta = {
     description = "KDE integrated BtTorrent client";
-    homepage = http://ktorrent.pwsp.net;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    inherit (libktorrent.meta) platforms;
+    homepage = https://www.kde.org/applications/internet/ktorrent/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff b/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
deleted file mode 100644
index b07c1ca1b83c..000000000000
--- a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix finding kworkspace.h
-diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
-index 59e5470..5b932ff 100644
---- a/plugins/shutdown/CMakeLists.txt
-+++ b/plugins/shutdown/CMakeLists.txt
-@@ -1,6 +1,8 @@
- set(KWORKSPACE_FOUND FALSE)
--FIND_PATH(KWORKSPACE_INCLUDE_DIR NAMES kworkspace.h  PATHS ${KDE4_INCLUDE_DIR}/kworkspace ${INCLUDE_INSTALL_DIR}/kworkspace.h)
--FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-+FIND_PATH(KWORKSPACE_INCLUDE_DIR
-+	NAMES kworkspace/kworkspace.h
-+	HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
-+FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
- 
- if(KWORKSPACE_INCLUDE_DIR AND KWORKSPACE_LIBRARY)
- 	set(KWORKSPACE_FOUND TRUE)
-diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp
-index e233353..1efc20b 100644
---- a/plugins/shutdown/shutdownplugin.cpp
-+++ b/plugins/shutdown/shutdownplugin.cpp
-@@ -19,7 +19,7 @@
- ***************************************************************************/
- #include <kjob.h>
- #include <kgenericfactory.h>
--#include <kworkspace.h>
-+#include <kworkspace/kworkspace.h>
- #include <ktoggleaction.h>
- #include <kactioncollection.h>
- #include <kmessagebox.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5ce3e6a8760..74b85117a810 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14029,7 +14029,7 @@ with pkgs;
 
   ksuperkey = callPackage ../tools/X11/ksuperkey { };
 
-  ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent/5.nix { };
+  ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent { };
 
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {
     go = go_1_6;
@@ -16741,8 +16741,6 @@ with pkgs;
 
         krusader = callPackage ../applications/misc/krusader { };
 
-        ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
-
         kuickshow = callPackage ../applications/graphics/kuickshow { };
 
         libalkimia = callPackage ../development/libraries/libalkimia { };