diff --git a/app-misc/watchexec/watchexec-2.3.2.ebuild b/app-misc/watchexec/watchexec-2.3.2.ebuild
index d7244e6c44..dda7fd7a67 100644
--- a/app-misc/watchexec/watchexec-2.3.2.ebuild
+++ b/app-misc/watchexec/watchexec-2.3.2.ebuild
@@ -5,7 +5,9 @@
 
 EAPI=8
 
-# pycargoebuild -i watchexec-<$PV>.ebuild $(find watchexec/crates -regextype egrep -regex '.*watchexec/crates/.*Cargo.toml' | sed -E 's/Cargo.toml//')
+# find watchexec/crates -maxdepth 2 -type f  -name 'Cargo.toml' -print0 |
+# xargs --null dirname --zero |
+# xargs --null sudo pycargoebuild -i watchexec-${PV}.ebuild
 CRATES="
 	addr2line@0.24.2
 	adler2@2.0.0
@@ -508,13 +510,9 @@ inherit cargo shell-completion
 DESCRIPTION="Executes commands in response to file modifications"
 HOMEPAGE="https://watchexec.github.io"
 
-if [[ "$PV" == 9999 ]]; then
+if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/watchexec/watchexec.git"
-	src_unpack() {
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	}
 else
 	SRC_URI="https://github.com/watchexec/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" ${CARGO_CRATE_URIS}"
@@ -537,6 +535,15 @@ DOCS=( crates/cli/README.md )
 # update with proper path to binaries this crate installs, omit leading /
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
+src_unpack() {
+	if [[ "${PV}" == 9999 ]];then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
 src_compile() {
 	cargo_src_compile --manifest-path=crates/cli/Cargo.toml
 }
diff --git a/app-misc/watchexec/watchexec-9999.ebuild b/app-misc/watchexec/watchexec-9999.ebuild
index 0c2793dfa4..2ae774108e 100644
--- a/app-misc/watchexec/watchexec-9999.ebuild
+++ b/app-misc/watchexec/watchexec-9999.ebuild
@@ -15,13 +15,9 @@ inherit cargo shell-completion
 DESCRIPTION="Executes commands in response to file modifications"
 HOMEPAGE="https://watchexec.github.io"
 
-if [[ "$PV" == 9999 ]]; then
+if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/watchexec/watchexec.git"
-	src_unpack() {
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	}
 else
 	SRC_URI="https://github.com/watchexec/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" ${CARGO_CRATE_URIS}"
@@ -44,6 +40,15 @@ DOCS=( crates/cli/README.md )
 # update with proper path to binaries this crate installs, omit leading /
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
+src_unpack() {
+	if [[ "${PV}" == 9999 ]];then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
 src_compile() {
 	cargo_src_compile --manifest-path=crates/cli/Cargo.toml
 }