Merge branch 'git-annex/out-of-tree-fix' into 'edge'

user/git-annex: update out-of-tree depends order

See merge request ayakael/user-aports!20

user/git-annex/APKBUILD

@@ -4,7 +4,7 @@ pkgname=git-annex
 pkgver=10.20230214
 _bloomfilterver=2.0.1.0
 _gitlfsver=1.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Manage files with git, without checking their contents into git"
 url="http://git-annex.branchable.com"
 arch="x86_64 aarch64" # limited by ghc
@@ -60,6 +60,8 @@ _cabal_home="$srcdir/dist"
 _cabal_config="git-annex git-lfs"
 
 cabal_update() {
+	cabal_depends
+
 	msg "Freezing $pkgname dependencies"
 
 	# Resolve deps and generate fresh cabal.config with version constraints.
@@ -80,18 +82,7 @@ cabal_update() {
 	fi
 }
 
-prepare() {
-	default_prepare
-
-	if [ "$(head -n 1 "$srcdir/git-annex.config")" != "--$pkgver" ]; then
-		die "Requirements file is outdated, run 'abuild cabal_update'"
-	fi
-
-	for i in $_cabal_config; do
-		cd "$srcdir"/$i*
-		ln -sf "$srcdir/$i.config" cabal.config
-	done
-
+cabal_depends() {
 	# ghc version path
 	export PATH="$PATH:/usr/lib/llvm14/bin"
 
@@ -109,6 +100,21 @@ prepare() {
 	HOME="$_cabal_home" cabal v1-install
 }
 
+prepare() {
+	default_prepare
+
+	if [ "$(head -n 1 "$srcdir/git-annex.config")" != "--$pkgver" ]; then
+		die "Requirements file is outdated, run 'abuild cabal_update'"
+	fi
+
+	for i in $_cabal_config; do
+		cd "$srcdir"/$i*
+		ln -sf "$srcdir/$i.config" cabal.config
+	done
+
+	cabal_depends
+}
+
 build() {
 	# ghc version path
 	export PATH="$PATH:/usr/lib/llvm14/bin"
@@ -131,7 +137,6 @@ check() {
 package() {
 	HOME="$_cabal_home" make DESTDIR="$pkgdir" install
 }
-
 sha512sums="
 60047137c1b72d9d9161275063028af020016aa87b8929164ec35e53bb6d2eac1067896cc81e14bcd46ee1a3621319c9928658d94e80d2b88188242dce79bd10  git-annex-10.20230214.tar.gz
 1031cc28c5e5c1b7687355b709d436ebab1956ffd7591a010fa3852a1bc7412925a365f99937feeacf4b1a5d3c7b34bc0370707ad6e4533280dcac4ea3fa7c21  bloomfilter-2.0.1.0.tar.gz