From 6791c7ff388b1aae4026f8d87c09d17f8330380c Mon Sep 17 00:00:00 2001
From: omni <omni+alpine@hack.org>
Date: Wed, 27 Nov 2024 20:56:36 +0000
Subject: [PATCH] testing/*: add HARECACHE env var to hare aports

to make sure no old cache is used during build, like what we do for
golang aports
---
 testing/ab-tidy/APKBUILD         | 4 +++-
 testing/hare-cairo/APKBUILD      | 4 +++-
 testing/hare-compress/APKBUILD   | 4 +++-
 testing/hare-harfbuzz/APKBUILD   | 4 +++-
 testing/hare-madeline/APKBUILD   | 8 ++++----
 testing/hare-scfg/APKBUILD       | 4 +++-
 testing/hare-unicode/APKBUILD    | 4 +++-
 testing/hare-wayland/APKBUILD    | 4 +++-
 testing/hare-xkb/APKBUILD        | 4 +++-
 testing/haredo/APKBUILD          | 4 +++-
 testing/himitsu-firefox/APKBUILD | 8 ++++----
 testing/mcron/APKBUILD           | 4 +++-
 testing/mkrundir/APKBUILD        | 8 ++++----
 13 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/testing/ab-tidy/APKBUILD b/testing/ab-tidy/APKBUILD
index 3f8d512efb3c..d79a7ca41fd7 100644
--- a/testing/ab-tidy/APKBUILD
+++ b/testing/ab-tidy/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Hugo Osvaldo Barrera <hugo@whynothugo.nl>"
 pkgname=ab-tidy
 pkgver=0.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Tidy up an address book"
 url="https://sr.ht/~whynothugo/ab-tidy/"
 arch="x86_64 aarch64 riscv64" # Hare
@@ -12,6 +12,8 @@ source="ab-tidy-$pkgver.tar.gz::https://git.sr.ht/~whynothugo/ab-tidy/archive/v$
 options="!check"
 builddir="$srcdir/ab-tidy-v$pkgver/"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	make PREFIX=/usr
 }
diff --git a/testing/hare-cairo/APKBUILD b/testing/hare-cairo/APKBUILD
index 5efaef862b04..fc268de8ccdd 100644
--- a/testing/hare-cairo/APKBUILD
+++ b/testing/hare-cairo/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=hare-cairo
 pkgver=0_git20240217
 _commit=3e5118a8fe4d0d0f4688e662be974d81b319fb32
-pkgrel=0
+pkgrel=1
 pkgdesc="Hare interface to the cairo 2D graphics library"
 url="https://codeberg.org/une/hare-cairo"
 # Currently doesn't build on riscv64
@@ -14,6 +14,8 @@ source="
 "
 builddir="$srcdir/$pkgname"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	make -j1 PREFIX=/usr
 }
diff --git a/testing/hare-compress/APKBUILD b/testing/hare-compress/APKBUILD
index 25381336f91c..019acca4c5ef 100644
--- a/testing/hare-compress/APKBUILD
+++ b/testing/hare-compress/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=hare-compress
 pkgver=0_git20240623
 _commit=9597005edca5365000c77f1a6e2f892484348ff1
-pkgrel=0
+pkgrel=1
 pkgdesc="Compression algorithms for Hare"
 url="https://git.sr.ht/~sircmpwn/hare-compress"
 arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare
@@ -12,6 +12,8 @@ makedepends="hare"
 source="$pkgname-$_commit.tar.gz::https://git.sr.ht/~sircmpwn/hare-compress/archive/$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	make -j1 PREFIX=/usr
 }
diff --git a/testing/hare-harfbuzz/APKBUILD b/testing/hare-harfbuzz/APKBUILD
index ebc710f68065..023a1a7a155a 100644
--- a/testing/hare-harfbuzz/APKBUILD
+++ b/testing/hare-harfbuzz/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=hare-harfbuzz
 pkgver=0_git20240715
 _commit=524d77df5fe1a5e96d03fcd78adccacf529ab465
-pkgrel=0
+pkgrel=1
 pkgdesc="Hare interface to the xkbcommon library"
 url="https://git.sr.ht/~stacyharper/hare-xkb"
 # Currently doesn't build on riscv64
@@ -15,6 +15,8 @@ source="
 "
 builddir="$srcdir/$pkgname-$_commit"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 # Work-around of https://todo.sr.ht/~sircmpwn/hare/723#event-261138
 case "$CARCH" in
 	aarch64)
diff --git a/testing/hare-madeline/APKBUILD b/testing/hare-madeline/APKBUILD
index 1e6640b52ea5..695ac3e6e001 100644
--- a/testing/hare-madeline/APKBUILD
+++ b/testing/hare-madeline/APKBUILD
@@ -2,18 +2,18 @@ maintainer="Hugo Osvaldo Barrera <hugo@whynothugo.nl>"
 pkgname=hare-madeline
 pkgver=0.1_git20240505
 _commit=c693a0a797849cff0ac629c83e21f028fa60bff6
-pkgrel=0
+pkgrel=1
 pkgdesc="tiny readline-alike with some batteries included"
 url="https://git.sr.ht/~ecs/madeline"
 arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare
 license="WTFPL"
 checkdepends="hare"
-source="
-	$pkgname-$_commit.tar.gz::https://git.sr.ht/~ecs/madeline/archive/$_commit.tar.gz
-"
+source="$pkgname-$_commit.tar.gz::https://git.sr.ht/~ecs/madeline/archive/$_commit.tar.gz"
 subpackages="$pkgname-doc"
 builddir="$srcdir/madeline-$_commit"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 check() {
 	hare test
 }
diff --git a/testing/hare-scfg/APKBUILD b/testing/hare-scfg/APKBUILD
index dd0be9bdda20..5a103243431e 100644
--- a/testing/hare-scfg/APKBUILD
+++ b/testing/hare-scfg/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: fossdd <fossdd@pwned.life>
 pkgname=hare-scfg
 pkgver=0.24.2
-pkgrel=0
+pkgrel=1
 pkgdesc="scfg implementation for Hare"
 url="https://git.sr.ht/~chrisppy/hare-scfg"
 arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare
@@ -11,6 +11,8 @@ license="MPL-2.0"
 makedepends="hare"
 source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~chrisppy/hare-scfg/archive/$pkgver.tar.gz"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	make -j1 PREFIX=/usr
 }
diff --git a/testing/hare-unicode/APKBUILD b/testing/hare-unicode/APKBUILD
index a1cdfcd47bef..b1c195a58241 100644
--- a/testing/hare-unicode/APKBUILD
+++ b/testing/hare-unicode/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=hare-unicode
 pkgver=0_git20240417
 _commit=1488c26f46f7f8568235eaee6224983ac46e78ff
-pkgrel=0
+pkgrel=1
 pkgdesc="Hare unicode database"
 url="https://git.sr.ht/~sircmpwn/hare-unicode"
 arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare
@@ -12,6 +12,8 @@ checkdepends="hare"
 source="$pkgname-$_commit.tar.gz::https://git.sr.ht/~sircmpwn/hare-unicode/archive/$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 check() {
 	hare test
 }
diff --git a/testing/hare-wayland/APKBUILD b/testing/hare-wayland/APKBUILD
index f72e933f545d..b85611db87ff 100644
--- a/testing/hare-wayland/APKBUILD
+++ b/testing/hare-wayland/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=hare-wayland
 pkgver=0_git20240817
 _commit=81648414049c29e3fc5a62dd604f8f3a6dc7b00f
-pkgrel=0
+pkgrel=1
 pkgdesc="Native Hare Wayland bindings"
 url="https://sr.ht/~sircmpwn/hare-wayland"
 arch="x86_64 aarch64 riscv64" # hare
@@ -13,6 +13,8 @@ source="
 "
 builddir="$srcdir/$pkgname-$_commit"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	make -j1 PREFIX=/usr
 }
diff --git a/testing/hare-xkb/APKBUILD b/testing/hare-xkb/APKBUILD
index 570efb956610..18d982c5f23a 100644
--- a/testing/hare-xkb/APKBUILD
+++ b/testing/hare-xkb/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=hare-xkb
 pkgver=0_git20231011
 _commit=f26da188280caa8406d4d6345868f41021fdfdec
-pkgrel=0
+pkgrel=1
 pkgdesc="Hare interface to the xkbcommon library"
 url="https://git.sr.ht/~stacyharper/hare-xkb"
 # Currently doesn't build on riscv64
@@ -14,6 +14,8 @@ source="
 "
 builddir="$srcdir/$pkgname-$_commit"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	make -j1 PREFIX=/usr
 }
diff --git a/testing/haredo/APKBUILD b/testing/haredo/APKBUILD
index b87a0d095812..6bf6787b8f02 100644
--- a/testing/haredo/APKBUILD
+++ b/testing/haredo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Umar Getagazov <umar@handlerug.me>
 pkgname=haredo
 pkgver=1.0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple, Unix-idiomatic build automator"
 url="https://sr.ht/~autumnull/haredo"
 arch="x86_64 aarch64 riscv64" # Hare
@@ -10,6 +10,8 @@ makedepends="hare scdoc"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~autumnull/haredo/archive/$pkgver.tar.gz"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	./bootstrap.sh
 }
diff --git a/testing/himitsu-firefox/APKBUILD b/testing/himitsu-firefox/APKBUILD
index 03e89fea6044..fc07933f70dc 100644
--- a/testing/himitsu-firefox/APKBUILD
+++ b/testing/himitsu-firefox/APKBUILD
@@ -1,18 +1,18 @@
 # Maintainer:
 pkgname=himitsu-firefox
 pkgver=0.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Firefox integration for Himitsu"
 url="https://himitsustore.org"
 arch="x86_64 aarch64 riscv64" # Hare
 license="GPL-3.0-only"
 makedepends="hare hare-json himitsu-dev zip"
-source="
-	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/himitsu-firefox/archive/$pkgver.tar.gz
-"
+source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/himitsu-firefox/archive/$pkgver.tar.gz"
 install="$pkgname.post-install"
 options="!check"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	make -j1 PREFIX=/usr
 }
diff --git a/testing/mcron/APKBUILD b/testing/mcron/APKBUILD
index d3623b31961e..5d2b464e26b5 100644
--- a/testing/mcron/APKBUILD
+++ b/testing/mcron/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Willow Barraco <contact@willowbarraco.fr>
 pkgname=mcron
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A cron implementation for mobile phones"
 url="https://sr.ht/~stacyharper/mcron/"
 install="$pkgname.pre-install"
@@ -15,6 +15,8 @@ source="
 	mcron.confd
 	"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	# Don't use user's global Hare cache
 	export HARECACHE="$srcdir"/hare-cache
diff --git a/testing/mkrundir/APKBUILD b/testing/mkrundir/APKBUILD
index c6b4f23ee443..aab119b62c57 100644
--- a/testing/mkrundir/APKBUILD
+++ b/testing/mkrundir/APKBUILD
@@ -2,18 +2,18 @@
 maintainer="Hugo Osvaldo Barrera <hugo@whynothugo.nl>"
 pkgname=mkrundir
 pkgver=0.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Create an XDG_RUNTIME_DIR"
 url="https://sr.ht/~whynothugo/mkrundir/"
 arch="x86_64 aarch64 riscv64" # Hare
 license="ISC"
 makedepends="hare libcap-setcap"
-source="
-	mkrundir-$pkgver.tar.gz::https://git.sr.ht/~whynothugo/mkrundir/archive/v$pkgver.tar.gz
-"
+source="mkrundir-$pkgver.tar.gz::https://git.sr.ht/~whynothugo/mkrundir/archive/v$pkgver.tar.gz"
 options="!check setcap"
 builddir="$srcdir/mkrundir-v$pkgver/"
 
+export HARECACHE="${HARECACHE:-"$srcdir/hare-cache"}"
+
 build() {
 	make PREFIX=/usr mkrundir
 }
-- 
GitLab