From 08f7e773074d14f42cd6fd7a339f2865fb4cf31b Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sat, 26 Oct 2019 13:32:15 -0500
Subject: libretools-20181004-6.1: rebuild against pacman-5.2.0

---
 .../libretools/0002-libremakepkg-pacman_5_2.patch  | 23 ++++++++++++++++++++++
 libre/libretools/PKGBUILD                          | 15 ++++++++------
 2 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 libre/libretools/0002-libremakepkg-pacman_5_2.patch

(limited to 'libre')

diff --git a/libre/libretools/0002-libremakepkg-pacman_5_2.patch b/libre/libretools/0002-libremakepkg-pacman_5_2.patch
new file mode 100644
index 000000000..186b05dbd
--- /dev/null
+++ b/libre/libretools/0002-libremakepkg-pacman_5_2.patch
@@ -0,0 +1,23 @@
+--- libretools-20181004.orig/src/lib/common.sh.in	2018-10-04 14:31:05.000000000 -0500
++++ libretools-20181004/src/lib/common.sh.in	2019-10-26 03:17:40.383684905 -0500
+@@ -58,7 +58,7 @@
+ 	declare -f "${fns[@]}" | sed 's/^[a-z]/_makepkg_&/'
+ 
+ 	# re-declare ${fn} as a wrapper around _makepkg_${fn}
+-	printf '%s() { local mesg; mesg="$(_ "$1")"; _p _makepkg_"${FUNCNAME[0]}" "$mesg" "${@:2}"; }\n' \
++	printf '%s() { local mesg; local QUIET=$(true); mesg="$(_ "$1")"; _p _makepkg_"${FUNCNAME[0]}" "$mesg" "${@:2}"; }\n' \
+ 	       "${fns[@]}"
+ )"
+ 
+--- libretools-20181004.orig/src/lib/conf.sh.in	2018-10-04 14:31:05.000000000 -0500
++++ libretools-20181004/src/lib/conf.sh.in	2019-10-26 03:11:48.993679739 -0500
+@@ -200,9 +200,6 @@
+ 		done
+ 	}
+ 
+-	# This line is taken from the makepkg source
+-	local known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512')
+-
+ 	# From the "OPTIONS AND DIRECTIVES" section (in order of mention)
+ 	unset -v pkgname pkgver
+ 	unset -f pkgver
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 93713c2b8..423a7bb20 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,20 +9,22 @@ pkgdesc="Programs for Parabola development"
 url="https://git.parabola.nu/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20190906
+pkgver=20181004
 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}
-        0001-libremakepkg-rw-startdir.patch)
+        0001-libremakepkg-rw-startdir.patch
+        0002-libremakepkg-pacman_5_2.patch)
 sha256sums=('2bdefd1803ba3e6cbd1eb955fad3de9ce8a4abfd23a0bd96a60772762df7b53b'
             'SKIP'
-            '19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883')
+            '19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883'
+            '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df')
 validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker
 
-pkgrel=1
+pkgrel=6.1
 arch=('any')
 makedepends=(ruby-ronn)
 checkdepends=(
   bash-bats git
-  'pacman>=5.1.1-1.parabola5' 'pacman<5.2'
+  'pacman>=5.1.1-1.parabola5' 'pacman<5.3'
   expac
   openssh
   rsync
@@ -32,6 +34,7 @@ checkdepends=(
 prepare() {
   cd "$srcdir/$pkgbase-$pkgver"
   patch -N -p1 -i $srcdir/0001-libremakepkg-rw-startdir.patch
+  patch -N -p1 -i $srcdir/0002-libremakepkg-pacman_5_2.patch
 }
 
 build() {
@@ -92,7 +95,7 @@ package_libretools() {
   depends=(
     "librelib=$pkgver"
     "gitget=$pkgver" # `createworkdir`
-    'pacman>=5.1.1-1.parabola5' 'pacman<5.2'
+    'pacman>=5.1.1-1.parabola5' 'pacman<5.3'
     arch-install-scripts # `mkarchroot` uses `pacstrap`
     binutils # `libremakepkg` uses `makepkg` uses `strip`
     expac # `libredbdiff`
-- 
cgit v1.2.3