libtorrent, rtorrent: merge *-git into default, drop outdated *-git versions, cleanup

This also gives the man page (it is outdated, though).

pkgs/tools/networking/p2p/libtorrent/default.nix

@@ -1,21 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libsigcxx, zlib }:
+{ stdenv, fetchFromGitHub, pkgconfig
+, libtool, autoconf, automake, cppunit
+, openssl, libsigcxx, zlib }:
 
 stdenv.mkDerivation rec {
   name = "libtorrent-${version}";
   version = "0.13.6";
 
-  src = fetchurl {
-    url = "http://rtorrent.net/downloads/${name}.tar.gz";
-    sha256 = "012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18";
+  src = fetchFromGitHub rec {
+    owner = "rakshasa";
+    repo = "libtorrent";
+    rev = "${version}";
+    sha256 = "1rvrxgb131snv9r6ksgzmd74rd9z7q46bhky0zazz7dwqqywffcp";
   };
 
-  buildInputs = [ pkgconfig openssl libsigcxx zlib ];
+  buildInputs = [ pkgconfig libtool autoconf automake cppunit openssl libsigcxx zlib ];
+
+  preConfigure = "./autogen.sh";
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/rakshasa/libtorrent/;
+    homepage = src.homepage;
     description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";
 
     platforms = platforms.unix;
-    maintainers = with maintainers; [ simons ebzzry ];
+    maintainers = with maintainers; [ simons ebzzry codyopel ];
   };
 }

pkgs/tools/networking/p2p/libtorrent/git.nix

@@ -1,28 +0,0 @@
-{ stdenv, autoconf, automake, cppunit, fetchFromGitHub, pkgconfig, openssl, libsigcxx, libtool, zlib }:
-
-stdenv.mkDerivation {
-  name = "libtorrent-git-2014-08-20";
-
-  src = fetchFromGitHub rec {
-    owner = "rakshasa";
-    repo = "libtorrent";
-    rev = "c60d2b9475804e41649356fa0301e9f770798f8d";
-    sha256 = "1x78g5yd4q0ksdsw91awz2a1ax8zyfy5b53gbbil4fpjy96vb577";
-  };
-  
-  buildInputs = [ autoconf automake cppunit pkgconfig openssl libsigcxx libtool zlib ];
-
-  configureFlags = "--disable-dependency-tracking --enable-aligned";
-
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://libtorrent.rakshasa.no/";
-    description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
-    license = licenses.gpl2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ codyopel ];
-  };
-}