libretools: rebuild nonsystemd for pacman 6.1

preparing for merge/rebase nonsystemd->libre

* synchronize/normalize libre and nonsystemd PKGBUILDs
* remove ancient/obsolete depends/provides

3 files changed, 118 insertions, 67 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index aeb4b510d..5b4d02fcb 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,28 +4,19 @@
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: bill-auger <bill-auger@programmer.net>
 
-# Upstream information
 
 pkgbase=libretools
 pkgname=(libretools librelib gitget)
-pkgdesc="Programs for Parabola development"
-url="https://git.parabola.nu/packages/libretools.git/"
-license=('GPL3' 'GPL2')
-
 pkgver=20240403
-source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
-sha256sums=('210fecb2c5113818c685e90dc7e67f0f64995142cecc5eed1ac1284589d5840e'
-            'SKIP')
-validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9'  # Luke Shumaker
-              'BFA8008A8265677063B11BF47171986E4B745536'  # Andreas Grapentin
-              '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
-
-# Package information
-
+_pacman_constraints=( 'pacman<6.2' )
 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')
+
 makedepends=(ruby-ronn-ng)
-_pacman_constraints=('pacman>=6.1' 'pacman<6.2')
 checkdepends=(
   bats
   git
@@ -36,15 +27,23 @@ checkdepends=(
   tokyocabinet
 )
 
-# Build instructions
+source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
+sha256sums=('210fecb2c5113818c685e90dc7e67f0f64995142cecc5eed1ac1284589d5840e'
+            'SKIP')
+validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9'  # Luke Shumaker
+              '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78'  # David P.
+              'BFA8008A8265677063B11BF47171986E4B745536'  # Andreas Grapentin
+              '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir"/$pkgbase-$pkgver
+
   make
 }
 
 check() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir"/$pkgbase-$pkgver
+
   SUDO_USER= make check BATS_FLAGS='--filter-tags !network,!sudo'
 }
 
@@ -57,7 +56,8 @@ package_librelib() {
     'wget: for libreblacklist/blacklist.sh'
   )
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$srcdir"/$pkgbase-$pkgver
+
   make install-librelib DESTDIR="$pkgdir"
 }
 
@@ -66,11 +66,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"
 }
 
