Move gnupg to gnupg1 and gnupg2 to gnupg

Also add gnupg1-compatibility symlinks to gnupg2.
Most packages should be able to use gnupg2 instead of gnupg1.

svn path=/nixpkgs/trunk/; revision=21883

pkgs/development/libraries/gpgme/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth}:
 
 stdenv.mkDerivation {
   name = "gpgme-1.1.4";
@@ -6,5 +6,5 @@ stdenv.mkDerivation {
     url = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.4.tar.bz2;
     sha256 = "0ncrv7p33rjq1avkxpp9x0gz6wna9y3b3dmw6nv366n5mgvxmpg8";
   };
-  buildInputs = [libgpgerror gnupg gnupg2 pkgconfig glib pth];
+  buildInputs = [libgpgerror gnupg pkgconfig glib pth];
 }