From 7e713d927d7541f5e2b79e45f773f2d327baeb5e Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 3 Feb 2016 11:23:06 +0300
Subject: [PATCH] pacman: Update to 5.0.0.6348.cc5a8f1

---
 pacman/PKGBUILD | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD
index e1b8fc1c..abd0fbd3 100644
--- a/pacman/PKGBUILD
+++ b/pacman/PKGBUILD
@@ -3,7 +3,8 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
 pkgname=pacman
-pkgver=4.2.1.6317.6ac7836
+_base_ver=5.0.0
+pkgver=5.0.0.6348.cc5a8f1
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
 arch=('i686' 'x86_64')
@@ -44,7 +45,7 @@ backup=("etc/pacman.conf"
         "etc/makepkg.conf"
         "etc/makepkg_mingw32.conf"
         "etc/makepkg_mingw64.conf")
-source=("$pkgname"::'git+https://github.com/Alexpux/MSYS2-pacman.git'
+source=("${pkgname}"::'git+https://github.com/Alexpux/MSYS2-pacman.git'
         "pacman.conf"
         "makepkg.conf"
         "makepkg_mingw32.conf"
@@ -67,12 +68,12 @@ md5sums=('SKIP'
 
 pkgver() {
   cd "${srcdir}/${pkgname}"
-  #printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  printf "%s.%s.%s" "$(git describe --tags --abbrev=0 | sed 's/^v//')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf "%s.%s.%s" ${_base_ver} "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  #printf "%s.%s.%s" "$(git describe --tags --abbrev=0 | sed 's/^v//')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd ${srcdir}/$pkgname
+  cd ${srcdir}/${pkgname}
   git am "${srcdir}"/0001-more-debugging-info.patch
   #git am "${srcdir}"/0002-Add-util-msys2.-c-h-and-rebase-db-msys2.-c.patch
   #git am "${srcdir}"/0003-use-busybox-for-msys2-post-installs.patch
@@ -108,6 +109,7 @@ build() {
     --enable-git-version \
     --with-scriptlet-shell=/usr/bin/bash \
     --with-pkg-ext=.pkg.tar.xz
+
   make -j1
   make -C contrib
 }
@@ -125,7 +127,7 @@ package() {
   install -dm755 ${pkgdir}/etc
   install -m644 ${srcdir}/pacman.conf ${pkgdir}/etc/pacman.conf
 
-  case "$CARCH" in
+  case "${CARCH}" in
   i686)
     mycarch="i686"
     mychost="i686-pc-msys"
@@ -145,9 +147,9 @@ package() {
 
   # set things correctly in the default conf file
   sed -i ${pkgdir}/etc/makepkg.conf \
-    -e "s|@CARCH[@]|$mycarch|g" \
-    -e "s|@CHOST[@]|$mychost|g" \
-    -e "s|@CARCHFLAGS[@]|$myflags|g"
+    -e "s|@CARCH[@]|${mycarch}|g" \
+    -e "s|@CHOST[@]|${mychost}|g" \
+    -e "s|@CARCHFLAGS[@]|${myflags}|g"
 
   # put bash_completion in the right location
   install -dm755 ${pkgdir}/usr/share/bash-completion/completions