gentoo resync : 13.11.2021

3 files changed, 32 insertions, 8 deletions

diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 7703598714cd..a32447ed0933 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -190,10 +190,11 @@ DIST rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz 147853396 BLAKE2B 1d1318c9f076f
 DIST rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ff984dfa092ff3c1c5a3d1a5849b8dc5807c5885dff5eca020d0b1c404484197adb8e1ea5802886b15e2b8846d0f3aa4bb161e49dc39adc151ca7d57a988ff24 SHA512 53b57ceaf621248fff020de75434c8fe60657335852c88d14ea399c7935206caaff61ce159cb2f487510336981aa1d839b91153b9764ea21ced1fb6455a16bdd
 DIST rust-1.56.1-x86_64-unknown-linux-musl.tar.xz 255304020 BLAKE2B c379fb419b6fa1c73b9c426a4f6e46328ce2ac1beddffb1ed25922b3387147eaf0217d3904ccc14ce2b97952f1035760264ae5fc7a575f92bea84d9581d8b315 SHA512 b26d4b9f6396be87aadfbb4777d91c80cfe656570e2bf1a0350788ca45caa7178d4b91966e77c8cc4873e017fd99649ae6a82abad64b32a4eb1f5dfb3a20d45e
 DIST rust-1.56.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B aed2703ef8cdcdf076d6538fb968f465c0a884b4c11916470324116e56a5b93fd7118b8b167ab19007ac71201044789f58de3a7ee1b60dffc47c3d123db1b4a5 SHA512 32c042982da7bde6c36bcb33fd3d9ebcb469667c880214b703e7b2cf89467e7e2bf37282cbc128d0207b9e433b7f2bd028e0d2614b657b544a552aa401bc98c8
+DIST rust-src-1.56.1.tar.xz 2456408 BLAKE2B 19cd9ac0c0c57d077e2a62e6ef202cf8f349582870d0acf28b105278da611e3e3884b1db59cb43c1a13c8f0ff546f83f8ac30783e46f99233a0a81df04dfd359 SHA512 6ebcb7e641031b269af244f0a14ef23c5a6c324d8c9f8f9ffe3b1802fb2aad522b10544f6c29789950dd2a9fe7cbbdb6587f793ec8f53881e707734bbaf3a3d6
 EBUILD rust-bin-1.52.1.ebuild 5664 BLAKE2B 16e4c51664da8266a87e0c562d1e556de386d19ad757f52258d1304253ef2afe0ceb59fcac0e91a663b6c38a0f4d7488e58828a957a89460f4a352323287ecdf SHA512 5b4b3da47378dd9369af0f19caea74d932036ece72fed8b602668584db0c0801a78ef65a98f8d9fa9feace9b040fbb86943f9d2fde2d20f74de13226f31e69c4
 EBUILD rust-bin-1.53.0.ebuild 5664 BLAKE2B 16e4c51664da8266a87e0c562d1e556de386d19ad757f52258d1304253ef2afe0ceb59fcac0e91a663b6c38a0f4d7488e58828a957a89460f4a352323287ecdf SHA512 5b4b3da47378dd9369af0f19caea74d932036ece72fed8b602668584db0c0801a78ef65a98f8d9fa9feace9b040fbb86943f9d2fde2d20f74de13226f31e69c4
 EBUILD rust-bin-1.54.0.ebuild 5669 BLAKE2B e20feafc001ad5ea01d4cc6729fc02d80bf4a3a23ae7ccb436c2eb702de4adf9adfb94150f794e5140787c0c7ec11eb3a2ccb3954ba0f8e709642c98b2935f0b SHA512 30c4641ac1244a03096fe6d089607ea67674cf8f1c9e397287eb1349a728cc78a58b4cf5b82d4205c5ebc91667e84bff01bd92f5c523e002129075f9c3b1f76e
 EBUILD rust-bin-1.55.0.ebuild 5669 BLAKE2B e20feafc001ad5ea01d4cc6729fc02d80bf4a3a23ae7ccb436c2eb702de4adf9adfb94150f794e5140787c0c7ec11eb3a2ccb3954ba0f8e709642c98b2935f0b SHA512 30c4641ac1244a03096fe6d089607ea67674cf8f1c9e397287eb1349a728cc78a58b4cf5b82d4205c5ebc91667e84bff01bd92f5c523e002129075f9c3b1f76e
 EBUILD rust-bin-1.56.0.ebuild 5669 BLAKE2B e20feafc001ad5ea01d4cc6729fc02d80bf4a3a23ae7ccb436c2eb702de4adf9adfb94150f794e5140787c0c7ec11eb3a2ccb3954ba0f8e709642c98b2935f0b SHA512 30c4641ac1244a03096fe6d089607ea67674cf8f1c9e397287eb1349a728cc78a58b4cf5b82d4205c5ebc91667e84bff01bd92f5c523e002129075f9c3b1f76e
