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 7A6FE138334 for ; Wed, 19 Jun 2019 00:35:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F925E09BD; Wed, 19 Jun 2019 00:35:42 +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 E2697E09BD for ; Wed, 19 Jun 2019 00:35:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D02E4346468 for ; Wed, 19 Jun 2019 00:35:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C70B625 for ; Wed, 19 Jun 2019 00:35:37 +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: <1560902967.fd41c6f30f6a2ffa36f2d7bf060afe4ce58e62d9.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust-bin/Manifest dev-lang/rust-bin/metadata.xml dev-lang/rust-bin/rust-bin-1.29.1-r1.ebuild X-VCS-Directories: dev-lang/rust-bin/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: fd41c6f30f6a2ffa36f2d7bf060afe4ce58e62d9 X-VCS-Branch: master Date: Wed, 19 Jun 2019 00:35:37 +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: ab5a850c-9c68-4809-8291-d5aaedea4d8e X-Archives-Hash: 429020b67b0addc1fd96fa91ffaf7939 commit: fd41c6f30f6a2ffa36f2d7bf060afe4ce58e62d9 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Jun 17 23:34:49 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jun 19 00:09:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd41c6f3 dev-lang/rust-bin: drop 1.29.1-r1 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust-bin/Manifest | 6 - dev-lang/rust-bin/metadata.xml | 1 - dev-lang/rust-bin/rust-bin-1.29.1-r1.ebuild | 175 ---------------------------- 3 files changed, 182 deletions(-) diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest index f9f31fee851..6f538611795 100644 --- a/dev-lang/rust-bin/Manifest +++ b/dev-lang/rust-bin/Manifest @@ -1,9 +1,3 @@ -DIST rust-1.29.1-aarch64-unknown-linux-gnu.tar.xz 100127240 BLAKE2B 32bebfcb3fe9c12bc0404d1a7980d09a3e96117d93eccc3f76601a4a06ff5ab9d4627bc50ce00b6c69723379a2ebf3e3f25b9724b1bd2dc00c001b28fd70b916 SHA512 fae658f99069b599e3ec17e5a6b80f3c726937dd4751e375a003583ac6feeeb5f68bdd9e55c8ab84a0974607a45e08eaaad9e373f5a9b4bc172d2c986664d671 -DIST rust-1.29.1-arm-unknown-linux-gnueabi.tar.xz 105764732 BLAKE2B 552c0df65a1ca1ff094d25ddbdaf6e50b4faa1123677b796eb6a5aec2f8cba7f9ede9611aa2e7ffd7c4e39d578f166e73e4c9916a8db7a7652b006364ea78601 SHA512 cd5ea55b3c4f67deeb9a2688fea6800ebac1bbabfa5ce8d37f6ca0c1628cde9770831a0ec894309ca86dfed9faa3949c479e5b546abfaebcc6431f7709f487b2 -DIST rust-1.29.1-arm-unknown-linux-gnueabihf.tar.xz 106051860 BLAKE2B 65d9a5f75540cdfedf89ebbe30f04fce964a3e1d27479a8393924c5b6a1cd77883c7d54b9e1634378febe6a2ec3ec04f6ba403e15afc43e6cc5b32902932ba57 SHA512 aea98cbe613abf8fbba45806356a26776bc369c4100658fc613bf730d7f7ed6aeb413cbfefa5eb77da80008dce95264b8bcbe420804b32ad577c5821203fe151 -DIST rust-1.29.1-armv7-unknown-linux-gnueabihf.tar.xz 106372416 BLAKE2B 25371071e52a585c3f0b99f5849cf674aedd6d024ce75f6bf7b0d88f485d715b42d6a0f5eb8871890240d1c2488d7ad75c8ac7b4b22dd88e3ce2d049d35ae8ee SHA512 0067476eb0972998cee33f27d8fd6ef51c497bd6edbbd8a289fcf768da525805646569ed029318d4be6ecb6aece6669e3554eb30a14e1d31f2a3e7d5896b14c3 -DIST rust-1.29.1-i686-unknown-linux-gnu.tar.xz 150811536 BLAKE2B 999997d268cbbb5485d8efde108462bb0086ed9428a9b7ba8136dac764cd871a39d9503f6b928ce5fd9f1cdbf20dd109877f4404cb4522ccb2d37bfd55b15664 SHA512 8dc2a3b7fb1eef4b009541c473b767d07ab1136b933495b22e3fa56925def80b141b4801ce362ce9986a559fda4299fea35dd4bd7209dc1b3425b44421605df8 -DIST rust-1.29.1-x86_64-unknown-linux-gnu.tar.xz 148184680 BLAKE2B be64a44619807be3151162e45cefe79242e965277606b7aac4f0456d34e4cb526b1779c327499c47c484a830c4c566ab1aeaef30cf17ae7d2bdc89ecbf1f5de5 SHA512 69809c2ae77be6a1f71a5f14cea74dee6ac59bb548bc8ed454819ce3db38146ad64b83a6bf2a6d5cea68c807bc8ecf6c7929c4f8365b419e40a23022074efa16 DIST rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz 120868188 BLAKE2B d843cce81338b2b3765c973f06dca83161fefed129efefe94efad663b5ddef54aa092bf5977ba7bca74519b008796e60486cf8b193ec2a2dead3add66295d41f SHA512 7103362b8840d094661a16053d8f07eba413c369bf3a2b686313875aa97c30b35697fceefbfc90dffd5cfd4de946e7f848f2b791736443639b30bb75709b7122 DIST rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz 122563056 BLAKE2B 05e73de7d58723affef3f272e646245a97b17373cc960d5e1be0365919ad3879e08bd9012126e41235b97a758bb57fa4e67fcd11e2f29322af9ab039fc3e2dfd SHA512 d6c055e8ba0fd494797a55d2a6df1eec2a6361c0b081e4b7cb06e42a03a644e4de49c7b17dc8cb6484f3271517f2bd50935bc72ead486531b5b370a1c576b12a DIST rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz 122858592 BLAKE2B aebe65fb64044c342f525749eb5d67217f459712aa72d49497062af461901a6e92d21b00e05439bd0753228b876f521198a8b005b116b5121ec3dd812df4bec8 SHA512 5cc2612988182b68d9b220d6d7620fc0b064a9d347825d4677959b7e43820647ff25651427db3a5c72401ab8d0c14e2976921d71ddbe0a5b540cf045241cd727 diff --git a/dev-lang/rust-bin/metadata.xml b/dev-lang/rust-bin/metadata.xml index 5252c49ea5c..aa932207aa0 100644 --- a/dev-lang/rust-bin/metadata.xml +++ b/dev-lang/rust-bin/metadata.xml @@ -6,7 +6,6 @@ Rust Project - Install cargo component Install clippy component Install rustfmt component diff --git a/dev-lang/rust-bin/rust-bin-1.29.1-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.29.1-r1.ebuild deleted file mode 100644 index a46314e5314..00000000000 --- a/dev-lang/rust-bin/rust-bin-1.29.1-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils bash-completion-r1 versionator toolchain-funcs - -MY_P="rust-${PV}" - -DESCRIPTION="Systems programming language from Mozilla" -HOMEPAGE="https://www.rust-lang.org/" -SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz ) - arm? ( - https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz - https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz - https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz - ) - arm64? ( https://static.rust-lang.org/dist/${MY_P}-aarch64-unknown-linux-gnu.tar.xz ) - x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )" - -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" -SLOT="stable" -KEYWORDS="amd64 ~arm64 x86" -IUSE="cargo clippy cpu_flags_x86_sse2 doc libressl rustfmt" - -CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0" - -DEPEND="" -RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425 - cargo? ( - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-libs/libssh2 - net-misc/curl[ssl] - !dev-util/cargo - ) - !dev-lang/rust:0 - rustfmt? ( !dev-util/rustfmt )" -PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" - -QA_PREBUILT=" - opt/${P}/bin/*-${PV} - opt/${P}/lib/*.so - opt/${P}/lib/rustlib/*/lib/*.so - opt/${P}/lib/rustlib/*/lib/*.rlib* -" - -pkg_pretend () { - if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then - die "${CHOST} is not supported by upstream Rust. You must use a hard float version." - fi -} - -src_unpack() { - default - - local postfix - use amd64 && postfix=x86_64-unknown-linux-gnu - - if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then - postfix=arm-unknown-linux-gnueabi - elif use arm && [[ ${CHOST} == armv6*h* ]]; then - postfix=arm-unknown-linux-gnueabihf - elif use arm && [[ ${CHOST} == armv7*h* ]]; then - postfix=armv7-unknown-linux-gnueabihf - fi - - use arm64 && postfix=aarch64-unknown-linux-gnu - use x86 && postfix=i686-unknown-linux-gnu - mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die -} - -src_install() { - local std=$(grep 'std' ./components) - local components="rustc,${std}" - use doc && components="${components},rust-docs" - use cargo && components="${components},cargo" - use clippy && components="${components},clippy-preview" - use rustfmt && components="${components},rustfmt-preview" - ./install.sh \ - --components="${components}" \ - --disable-verify \ - --prefix="${D}/opt/${P}" \ - --mandir="${D}/usr/share/${P}/man" \ - --disable-ldconfig \ - || die - - local rustc=rustc-bin-${PV} - local rustdoc=rustdoc-bin-${PV} - local rustgdb=rust-gdb-bin-${PV} - local rustlldb=rust-lldb-bin-${PV} - - mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die - mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die - mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die - mv "${D}/opt/${P}/bin/rust-lldb" "${D}/opt/${P}/bin/${rustlldb}" || die - - dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}" - dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}" - dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}" - dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}" - - if use cargo; then - local cargo=cargo-bin-${PV} - mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die - dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" - fi - if use clippy; then - local clippy_driver=clippy-driver-bin-${PV} - local cargo_clippy=cargo-clippy-bin-${PV} - mv "${D}/opt/${P}/bin/clippy-driver" "${D}/opt/${P}/bin/${clippy_driver}" || die - mv "${D}/opt/${P}/bin/cargo-clippy" "${D}/opt/${P}/bin/${cargo_clippy}" || die - dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}" - dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}" - fi - if use rustfmt; then - local rustfmt=rustfmt-bin-${PV} - local cargo_fmt=cargo-fmt-bin-${PV} - mv "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die - mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die - dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}" - dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}" - fi - - cat <<-EOF > "${T}"/50${P} - LDPATH="/opt/${P}/lib" - MANPATH="/usr/share/${P}/man" - EOF - doenvd "${T}"/50${P} - - cat <<-EOF > "${T}/provider-${P}" - /usr/bin/rustdoc - /usr/bin/rust-gdb - /usr/bin/rust-lldb - EOF - if use cargo; then - echo /usr/bin/cargo >> "${T}/provider-${P}" - fi - if use clippy; then - echo /usr/bin/clippy-driver >> "${T}/provider-${P}" - echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" - fi - if use rustfmt; then - echo /usr/bin/rustfmt >> "${T}/provider-${P}" - echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" - fi - dodir /etc/env.d/rust - insinto /etc/env.d/rust - doins "${T}/provider-${P}" -} - -pkg_postinst() { - eselect rust update --if-unset - - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}," - - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then - elog "install app-emacs/rust-mode to get emacs support for rust." - fi - - if has_version app-editors/gvim || has_version app-editors/vim; then - elog "install app-vim/rust-vim to get vim support for rust." - fi - - if has_version 'app-shells/zsh'; then - elog "install app-shells/rust-zshcomp to get zsh completion for rust." - fi -} - -pkg_postrm() { - eselect rust unset --if-invalid -}