gnu: Remove gnupg-1.

* gnu/packages/gnupg.scm (gnupg-1): Delete variable.
* gnu/packages/patches/gnupg-1-build-with-gcc10.patch: Remove file.
* gnu/packages/gnupg.scm (dist_patch_DATA): Unregister file.

3 files changed, 0 insertions, 87 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index f90c12810fd..ed9d244e7a2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1533,7 +1533,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnulib-bootstrap.patch                   \
   %D%/packages/patches/gnumach-version.patch                    \
   %D%/packages/patches/gnupg-default-pinentry.patch             \
-  %D%/packages/patches/gnupg-1-build-with-gcc10.patch           \
   %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   %D%/packages/patches/gobject-introspection-cc.patch           \
   %D%/packages/patches/gobject-introspection-girepository.patch \
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index a94182e987f..70e0a562b28 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -435,28 +435,6 @@ components), libgpg-error (centralized GnuPG error values), and
 libskba (working with X.509 certificates and CMS data).")
     (license license:gpl3+)))
 
-(define-public gnupg-1
-  (package (inherit gnupg)
-    (version "1.4.23")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
-                                  ".tar.bz2"))
-              (sha256
-               (base32
-                "1fkq4sqldvf6a25mm2qz95swv1qjg464736091w51djiwqbjyin9"))
-              (patches (search-patches "gnupg-1-build-with-gcc10.patch"))))
-    (native-inputs '())
-    (inputs
-     (list zlib bzip2 curl readline libgpg-error))
-    (arguments
-     (list #:phases
-       #~(modify-phases %standard-phases
-           (add-after 'unpack 'patch-check-sh
-             (lambda _
-               (substitute* "checks/Makefile.in"
-                 (("/bin/sh") (which "sh"))))))))))
-
 (define-public gpgme-2
   (package
     (name "gpgme")
diff --git a/gnu/packages/patches/gnupg-1-build-with-gcc10.patch b/gnu/packages/patches/gnupg-1-build-with-gcc10.patch
deleted file mode 100644
index 40b2aff98e2..00000000000
--- a/gnu/packages/patches/gnupg-1-build-with-gcc10.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Borrowed from Debian
-https://sources.debian.org/src/gnupg1/1.4.23-1.1/debian/patches/0006-fix-for-gcc10.patch/
-
-Subject: Fix build with gcc-10
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2021-01-04
-Bug: https://dev.gnupg.org/T5215
-Bug-Debian: https://bugs.debian.org/957293
-
---- a/g10/options.h
-+++ b/g10/options.h
-@@ -29,6 +29,8 @@
- /* Norcraft can't cope with common symbols */
- #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
- #define EXTERN_UNLESS_MAIN_MODULE extern
-+#elif defined (__GNUC__) && __GNUC__ >= 10
-+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
- #else
- #define EXTERN_UNLESS_MAIN_MODULE
- #endif
---- a/include/cipher.h
-+++ b/include/cipher.h
-@@ -117,6 +117,8 @@
- #ifndef EXTERN_UNLESS_MAIN_MODULE
- #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
- #define EXTERN_UNLESS_MAIN_MODULE extern
-+#elif defined (__GNUC__) && __GNUC__ >= 10
-+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
- #else
- #define EXTERN_UNLESS_MAIN_MODULE
- #endif
---- a/include/iobuf.h
-+++ b/include/iobuf.h
-@@ -72,6 +72,8 @@
- #ifndef EXTERN_UNLESS_MAIN_MODULE
- #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
- #define EXTERN_UNLESS_MAIN_MODULE extern
-+#elif defined (__GNUC__) && __GNUC__ >= 10
-+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
- #else
- #define EXTERN_UNLESS_MAIN_MODULE 
- #endif
---- a/include/memory.h
-+++ b/include/memory.h
-@@ -93,6 +93,8 @@
- #ifndef EXTERN_UNLESS_MAIN_MODULE
- #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
- #define EXTERN_UNLESS_MAIN_MODULE extern
-+#elif defined (__GNUC__) && __GNUC__ >= 10
-+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
- #else
- #define EXTERN_UNLESS_MAIN_MODULE 
- #endif
---- a/include/mpi.h
-+++ b/include/mpi.h
-@@ -38,6 +38,8 @@
- #ifndef EXTERN_UNLESS_MAIN_MODULE
- #if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
- #define EXTERN_UNLESS_MAIN_MODULE extern
-+#elif defined (__GNUC__) && __GNUC__ >= 10
-+#define EXTERN_UNLESS_MAIN_MODULE __attribute__((__common__))
- #else
- #define EXTERN_UNLESS_MAIN_MODULE 
- #endif