gentoo resync : 25.11.2020

4 files changed, 42 insertions, 23 deletions

diff --git a/dev-util/rustup/Manifest b/dev-util/rustup/Manifest
index b94c019bf8fe..aa8ea6f78072 100644
--- a/dev-util/rustup/Manifest
+++ b/dev-util/rustup/Manifest
@@ -1,4 +1,4 @@
-AUX symlink_rustup.sh 2517 BLAKE2B 618beadda1eae620b4e2686a83042344e61c271242249e45a9485188ae50f4df8b0752f1a3093a1fab8aff183ada8bb8ea4c30a3bf72435b3f0fb52af8957e89 SHA512 9e55cc455f6672b2ef37860be1692112ab41f0d3263422f6005c68071d9ed30e66a09afe395292367cbb5a8b6c791457eb9082dadcac67b8d9264eff508f17bb
+AUX symlink_rustup.sh 2581 BLAKE2B 3bb410b287db19e3876236b811d97ffcfc959e11ed5686940aef19272fa6493c24a48b1e4c4c28559ec6f072c4c2514e193241b74b54050dac3b6e21bbe7ba85 SHA512 fe1336549dfa8978d805f6a76cb734ec88b7d06647c9e80ea6b5fba9c8906868c5aebcfaaf52df17d959d8e44451e6449b8a960f0cdcc699e4d07760b91fcadd
 DIST addr2line-0.12.2.crate 119767 BLAKE2B 5d012c7c0a0d8afd48f2148b5fb4ceb54f525ef1ae6e4f9c0ad228cff059b2e0662aabb82eead22db6ea284b5c430c8b8cc2aa0100a46d8d14009bd88b5fe24a SHA512 2c797f587498418c3c14d8ffc7eb79092532dfbb290b5371594e8dbd82a0979929ecb0b6f2cb615d0481a555cb1508b4220acb2db8076ea64fee0d47f290de6d
 DIST adler32-1.1.0.crate 5442 BLAKE2B 1a4d932402a584fa6edda414c0dedff4994afcee7bfc71f85f6e8b4568de835bb7a3eebad1b5ac0be7f59cdb0e5ce5dfa4444d2c59d5ecf819d2a6abbbd7ea37 SHA512 57e3b3812e2747470c63edf64e13827c96ef8dd2311833b7f616ec63cf57ce8967636ec4d57464b607f570df06f6f648214d12ddc567e761b2de2ab16c8a7271
 DIST aes-0.3.2.crate 84345 BLAKE2B e3e634fd6256bc52a8d0be5042dcc74651e1197eac17592378b9e78ea173eb02f8680b1408d860b3c278bc4eb22d714cc83788a321b4f88d272495811327788a SHA512 0dde257064659ae0d7b13d12e538f2cf2f35d2f3cac2f3e0cf3a2dba0a4a89bb78377e85382cf82b95e347f34ae3c27bb145441d50f20e595c069445560a9e04
@@ -234,6 +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 5967 BLAKE2B 987dbc8c42def9bdbe8c727ef3eed809cdb381635a1ed0ffb95b4dd5ea0f534fb535c9659c64b0b025afd139450b16d65770c9e7bd9b1178f620d95b5843baf4 SHA512 87e27711d7f743e418ef29adbb138cbaeebd23f2b9e80e90ca37518f6f40e2ce8004184d8617d1aee250a77a22b7839cc4c4210e808096d939d5e96036c11003
-EBUILD rustup-9999.ebuild 1907 BLAKE2B 37a0bbf4e8a391aa2531a0579e4a2d17aaa9ae6251cfcba7d71441afed618b2304e4f27b750085db64219ab9aa80b643fafdde5bcf9d9faa2c220e2438c00abd SHA512 5e272b49b1efe36a4bbb941c5a7faae5b957a3ac16c7db0fc539f51d3e8b6a1ace2151ed7ab8a4a11d71a7463f1c4497c11d9c009fba621864780cb7ae7278b9
+EBUILD rustup-1.22.1-r2.ebuild 6247 BLAKE2B cf381c4df7fe47ebe55f8291591d05ecd2e1720bdad88a4c6e293ab90bc0936619a476ab5d8661f0cea40fce6d255e1016b99e92281d577afa2cd0b7ce68f4fc SHA512 7614fc73f5b8045718e1bfd4625192100f1b36645153a2e2fc7de5e3b73b0d99766114e4d5c9ffce533b0d8440faebd98f782f9ae889f85afc3bfc1e57e100e3
+EBUILD rustup-9999.ebuild 2000 BLAKE2B 13c78fe9644a8646d11545f4d8ab1f613b94b2f448dbfcb65a0d0afa40119dbc562c00f561370411f5cbef6cb062636aa853546d1b4fde69bfa7aaadd54c7dee SHA512 6167c62a6bf20dea007775c994c00ceedecb60f6f199703c2c73d502ddb697790c7fc28d45f5083794f590e41f133a96d05befc1fc133ecbf7b828ea9ddefce7
 MISC metadata.xml 356 BLAKE2B e17235a7b0ea9156af7ba204f1693bffd96a42926df5241e158e67616a60101d5a554d882e3aec14eb41a53b411a762cb50ceae076e44bab6e0e361eee83c569 SHA512 dc4ec000b7f6d769dabb37210fd9515917feba7224cbd1db27013b0e0f27824cdf03c7310d0f64dd3a099bdc33fc65c29648e860011c98fc6c8e9b374a17e337