-EBUILD rust-bin-1.56.1.ebuild 5669 BLAKE2B e20feafc001ad5ea01d4cc6729fc02d80bf4a3a23ae7ccb436c2eb702de4adf9adfb94150f794e5140787c0c7ec11eb3a2ccb3954ba0f8e709642c98b2935f0b SHA512 30c4641ac1244a03096fe6d089607ea67674cf8f1c9e397287eb1349a728cc78a58b4cf5b82d4205c5ebc91667e84bff01bd92f5c523e002129075f9c3b1f76e
-MISC metadata.xml 490 BLAKE2B 91056b5357c6d4a4bb86d867114272211ffd3bc8299e89fd1fe5f83f4809687c9f79dcca87df02d2d4e0d820df8de7457fac7869ba1e12d8a02b54fd0bde8ad4 SHA512 1052d99d16e2bcd4dc37c94966cee016e11ab020137dd4d73839b305ce58b158ee1df5e4315ee9657c530d2ef8f5a1c44ecccee49e4968cb69a1216da6203178
+EBUILD rust-bin-1.56.1.ebuild 6400 BLAKE2B 38c8256046e34f148dc3ac6b2639d1cdadf70774c7281ae9eb8fa7936647b8a1ba117495f4ee79bc5e42e29de64addadf070caaf98707bf10ca035ee774a454b SHA512 9667291033290453d473042e836c4585b3d7904855c5bede8df91fe448a4505191bf05a39ead22306360b9451972a12361666a71d5333a6e57b4bcc47552daca
+MISC metadata.xml 591 BLAKE2B 6f9d494e400400b8b957eaa3c242b5f096808cc8372360eac0d9ae4bffcd2aa75b35bad4acc7248543b08466d8616b0145ae8a9b1534db1ad5ee838f07f9dc51 SHA512 9f59ea60d8ec9b748eac0789fa6750f32e4867e1c2cbe106ce270acdb7306d40fe8754315f8c65a924af43d5b3e88f4f50dec6361299de80ef1a25665aa03182
diff --git a/dev-lang/rust-bin/metadata.xml b/dev-lang/rust-bin/metadata.xml
index c4bf8b775c46..ba87525c4c59 100644
--- a/dev-lang/rust-bin/metadata.xml
+++ b/dev-lang/rust-bin/metadata.xml
@@ -9,5 +9,6 @@
 		<flag name="clippy">Install clippy, Rust code linter</flag>
 		<flag name="rls">Install rls, Rust Language Server (used with IDEs supporting RLS protocol)</flag>
 		<flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
+		<flag name="rust-src">Install rust-src, needed by developer tools and for build-std (cross)</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-lang/rust-bin/rust-bin-1.56.1.ebuild b/dev-lang/rust-bin/rust-bin-1.56.1.ebuild
index 2796cb0698b1..54670faf5a03 100644
--- a/dev-lang/rust-bin/rust-bin-1.56.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.56.1.ebuild
@@ -3,18 +3,22 @@
 
 EAPI=7
 
-inherit bash-completion-r1 prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+inherit prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
 
 MY_P="rust-${PV}"
+# curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
+MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL}/2021-11-01/rust-src-${PV}.tar.xz"
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
-SRC_URI="$(rust_all_arch_uris ${MY_P})"
+SRC_URI="$(rust_all_arch_uris ${MY_P})
+	rust-src? ( ${MY_SRC_URI} )
+"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rustfmt"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
 
 DEPEND=""
 RDEPEND=">=app-eselect/eselect-rust-20190311"
@@ -38,7 +42,7 @@ QA_PREBUILT="
 # so we can safely silence the warning for this QA check.
 QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/rust.asc"
 
 pkg_pretend() {
 	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
@@ -47,7 +51,18 @@ pkg_pretend() {
 }
 
 src_unpack() {
-	verify-sig_src_unpack
+	# sadly rust-src tarball does not have corresponding .asc file
+	# so do partial verification
+	if use verify-sig; then
+		for f in ${A}; do
+			if [[ -f ${DISTDIR}/${f}.asc ]]; then
+				verify-sig_verify_detached "${DISTDIR}/${f}" "${DISTDIR}/${f}.asc"
+			fi
+		done
+	fi
+
+	default_src_unpack
+
 	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
 }
 
@@ -74,6 +89,13 @@ multilib_src_install() {
 	use clippy && components="${components},clippy-preview"
 	use rls && components="${components},rls-preview,${analysis}"
 	use rustfmt && components="${components},rustfmt-preview"
+	# Rust component 'rust-src' is extracted from separate archive
+	if use rust-src; then
+		einfo "Combining rust and rust-src installers"
+		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
+		echo rust-src >> ./components || die
+		components="${components},rust-src"
+	fi
 	./install.sh \
 		--components="${components}" \
 		--disable-verify \