From e04b0cf93b3fa053aa2c1f135a8a2a7019fdfc2f Mon Sep 17 00:00:00 2001
From: Itai Ferber <itai@itaiferber.net>
Date: Tue, 9 Jun 2026 15:56:17 -0400
Subject: [PATCH] dev-lang/swift-bin: die on installation failure

Hardens the src_install phase by validating that the expected image
exists in the downloaded package, and dies if copying those files to
"$ED" fails.

Signed-off-by: Itai Ferber <itai@itaiferber.net>
---
 dev-lang/swift-bin/swift-bin-5.10.1-r6.ebuild | 3 ++-
 dev-lang/swift-bin/swift-bin-6.2.3.ebuild     | 3 ++-
 dev-lang/swift-bin/swift-bin-6.2.4.ebuild     | 3 ++-
 dev-lang/swift-bin/swift-bin-6.3-r2.ebuild    | 3 ++-
 dev-lang/swift-bin/swift-bin-6.3.1-r2.ebuild  | 3 ++-
 dev-lang/swift-bin/swift-bin-6.3.1.ebuild     | 3 ++-
 dev-lang/swift-bin/swift-bin-6.3.2-r2.ebuild  | 3 ++-
 dev-lang/swift-bin/swift-bin-6.3.2.ebuild     | 3 ++-
 dev-lang/swift-bin/swift-bin-6.3.ebuild       | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/dev-lang/swift-bin/swift-bin-5.10.1-r6.ebuild b/dev-lang/swift-bin/swift-bin-5.10.1-r6.ebuild