@@ -80,31 +77,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_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` # not yet, it doesn't
+    pacutils             # `librechroot` uses `pacsift`
     rsync                # `librerelease` and `makechrootpkg.sh`
-    'systemd-tools>=234' # `systemd-nspawn` # TODO: nonsystemd `chroot-run`
     tokyocabinet         # `toru`
-    #namcap               # `libremakepkg` # Namcap is currently disabled in libremakepkg :-(
+    namcap               # `libremakepkg`
     subversion           # `diff-unfree`
     wget                 # `aur`, optdepend for librelib:`blacklist`
   )
+  depends+=( # pinned dependencies
+    "librelib=$pkgver"
+    "gitget=$pkgver"     # `createworkdir`
+    "${_pacman_constraints[@]}"
+    'systemd-tools>=234' # `systemd-nspawn` # TODO: merge 'nonsystemd' branch
+  )
+  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"
 }
diff --git a/nonsystemd/libretools/0001-revert.patch b/nonsystemd/libretools/0001-revert.patch
new file mode 100644
index 000000000..8cb31eb63
--- /dev/null
+++ b/nonsystemd/libretools/0001-revert.patch
@@ -0,0 +1,30 @@
+From 42cca853176c9ff23a5d2896f9b132630f034fb7 Mon Sep 17 00:00:00 2001
+From: David P <megver83@parabola.nu>
+Date: Sat, 10 Jul 2021 18:33:14 -0400
+Subject: Revert "notify pbot after sccessful publish"
+
+This reverts commit dba8171b8b72790e84a86569ca9be58c324b3f5d.
+---
+ src/abslibre-tools/librerelease | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
+index 8ebdc54..50d9162 100755
+--- a/src/abslibre-tools/librerelease
++++ b/src/abslibre-tools/librerelease
+@@ -296,12 +296,6 @@ release_packages() {
+ 		)
+ 	fi
+ 
+-	# notify pbot of the excellent work we have done
+-	local packages=${file_list} # TODO: parse package names? - this is gonna be messy
+-	local login=${REPODEST_userinfo:-somebody} ; login=${login%%:*} ;
+-	ssh ${REPODEST_port:+-p "$REPODEST_port"} "${REPODEST_userhost}" \
+-	"which pbot-say && pbot-say ${login} just published: ${packages}"
+-
+ 	return $EXIT_SUCCESS
+ }
+ 
+-- 
+cgit v1.2.2
+
diff --git a/nonsystemd/libretools/PKGBUILD b/nonsystemd/libretools/PKGBUILD
index 9d21ad451..a8132f9d6 100644
--- a/nonsystemd/libretools/PKGBUILD
+++ b/nonsystemd/libretools/PKGBUILD
@@ -3,49 +3,66 @@
 # 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)
-pkgdesc="Programs for Parabola development"
-url="https://git.parabola.nu/packages/libretools.git/"
-license=('GPL3' 'GPL2')
-
 pkgver=20190907
-source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver-nonsystemd.tar.gz{,.sig}
-        "revert.patch::https://git.parabola.nu/packages/libretools.git/patch/?id=42cca853176c9ff23a5d2896f9b132630f034fb7"
-        0002-libremakepkg-pacman_5_2.patch)
-sha256sums=('c9bdc6f422234b6b260349e488266500756857bbb65079783aa5e997b6a2d410'
-            'SKIP'
-            '108aa8bbfb1ffe96427540cd8f7788338883b08ad038b2ed426e93ac6c57e91b'
-            '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df')
-validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9'  # Luke Shumaker
-              '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78') # David P.
-
+_pacman_constraints=( 'pacman<6.2' )
 pkgrel=1
-pkgrel+=.nonsystemd2
-
+pkgrel+=.nonsystemd3
+pkgdesc="Programs for Parabola development"
 arch=('any')
-makedepends=(ruby-ronn)
+url="https://git.parabola.nu/packages/libretools.git/"
+# license=(GPL-2.0-only GPL-3.0-or-later) # TODO:
+license=('GPL2' 'GPL3')
+
+makedepends=(ruby-ronn-ng)
 checkdepends=(
-  bash-bats git
-  'pacman>=5.1.1-1.parabola5' 'pacman<6.1'
+  bats
+  git
+  "${_pacman_constraints[@]}"
   expac
   openssh
   rsync
   tokyocabinet
 )
 
+source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver-nonsystemd.tar.gz{,.sig})
+source+=(0001-revert.patch
+         0002-libremakepkg-pacman_5_2.patch)
+sha256sums=('c9bdc6f422234b6b260349e488266500756857bbb65079783aa5e997b6a2d410'
+            'SKIP')
+sha256sums+=('108aa8bbfb1ffe96427540cd8f7788338883b08ad038b2ed426e93ac6c57e91b'
+             '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df')
+validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9'  # Luke Shumaker
+              '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78'  # David P.
+              'BFA8008A8265677063B11BF47171986E4B745536'  # Andreas Grapentin
+              '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
+
+
 prepare() {
-  cd "$srcdir/$pkgbase-$pkgver-nonsystemd"
+  cd "$srcdir"/$pkgbase-$pkgver-nonsystemd
   patch -N -p1 -i $srcdir/revert.patch
   patch -N -p1 -i $srcdir/0002-libremakepkg-pacman_5_2.patch
 }
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver-nonsystemd"
+  cd "$srcdir"/$pkgbase-$pkgver-nonsystemd
+
   make
 }
 
+check() {
+  cd "$srcdir"/$pkgbase-$pkgver-nonsystemd
+
+  # <= 20240327
+  # SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo'
+  # >= 20240403
+  # SUDO_USER= make check BATS_FLAGS='--filter-tags !network,!sudo'
+}
+
 package_librelib() {
   pkgdesc="The shell library portion of libretools"
   license=(GPL2)
@@ -55,7 +72,8 @@ package_librelib() {
     'wget: for libreblacklist/blacklist.sh'
   )
 
-  cd "$srcdir/$pkgbase-$pkgver-nonsystemd"
+  cd "$srcdir"/$pkgbase-$pkgver-nonsystemd
+
   make install-librelib DESTDIR="$pkgdir"
 }
 
@@ -64,11 +82,8 @@ package_gitget() {
   license=(GPL2)
   depends=("librelib=$pkgver" git)
 
-  provides=("libregit=$pkgver")
-  conflicts=("libregit")
-  replaces=("libregit")
+  cd "$srcdir"/$pkgbase-$pkgver-nonsystemd
 
-  cd "$srcdir/$pkgbase-$pkgver-nonsystemd"
   make install-gitget DESTDIR="$pkgdir"
 }
 
@@ -78,29 +93,34 @@ 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`
+    binutils             # `libremakepkg`->`makepkg` uses `strip`
     expac # `libredbdiff`
-    fakeroot # `libremakepkg` uses `makepkg` uses `fakeroot`
+    fakeroot             # `libremakepkg`->`makepkg` uses `fakeroot`
     make # `librefetch`
     openssh # `librerelease`
+    pacutils             # `librechroot` uses `pacsift`
     rsync # `librerelease` and `makechrootpkg.sh`
     tokyocabinet # `toru`
-    #namcap # Namcap is currently dissabled in libremakepkg :-(
+    namcap               # `libremakepkg`
     subversion # `diff-unfree`
     wget # `aur`, optdepend for librelib:`blacklist`
   )
+  depends+=( # pinned dependencies
+    "librelib=$pkgver"
+    "gitget=$pkgver"     # `createworkdir`
+    "${_pacman_constraints[@]}"
+  )
+  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-nonsystemd"
+  cd "$srcdir"/$pkgbase-$pkgver-nonsystemd
+
   make install-libretools DESTDIR="$pkgdir"
 }