01/01: Merge branch 'master' into core-updates

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 3820d3973982048e5b93ad08d619c893bc50de14
Merge: 751be9a afff905
Author: Mark H Weaver <address@hidden>
Date:   Sun Mar 1 19:05:29 2015 -0500

    Merge branch 'master' into core-updates
    
    Conflicts:
        gnu/packages/gnupg.scm

 gnu/packages/audio.scm   |  172 ++++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/fonts.scm   |   56 +++++++++++++++
 gnu/packages/glib.scm    |    6 +-
 gnu/packages/gnupg.scm   |   10 ++--
 gnu/packages/gtk.scm     |    8 +-
 gnu/packages/linux.scm   |    4 +-
 gnu/packages/lisp.scm    |   49 ++++++++------
 gnu/packages/mail.scm    |   31 ++++++---
 gnu/packages/man.scm     |   27 +++++++
 gnu/packages/mpd.scm     |   62 +++++++++++++---
 gnu/packages/python.scm  |   51 ++++++--------
 gnu/packages/web.scm     |    7 ++-
 gnu/packages/wget.scm    |   10 ++-
 gnu/packages/xdisorg.scm |   33 +++++++++
 gnu/packages/xfce.scm    |   72 ++++++++++---------
 gnu/services/xorg.scm    |   12 +++
 16 files changed, 483 insertions(+), 127 deletions(-)

diff --cc gnu/packages/gnupg.scm
index 63756a7,3b52351..b920f83
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; GNU Guix --- Functional package management for GNU
- ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+ ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
 -;;; Copyright © 2013 Andreas Enge <address@hidden>
 +;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
  ;;; Copyright © 2014 Eric Bavier <address@hidden>
  ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
  ;;;
@@@ -229,39 -204,9 +229,39 @@@ components), libgpg-error (centralized 
  libskba (working with X.509 certificates and CMS data).")
      (license gpl3+)))
  
 +(define-public gnupg-2.0
 +  (package (inherit gnupg)
-     (version "2.0.26")
++    (version "2.0.27")
 +    (source (origin
 +              (method url-fetch)
 +              (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
 +                                  ".tar.bz2"))
 +              (sha256
 +               (base32
-                 "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p"))))
++                "1wihx7dphacg9fy5wfj93h236lr1w5gwzh7ir3js37wi9cz6sr2p"))))
 +    (inputs
 +     `(("bzip2" ,guix:bzip2)
 +       ("curl" ,curl)
 +       ("libassuan" ,libassuan)
 +       ("libgcrypt" ,libgcrypt)
 +       ("libgpg-error" ,libgpg-error)
 +       ("libksba" ,libksba)
 +       ("pth" ,pth)
 +       ("openldap" ,openldap)
 +       ("zlib" ,guix:zlib)
 +       ("readline" ,readline)))
 +   (arguments
 +    `(#:phases
 +       (alist-cons-before
 +        'configure 'patch-config-files
 +        (lambda _
 +          (substitute* "tests/openpgp/Makefile.in"
 +            (("/bin/sh") (which "bash"))))
 +       %standard-phases)))))
 +
  (define-public gnupg-1
    (package (inherit gnupg)
-     (version "1.4.18")
+     (version "1.4.19")
      (source (origin
                (method url-fetch)
                (uri (string-append "mirror://gnupg/gnupg/gnupg-" version