gentoo auto-resync : 12:02:2023 - 09:56:54

3 files changed, 413 insertions, 14 deletions

diff --git a/dev-util/rustup/Manifest b/dev-util/rustup/Manifest
index 82452108b580..398344d43e41 100644
--- a/dev-util/rustup/Manifest
+++ b/dev-util/rustup/Manifest
@@ -99,7 +99,7 @@ DIST h2-0.3.13.crate 161962 BLAKE2B e8fcea52f4b6020c8c7d84b440977beede9f655f85d0
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hmac-0.11.0.crate 11385 BLAKE2B 850527040c0fef278175f35a0c8bf77bc005708539af8ec5a85111f83e9c94a912741a2b24965c026fd75db6c58fc82a46a9c5de9454540400c9f19341561b4c SHA512 82d83071d1cea14603b1f1a85d564c78e28d982025a029779d8d83522fd5c56583303dd3a902d8023b5e9df2ddb5c5d9a5fc88000d41dba45dc026239ec81d0d
-DIST home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz 10281 BLAKE2B 283ea853ff98658507194902b501cc0c6438bc2dde1007f579fbaf92917b906e5b9ccb322dc4d34fc01e08809d24194db10ea9c5177c0593ffc94bbfc934353d SHA512 39343c2c05adbbcd6a4a581abdddfc2801d9b052894b1edf3df304526045252b9b16b93c9db4fa248f308b762084cc7b97c3163c47d0ae4776b96be155836985
+DIST home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.gh.tar.gz 10281 BLAKE2B 283ea853ff98658507194902b501cc0c6438bc2dde1007f579fbaf92917b906e5b9ccb322dc4d34fc01e08809d24194db10ea9c5177c0593ffc94bbfc934353d SHA512 39343c2c05adbbcd6a4a581abdddfc2801d9b052894b1edf3df304526045252b9b16b93c9db4fa248f308b762084cc7b97c3163c47d0ae4776b96be155836985
 DIST http-0.2.7.crate 104219 BLAKE2B a36788bca43effd34d8a328b428a896d71b1a036c6faa3559f4f452f6ff7a1bfa3237160392ccb04a3a33c518682ed7f4d3a43c720727bc413cbc1e025a0bacb SHA512 ab0227703cf3721d15de8b8e7aea441611d038928f60e04c6a7d40a66b1c1a4107c86848fe64376ba3ba99a3135ca1f60f2bc240b7f55251f110835576b88eeb
 DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5
 DIST httparse-1.7.1.crate 29379 BLAKE2B 2e938694bb1afb0bcd79d19637a4dfd9201b217661fda14dff7b6652666e14fbdea6454743778530ea12d3c51ab51944981d29aa06ebf6e58e493684886be2dd SHA512 6db3892a754a49d9d529859acdacd548a71203eafc29c485b83006650a26f82b6e34969bd5e11d3f259259eae4d71bbdd0992fc7cad78a9a6f102977d057a8ba
@@ -195,6 +195,7 @@ DIST rustls-native-certs-0.6.2.crate 22089 BLAKE2B f933315b493902c19b208894df252
 DIST rustls-pemfile-0.3.0.crate 14487 BLAKE2B 8f7150f409f8708aaabfb8f41ef57f075cf6c135a5d4eaa3aa2851d7fb413114e861f0b6a53474faf73a22b560f36fdf52ee17ecf5809ab6563297b6c0cd5bd8 SHA512 62c35aaae1685b5b274cb7de8a12770a1564b0862da9544f4445b1402b0a494619714fb9bb50909c7fdfe32ee5f8bdcfbea237b2fde843e5af9ea1393c206b50
 DIST rustls-pemfile-1.0.0.crate 14559 BLAKE2B 8285b8ee627f9b6760df9ff27dd4983f993ddc7f24248801b80305df6edc9e2f9ed682327dc1752f6547cb93304b8ccb67e50aded61927b855e3f624fd3e40d7 SHA512 5d4c5e720bbf2c1aa4e0141d51fa2e804415167b1dd588d94e9c1e1332b9138a15391b190535605f1518868b7727322078bd6a5bbff6c850c868832bc5270e20
 DIST rustup-1.25.1.tar.gz 747100 BLAKE2B 9c0b5cfef9643fd0bcf4e5554c7e596b5564cbf0bd9e01d5ff6765072a64fc59ac8037616c523ff190d5cfdf68394073852b9d48f6ca05a61ae9b8fdee35fab7 SHA512 a77cb34ba0c2e7577c8acbd474197aabaa84e3b64b3c42f1d0c328df55c6accbe412aba9a787f0ea2f0654f085475455c9c488b2b6de34ad8889a2716d1e8d0c
