From 97c4d0007b7cd709159b64ce0a1227c44eeef7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Wed, 20 Nov 2024 14:12:49 +0100
Subject: [PATCH] gnupg: bump version

---
 ...{gnupg-2.4.3.recipe => gnupg-2.4.6.recipe} | 23 ++++---------------
 ...pg-2.4.3.patchset => gnupg-2.4.6.patchset} |  0
 2 files changed, 5 insertions(+), 18 deletions(-)
 rename app-crypt/gnupg/{gnupg-2.4.3.recipe => gnupg-2.4.6.recipe} (86%)
 rename app-crypt/gnupg/patches/{gnupg-2.4.3.patchset => gnupg-2.4.6.patchset} (100%)

diff --git a/app-crypt/gnupg/gnupg-2.4.3.recipe b/app-crypt/gnupg/gnupg-2.4.6.recipe
similarity index 86%
rename from app-crypt/gnupg/gnupg-2.4.3.recipe
rename to app-crypt/gnupg/gnupg-2.4.6.recipe
index f0ade4868..d534fd3c8 100644
--- a/app-crypt/gnupg/gnupg-2.4.3.recipe
+++ b/app-crypt/gnupg/gnupg-2.4.6.recipe
@@ -29,9 +29,9 @@ LICENSE="CC0 v1.0
 	GNU GPL v3
 	GNU LGPL v2.1
 	GNU LGPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
-CHECKSUM_SHA256="a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d"
+CHECKSUM_SHA256="95acfafda7004924a6f5c901677f15ac1bda2754511d973bb4523e8dd840e17a"
 PATCHES="gnupg-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -41,17 +41,15 @@ PROVIDES="
 	gnupg$secondaryArchSuffix = $portVersion
 	cmd:addgnupghome$secondaryArchSuffix
 	cmd:applygnupgdefaults$secondaryArchSuffix
-	cmd:gpg_card$secondaryArchSuffix
-	cmd:convert_from_106$secondaryArchSuffix
 	cmd:dirmngr$secondaryArchSuffix
 	cmd:dirmngr_client$secondaryArchSuffix
 	cmd:gpg$secondaryArchSuffix
 	cmd:gpg_agent$secondaryArchSuffix
-	cmd:gpg_check_pattern$secondaryArchSuffix
+	cmd:gpg_card$secondaryArchSuffix
 	cmd:gpg_connect_agent$secondaryArchSuffix
+	cmd:gpg_mail_tube$secondaryArchSuffix
 	cmd:gpg_wks_client$secondaryArchSuffix
 	cmd:gpg_wks_server$secondaryArchSuffix
-	cmd:gpg_zip$secondaryArchSuffix
 	cmd:gpgconf$secondaryArchSuffix
 	cmd:gpgparsemail$secondaryArchSuffix
 	cmd:gpgscm$secondaryArchSuffix
@@ -60,9 +58,6 @@ PROVIDES="
 	cmd:gpgtar$secondaryArchSuffix
 	cmd:gpgv$secondaryArchSuffix
 	cmd:kbxutil$secondaryArchSuffix
-	cmd:lspgpot$secondaryArchSuffix
-	cmd:mail_signed_keys$secondaryArchSuffix
-	cmd:make_dns_cert$secondaryArchSuffix
 	cmd:watchgnupg$secondaryArchSuffix
 	"
 REQUIRES="
@@ -97,7 +92,7 @@ BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libksba$secondaryArchSuffix
-	devel:libldap$secondaryArchSuffix
+	devel:libldap$secondaryArchSuffix >= 2.0
 	devel:libnpth$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
@@ -131,22 +126,14 @@ BUILD()
 	AUTOPOINT=true autoreconf -vfi
 	runConfigure ./configure \
 		--libexecdir=$libDir/gnupg \
-		--enable-wks-tools \
 		--with-bzip2 \
 		--disable-libdns
 	make $jobArgs
-	make -C doc html
 }
 
 INSTALL()
 {
 	make install
-	make -C doc install-html
-	# Extra tools, gentoo does the same
-	for f in convert-from-106 gpg-check-pattern lspgpot gpgconf gpgsplit \
-		gpg-check-pattern mail-signed-keys make-dns-cert; do
-		cp -r tools/$f $binDir/
-	done
 }
 
 TEST()
diff --git a/app-crypt/gnupg/patches/gnupg-2.4.3.patchset b/app-crypt/gnupg/patches/gnupg-2.4.6.patchset
similarity index 100%
rename from app-crypt/gnupg/patches/gnupg-2.4.3.patchset
rename to app-crypt/gnupg/patches/gnupg-2.4.6.patchset