diff --git a/dev-util/stripe-cli/stripe-cli-1.32.0.ebuild b/dev-util/stripe-cli/stripe-cli-1.32.0.ebuild
index 84ca985f1e..709f9d4aa2 100644
--- a/dev-util/stripe-cli/stripe-cli-1.32.0.ebuild
+++ b/dev-util/stripe-cli/stripe-cli-1.32.0.ebuild
@@ -12,10 +12,6 @@ HOMEPAGE="https://docs.stripe.com/stripe-cli"
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/stripe/stripe-cli"
-	src_unpack() {
-		git-r3_src_unpack
-		go-module_live_vendor
-	}
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/stripe/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -35,6 +31,15 @@ IUSE="bash-completion zsh-completion"
 
 BDEPEND=">=dev-lang/go-1.24.1"
 
+src_unpack() {
+	if [[ "$PV" == *9999* ]];then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		default
+	fi
+}
+
 src_compile() {
 	CGO_ENABLED=0 ego build -o "bin/${MY_PN}" "cmd/stripe/main.go"
 }
diff --git a/dev-util/stripe-cli/stripe-cli-1.33.0.ebuild b/dev-util/stripe-cli/stripe-cli-1.33.0.ebuild
index 5398c8c545..5c82f4f977 100644
--- a/dev-util/stripe-cli/stripe-cli-1.33.0.ebuild
+++ b/dev-util/stripe-cli/stripe-cli-1.33.0.ebuild
@@ -12,10 +12,6 @@ HOMEPAGE="https://docs.stripe.com/stripe-cli"
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/stripe/stripe-cli"
-	src_unpack() {
-		git-r3_src_unpack
-		go-module_live_vendor
-	}
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/stripe/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -34,6 +30,15 @@ SLOT="0"
 
 BDEPEND=">=dev-lang/go-1.24.1"
 
+src_unpack() {
+	if [[ "$PV" == *9999* ]];then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		default
+	fi
+}
+
 src_compile() {
 	CGO_ENABLED=0 ego build -o "bin/${MY_PN}" "cmd/stripe/main.go"
 }
diff --git a/dev-util/stripe-cli/stripe-cli-9999.ebuild b/dev-util/stripe-cli/stripe-cli-9999.ebuild
index 5db1486ab7..65aa98cb50 100644
--- a/dev-util/stripe-cli/stripe-cli-9999.ebuild
+++ b/dev-util/stripe-cli/stripe-cli-9999.ebuild
@@ -12,10 +12,6 @@ HOMEPAGE="https://docs.stripe.com/stripe-cli"
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/stripe/stripe-cli"
-	src_unpack() {
-		git-r3_src_unpack
-		go-module_live_vendor
-	}
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/stripe/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -34,6 +30,15 @@ SLOT="0"
 
 BDEPEND=">=dev-lang/go-1.24.1"
 
+src_unpack() {
+	if [[ "$PV" == *9999* ]];then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		default
+	fi
+}
+
 src_compile() {
 	CGO_ENABLED=0 ego build -o "bin/${MY_PN}" "cmd/stripe/main.go"
 }