From 964d68aafe6ecfd4693c2f05e96b85abfed213d0 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@gentoo.org>
Date: Thu, 7 Aug 2025 00:22:39 -0400
Subject: [PATCH] dev-util/rustup: unbundle zstd crate by using system deps

Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
---
 .../{rustup-1.28.2.ebuild => rustup-1.28.2-r1.ebuild}       | 2 ++
 dev-util/rustup/rustup-9999.ebuild                          | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 rename dev-util/rustup/{rustup-1.28.2.ebuild => rustup-1.28.2-r1.ebuild} (98%)

diff --git a/dev-util/rustup/rustup-1.28.2.ebuild b/dev-util/rustup/rustup-1.28.2-r1.ebuild
similarity index 98%
rename from dev-util/rustup/rustup-1.28.2.ebuild
rename to dev-util/rustup/rustup-1.28.2-r1.ebuild
index c1e6862ba7b0a..2b094f98a402a 100644
--- a/dev-util/rustup/rustup-1.28.2.ebuild
+++ b/dev-util/rustup/rustup-1.28.2-r1.ebuild
@@ -31,6 +31,7 @@ RESTRICT="test"
 
 DEPEND="
 	app-arch/xz-utils
+	app-arch/zstd
 	net-misc/curl:=[http2,ssl]
 	dev-libs/openssl:0=
 "
@@ -67,6 +68,7 @@ src_configure() {
 
 src_compile() {
 	export OPENSSL_NO_VENDOR=true
+	export ZSTD_SYS_USE_PKG_CONFIG=1
 	cargo_src_compile
 }
 
diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
index c54f25182a626..2b094f98a402a 100644
--- a/dev-util/rustup/rustup-9999.ebuild
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -22,13 +22,16 @@ fi
 
 LICENSE="|| ( Apache-2.0 MIT )"
 # Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 openssl Unicode-3.0"
+LICENSE+="
+	Apache-2.0 BSD CDLA-Permissive-2.0 ISC MIT openssl Unicode-3.0 ZLIB
+"
 SLOT="0"
 # uses network
 RESTRICT="test"
 
 DEPEND="
 	app-arch/xz-utils
+	app-arch/zstd
 	net-misc/curl:=[http2,ssl]
 	dev-libs/openssl:0=
 "
@@ -65,6 +68,7 @@ src_configure() {
 
 src_compile() {
 	export OPENSSL_NO_VENDOR=true
+	export ZSTD_SYS_USE_PKG_CONFIG=1
 	cargo_src_compile
 }