From f62e10d2520c64264b2d5516ceb5b12ea8f1a7b1 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Sat, 27 Aug 2022 11:09:01 -0400
Subject: [libretools]: housekeeping

---
 libre/libretools/PKGBUILD | 99 +++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index d63b80bb2..ca864499e 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,19 +1,28 @@
-# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
-# Maintainer: David P. <megver83@parabola.nu>
+# Maintainer: Parabola Hackers <dev@lists.parabola.nu>
+# Contributor: Luke Shumaker <lukeshu@parabola.nu>
+# Contributor: David P. <megver83@parabola.nu>
 # Contributor: Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
 
 pkgbase=libretools
 pkgname=(libretools librelib gitget)
+pkgver=20191025
+pkgrel=1
 pkgdesc="Programs for Parabola development"
+arch=('any')
 url="https://git.parabola.nu/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20191025
+makedepends=(ruby-ronn)
+checkdepends=(bash-bats git expac openssh rsync tokyocabinet)
+checkdepends+=('pacman>=6.0' 'pacman<6.1')
 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}
         0001-libremakepkg-rw-startdir.patch
         0002-libremakepkg-pacman_5_2.patch)
+
 sha256sums=('0'
             'SKIP'
             '19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883'
@@ -24,31 +33,25 @@ validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9'  # Luke Shumaker
               '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 
 
-pkgrel=1
-arch=('any')
-makedepends=(ruby-ronn)
-checkdepends=(
-  bash-bats git
-  'pacman>=5.1.1-1.parabola5' 'pacman<6.1'
-  expac
-  openssh
-  rsync
-  tokyocabinet
-)
-
 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
+  cd "$srcdir"/$pkgbase-$pkgver
+
+  echo "applying 0001-libremakepkg-rw-startdir.patch"
+  patch -N -p1 -i "$srcdir"/0001-libremakepkg-rw-startdir.patch
+
+  echo "applying 0002-libremakepkg-pacman_5_2.patch"
+  patch -N -p1 -i "$srcdir"/0002-libremakepkg-pacman_5_2.patch
 }
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir"/$pkgbase-$pkgver
+
   make
 }
 
 check() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir"/$pkgbase-$pkgver
+
   # FIXME as soon as possible
   # we needed to unbreak kernel builds, but tests were failing
   # with the stock PKGBUILD like this:
@@ -66,12 +69,11 @@ package_librelib() {
   pkgdesc="The shell library portion of libretools"
   license=(GPL2)
   conflicts=('xbs')
-  optdepends=(
-    'libretools: for libreblacklist/blacklist.sh'
-    'wget: for libreblacklist/blacklist.sh'
-  )
+  optdepends=('libretools: for libreblacklist/blacklist.sh'
+              'wget: for libreblacklist/blacklist.sh')
+
+  cd "$srcdir"/$pkgbase-$pkgver
 
-  cd "$srcdir/$pkgbase-$pkgver"
   make install-librelib DESTDIR="$pkgdir"
 }
 
@@ -84,7 +86,8 @@ package_gitget() {
   conflicts=("libregit")
   replaces=("libregit")
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir"/$pkgbase-$pkgver
+
   make install-gitget DESTDIR="$pkgdir"
 }
 
@@ -94,29 +97,25 @@ package_libretools() {
           etc/libretools.d/libredbdiff.conf
           etc/libretools.d/librefetch.conf)
   install=libretools.install
-  conflicts=(devtools libretools-mips64el)
-  replaces=(libretools-mips64el)
-
-  depends=(
-    "librelib=$pkgver"
-    "gitget=$pkgver" # `createworkdir`
-    'pacman>=5.1.1-1.parabola5' 'pacman<6.1'
-    arch-install-scripts # `mkarchroot` uses `pacstrap`
-    binutils # `libremakepkg` uses `makepkg` uses `strip`
-    expac # `libredbdiff`
-    fakeroot # `libremakepkg` uses `makepkg` uses `fakeroot`
-    make # `librefetch`
-    openssh # `librerelease`
-    rsync # `librerelease` and `makechrootpkg.sh`
-    tokyocabinet # `toru`
-    #namcap # Namcap is currently dissabled in libremakepkg :-(
-    subversion # `diff-unfree`
-    wget # `aur`, optdepend for librelib:`blacklist`
-  )
-  optdepends=(
-    'qemu-user-static-binfmt: To build ARM packages from x86'
-  )
-
-  cd "$srcdir/$pkgbase-$pkgver"
+  conflicts=(devtools)
+
+  depends=(arch-install-scripts       # `mkarchroot` uses `pacstrap`
+           binutils                   # `libremakepkg` uses `makepkg` uses `strip`
+           expac                      # `libredbdiff`
+           fakeroot                   # `libremakepkg` uses `makepkg` uses `fakeroot`
+           "gitget=$pkgver"           # `createworkdir`
+           "librelib=$pkgver"         # common defines and utilities
+           make                       # `librefetch`
+           #namcap                    # Namcap is currently dissabled in libremakepkg :-(
+           openssh                    # `librerelease`
+           'pacman>=6.0' 'pacman<6.1' # `pacstraop` and other obvious reasons
+           rsync                      # `librerelease` and `makechrootpkg.sh`
+           tokyocabinet               # `toru`
+           subversion                 # `diff-unfree`
+           wget)                      # `aur`, optdepend for librelib:`blacklist`
+  optdepends=('qemu-user-static-binfmt: To build ARM packages from x86')
+
+  cd "$srcdir"/$pkgbase-$pkgver
+
   make install-libretools DESTDIR="$pkgdir"
 }
-- 
cgit v1.2.2