From 7de44023a2d357ee634cd015d685a334a8eedcbf Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Thu, 12 Jul 2018 11:09:20 -0400
Subject: [PATCH] gnu: libgpg-error: Update to 1.31.

* gnu/packages/gnupg.scm (libgpg-error): Update to 1.31.
(libgpg-error-1.31): Remove variable.
(gpgme)[propagated-inputs]: Replace libgpg-error-1.31 with libgpg-error.
---
 gnu/packages/gnupg.scm | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 5365c2b528..47fb904f77 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -70,7 +70,7 @@ (define-module (gnu packages gnupg)
 (define-public libgpg-error
   (package
     (name "libgpg-error")
-    (version "1.29")
+    (version "1.31")
     (source
      (origin
       (method url-fetch)
@@ -78,7 +78,7 @@ (define-public libgpg-error
                           version ".tar.bz2"))
       (sha256
        (base32
-        "1smihcrhkfy58kazjaigmfbagy52rw98fqfsv1x7ml8razx2dsgc"))))
+        "1vx4nw6rxh2biy3h8n96fyr86q29h8gjl6837437i51jr4isil20"))))
     (build-system gnu-build-system)
     (home-page "https://gnupg.org")
     (synopsis "Library of error values for GnuPG components")
@@ -91,20 +91,6 @@ (define-public libgpg-error
     (properties '((ftp-server . "ftp.gnupg.org")
                   (ftp-directory . "/gcrypt/libgpg-error")))))
 
-;; Some packages (e.g. GPGME) require a newer libgpg-error to deal with
-;; error codes from recent GnuPG.  Remove this in the next rebuild cycle.
-(define-public libgpg-error-1.31
-  (package
-    (inherit libgpg-error)
-    (version "1.31")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-"
-                                  version ".tar.bz2"))
-              (sha256
-               (base32
-                "1vx4nw6rxh2biy3h8n96fyr86q29h8gjl6837437i51jr4isil20"))))))
-
 (define-public libgcrypt
   (package
     (name "libgcrypt")
@@ -389,7 +375,7 @@ (define-public gpgme
      `(("gnupg" ,gnupg)))
     (propagated-inputs
      ;; Needs to be propagated because gpgme.h includes gpg-error.h.
-     `(("libgpg-error" ,libgpg-error-1.31)))
+     `(("libgpg-error" ,libgpg-error)))
     (inputs
      `(("libassuan" ,libassuan)))
     (home-page "https://www.gnupg.org/related_software/gpgme/")