From 314a4de1eec4230b1581d7abc97dc6795c97d8b1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:15:30 -0600
Subject: [PATCH] Remove kde4.libktorrent

- Already updated to KDE 5 in Nixpkgs
---
 pkgs/development/libraries/libktorrent/5.nix  | 29 -----------------
 .../libraries/libktorrent/default.nix         | 31 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  6 +---
 3 files changed, 17 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/development/libraries/libktorrent/5.nix

diff --git a/pkgs/development/libraries/libktorrent/5.nix b/pkgs/development/libraries/libktorrent/5.nix
deleted file mode 100644
index e5406d3a2a58..000000000000
--- a/pkgs/development/libraries/libktorrent/5.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, cmake, ecm
-, karchive, kcrash, ki18n, kio, solid
-, boost, gmp, qca-qt5, libgcrypt
-}:
-
-stdenv.mkDerivation rec {
-  name = "libktorrent-2.0.1";
-
-  src = fetchurl {
-    url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz;
-    sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ cmake ecm ];
-  buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ];
-
-  propagatedBuildInputs = [ gmp boost ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "A BitTorrent library used by KTorrent";
-    homepage = https://www.kde.org/applications/internet/ktorrent/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index 9e7fb0a0b3d5..e5406d3a2a58 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -1,28 +1,29 @@
-{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4
-, phonon, libgcrypt }:
+{ stdenv, fetchurl, cmake, ecm
+, karchive, kcrash, ki18n, kio, solid
+, boost, gmp, qca-qt5, libgcrypt
+}:
 
-let
-  mp_ = "3.1";
-  version = "1.${mp_}";
-  version4 = "4.${mp_}";
-in
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
-  pname = "libktorrent";
+  name = "libktorrent-2.0.1";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/${version4}/${name}.tar.bz2";
-    sha256 = "2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725";
+    url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz;
+    sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7";
   };
 
-  nativeBuildInputs = [ cmake automoc4 gettext ];
-  buildInputs = [ kdelibs phonon gmp qca2 boost libgcrypt ];
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ cmake ecm ];
+  buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ];
+
+  propagatedBuildInputs = [ gmp boost ];
 
   enableParallelBuilding = true;
 
   meta = {
     description = "A BitTorrent library used by KTorrent";
-    homepage = http://ktorrent.pwsp.net;
-    inherit (kdelibs.meta) platforms;
+    homepage = https://www.kde.org/applications/internet/ktorrent/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8db8eb099d8..d5689d255164 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9319,7 +9319,7 @@ with pkgs;
 
     libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
 
-    libktorrent = callPackage ../development/libraries/libktorrent/5.nix { };
+    libktorrent = callPackage ../development/libraries/libktorrent { };
 
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {
       ffmpeg = ffmpeg_2;
@@ -16719,10 +16719,6 @@ with pkgs;
 
         krusader = callPackage ../applications/misc/krusader { };
 
-        libktorrent = callPackage ../development/libraries/libktorrent {
-          boost = boost155;
-        };
-
         libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
 
         liblikeback = callPackage ../development/libraries/liblikeback { };