=== modified file 'default.alpine-base.do'
--- default.alpine-base.do	2017-11-30 22:12:00 +0000
+++ default.alpine-base.do	2017-11-30 21:40:46 +0000
@@ -4,8 +4,13 @@
 	local -a apk_args
 	apk_args=( )
 
-	clone-depend-if-changed alpine-repo-init \
-		\?arch \?release \?repositories \?alpine_mirror
+	depend alpine-repo-init \
+		\?arch \?release \?repositories \?alpine_mirror \
+		%build_dir=source_dir
+	init-build-dir-vars
+	hash-changes
+	exit-if-unchanged
+	clone-build-dir $vars[source_dir]
 
 	apk_args+=(
 		--root $vars[build_dir]

=== removed file 'functions/clone-depend-if-changes'
--- functions/clone-depend-if-changes	2017-11-30 22:12:00 +0000
+++ functions/clone-depend-if-changes	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-init-build-dir-vars
-depend alpine-repo-init "$@" %build_dir=source_dir
-hash-changes
-exit-if-unchanged
-
-while grep -q "^overlay ${vars[build_dir]:A} overlay" /proc/mounts; do
-	umount ${vars[build_dir]:A} || die "Failed to umount ${(qqq)vars[build_dir]}"
-done
-
-local remove
-
-[[ -e $vars[changes_dir] ]] && remove+=( $vars[changes_dir]/*(DN) )
-[[ -e $vars[work_dir] ]] && remove+=( $vars[work_dir]/*(DN) )
-if (($#remove)); then
-	rm -rf $remove || die "Failed to clean work directories"
-fi
-mkdir -p $vars[changes_dir] $vars[work_dir] $vars[build_dir] \
-	|| die "Failed to create work directories"
-
-local -a mount_opts
-mount_opts=(
-	lowerdir=${1//=/\\=}
-	upperdir=${vars[changes_dir]//=/\\=}
-	workdir=${vars[work_dir]//=/\\=}
-)
-mount -t overlay overlay -o ${(j:,:)mount_opts} ${vars[build_dir]:A} \
-	|| die "Failed to mount ${(qqq)vars[build_dir]}"
-grep -q "^overlay ${vars[build_dir]:A} overlay" /proc/mounts \
-	|| die "Not visible as mounted: ${(qqq)vars[build_dir]}"
-# vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4