libretools: upgrade to v20240327

1 files changed, 44 insertions, 34 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 8a1f9e1c2..2a6c8f173 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -2,35 +2,42 @@
 # 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=20240327
+pkgrel=1
 pkgdesc="Programs for Parabola development"
+arch=('any')
 url="https://git.parabola.nu/packages/libretools.git/"
-license=('GPL3' 'GPL2')
-
-pkgver=20240221.1
-source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
-sha256sums=('1058ac92d0e660c23f12bc752490f8ae029c7103f68ea5d7223309efe86602ca'
-            'SKIP')
-validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9'  # Luke Shumaker
-              'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
+# license=(GPL-2.0-only GPL-3.0-or-later) # TODO:
+license=('GPL2' 'GPL3')
 
-pkgrel=2
-arch=('any')
+_pacman_constraintts=( 'pacman>=5.1.1-1.parabola5' 'pacman<6.2' )
 makedepends=(ruby-ronn-ng)
 checkdepends=(
   bats
   git
-  'pacman>=5.1.1-1.parabola5' 'pacman<6.1'
+  ${_pacman_constraintts[*]}
   expac
   openssh
   rsync
   tokyocabinet
 )
 
+source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
+sha256sums=('e3a3aa54322813682414405b9a546274a984470bd40cea10d6349cc582f1f9a3'
+            'SKIP')
+validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9'  # Luke Shumaker
+              'BFA8008A8265677063B11BF47171986E4B745536'  # Andreas Grapentin
+              '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
+
+
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir"/$pkgbase-$pkgver
+
   make
 }
 
@@ -48,7 +55,8 @@ package_librelib() {
     'wget: for libreblacklist/blacklist.sh'
   )
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir"/$pkgbase-$pkgver
+
   make install-librelib DESTDIR="$pkgdir"
 }
 
@@ -57,11 +65,8 @@ package_gitget() {
   license=(GPL2)
   depends=("librelib=$pkgver" git)
 
-  provides=("libregit=$pkgver")
-  conflicts=("libregit")
-  replaces=("libregit")
+  cd "$srcdir"/$pkgbase-$pkgver
 
-  cd "$srcdir/$pkgbase-$pkgver"
   make install-gitget DESTDIR="$pkgdir"
 }
 
@@ -71,30 +76,35 @@ package_libretools() {
           etc/libretools.d/libredbdiff.conf
           etc/libretools.d/librefetch.conf)
   install=libretools.install
-  conflicts=(devtools libretools-mips64el)
-  replaces=(libretools-mips64el)
+  conflicts=(devtools)
 
   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`
-    'systemd-tools>=234' # systemd-nspawn
-    tokyocabinet # `toru`
-    #namcap # Namcap is currently dissabled in libremakepkg :-(
-    subversion # `diff-unfree`
-    wget # `aur`, optdepend for librelib:`blacklist`
+    binutils             # `libremakepkg`->`makepkg` uses `strip`
+    expac                # `libredbdiff`
+    fakeroot             # `libremakepkg`->`makepkg` uses `fakeroot`
+    make                 # `librefetch`
+    openssh              # `librerelease`
+    pacutils             # `librechroot` uses `pacsift`
+    rsync                # `librerelease` and `makechrootpkg.sh`
+    tokyocabinet         # `toru`
+    namcap               # `libremakepkg`
+    subversion           # `diff-unfree`
+    wget                 # `aur`, optdepend for librelib:`blacklist`
+  )
+  depends+=( # pinned dependencies
+    "librelib=$pkgver"
+    "gitget=$pkgver"     # `createworkdir`
+    ${_pacman_constraintts[*]}
+    'systemd-tools>=234' # `systemd-nspawn` # TODO: nonsystemd `chroot-run`
   )
+  depends=( ${depends[*]/pacutils/} ) # WIP
+  depends=( ${depends[*]/namcap/} ) # FIXME: Namcap is currently disabled in libremakepkg :-(
   optdepends=(
     'qemu-user-static-binfmt: To build ARM packages from x86'
   )
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir"/$pkgbase-$pkgver
+
   make install-libretools DESTDIR="$pkgdir"
 }