diff --git a/dev-util/rustup/files/symlink_rustup.sh b/dev-util/rustup/files/symlink_rustup.sh
index 87365028843a..743072b8f96c 100644
--- a/dev-util/rustup/files/symlink_rustup.sh
+++ b/dev-util/rustup/files/symlink_rustup.sh
@@ -3,7 +3,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-SYMLINK_RUSTUP_VERSION="0.0.2"
+SYMLINK_RUSTUP_VERSION="0.0.3"
+
 
 : "${CARGO_HOME:=${HOME}/.cargo}"
 : "${RUSTUP_HOME:=${HOME}/.rustup}"
@@ -79,6 +80,7 @@ symlink_rustup() {
 
 
 main(){
+	[[ "$EUID" -eq 0 ]] && die "Running as root is not supported"
 	local me
 	me="$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]} - 1]}")"
 	while [[ ${#} -gt 0 ]]; do
diff --git a/dev-util/rustup/rustup-1.22.1-r1.ebuild b/dev-util/rustup/rustup-1.22.1-r2.ebuild
index 9f951ef8aa7d..cb13c09bcf50 100644
--- a/dev-util/rustup/rustup-1.22.1-r1.ebuild
+++ b/dev-util/rustup/rustup-1.22.1-r2.ebuild
@@ -239,19 +239,25 @@ zeroize-1.1.0
 zeroize_derive-1.0.0
 "
 
-inherit bash-completion-r1 cargo prefix
-
 HOME_CRATE_COMMIT="a243ee2fbee6022c57d56f5aa79aefe194eabe53"
 
+inherit bash-completion-r1 cargo prefix
+
 DESCRIPTION="Rust toolchain installer"
 HOMEPAGE="https://rust-lang.github.io/rustup/"
-SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rbtcollins/home/archive/${HOME_CRATE_COMMIT}.tar.gz -> ${P}_home_crate.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+
+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
+		https://github.com/rbtcollins/home/archive/${HOME_CRATE_COMMIT}.tar.gz -> ${P}_home_crate.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"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE=""
 
 # requires old libressl-2.5, so openssl only for now.
@@ -274,6 +280,15 @@ src_prepare() {
 	sed -i "/^home =/s:.*:home = { path = \"../home-${HOME_CRATE_COMMIT}\" }:" Cargo.toml || die
 }
 
+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
@@ -287,8 +302,7 @@ src_compile() {
 src_install() {
 	cargo_src_install
 	einstalldocs
-	exeinto /usr/share/rustup
-	newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
+	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
@@ -302,9 +316,10 @@ src_install() {
 
 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 "eselect activated system rust toolchain can be added to rustup by running"
+		einfo "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
+		einfo "it will create symlinks to system-installed rustup in home directory"
 		einfo "and rustup updates will be managed by portage"
-		einfo "please delete current rustup installation (if any) before running the script"
+		einfo "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
+		einfo "before running rustup-init-gentoo"
 }
diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
index 5db8a446ae65..ccdc91c9c6bc 100644
--- a/dev-util/rustup/rustup-9999.ebuild
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-CRATES=""
+CRATES="
+"
 
 inherit bash-completion-r1 cargo prefix
 
@@ -23,6 +24,7 @@ LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Un
 SLOT="0"
 IUSE=""
 
+# requires old libressl-2.5, so openssl only for now.
 DEPEND="
 	app-arch/xz-utils
 	net-misc/curl:=[http2,ssl]
@@ -58,8 +60,7 @@ src_compile() {
 src_install() {
 	cargo_src_install
 	einstalldocs
-	exeinto /usr/share/rustup
-	newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
+	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
@@ -73,9 +74,10 @@ src_install() {
 
 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 "eselect activated system rust toolchain can be added to rustup by running"
+		einfo "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
+		einfo "it will create symlinks to system-installed rustup in home directory"
 		einfo "and rustup updates will be managed by portage"
-		einfo "please delete current rustup installation (if any) before running the script"
+		einfo "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
+		einfo "before running rustup-init-gentoo"
 }