From b5c5952c750f445b7b90293883e61f837dd717cb Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 14 Jul 2018 03:22:58 -0500
Subject: user/gpgme: bump to 1.11.1, take, fix up

---
 user/gpgme/APKBUILD          | 17 ++++++++---------
 user/gpgme/fix-bashism.patch | 10 ----------
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 user/gpgme/fix-bashism.patch

(limited to 'user/gpgme')

diff --git a/user/gpgme/APKBUILD b/user/gpgme/APKBUILD
index 10ffc83de..f96ad7760 100644
--- a/user/gpgme/APKBUILD
+++ b/user/gpgme/APKBUILD
@@ -1,18 +1,18 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gpgme
-pkgver=1.9.0
-pkgrel=2
+pkgver=1.11.1
+pkgrel=0
 pkgdesc="GnuPG Made Easy"
-url="http://www.gnupg.org/related_software/gpgme/"
+url="https://www.gnupg.org/related_software/gpgme/"
 arch="all"
-license="GPL"
+# gpgme-tool: GPL3; lib is mixture of the rest
+license="(LGPL-3.0+ OR GPL-2.0+) AND LGPL-2.1+ AND MIT AND GPL-3.0+"
 depends="gnupg"
 depends_dev="libgpg-error-dev libassuan-dev qt5-qtbase-dev"
 makedepends="$depends_dev doxygen"
 subpackages="$pkgname-dev $pkgname-doc gpgmepp qgpgme"
-source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
-	fix-bashism.patch"
+source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	cd "$builddir"
@@ -55,5 +55,4 @@ gpgmepp() {
 }
 
 
-sha512sums="2a33343e907d9d70cc57dc1ef4e1c01995e1030bb0db937f44435643d6abfbb1bd55d52ba241701fa702783ebf035c09941131604fd8a811474b8bee41afccc8  gpgme-1.9.0.tar.bz2
-6d83139277026d280fa08827623196c90c6158ecb9a39b58f58f3b4211d8d1e9694aa255eb71a08e40028776f6cc9df9b8f6a71d918065479504de14619a11bd  fix-bashism.patch"
+sha512sums="42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a  gpgme-1.11.1.tar.bz2"
diff --git a/user/gpgme/fix-bashism.patch b/user/gpgme/fix-bashism.patch
deleted file mode 100644
index 19508c96e..000000000
--- a/user/gpgme/fix-bashism.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/tests/gpg/pinentry b/tests/gpg/pinentry
-index 3b99726..b12caae 100755
---- a/tests/gpg/pinentry
-+++ b/tests/gpg/pinentry
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
- # Dummy pinentry
- # 
- # Copyright 2008 g10 Code GmbH
-- 
cgit v1.2.3-60-g2f50