From 53dfe73572a617f91aa339fffb3d32d87eb6cccf Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 12 Jun 2021 12:19:56 -0700
Subject: [PATCH] pacman: update to 6.0.0

---
 srcpkgs/pacman/patches/gpg2gpg2.patch | 21 ++++++++++-----------
 srcpkgs/pacman/template               |  8 ++++----
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/pacman/patches/gpg2gpg2.patch b/srcpkgs/pacman/patches/gpg2gpg2.patch
index ba668e1f2eda..db2ed45b4499 100644
--- a/srcpkgs/pacman/patches/gpg2gpg2.patch
+++ b/srcpkgs/pacman/patches/gpg2gpg2.patch
@@ -3,36 +3,35 @@ 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
---- scripts/pacman-key.sh.in	2019-10-24 06:29:08.000000000 -0700
-+++ scripts/pacman-key.sh.in	2020-05-24 02:30:26.838797182 -0700
+diff -Naur pacman-6.0.0.orig/scripts/pacman-key.sh.in pacman-6.0.0/scripts/pacman-key.sh.in
+--- scripts/pacman-key.sh.in	2021-05-19 20:38:45.954786000 -0700
++++ scripts/pacman-key.sh.in	2021-06-12 12:25:27.924889358 -0700
 @@ -51,6 +51,7 @@
- UPDATEDB=0
  USE_COLOR='y'
  VERIFY=0
+ VERBOSE=0
 +GPG_COMMAND='gpg2'
-
+ 
  usage() {
  	printf "pacman-key (pacman) %s\n" ${myver}
-@@ -591,8 +592,8 @@
+@@ -665,8 +666,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 @@
+ 
+@@ -685,7 +686,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 d23aba0468bf..210f47d45ad1 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
+version=6.0.0
+revision=1
 make_dirs="/var/lib/pacman 0755 root root
  /usr/var/cache/pacman/pkg 0755 root root
  /usr/share/libalpm/hooks 0755 root root"
@@ -15,8 +15,8 @@ short_desc="Simple library-based package manager"
 maintainer="oreo639 <oreo6391@gmail.com>"
 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
+distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.xz"
+checksum=004448085a7747bdc7a0a4dd5d1fb7556c6b890111a06e029ab088f9905d4808
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	do_check() {