From a964b909495b014ef9869aa61219952c79a1ef5e Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Fri, 21 Jun 2019 21:44:49 -0500
Subject: user/cbindgen: Unify with other rust APKBUILD style

Signed-off-by: Samuel Holland <samuel@sholland.org>
---
 user/cbindgen/APKBUILD | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'user/cbindgen')

diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD
index 6a8530b95..56652dda1 100644
--- a/user/cbindgen/APKBUILD
+++ b/user/cbindgen/APKBUILD
@@ -26,16 +26,14 @@ cargo_deps="$pkgname-$pkgver ansi_term-0.11.0 atty-0.2.11 autocfg-0.1.4
 	vec_map-0.8.1 winapi-0.3.7 winapi-i686-pc-windows-gnu-0.4.0
 	winapi-x86_64-pc-windows-gnu-0.4.0"
 
-for _dep in $cargo_deps; do
-	_dep_name=${_dep%-*}
-	_dep_ver=${_dep##*-}
-	source="$source $_dep.tar.gz::https://crates.io/api/v1/crates/$_dep_name/$_dep_ver/download"
-done
+source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')"
 
 prepare() {
 	export CARGO_HOME="$srcdir/cargo-home"
 	export CARGO_VENDOR="$CARGO_HOME/adelie"
 
+	(builddir=$srcdir; default_prepare)
+
 	mkdir -p "$CARGO_VENDOR"
 	cat <<- EOF > "$CARGO_HOME/config"
 		[source.adelie]
@@ -59,13 +57,11 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	export CARGO_HOME="$srcdir/cargo-home"
 	cargo build -j $JOBS --release
 }
 
 check() {
-	cd "$builddir"
 	export CARGO_HOME="$srcdir/cargo-home"
 
 	# Failing tests
@@ -74,7 +70,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	export CARGO_HOME="$srcdir/cargo-home"
 	cargo install --path . --root="$pkgdir"/usr
 	rm "$pkgdir"/usr/.crates.toml
-- 
cgit v1.2.3-60-g2f50