+DIST rustup-1.25.2.tar.gz 747638 BLAKE2B 981e9c7091ed6597bd364fb489cdd80d56d977ea9200b4f01389a4e963356b5e26782358979da442ede2d10af75536f84659e7fcfc13af8a0a9b58377b799aa7 SHA512 77268322224816c84c1a17f125cce10e0bfddae857f1e71885d9999f1415c567ee508f93367dd6adca62a92092c2869957206d4c707d20da461e2866fdc74e67
 DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
 DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -305,6 +306,7 @@ DIST zeroize_derive-1.3.2.crate 10299 BLAKE2B 39cd21629ae91a3a80ec283c8a988be355
 DIST zstd-0.11.2+zstd.1.5.2.crate 28987 BLAKE2B e04fe25ec6661819efeca08698c207922c38447459aa291961d3512d7c30016c51ddf49a8dadac0b7b2bf677b6a89d22670ec1e214607b476584a7e1b2dbf36d SHA512 d3f053c4acbdb45f3dadc9590db56095c761f0ff8899d22461f664701de766dde2fac2960a4477cd05d0a9c7ec200caa02ff891eb1f04630734996e0c38d10dd
 DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff291325bc23fd06a1249148426bb853271393eab5121d2e1e29e433eff562c9eab72c1be265f3fe3bf14cc35d4a741db03c38 SHA512 03a6f07ada211fd6c364f03d06acff705fa5b08129aa09c29ad310f05b233553f8ea697e504470d4c104bd947f5d4102328c4df0df5e1da6d8e537f51451a014
 DIST zstd-sys-2.0.1+zstd.1.5.2.crate 715552 BLAKE2B 497901ccaff7f92aa607797970c6beaaa3fcbeb08a48a2dffdfd465af999291e65024dfb7fc844802e5befa0e67dbe225310f72e6292bdcd22596b2614665d8e SHA512 a54ff4159640d31f898cbd374b9117d1e7ee4b54c5b4a8e1ed6286d9e954341e077088c52161e086ef0f28dfec13e03f64013712fa9bc59d471191cffd8e0e1e
-EBUILD rustup-1.25.1-r1.ebuild 8093 BLAKE2B b1067745c76a02cc2d42802ba59de1401ba9b1e3b1f0c7881dbd24d52cdf434d9bf010c6db40c49fc2f0912b87f17831e44afe222c9387d77ee251256362da84 SHA512 521819513ca9c60a770592f4e911afdbab11b04e8f81882c07ccd925fb52c92ff95bf11a21bc4bdbbe244b87198558d744e0016bb4f695b8c93134ed466026f7
+EBUILD rustup-1.25.1-r1.ebuild 7841 BLAKE2B 598f9c61e13879229c545e28dc7f5a2fe2d32975cb62ccaa5ec84dbfedcfdd73e03e9827d39f070302a1e4a0c71b07c00de3aff3c757d63c7fa1d1e76c7f516a SHA512 6d44ef4994b6c2f9c5275241422f9bbbd88c6faaef6742d2bb3d98691a89929f19f1e15873ea511f6d12bc1cfb1e4fea01cec1a0e3c06e371da34b1a9e1869b7
+EBUILD rustup-1.25.2.ebuild 7841 BLAKE2B 598f9c61e13879229c545e28dc7f5a2fe2d32975cb62ccaa5ec84dbfedcfdd73e03e9827d39f070302a1e4a0c71b07c00de3aff3c757d63c7fa1d1e76c7f516a SHA512 6d44ef4994b6c2f9c5275241422f9bbbd88c6faaef6742d2bb3d98691a89929f19f1e15873ea511f6d12bc1cfb1e4fea01cec1a0e3c06e371da34b1a9e1869b7
 EBUILD rustup-9999.ebuild 2235 BLAKE2B c0562dab0e7a5ed4e7b9466dcefe3f85f826460376e4594a8cc1d4930bc93456cee6f00ba8b6f56d84948c9acaefbee787578a7553878b4631066c289de2fe36 SHA512 d9a8326520dff7c24d7cfb265c55f034da00f6c280562d14c5c1dda6b88e1fd7f22f4b602676a324845492676f095edb9a169eeea347f0fe80a1ad6dbd16470f
 MISC metadata.xml 438 BLAKE2B cb3b086cc3bc460eba991afe79f2f489f675dc61f5fc7f33796963f91be9766379453ef5dd3f621991e21d1c1b477c9787e8ee6619a1f3c25890aab5935de1b6 SHA512 0affb079963bfe587f9afc6266c582e7fc8b8f6f143f749c1b131a326437b1181b6b5399eaba98c270263e679ae5261bdf56e0e0aa15858522937e0d438fd7d6
