From 23f69309403ee135fb8d55faf0d467c79ce47e00 Mon Sep 17 00:00:00 2001
From: miqlas <miqlas@users.noreply.github.com>
Date: Tue, 27 Jun 2017 13:57:41 +0200
Subject: [PATCH] GnuPG: fix provides, enable extra libs according to the
 gentoo  port (#1478)

---
 app-crypt/gnupg/gnupg-2.1.21.recipe | 62 ++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/app-crypt/gnupg/gnupg-2.1.21.recipe b/app-crypt/gnupg/gnupg-2.1.21.recipe
index dcb35d970..56cfc4a1e 100644
--- a/app-crypt/gnupg/gnupg-2.1.21.recipe
+++ b/app-crypt/gnupg/gnupg-2.1.21.recipe
@@ -6,9 +6,9 @@ well as access modules for all kinds of public key directories. GnuPG, also \
 known as GPG, is a command line tool with features for easy integration with \
 other applications."
 HOMEPAGE="https://gnupg.org/"
-COPYRIGHT="1998-2016 Free Software Foundation, Inc."
+COPYRIGHT="1998-2017 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
 CHECKSUM_SHA256="7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd"
 PATCHES="gnupg-$portVersion.patchset"
@@ -20,72 +20,106 @@ PROVIDES="
 	gnupg$secondaryArchSuffix = $portVersion
 	cmd:addgnupghome$secondaryArchSuffix
 	cmd:applygnupgdefaults$secondaryArchSuffix
+	cmd:convert_from_106$secondaryArchSuffix
 	cmd:dirmngr_client$secondaryArchSuffix
 	cmd:dirmngr$secondaryArchSuffix
 	cmd:gpg$secondaryArchSuffix
-	cmd:gpg_zip$secondaryArchSuffix
-	cmd:gpgsplit$secondaryArchSuffix
-	cmd:gpg_agent$secondaryArchSuffix
-	cmd:gpg_connect_agent$secondaryArchSuffix
 	cmd:gpg2$secondaryArchSuffix
 	cmd:gpgconf$secondaryArchSuffix
 	cmd:gpgparsemail$secondaryArchSuffix
 	cmd:gpgscm$secondaryArchSuffix
 	cmd:gpgsm$secondaryArchSuffix
+	cmd:gpgsplit$secondaryArchSuffix
 	cmd:gpgtar$secondaryArchSuffix
-	cmd:gpgv2$secondaryArchSuffix
 	cmd:gpgv$secondaryArchSuffix
+	cmd:gpgv2$secondaryArchSuffix
+	cmd:gpg_agent$secondaryArchSuffix
+	cmd:gpg_check_pattern$secondaryArchSuffix
+	cmd:gpg_connect_agent$secondaryArchSuffix
+	cmd:gpg_wks_server$secondaryArchSuffix
+	cmd:gpg_zip$secondaryArchSuffix
 	cmd:kbxutil$secondaryArchSuffix
+	cmd:lspgpot$secondaryArchSuffix
+	cmd:mail_signed_keys$secondaryArchSuffix
+	cmd:make_dns_cert$secondaryArchSuffix
 	cmd:watchgnupg$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libcurl$secondaryArchSuffix
-	lib:libgpg_error$secondaryArchSuffix
-	lib:libgcrypt$secondaryArchSuffix
+	cmd:pinentry$secondaryArchSuffix
 	lib:libassuan$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libgcrypt$secondaryArchSuffix
+	lib:libgnutls$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libksba$secondaryArchSuffix
+	lib:liblber$secondaryArchSuffix
+	lib:libldap$secondaryArchSuffix
 	lib:libnpth$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libcurl$secondaryArchSuffix
-	devel:libgpg_error$secondaryArchSuffix
-	devel:libgcrypt$secondaryArchSuffix
 	devel:libassuan$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
+	devel:libgcrypt$secondaryArchSuffix
+	devel:libgnutls$secondaryArchSuffix
+	devel:libgpg_error$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libksba$secondaryArchSuffix
+	devel:libldap$secondaryArchSuffix
 	devel:libnpth$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
 	devel:libusb_1.0$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
+	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:pinentry$secondaryArchSuffix
+	cmd:shred
+	cmd:tar
 	"
 
 BUILD()
 {
 	autogen.sh
 	runConfigure ./configure \
-		--libexecdir=$libDir/gnupg
+		--libexecdir=$libDir/gnupg \
+		--enable-wks-server \
+		--enable-wks-tools \
+		--with-bzip2
 	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
+	# Extra tools, gentoo does the same
+	for f in convert-from-106 gpg-check-pattern gpg-zip lspgpot mail-signed-keys \
+		make-dns-cert; do
+		cp -r tools/$f $binDir/
+	done
+	# Symlinks for compatibility reasons
+	ln -s $binDir/gpg2 $binDir/gpg
+	ln -s $binDir/gpgv2 $binDir/gpgv
 }
 
 TEST()