From 8fe993e3f5450b63fc6a8e8206b82db720f8d8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Mon, 23 May 2016 11:18:41 -0300
Subject: pacman-5.0.1-4.parabola1: pull upstream patchset, fixes pacman-key
 with latest gpg

---
 libre/pacman/PKGBUILD | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'libre/pacman/PKGBUILD')

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index f1ea71438..16541c609 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,5 +1,5 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 266765 2016-05-02 13:04:32Z allan $
+# $Id: PKGBUILD 268273 2016-05-18 05:54:54Z allan $
 # Maintainer (Arch): Dan McGee <dan@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -10,7 +10,7 @@
 
 pkgname=pacman
 pkgver=5.0.1
-pkgrel=3.parabola1
+pkgrel=4.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.archlinux.org/pacman/"
@@ -20,7 +20,7 @@ depends=('bash' 'glibc' 'libarchive' 'curl'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring'
          'parabola-keyring')
 depends_armv7h=('archlinuxarm-keyring')
-makedepends=('asciidoc') # roundup patch alters docs
+makedepends=('asciidoc')
 checkdepends=('python2' 'fakechroot')
 optdepends=('cron: run specified programs at scheduled times and related tools')
 provides=("$pkgname-contrib")
@@ -33,7 +33,7 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig
         makepkg.conf.in
         $pkgname-keyring.service
         $pkgname-keyring.timer
-        0001-libmakepkg-fix-is_array-function.patch
+        pacman-5.0.1-roundup.patch
         0001-Sychronize-filesystem.patch
         0002-Revert-close-stdin-before-running-install-scripts.patch
         0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch
@@ -46,7 +46,7 @@ md5sums=('377a2664d6007d72d6d8a126add83bcf'
          '19c91127e409cf24246de252be44eaa9'
          '11a5fac02651041e44d65d66c3538030'
          '7fb448e0d2b5b22da5ddc0040378efb0'
-         '55732144f1048f714f1f93203e9b7728'
+         '1a6573187531068d38cb4478cd20368c'
          '11869a104d0944cc86215098cf5a32bf'
          'd4692c3add0b0dab87036edad3f59626'
          'fd59d9fb04abadffb937082c288bb10c'
@@ -57,17 +57,18 @@ prepare() {
   cd "$pkgname-$pkgver"
 
   # From Arch
-  patch -p1 -i $srcdir/0001-libmakepkg-fix-is_array-function.patch
+  # v5.0.1..pacman-5.0.1..c2f97580
+  patch -p1 -i $srcdir/pacman-5.0.1-roundup.patch
 
   # From Arch ARM
   if [ "${CARCH}" = "armv7h" ]; then
-    patch -p1 -i ../0001-Sychronize-filesystem.patch
-    patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch
-    patch -p1 -i ../0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch
+    patch -p1 -i $srcdir/0001-Sychronize-filesystem.patch
+    patch -p1 -i $srcdir/0002-Revert-close-stdin-before-running-install-scripts.patch
+    patch -p1 -i $srcdir/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch
   fi
 
   # From Parabola
-  patch -p1 -i ../0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch
+  patch -p1 -i $srcdir/0001-makepkg-treat-pkgrel-more-similarly-to-pkgver.patch
 }
 
 build() {
-- 
cgit v1.2.2