From ebf986fa2d2cadc8fab5a767e62a935151f7b7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 19:26:24 +0700
Subject: [PATCH] pacman: our gpg is gpg2

---
 srcpkgs/pacman/patches/gpg2gpg2.patch | 38 ---------------------------
 srcpkgs/pacman/template               | 11 ++++----
 2 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/pacman/patches/gpg2gpg2.patch

diff --git a/srcpkgs/pacman/patches/gpg2gpg2.patch b/srcpkgs/pacman/patches/gpg2gpg2.patch
deleted file mode 100644
index dd458cae9c4..00000000000
--- a/srcpkgs/pacman/patches/gpg2gpg2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-gpg to gpg2:
-Arch's "gnupg" package is this distro's "gnupg2"
-This patches all references to the gpg command to use
-gpg2 instead.
-
-diff -Naur pacman-5.2.1.orig/scripts/pacman-key.sh.in pacman-5.2.1/scripts/pacman-key.sh.in
---- a/scripts/pacman-key.sh.in	2019-10-24 06:29:08.000000000 -0700
-+++ b/scripts/pacman-key.sh.in	2020-05-24 02:30:26.838797182 -0700
-@@ -51,6 +51,7 @@
- UPDATEDB=0
- USE_COLOR='y'
- VERIFY=0
-+GPG_COMMAND='gpg2'
-
- usage() {
- 	printf "pacman-key (pacman) %s\n" ${myver}
-@@ -591,8 +592,8 @@
- 	unset ALL_OFF BOLD BLUE GREEN RED YELLOW
- fi
-
--if ! type -p gpg >/dev/null; then
--	error "$(gettext "Cannot find the %s binary required for all %s operations.")" "gpg" "pacman-key"
-+if ! type -p ${GPG_COMMAND} >/dev/null; then
-+	error "$(gettext "Cannot find the %s binary required for all %s operations.")" "${GPG_COMMAND}" "pacman-key"
- 	exit 1
- fi
-
-@@ -611,7 +612,7 @@
- # file, falling back on a hard default
- PACMAN_KEYRING_DIR=${PACMAN_KEYRING_DIR:-$(pacman-conf --config="$CONFIG" gpgdir)}
-
--GPG_PACMAN=(gpg --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning)
-+GPG_PACMAN=(${GPG_COMMAND} --homedir "${PACMAN_KEYRING_DIR}" --no-permission-warning)
- if [[ -n ${KEYSERVER} ]]; then
- 	GPG_PACMAN+=(--keyserver "${KEYSERVER}")
- fi
-
-
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index d23aba0468b..b98560e1063 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
 # Template file for 'pacman'
 pkgname=pacman
 version=5.2.2
-revision=2
+revision=3
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"
@@ -9,7 +9,7 @@ conf_files="/etc/pacman.conf"
 build_style=meson
 hostmakedepends="autoconf automake curl libtool gettext-devel pkg-config asciidoc"
 makedepends="libarchive-devel gpgme-devel libcurl-devel"
-depends="gnupg2"
+depends="gnupg>=2"
 checkdepends="fakeroot"
 short_desc="Simple library-based package manager"
 maintainer="oreo639 <oreo6391@gmail.com>"
@@ -17,11 +17,10 @@ license="GPL-2.0-or-later"
 homepage="https://www.archlinux.org/pacman/"
 distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz"
 checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
+make_check=ci-skip
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	do_check() {
-		: fakechroot is not available
-	}
+	make_check=no # fakechroot is not available
 else
-	checkdepends+=" fakechroot"
+	checkdepends="fakeroot fakechroot gnupg"
 fi