[gentoo-commits] repo/gentoo:master commit in: dev-util/rustup/

[Arthur Zamarin]

commit:     9f75f583cc113f37b873393c8de6046e64b94d69
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 12:09:35 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 12:10:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f75f583

dev-util/rustup: sync live

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-util/rustup/rustup-9999.ebuild | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/dev-util/rustup/rustup-9999.ebuild 
b/dev-util/rustup/rustup-9999.ebuild
index e5921e9dc313..924ee6667be1 100644
--- a/dev-util/rustup/rustup-9999.ebuild
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,13 +16,16 @@ if [[ ${PV} == "9999" ]] ; then
        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})"
+               ${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"
+LICENSE="|| ( Apache-2.0 MIT )"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-DFS-2016"
 SLOT="0"
-IUSE=""
+# uses network
+RESTRICT="test"
 
 DEPEND="
        app-arch/xz-utils
@@ -32,13 +35,11 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/rust"
 
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-# uses network
-RESTRICT="test"
+# rust does not use *FLAGS from make.conf, silence portage warning
+QA_FLAGS_IGNORED="usr/bin/${PN}"
 
 src_unpack() {
-       if [[ "${PV}" == *9999* ]]; then
+       if [[ "${PV}" == 9999 ]]; then
                git-r3_src_unpack
                cargo_live_src_unpack
        else
@@ -56,7 +57,7 @@ src_configure() {
                reqwest-default-tls
        )
        case ${ARCH} in
-               ppc*|mips*|riscv*|s390*)
+               ppc* | mips* | riscv* | s390*)
                        ;;
                *) myfeatures+=( reqwest-rustls-tls )
                        ;;
@@ -85,11 +86,11 @@ src_install() {
 }
 
 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"
+       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"
 }