gentoo resync : 23.09.2020

3 files changed, 91 insertions, 8 deletions

diff --git a/dev-util/rustup/Manifest b/dev-util/rustup/Manifest
index 7ca801770fc2..b94c019bf8fe 100644
--- a/dev-util/rustup/Manifest
+++ b/dev-util/rustup/Manifest
@@ -234,5 +234,6 @@ DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c
 DIST xz2-0.1.6.crate 24512 BLAKE2B 47f260f4ce920bf8eff1446981672c9d877b4e5908fe20053ed15419e3cebd540fcedecf71ace32b25bfc5d6731092a565a2a8ac303ed21ae47460c1b3414833 SHA512 c0880b2bbf890e962b27efda6c513d1626332ff400dd08a9126a6e1d1375e0d0e3bf243b10df78e2397b611d0365b6526d96974c4ff332bb81edba71b6ebc811
 DIST zeroize-1.1.0.crate 10316 BLAKE2B d5907adacd54a8fee639faa230ce98d8f9f2e1a68d22c824f475f0ca84d621e6d5c21e0aac676c5979b8529de556d45e5cf8c434ad3d8f99e9e1b2f9872919c8 SHA512 19ebb9515b7c8bc384c180e4ec8b6f77dc84fbc49a3690af972918b2ca73695b935d4673ff17ec8ae95a1824e5b261838e656e7939f10e3b14b3b984180aecbd
 DIST zeroize_derive-1.0.0.crate 4247 BLAKE2B 2e96c44ca630eccab5e49f4426bbecfcf83318ecfefdfce2ecf877dbde94a93c4fc44ca60c4cf2950e5108ccc1b4474e40be29edeace558c74dab8b12f9f84c5 SHA512 495979256548c6dc0e39d7f08d752772f6358214a2704328ec839a1872a59a62244b8bc700cf20830091ad4f02298dc8f571f2f17253f95c1ae99b38fb0b9445
-EBUILD rustup-1.22.1-r1.ebuild 5991 BLAKE2B fd99965860e6622882012cfeb3bd7d6e94c267fe36908d6bf2abb2d128c005e88574866d22d76f60b7631388b92583bf222d0258c01411b82a8a71dfe87a3b07 SHA512 cafe289e51d87d053c7b333c0864e2aea5cde08f6cae287da0ba360eca8f887321c0f92f8e90727444fe4a5b6ae39ad7ba89b439169e5af6d1ebb626c91ae317
+EBUILD rustup-1.22.1-r1.ebuild 5967 BLAKE2B 987dbc8c42def9bdbe8c727ef3eed809cdb381635a1ed0ffb95b4dd5ea0f534fb535c9659c64b0b025afd139450b16d65770c9e7bd9b1178f620d95b5843baf4 SHA512 87e27711d7f743e418ef29adbb138cbaeebd23f2b9e80e90ca37518f6f40e2ce8004184d8617d1aee250a77a22b7839cc4c4210e808096d939d5e96036c11003
+EBUILD rustup-9999.ebuild 1907 BLAKE2B 37a0bbf4e8a391aa2531a0579e4a2d17aaa9ae6251cfcba7d71441afed618b2304e4f27b750085db64219ab9aa80b643fafdde5bcf9d9faa2c220e2438c00abd SHA512 5e272b49b1efe36a4bbb941c5a7faae5b957a3ac16c7db0fc539f51d3e8b6a1ace2151ed7ab8a4a11d71a7463f1c4497c11d9c009fba621864780cb7ae7278b9
 MISC metadata.xml 356 BLAKE2B e17235a7b0ea9156af7ba204f1693bffd96a42926df5241e158e67616a60101d5a554d882e3aec14eb41a53b411a762cb50ceae076e44bab6e0e361eee83c569 SHA512 dc4ec000b7f6d769dabb37210fd9515917feba7224cbd1db27013b0e0f27824cdf03c7310d0f64dd3a099bdc33fc65c29648e860011c98fc6c8e9b374a17e337
diff --git a/dev-util/rustup/rustup-1.22.1-r1.ebuild b/dev-util/rustup/rustup-1.22.1-r1.ebuild
index fa40b7f00826..9f951ef8aa7d 100644
--- a/dev-util/rustup/rustup-1.22.1-r1.ebuild
+++ b/dev-util/rustup/rustup-1.22.1-r1.ebuild
@@ -251,7 +251,7 @@ SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE=""
 
 # requires old libressl-2.5, so openssl only for now.
@@ -274,13 +274,18 @@ src_prepare() {
 	sed -i "/^home =/s:.*:home = { path = \"../home-${HOME_CRATE_COMMIT}\" }:" Cargo.toml || die
 }
 
+src_configure() {
+	local myfeatures=( no-self-update )
+	cargo_src_configure
+}
+
 src_compile() {
 	export OPENSSL_NO_VENDOR=true
-	cargo_src_compile --features no-self-update
+	cargo_src_compile
 }
 
 src_install() {
-	cargo_src_install --features no-self-update
+	cargo_src_install
 	einstalldocs
 	exeinto /usr/share/rustup
 	newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
@@ -295,10 +300,6 @@ src_install() {
 	doins "${T}/_rustup"
 }
 
-src_test() {
-	cargo_src_test --features no-self-update
-}
-
 pkg_postinst() {
 		einfo "No rustup toolchains installed by default"
 		einfo "system rust toolchain can be added to rustup by running"
diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
new file mode 100644
index 000000000000..5db8a446ae65
--- /dev/null
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES=""
+
+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
+	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		$(cargo_crate_uris ${CRATES})"
+	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() {
+	local myfeatures=( no-self-update )
+	cargo_src_configure
+}
+
+src_compile() {
+	export OPENSSL_NO_VENDOR=true
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+	exeinto /usr/share/rustup
+	newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
+
+	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() {
+		einfo "No rustup toolchains installed by default"
+		einfo "system rust toolchain can be added to rustup by running"
+		einfo "helper script installed to ${EPREFIX}/usr/share/rustup/symlink_rustup"
+		einfo "it will create proper symlinks in user home directory"
+		einfo "and rustup updates will be managed by portage"
+		einfo "please delete current rustup installation (if any) before running the script"
+}