From 3bb3651edcdbdc519d948929f5f2f04a1e8b3f06 Mon Sep 17 00:00:00 2001
From: kenmays <maybird1776@yahoo.com>
Date: Sun, 31 Jan 2021 10:20:15 -0800
Subject: [PATCH] gpgme: bump to v1.15.1 (#5638)

---
 ...pgme-1.12.0.recipe => gpgme-1.15.1.recipe} | 24 +++++++------------
 ...-1.12.0.patchset => gpgme-1.15.1.patchset} | 20 ++++++++--------
 2 files changed, 19 insertions(+), 25 deletions(-)
 rename app-crypt/gpgme/{gpgme-1.12.0.recipe => gpgme-1.15.1.recipe} (90%)
 rename app-crypt/gpgme/patches/{gpgme-1.12.0.patchset => gpgme-1.15.1.patchset} (52%)

diff --git a/app-crypt/gpgme/gpgme-1.12.0.recipe b/app-crypt/gpgme/gpgme-1.15.1.recipe
similarity index 90%
rename from app-crypt/gpgme/gpgme-1.12.0.recipe
rename to app-crypt/gpgme/gpgme-1.15.1.recipe
index 5a3e5c430..48e7ee651 100644
--- a/app-crypt/gpgme/gpgme-1.12.0.recipe
+++ b/app-crypt/gpgme/gpgme-1.15.1.recipe
@@ -1,26 +1,20 @@
 SUMMARY="GnuPG Made Easy is a library for making GnuPG easier to use"
-DESCRIPTION="
-GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG \
+DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG \
 easier for applications. It provides a High-Level Crypto API for \
 encryption, decryption, signing, signature verification and key management. \
 Currently it uses GnuPG as its backend but the API isn't restricted to \
-this engine; in fact we have already developed a backend for CMS (S/MIME).
-"
+this engine; in fact we have already developed a backend for CMS (S/MIME)."
 HOMEPAGE="http://www.gnupg.org/gpgme.html"
-COPYRIGHT="
-	1998-2018 Free Software Foundation, Inc.
-	2001-2010 g10 Code GmbH
-	"
-LICENSE="
-	GNU GPL v2
-	GNU LGPL v2.1
-	"
-REVISION="3"
+COPYRIGHT="1998-2020 Free Software Foundation, Inc.
+	2001-2021 g10 Code GmbH"
+LICENSE="GNU GPL v2
+	GNU LGPL v2.1"
+REVISION="1"
 SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$portVersion.tar.bz2"
-CHECKSUM_SHA256="b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8"
+CHECKSUM_SHA256="eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad"
 PATCHES="gpgme-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 libgpgmeVersion="11.21.0"
diff --git a/app-crypt/gpgme/patches/gpgme-1.12.0.patchset b/app-crypt/gpgme/patches/gpgme-1.15.1.patchset
similarity index 52%
rename from app-crypt/gpgme/patches/gpgme-1.12.0.patchset
rename to app-crypt/gpgme/patches/gpgme-1.15.1.patchset
index 82b4eb559..9b9bb9e03 100644
--- a/app-crypt/gpgme/patches/gpgme-1.12.0.patchset
+++ b/app-crypt/gpgme/patches/gpgme-1.15.1.patchset
@@ -1,4 +1,4 @@
-From 54b2d7cab751b041efbc6dfe3c6f2d1ea86a35a2 Mon Sep 17 00:00:00 2001
+From 1f62e93200d3307b0c777c27f3fe35cbd4d308b1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Sun, 16 Nov 2014 14:50:17 +0100
 Subject: configure.ac: Haiku does have a thread-safe getenv
@@ -6,19 +6,19 @@ Subject: configure.ac: Haiku does have a thread-safe getenv
 Also force HAVE_PTHREAD.
 
 diff --git a/configure.ac b/configure.ac
-index 0dac6ce..c1e7477 100644
+index 628e5ff..b9d4410 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -218,6 +218,9 @@ case "${host}" in
- 	    AC_HELP_STRING([--enable-w32-glib], [build GPGME Glib for W32]),
- 	    		   build_w32_glib=$enableval)
-        ;;
+@@ -230,6 +230,9 @@ case "${host}" in
+     *-apple-darwin*)
+         have_macos_system=yes
+         ;;
 +    *-haiku*)
 +        have_thread_safe_getenv=yes
 +        ;;
-     *)
- 
- 	# XXX: Probably use exec-prefix here?
+ esac
+ case "${host}" in
+     *-mingw32*)
 -- 
-2.13.1
+2.30.0