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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0FA7B13835B for ; Wed, 23 Sep 2020 06:33:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37D50E0863; Wed, 23 Sep 2020 06:33:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 12E8BE0863 for ; Wed, 23 Sep 2020 06:33:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF151340E77 for ; Wed, 23 Sep 2020 06:33:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49A6337B for ; Wed, 23 Sep 2020 06:33:31 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1600840734.8d56b2b284d913d13e747196b971c356b5be12e5.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rustup/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/rustup/rustup-1.22.1-r1.ebuild dev-util/rustup/rustup-9999.ebuild X-VCS-Directories: dev-util/rustup/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 8d56b2b284d913d13e747196b971c356b5be12e5 X-VCS-Branch: master Date: Wed, 23 Sep 2020 06:33:31 +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: 68e7c84e-fcde-495b-b20f-a644f5e8a426 X-Archives-Hash: 2b493755f2a0a7ba9f4c55ef7fb3792b commit: 8d56b2b284d913d13e747196b971c356b5be12e5 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Sep 23 05:13:03 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Sep 23 05:58:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d56b2b2 dev-util/rustup: adjust for cargo_src_configure Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> dev-util/rustup/rustup-1.22.1-r1.ebuild | 13 +++++++------ dev-util/rustup/rustup-9999.ebuild | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dev-util/rustup/rustup-1.22.1-r1.ebuild b/dev-util/rustup/rustup-1.22.1-r1.ebuild index 8f85dafe29d..9f951ef8aa7 100644 --- a/dev-util/rustup/rustup-1.22.1-r1.ebuild +++ b/dev-util/rustup/rustup-1.22.1-r1.ebuild @@ -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 index c3b57a8be11..5db8a446ae6 100644 --- a/dev-util/rustup/rustup-9999.ebuild +++ b/dev-util/rustup/rustup-9999.ebuild @@ -45,13 +45,18 @@ src_unpack() { fi } +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 @@ -66,10 +71,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"