libre/libretools: Back out formatting changes

1 files changed, 32 insertions, 32 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 2a6c8f173..3e5dbbb61 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,40 +4,42 @@
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: bill-auger <bill-auger@programmer.net>
 
+# Upstream information
 
 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=(GPL-2.0-only GPL-3.0-or-later) # TODO:
-license=('GPL2' 'GPL3')
+license=('GPL3' 'GPL2')
+
+pkgver=20240327
+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
+
+# Package information
 
-_pacman_constraintts=( 'pacman>=5.1.1-1.parabola5' 'pacman<6.2' )
+pkgrel=1
+arch=('any')
 makedepends=(ruby-ronn-ng)
+_pacman_constraints=('pacman>=6.1' 'pacman<6.2')
 checkdepends=(
   bats
   git
-  ${_pacman_constraintts[*]}
+  "${_pacman_constraints[@]}"
   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 instructions
 
 build() {
-  cd "$srcdir"/$pkgbase-$pkgver
-
+  cd "$srcdir/$pkgbase-$pkgver"
   make
 }
 
@@ -55,8 +57,7 @@ package_librelib() {
     'wget: for libreblacklist/blacklist.sh'
   )
 
-  cd "$srcdir"/$pkgbase-$pkgver
-
+  cd "$srcdir/$pkgbase-$pkgver"
   make install-librelib DESTDIR="$pkgdir"
 }
 
@@ -65,8 +66,11 @@ package_gitget() {
   license=(GPL2)
   depends=("librelib=$pkgver" git)
 
-  cd "$srcdir"/$pkgbase-$pkgver
+  provides=("libregit=$pkgver")
+  conflicts=("libregit")
+  replaces=("libregit")
 
+  cd "$srcdir/$pkgbase-$pkgver"
   make install-gitget DESTDIR="$pkgdir"
 }
 
@@ -76,35 +80,31 @@ package_libretools() {
           etc/libretools.d/libredbdiff.conf
           etc/libretools.d/librefetch.conf)
   install=libretools.install
-  conflicts=(devtools)
+  conflicts=(devtools libretools-mips64el)
+  replaces=(libretools-mips64el)
 
   depends=(
+    "librelib=$pkgver"
+    "gitget=$pkgver"     # `createworkdir`
+    "${_pacman_constraints[@]}"
     arch-install-scripts # `mkarchroot` uses `pacstrap`
     binutils             # `libremakepkg`->`makepkg` uses `strip`
     expac                # `libredbdiff`
     fakeroot             # `libremakepkg`->`makepkg` uses `fakeroot`
     make                 # `librefetch`
     openssh              # `librerelease`
-    pacutils             # `librechroot` uses `pacsift`
+    #pacutils             # `librechroot` uses `pacsift` # not yet, it doesn't
     rsync                # `librerelease` and `makechrootpkg.sh`
+    'systemd-tools>=234' # `systemd-nspawn` # TODO: nonsystemd `chroot-run`
     tokyocabinet         # `toru`
-    namcap               # `libremakepkg`
+    #namcap               # `libremakepkg` # Namcap is currently disabled in 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"
 }