From b580b8706247c7cdb8580f9b595784dc063f9d1d Mon Sep 17 00:00:00 2001
From: xiota <aur@mentalfossa.com>
Date: Wed, 14 Aug 2024 22:39:30 +0000
Subject: [PATCH] 13.18

---
 .SRCINFO |  9 ++++-----
 PKGBUILD | 37 ++++++++++++++++---------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index ac56277..03e2eca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = debhelper
 	pkgdesc = A collection of programs that can be used in a debian/rules file to automate common tasks
-	pkgver = 13.16
+	pkgver = 13.18
 	pkgrel = 1
 	url = https://salsa.debian.org/debian/debhelper
 	arch = any
@@ -10,11 +10,10 @@ pkgbase = debhelper
 	depends = dpkg
 	depends = perl-pod-parser
 	optdepends = dh-make: convert source archives into Debian package source
-	provides = dh-strip-nondeterminism
 	conflicts = dh-strip-nondeterminism
-	source = git+https://salsa.debian.org/debian/debhelper.git#tag=debian/13.16
-	source = dh_strip_nondeterminism-dh_13.16::https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/raw/master/bin/dh_strip_nondeterminism
-	sha256sums = SKIP
+	source = debhelper::git+https://salsa.debian.org/debian/debhelper.git#tag=debian/13.18
+	source = strip-nondeterminism::git+https://salsa.debian.org/reproducible-builds/strip-nondeterminism.git
+	sha256sums = fb609f50ae783723423d963aebd3bdebb82b3b563184e81a2dc625297a18f653
 	sha256sums = SKIP
 
 pkgname = debhelper
diff --git a/PKGBUILD b/PKGBUILD
index 8b7768c..1257af5 100644
--- a/PKGBUILD
+++ b/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/"
 }