13.18

PKGBUILD

@@ -3,13 +3,9 @@
 # Contributor: Antoine Lubineau <antoine@lubignon.info>
 # Contributor: Charles Pigott <charlespigott@googlemail.com>
 
-## useful links:
-# https://salsa.debian.org/debian/debhelper
-# https://salsa.debian.org/reproducible-builds/strip-nondeterminism
-
 _pkgname="debhelper"
 pkgname="$_pkgname"
-pkgver=13.16
+pkgver=13.18
 pkgrel=1
 pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks"
 url="https://salsa.debian.org/debian/debhelper"
@@ -28,22 +24,22 @@ optdepends=(
   'dh-make: convert source archives into Debian package source'
 )
 
-_pkgsrc="$_pkgname"
-source=("git+$url.git#tag=debian/${pkgver%%.r*}")
-sha256sums=('SKIP')
-
-pkgver() {
-  echo "${pkgver%%.r*}"
+_source_main() {
+  _pkgsrc="$_pkgname"
+  source=("$_pkgsrc"::"git+$url.git#tag=debian/$pkgver")
+  sha256sums=('fb609f50ae783723423d963aebd3bdebb82b3b563184e81a2dc625297a18f653')
 }
 
-provides+=("dh-strip-nondeterminism")
-conflicts+=("dh-strip-nondeterminism")
+_source_dh_strip_nd() {
+  conflicts+=("dh-strip-nondeterminism")
 
-# dh_strip_nondeterminism
-_dh_strip_nondeterminism_url="https://salsa.debian.org/reproducible-builds/strip-nondeterminism"
-_dh_strip_nondeterminism_script="dh_strip_nondeterminism-dh_${pkgver%%.r*}"
-source+=("$_dh_strip_nondeterminism_script"::"$_dh_strip_nondeterminism_url/-/raw/master/bin/dh_strip_nondeterminism")
-sha256sums+=('SKIP')
+  _pkgsrc_dh_strip_nd="strip-nondeterminism"
+  source+=("$_pkgsrc_dh_strip_nd"::"git+https://salsa.debian.org/reproducible-builds/strip-nondeterminism.git")
+  sha256sums+=('SKIP')
+}
+
+_source_main
+_source_dh_strip_nd
 
 prepare() {
   cd "$_pkgsrc"
@@ -69,7 +65,6 @@ package() {
     'po-debconf'
   )
 
-  cd "$_pkgsrc"
-  make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/$_dh_strip_nondeterminism_script" "$pkgdir/usr/bin/dh_strip_nondeterminism"
+  make -C "$_pkgsrc" DESTDIR="$pkgdir" install
+  install -Dm755 "$_pkgsrc_dh_strip_nd/bin/dh_strip_nondeterminism" -t "$pkgdir/usr/bin/"
 }