diff --git a/dev-util/rustup/rustup-1.25.1-r1.ebuild b/dev-util/rustup/rustup-1.25.1-r1.ebuild
index 5f76d5206991..9f97e7fcf2aa 100644
--- a/dev-util/rustup/rustup-1.25.1-r1.ebuild
+++ b/dev-util/rustup/rustup-1.25.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -319,10 +319,12 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
 else
-	HOME_COMMIT="a243ee2fbee6022c57d56f5aa79aefe194eabe53"
+	declare -A GIT_CRATES=(
+		[home]="https://github.com/rbtcollins/home;a243ee2fbee6022c57d56f5aa79aefe194eabe53"
+	)
 	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/rbtcollins/home/archive/${HOME_COMMIT}.tar.gz -> home-${HOME_COMMIT}.tar.gz
-		$(cargo_crate_uris ${CRATES})"
+		$(cargo_crate_uris)
+	"
 	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
@@ -352,14 +354,6 @@ src_unpack() {
 	fi
 }
 
-src_prepare() {
-	# patch git dep to use pre-fetched tarball
-	local home_path="home = { path = '"${WORKDIR}/home-${HOME_COMMIT}"' }"
-	sed -i "s@^home =.*@${home_path}@" "${S}/Cargo.toml" || die
-
-	default
-}
-
 src_configure() {
 	# modeled after ci/run.bash upstream
 	# reqwest-rustls-tls requires ring crate, which is not very portable.
diff --git a/dev-util/rustup/rustup-1.25.2.ebuild b/dev-util/rustup/rustup-1.25.2.ebuild
new file mode 100644
index 000000000000..9f97e7fcf2aa
--- /dev/null
+++ b/dev-util/rustup/rustup-1.25.2.ebuild
@@ -0,0 +1,403 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-1.0.2
+	aead-0.3.2
+	aes-0.6.0
+	aes-soft-0.6.4
+	aesni-0.10.0
+	aho-corasick-0.7.18
+	ansi_term-0.12.1
+	anyhow-1.0.57
+	ascii-canvas-3.0.0
+	async-compression-0.3.14
+	atty-0.2.14
+	autocfg-0.1.8
+	autocfg-1.1.0
+	base64-0.13.0
+	bit-set-0.5.2
+	bit-vec-0.6.3
+	bitflags-1.3.2
+	bitvec-0.20.4
+	block-buffer-0.9.0
+	block-buffer-0.10.2
+	block-modes-0.7.0
+	block-padding-0.2.1
+	blowfish-0.7.0
+	bstr-0.2.17
+	buffered-reader-1.1.2
+	bumpalo-3.10.0
+	byteorder-1.4.3
+	bytes-1.1.0
+	cast5-0.9.0
+	cc-1.0.73
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	cipher-0.2.5
+	clap-2.34.0
+	cmac-0.5.1
+	const-oid-0.5.2
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.2
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crunchy-0.2.2
+	crypto-common-0.1.3
+	crypto-mac-0.10.1
+	crypto-mac-0.11.1
+	ctr-0.6.0
+	curl-0.4.43
+	curl-sys-0.4.55+curl-7.83.1
+	curve25519-dalek-3.2.1
+	dbl-0.3.2
+	der-0.3.5
+	des-0.6.0
+	diff-0.1.12
+	digest-0.9.0
+	digest-0.10.3
+	dirs-next-2.0.0
+	dirs-sys-next-0.1.2
+	dyn-clone-1.0.5
+	eax-0.3.0
+	ecdsa-0.11.1
+	ed25519-1.5.2
+	ed25519-dalek-1.0.1
+	effective-limits-0.5.4
+	either-1.6.1
+	elliptic-curve-0.9.12
+	ena-0.14.0
+	encoding_rs-0.8.31
+	enum-map-2.3.0
+	enum-map-derive-0.9.0
+	env_proxy-0.4.1
+	fastrand-1.7.0
+	ff-0.9.0
+	filetime-0.2.16
+	fixedbitset-0.4.1
+	flate2-1.0.24
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	funty-1.1.0
+	futures-channel-0.3.21
+	futures-core-0.3.21
+	futures-io-0.3.21
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	generic-array-0.14.5
+	getrandom-0.1.16
+	getrandom-0.2.6
+	git-testament-0.2.1
+	git-testament-derive-0.1.13
+	group-0.9.0
+	h2-0.3.13
+	hashbrown-0.11.2
+	hermit-abi-0.1.19
+	hmac-0.11.0
+	http-0.2.7
+	http-body-0.4.5
+	httparse-1.7.1
+	httpdate-1.0.2
+	hyper-0.14.19
+	hyper-rustls-0.23.0
+	hyper-tls-0.5.0
+	idea-0.3.0
+	idna-0.2.3
+	indexmap-1.8.2
+	instant-0.1.12
+	ipnet-2.5.0
+	itertools-0.10.3
+	itoa-1.0.2
+	jobserver-0.1.24
+	js-sys-0.3.57
+	lalrpop-0.19.8
+	lalrpop-util-0.19.8
+	lazy_static-1.4.0
+	libc-0.2.126
+	libm-0.2.2
+	libz-sys-1.1.8
+	lock_api-0.4.7
+	log-0.4.17
+	lzma-sys-0.1.17
+	matches-0.1.9
+	md-5-0.9.1
+	memchr-2.5.0
+	memoffset-0.6.5
+	memsec-0.6.2
+	mime-0.3.16
+	miniz_oxide-0.5.3
+	mio-0.8.3
+	native-tls-0.2.10
+	new_debug_unreachable-1.0.4
+	no-std-compat-0.4.1
+	num-bigint-0.2.6
+	num-bigint-dig-0.6.1
+	num-integer-0.1.45
+	num-iter-0.1.43
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	num_threads-0.1.6
+	once_cell-1.12.0
+	opaque-debug-0.3.0
+	opener-0.5.0
+	openssl-0.10.40
+	openssl-macros-0.1.0
+	openssl-probe-0.1.5
+	openssl-src-111.20.0+1.1.1o
+	openssl-sys-0.9.74
+	p256-0.8.1
+	parking_lot-0.12.1
+	parking_lot_core-0.9.3
+	pem-0.8.3
+	percent-encoding-2.1.0
+	petgraph-0.6.2
+	phf_shared-0.10.0
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	pkcs8-0.6.1
+	pkg-config-0.3.25
+	ppv-lite86-0.2.16
+	precomputed-hash-0.1.1
+	proc-macro2-1.0.39
+	pulldown-cmark-0.8.0
+	quote-1.0.18
+	radium-0.6.2
+	rand-0.7.3
+	rand-0.8.5
+	rand_chacha-0.2.2
+	rand_chacha-0.3.1
+	rand_core-0.5.1
+	rand_core-0.6.3
+	rand_hc-0.2.0
+	rayon-1.5.3
+	rayon-core-1.9.3
+	redox_syscall-0.2.13
+	redox_users-0.4.3
+	regex-1.5.6
+	regex-automata-0.1.10
+	regex-syntax-0.6.26
+	remove_dir_all-0.5.3
+	remove_dir_all-0.7.0
+	reqwest-0.11.10
+	retry-1.3.1
+	ring-0.16.20
+	ripemd160-0.9.1
+	rs_tracing-1.0.1
+	rsa-0.3.0
+	rustls-0.20.6
+	rustls-native-certs-0.6.2
+	rustls-pemfile-0.3.0
+	rustls-pemfile-1.0.0
+	rustversion-1.0.6
+	ryu-1.0.10
+	same-file-1.0.6
+	schannel-0.1.20
+	scopeguard-1.1.0
+	sct-0.7.0
+	security-framework-2.6.1
+	security-framework-sys-2.6.1
+	semver-1.0.9
+	sequoia-openpgp-1.9.0
+	serde-1.0.137
+	serde_derive-1.0.137
+	serde_json-1.0.81
+	serde_urlencoded-0.7.1
+	sha-1-0.9.8
+	sha1collisiondetection-0.2.5
+	sha2-0.9.9
+	sha2-0.10.2
+	sharded-slab-0.1.4
+	signature-1.3.2
+	simple_asn1-0.4.1
+	siphasher-0.3.10
+	slab-0.4.6
+	smallvec-1.8.0
+	socket2-0.4.4
+	spin-0.5.2
+	spki-0.3.0
+	string_cache-0.8.4
+	strsim-0.8.0
+	strsim-0.10.0
+	subtle-2.4.1
+	syn-1.0.96
+	synstructure-0.12.6
+	sys-info-0.9.1
+	tap-1.0.1
+	tar-0.4.38
+	tempfile-3.3.0
+	term-0.5.1
+	term-0.7.0
+	textwrap-0.11.0
+	thiserror-1.0.31
+	thiserror-impl-1.0.31
+	threadpool-1.8.1
+	time-0.1.43
+	time-0.3.9
+	time-macros-0.2.4
+	tiny-keccak-2.0.2
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	tokio-1.19.0
+	tokio-native-tls-0.3.0
+	tokio-rustls-0.23.4
+	tokio-socks-0.5.1
+	tokio-util-0.6.10
+	tokio-util-0.7.2
+	toml-0.5.9
+	tower-service-0.3.1
+	tracing-0.1.34
+	tracing-attributes-0.1.21
+	tracing-core-0.1.26
+	try-lock-0.2.3
+	twofish-0.5.0
+	typenum-1.15.0
+	unicase-2.6.0
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.0
+	unicode-normalization-0.1.19
+	unicode-width-0.1.9
+	unicode-xid-0.2.3
+	untrusted-0.7.1
+	url-2.2.2
+	vcpkg-0.2.15
+	vec_map-0.8.2
+	version_check-0.9.4
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	want-0.3.0
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.80
+	wasm-bindgen-backend-0.2.80
+	wasm-bindgen-futures-0.4.30
+	wasm-bindgen-macro-0.2.80
+	wasm-bindgen-macro-support-0.2.80
+	wasm-bindgen-shared-0.2.80
+	web-sys-0.3.57
+	webpki-0.22.0
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
+	winreg-0.8.0
+	winreg-0.10.1
+	wyz-0.2.0
+	x25519-dalek-1.2.0
+	xattr-0.2.3
+	xxhash-rust-0.8.5
+	xz2-0.1.6
+	zeroize-1.3.0
+	zeroize_derive-1.3.2
+	zstd-0.11.2+zstd.1.5.2
+	zstd-safe-5.0.2+zstd.1.5.2
+	zstd-sys-2.0.1+zstd.1.5.2
+"
+
+inherit bash-completion-r1 cargo prefix
+
+DESCRIPTION="Rust toolchain installer"
+HOMEPAGE="https://rust-lang.github.io/rustup/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
+else
+	declare -A GIT_CRATES=(
+		[home]="https://github.com/rbtcollins/home;a243ee2fbee6022c57d56f5aa79aefe194eabe53"
+	)
+	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		$(cargo_crate_uris)
+	"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	app-arch/xz-utils
+	net-misc/curl:=[http2,ssl]
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/rust"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+# uses network
+RESTRICT="test"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_configure() {
+	# modeled after ci/run.bash upstream
+	# reqwest-rustls-tls requires ring crate, which is not very portable.
+	local myfeatures=(
+		no-self-update
+		curl-backend
+		reqwest-backend
+		reqwest-default-tls
+	)
+	case ${ARCH} in
+		ppc*|mips*|riscv*|s390*)
+			;;
+		*) myfeatures+=( reqwest-rustls-tls )
+			;;
+	esac
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	export OPENSSL_NO_VENDOR=true
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+	newbin "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" rustup-init-gentoo
+
+	ln -s "${ED}/usr/bin/rustup-init" rustup || die
+	./rustup completions bash rustup > "${T}/rustup" || die
+	./rustup completions zsh rustup > "${T}/_rustup" || die
+
+	dobashcomp "${T}/rustup"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${T}/_rustup"
+}
+
+pkg_postinst() {
+		elog "No rustup toolchains installed by default"
+		elog "eselect activated system rust toolchain can be added to rustup by running"
+		elog "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
+		elog "it will create symlinks to system-installed rustup in home directory"
+		elog "and rustup updates will be managed by portage"
+		elog "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
+		elog "before running rustup-init-gentoo"
+}