index b632959833..a9b2850777 100644
--- a/dev-lang/swift-bin/swift-bin-5.10.1-r6.ebuild
+++ b/dev-lang/swift-bin/swift-bin-5.10.1-r6.ebuild
@@ -45,7 +45,8 @@ src_unpack() {
 }
 
 src_install() {
-	mv "${SWIFT_PF}/image/usr" "${ED}"
+	[[ -d "${SWIFT_PF}/image" ]] || die "Expected image directory not found in package"
+	cp -R "${SWIFT_PF}/image/usr" "${ED}" || die "Copying prebuilt files failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/swift-bin/swift-bin-6.2.3.ebuild b/dev-lang/swift-bin/swift-bin-6.2.3.ebuild
index c8c2747edc..2dc556f775 100644
--- a/dev-lang/swift-bin/swift-bin-6.2.3.ebuild
+++ b/dev-lang/swift-bin/swift-bin-6.2.3.ebuild
@@ -45,7 +45,8 @@ src_unpack() {
 }
 
 src_install() {
-	mv "${SWIFT_PF}/image/usr" "${ED}"
+	[[ -d "${SWIFT_PF}/image" ]] || die "Expected image directory not found in package"
+	cp -R "${SWIFT_PF}/image/usr" "${ED}" || die "Copying prebuilt files failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/swift-bin/swift-bin-6.2.4.ebuild b/dev-lang/swift-bin/swift-bin-6.2.4.ebuild
index c8c2747edc..2dc556f775 100644
--- a/dev-lang/swift-bin/swift-bin-6.2.4.ebuild
+++ b/dev-lang/swift-bin/swift-bin-6.2.4.ebuild
@@ -45,7 +45,8 @@ src_unpack() {
 }
 
 src_install() {
-	mv "${SWIFT_PF}/image/usr" "${ED}"
+	[[ -d "${SWIFT_PF}/image" ]] || die "Expected image directory not found in package"
+	cp -R "${SWIFT_PF}/image/usr" "${ED}" || die "Copying prebuilt files failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/swift-bin/swift-bin-6.3-r2.ebuild b/dev-lang/swift-bin/swift-bin-6.3-r2.ebuild
index d9dc056964..42a0e5e31a 100644
--- a/dev-lang/swift-bin/swift-bin-6.3-r2.ebuild
+++ b/dev-lang/swift-bin/swift-bin-6.3-r2.ebuild
@@ -45,7 +45,8 @@ src_unpack() {
 }
 
 src_install() {
-	mv "${SWIFT_PF}/image/usr" "${ED}"
+	[[ -d "${SWIFT_PF}/image" ]] || die "Expected image directory not found in package"
+	cp -R "${SWIFT_PF}/image/usr" "${ED}" || die "Copying prebuilt files failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/swift-bin/swift-bin-6.3.1-r2.ebuild b/dev-lang/swift-bin/swift-bin-6.3.1-r2.ebuild
index d9dc056964..42a0e5e31a 100644
--- a/dev-lang/swift-bin/swift-bin-6.3.1-r2.ebuild
+++ b/dev-lang/swift-bin/swift-bin-6.3.1-r2.ebuild
@@ -45,7 +45,8 @@ src_unpack() {
 }
 
 src_install() {
-	mv "${SWIFT_PF}/image/usr" "${ED}"
+	[[ -d "${SWIFT_PF}/image" ]] || die "Expected image directory not found in package"
+	cp -R "${SWIFT_PF}/image/usr" "${ED}" || die "Copying prebuilt files failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/swift-bin/swift-bin-6.3.1.ebuild b/dev-lang/swift-bin/swift-bin-6.3.1.ebuild
index c8c2747edc..2dc556f775 100644
--- a/dev-lang/swift-bin/swift-bin-6.3.1.ebuild
+++ b/dev-lang/swift-bin/swift-bin-6.3.1.ebuild
@@ -45,7 +45,8 @@ src_unpack() {
 }
 
 src_install() {
-	mv "${SWIFT_PF}/image/usr" "${ED}"
+	[[ -d "${SWIFT_PF}/image" ]] || die "Expected image directory not found in package"
+	cp -R "${SWIFT_PF}/image/usr" "${ED}" || die "Copying prebuilt files failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/swift-bin/swift-bin-6.3.2-r2.ebuild b/dev-lang/swift-bin/swift-bin-6.3.2-r2.ebuild
index d9dc056964..42a0e5e31a 100644
--- a/dev-lang/swift-bin/swift-bin-6.3.2-r2.ebuild
+++ b/dev-lang/swift-bin/swift-bin-6.3.2-r2.ebuild
@@ -45,7 +45,8 @@ src_unpack() {
 }
 
 src_install() {
-	mv "${SWIFT_PF}/image/usr" "${ED}"
+	[[ -d "${SWIFT_PF}/image" ]] || die "Expected image directory not found in package"
+	cp -R "${SWIFT_PF}/image/usr" "${ED}" || die "Copying prebuilt files failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/swift-bin/swift-bin-6.3.2.ebuild b/dev-lang/swift-bin/swift-bin-6.3.2.ebuild
index c8c2747edc..2dc556f775 100644
--- a/dev-lang/swift-bin/swift-bin-6.3.2.ebuild
+++ b/dev-lang/swift-bin/swift-bin-6.3.2.ebuild
@@ -45,7 +45,8 @@ src_unpack() {
 }
 
 src_install() {
-	mv "${SWIFT_PF}/image/usr" "${ED}"
+	[[ -d "${SWIFT_PF}/image" ]] || die "Expected image directory not found in package"
+	cp -R "${SWIFT_PF}/image/usr" "${ED}" || die "Copying prebuilt files failed"
 }
 
 pkg_preinst() {
diff --git a/dev-lang/swift-bin/swift-bin-6.3.ebuild b/dev-lang/swift-bin/swift-bin-6.3.ebuild
index c8c2747edc..2dc556f775 100644
--- a/dev-lang/swift-bin/swift-bin-6.3.ebuild
+++ b/dev-lang/swift-bin/swift-bin-6.3.ebuild
@@ -45,7 +45,8 @@ src_unpack() {
 }
 
 src_install() {
-	mv "${SWIFT_PF}/image/usr" "${ED}"
+	[[ -d "${SWIFT_PF}/image" ]] || die "Expected image directory not found in package"
+	cp -R "${SWIFT_PF}/image/usr" "${ED}" || die "Copying prebuilt files failed"
 }
 
 pkg_preinst() {