From eb60784b2249ef1da0f325509b3d69a5720293c8 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@disroot.org>
Date: Tue, 12 May 2026 08:12:49 +0530
Subject: [PATCH] gnu: python-gpg: Update to 2.0.0.

* gnu/packages/gnupg.scm (python-gpg): Update to 2.0.0.
[source]<patches>: Remove the patch.
[arguments]<#:phases>: Remove 'set-environment phase.  Add 'patch-setup.py
phase.
[inputs]: Remove gpgme; add gpgme-2 and libgpg-error.
* gnu/packages/patches/python-gpg-setup-72.patch: Remove file.
* gnu/local.mk: Deregister it.

Fixes: guix/guix#2807
Merges guix/guix!8544

Change-Id: Ie926eed78500880420238272d42beb32333e5de7
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnupg.scm                        | 18 ++++++++++-----
 .../patches/python-gpg-setup-72.patch         | 22 -------------------
 3 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 gnu/packages/patches/python-gpg-setup-72.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c3e3227b054..e77341104e3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2117,7 +2117,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-clarabel-blas.patch		\
   %D%/packages/patches/python-daemon-relax-lockfile.patch	\
   %D%/packages/patches/python-docrepr-fix-tests.patch		\
-  %D%/packages/patches/python-gpg-setup-72.patch                \
   %D%/packages/patches/python-hdmedians-replace-nose.patch	\
   %D%/packages/patches/python-jinja2-fragments-modify-conftest-py.patch	\
   %D%/packages/patches/python-louvain-fix-test.patch		\
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index a08238ee427..10289c7dee6 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -634,21 +634,20 @@ interface (FFI) of Guile.")
 (define-public python-gpg
   (package
     (name "python-gpg")
-    (version "1.10.0")
+    (version "2.0.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "gpg" version))
-              (patches (search-patches "python-gpg-setup-72.patch"))
               (sha256
                (base32
-                "1ji3ynhp36m1ccx7bmaq75dhij9frpn19v9mpi4aajn8csl194il"))))
+                "0f2l0iyc8gp49i604c5wpliaa1dsyj0i0p9xc9zfj4z7fwaavdsf"))))
     (build-system pyproject-build-system)
     (arguments
      (list
       #:tests? #f ; No test suite.
       #:phases
       #~(modify-phases %standard-phases
-          (add-before 'build 'set-environment
+          (add-before 'build 'patch-setup.py
             (lambda _
               ;; GPGME is built with large file support, so we need to set
               ;; _FILE_OFFSET_BITS to 64 in all users of the GPGME library.
@@ -658,9 +657,16 @@ interface (FFI) of Guile.")
                            "extra_macros = { \"_FILE_OFFSET_BITS\": 64 }")))
                      #~())
               (substitute* "setup.py"
-                (("cc") (which "gcc"))))))))
+                (("cc") (which "gcc"))
+                (("\\/usr\\/lib\\/x86_64-linux-gnu( -lgpg-error)" _ keep)
+                 (string-append #$(this-package-input "libgpg-error") "/lib"
+                                keep))
+                (("\\/usr\\/lib\\/x86_64-linux-gnu( -lgpgme)" _ keep)
+                 (string-append #$(this-package-input "gpgme") "/lib" keep))
+                (("\\/usr\\/local(', 'include', 'gpgme\\.h')" _ keep)
+                 (string-append #$(this-package-input "gpgme") keep))))))))
     (inputs
-     (list gpgme))
+     (list gpgme-2 libgpg-error))
     (native-inputs
      (list swig-4.0 python-setuptools))
     (home-page (package-home-page gpgme))
diff --git a/gnu/packages/patches/python-gpg-setup-72.patch b/gnu/packages/patches/python-gpg-setup-72.patch
deleted file mode 100644
index af1699bc355..00000000000
--- a/gnu/packages/patches/python-gpg-setup-72.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Inspired by
-https://github.com/gentoo/gentoo/commit/2ad1ddf9b8b0e0b1f91fc3dd9412ad2f9c1346c3
-see also
-https://dev.gnupg.org/rMecd0c86d62351d267bdc9566286c532a394c711b
-Gemeinsame Unterverzeichnisse: gpg-1.10.0.alt/examples und gpg-1.10.0/examples.
-Gemeinsame Unterverzeichnisse: gpg-1.10.0.alt/gpg und gpg-1.10.0/gpg.
-diff -u gpg-1.10.0.alt/setup.py gpg-1.10.0/setup.py
---- gpg-1.10.0.alt/setup.py	2025-12-13 21:18:02.595203761 +0100
-+++ gpg-1.10.0/setup.py	2025-12-13 21:19:42.624197460 +0100
-@@ -220,9 +220,9 @@
-     def run(self):
-         self._generate()
- 
--        swig_sources.extend((self._in_build_base('gpgme.i'), self._in_build_base('helpers.c')))
--        swig_opts.extend(['-I' + self.build_base,
--                          '-outdir', os.path.join(self.build_lib, 'gpg')])
-+        swige.sources.extend((self._in_build_base('gpgme.i'), self._in_build_base('helpers.c')))
-+        swige.swig_opts.extend(['-I' + self.build_base,
-+                               '-outdir', os.path.join(self.build_lib, 'gpg')])
-         include_dirs.insert(0, self.build_base)
- 
-         self.run_command('build_ext')