From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 446EE158041 for ; Fri, 15 Mar 2024 12:10:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF12DE29E1; Fri, 15 Mar 2024 12:10:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5B3FE29E1 for ; Fri, 15 Mar 2024 12:10:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 82F6C335D0A for ; Fri, 15 Mar 2024 12:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5ABA1515 for ; Fri, 15 Mar 2024 12:10:46 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1710504629.9f75f583cc113f37b873393c8de6046e64b94d69.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rustup/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/rustup/rustup-9999.ebuild X-VCS-Directories: dev-util/rustup/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 9f75f583cc113f37b873393c8de6046e64b94d69 X-VCS-Branch: master Date: Fri, 15 Mar 2024 12:10:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a3a737f2-2d90-4819-b3b7-bd4bf8fa120d X-Archives-Hash: d3b2ccc778c53b9f161a3da40c6fb189 commit: 9f75f583cc113f37b873393c8de6046e64b94d69 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 15 12:09:35 2024 +0000 Commit: Arthur Zamarin gentoo 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 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" }