updpkg: nonsystemd/libretools 20181004-6.1.nonsystemd1

Signed-off-by: David P <megver83@parabola.nu>

2 files changed, 39 insertions, 11 deletions

diff --git a/nonsystemd/libretools/0002-libremakepkg-pacman_5_2.patch b/nonsystemd/libretools/0002-libremakepkg-pacman_5_2.patch
new file mode 100644
index 000000000..186b05dbd
--- /dev/null
+++ b/nonsystemd/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/nonsystemd/libretools/PKGBUILD b/nonsystemd/libretools/PKGBUILD
index 3c7c69f4a..f83036ac7 100644
--- a/nonsystemd/libretools/PKGBUILD
+++ b/nonsystemd/libretools/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libretools
 pkgver=20181004
-pkgrel=1
+pkgrel=6.1
 pkgrel+=.nonsystemd1
 pkgdesc="Programs for Parabola development"
 arch=('any')
@@ -21,7 +21,7 @@ replaces=(libretools-mips64el)
 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`
@@ -39,32 +39,37 @@ optdepends=('qemu-user-static-binfmt: To build ARM packages from x86')
 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
   tokyocabinet
 )
 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}
-        Remove-systemd-support.patch)
+        Remove-systemd-support.patch
+        0002-libremakepkg-pacman_5_2.patch)
 sha256sums=('2bdefd1803ba3e6cbd1eb955fad3de9ce8a4abfd23a0bd96a60772762df7b53b'
             'SKIP'
-            '4257e7c5383df8c322d79f8e601893f71eeccbd1b9ceac76c8ebbc90fb609875')
+            '4257e7c5383df8c322d79f8e601893f71eeccbd1b9ceac76c8ebbc90fb609875'
+            '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df')
 validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker
 
-build() {
+prepare() {
   cd "$srcdir/$pkgbase-$pkgver"
 
-  # Use chroot-nspawn instead of systemd-nspawn
+  # non-systemd patch changes:
+  # * uses chroot-nspawn instead of systemd-nspawn
+  # * removes the usage of unnecessary systemd utilities
   patch -p1 -i ../Remove-systemd-support.patch
 
-  make
+  # don't apply 0001-libremakepkg-rw-startdir.patch like libre/libretools because
+  # non-systemd systems don't have that issue
+  patch -N -p1 -i $srcdir/0002-libremakepkg-pacman_5_2.patch
 }
 
-check() {
+build() {
   cd "$srcdir/$pkgbase-$pkgver"
-
-  SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo'
+  make
 }
 
 package() {