public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/rust:master commit in: dev-lang/rust-bin/
@ 2020-01-13  6:19 Mikhail Pukhlikov
  0 siblings, 0 replies; 5+ messages in thread
From: Mikhail Pukhlikov @ 2020-01-13  6:19 UTC (permalink / raw
  To: gentoo-commits

commit:     138876e503cb9b9160f8ae96b950228afb246330
Author:     gentoo90 <gentoo90 <AT> gmail <DOT> com>
AuthorDate: Sat Jan  4 22:05:08 2020 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 06:19:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=138876e5

dev-lang/rust-bin-9999: allow choosing specific nightly version

Add RUST_NIGHTLY_DATE variable, similar to EGIT_COMMIT from git-r3.eclass.
Usage:
	RUST_NIGHTLY_DATE="YYYY-MM-DD" emerge rust-bin:nightly
Closes: https://github.com/gentoo/gentoo-rust/pull/474

Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>

 dev-lang/rust-bin/rust-bin-9999.ebuild | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild
index e66acb1..3eb3dbc 100644
--- a/dev-lang/rust-bin/rust-bin-9999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-9999.ebuild
@@ -10,6 +10,11 @@ HOMEPAGE="https://www.rust-lang.org/"
 MY_SRC_URI="https://static.rust-lang.org/dist/rust-nightly"
 MY_STDLIB_SRC_URI="https://static.rust-lang.org/dist/rust-std-nightly"
 
+if [[ -v RUST_NIGHTLY_DATE ]]; then
+	MY_SRC_URI="https://static.rust-lang.org/dist/${RUST_NIGHTLY_DATE}/rust-nightly"
+	MY_STDLIB_SRC_URI="https://static.rust-lang.org/dist/${RUST_NIGHTLY_DATE}/rust-std-nightly"
+fi
+
 ALL_RUSTLIB_TARGETS=(
 	"wasm32-unknown-unknown"
 )
@@ -80,6 +85,9 @@ src_install() {
 		components="${components},rls-preview,${analysis}"
 	fi
 	use rustfmt && components="${components},rustfmt-preview"
+
+	elog "installing components: ${components}"
+
 	./install.sh \
 		--components="${components}" \
 		--disable-verify \


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/rust:master commit in: dev-lang/rust-bin/
@ 2020-05-25  9:53 Mikhail Pukhlikov
  0 siblings, 0 replies; 5+ messages in thread
From: Mikhail Pukhlikov @ 2020-05-25  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     34cfff090ed5b13c5d8b8ddf0bb9e2e70b258d7d
Author:     David Heidelberg <david <AT> ixit <DOT> cz>
AuthorDate: Sun Apr 12 19:15:09 2020 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Mon May 25 09:53:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=34cfff09

dev-lang/rust-bin: keywords mask -999 & -9999 ebuilds

Signed-off-by: David Heidelberg <david <AT> ixit.cz>
Closes: https://github.com/gentoo/gentoo-rust/pull/482
Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>

 dev-lang/rust-bin/rust-bin-999.ebuild  | 7 ++++---
 dev-lang/rust-bin/rust-bin-9999.ebuild | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-lang/rust-bin/rust-bin-999.ebuild b/dev-lang/rust-bin/rust-bin-999.ebuild
index 69c73c4..e1e5699 100644
--- a/dev-lang/rust-bin/rust-bin-999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,12 +17,13 @@ ALL_RUSTLIB_TARGETS=( "${ALL_RUSTLIB_TARGETS[@]/#/rustlib_targets_}" )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="beta"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS=""
 RESTRICT="network-sandbox"
 
 IUSE="clippy cpu_flags_x86_sse2 doc libressl rls rustfmt ${ALL_RUSTLIB_TARGETS[*]}"
 
-CDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+CDEPEND="
+	>=app-eselect/eselect-rust-0.3_pre20150425
 	!dev-lang/rust:0
 	rustfmt? ( !dev-util/rustfmt )
 "

diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild
index 3eb3dbc..bd0fb59 100644
--- a/dev-lang/rust-bin/rust-bin-9999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,12 +22,13 @@ ALL_RUSTLIB_TARGETS=( "${ALL_RUSTLIB_TARGETS[@]/#/rustlib_targets_}" )
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="nightly"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS=""
 RESTRICT="network-sandbox"
 
 IUSE="clippy cpu_flags_x86_sse2 doc libressl rls rustfmt ${ALL_RUSTLIB_TARGETS[*]}"
 
-CDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+CDEPEND="
+	>=app-eselect/eselect-rust-0.3_pre20150425
 	!dev-lang/rust:0
 	rustfmt? ( !dev-util/rustfmt )
 "


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/rust:master commit in: dev-lang/rust-bin/
@ 2020-08-03  6:26 Mikhail Pukhlikov
  0 siblings, 0 replies; 5+ messages in thread
From: Mikhail Pukhlikov @ 2020-08-03  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     8395fe36d257a6da070961b98f39e2fe48d1f921
Author:     gentoo90 <gentoo90 <AT> gmail <DOT> com>
AuthorDate: Tue Jul 28 20:52:59 2020 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 06:25:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=8395fe36

dev-lang/rust-bin-9999: add "source" useflag

Downloads and installs the sourcecode. Required for RLS.

Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>

 dev-lang/rust-bin/rust-bin-9999.ebuild | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild
index bd0fb59..66bddf0 100644
--- a/dev-lang/rust-bin/rust-bin-9999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-9999.ebuild
@@ -8,10 +8,12 @@ inherit eutils bash-completion-r1
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
 MY_SRC_URI="https://static.rust-lang.org/dist/rust-nightly"
+MY_SRC_SRC_URI="https://static.rust-lang.org/dist/rust-src-nightly.tar.xz"
 MY_STDLIB_SRC_URI="https://static.rust-lang.org/dist/rust-std-nightly"
 
 if [[ -v RUST_NIGHTLY_DATE ]]; then
 	MY_SRC_URI="https://static.rust-lang.org/dist/${RUST_NIGHTLY_DATE}/rust-nightly"
+	MY_SRC_SRC_URI="https://static.rust-lang.org/dist/${RUST_NIGHTLY_DATE}/rust-src-nightly.tar.xz"
 	MY_STDLIB_SRC_URI="https://static.rust-lang.org/dist/${RUST_NIGHTLY_DATE}/rust-std-nightly"
 fi
 
@@ -25,7 +27,7 @@ SLOT="nightly"
 KEYWORDS=""
 RESTRICT="network-sandbox"
 
-IUSE="clippy cpu_flags_x86_sse2 doc libressl rls rustfmt ${ALL_RUSTLIB_TARGETS[*]}"
+IUSE="clippy cpu_flags_x86_sse2 doc libressl rls rustfmt source ${ALL_RUSTLIB_TARGETS[*]}"
 
 CDEPEND="
 	>=app-eselect/eselect-rust-0.3_pre20150425
@@ -43,7 +45,8 @@ RDEPEND="${CDEPEND}
 	net-misc/curl[ssl]
 	!dev-util/cargo
 	"
-REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )
+	rls? ( source )"
 
 QA_PREBUILT="
 	opt/${P}/bin/*-${PV}
@@ -74,12 +77,20 @@ src_unpack() {
 			cat "${WORKDIR}/rust-std-nightly-${target}/components" >> "${S}/components"
 		fi
 	done
+
+	if use source; then
+		wget "${MY_SRC_SRC_URI}" || die
+		unpack ./"rust-src-nightly.tar.xz"
+		mv "${WORKDIR}/rust-src-nightly/rust-src" "${S}/" || die
+		cat "${WORKDIR}/rust-src-nightly/components" >> "${S}/components"
+	fi
 }
 
 src_install() {
 	local std=$(grep 'std' ./components | paste -s -d',')
 	local components="rustc,cargo,${std}"
 	use doc && components="${components},rust-docs"
+	use source && components="${components},rust-src"
 	use clippy && components="${components},clippy-preview"
 	if use rls; then
 		local analysis=$(grep 'analysis' ./components)


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/rust:master commit in: dev-lang/rust-bin/
@ 2020-08-03  6:26 Mikhail Pukhlikov
  0 siblings, 0 replies; 5+ messages in thread
From: Mikhail Pukhlikov @ 2020-08-03  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     2260083a38d1f0ba59ad649446ddf14974c6a6cb
Author:     gentoo90 <gentoo90 <AT> gmail <DOT> com>
AuthorDate: Tue Jul 28 20:54:45 2020 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 06:25:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=2260083a

dev-lang/rust-bin-9999: add "rust-analyzer" useflag

RLS - old and busted.
rust-analyzer - new hotness.

Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>

 dev-lang/rust-bin/rust-bin-9999.ebuild | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild
index 66bddf0..c17cd9f 100644
--- a/dev-lang/rust-bin/rust-bin-9999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-9999.ebuild
@@ -27,7 +27,7 @@ SLOT="nightly"
 KEYWORDS=""
 RESTRICT="network-sandbox"
 
-IUSE="clippy cpu_flags_x86_sse2 doc libressl rls rustfmt source ${ALL_RUSTLIB_TARGETS[*]}"
+IUSE="clippy cpu_flags_x86_sse2 doc libressl rls rust-analyzer rustfmt source ${ALL_RUSTLIB_TARGETS[*]}"
 
 CDEPEND="
 	>=app-eselect/eselect-rust-0.3_pre20150425
@@ -46,7 +46,8 @@ RDEPEND="${CDEPEND}
 	!dev-util/cargo
 	"
 REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )
-	rls? ( source )"
+	rls? ( source )
+	rust-analyzer? ( source )"
 
 QA_PREBUILT="
 	opt/${P}/bin/*-${PV}
@@ -96,6 +97,10 @@ src_install() {
 		local analysis=$(grep 'analysis' ./components)
 		components="${components},rls-preview,${analysis}"
 	fi
+	if use rust-analyzer; then
+		local analysis=$(grep 'analysis' ./components)
+		components="${components},rust-analyzer-preview,${analysis}"
+	fi
 	use rustfmt && components="${components},rustfmt-preview"
 
 	elog "installing components: ${components}"
@@ -140,6 +145,11 @@ src_install() {
 		mv "${D}/opt/${P}/bin/rls" "${D}/opt/${P}/bin/${rls}" || die
 		dosym "../../opt/${P}/bin/${rls}" "/usr/bin/${rls}"
 	fi
+	if use rust-analyzer; then
+		local rust_analyzer=rust-analyzer-bin-${PV}
+		mv "${D}/opt/${P}/bin/rust-analyzer" "${D}/opt/${P}/bin/${rust_analyzer}" || die
+		dosym "../../opt/${P}/bin/${rust_analyzer}" "/usr/bin/${rust_analyzer}"
+	fi
 	if use rustfmt; then
 		local rustfmt=rustfmt-bin-${PV}
 		local cargo_fmt=cargo-fmt-bin-${PV}
@@ -170,6 +180,9 @@ src_install() {
 	if use rls; then
 		echo /usr/bin/rls >> "${T}/provider-${P}"
 	fi
+	if use rust-analyzer; then
+		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
+	fi
 	if use rustfmt; then
 		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
 		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/rust:master commit in: dev-lang/rust-bin/
@ 2020-08-03  6:26 Mikhail Pukhlikov
  0 siblings, 0 replies; 5+ messages in thread
From: Mikhail Pukhlikov @ 2020-08-03  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     66fdc8ef3df3d34944929a7cc2555f260caed7ad
Author:     gentoo90 <gentoo90 <AT> gmail <DOT> com>
AuthorDate: Fri Jul 31 19:03:13 2020 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 06:26:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=66fdc8ef

dev-lang/rust-bin-9999: add "miri" useflag

Closes: https://github.com/gentoo/gentoo-rust/pull/495
Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>

 dev-lang/rust-bin/rust-bin-9999.ebuild | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild
index c17cd9f..ffd2d0a 100644
--- a/dev-lang/rust-bin/rust-bin-9999.ebuild
+++ b/dev-lang/rust-bin/rust-bin-9999.ebuild
@@ -27,7 +27,7 @@ SLOT="nightly"
 KEYWORDS=""
 RESTRICT="network-sandbox"
 
-IUSE="clippy cpu_flags_x86_sse2 doc libressl rls rust-analyzer rustfmt source ${ALL_RUSTLIB_TARGETS[*]}"
+IUSE="clippy cpu_flags_x86_sse2 doc libressl miri rls rust-analyzer rustfmt source ${ALL_RUSTLIB_TARGETS[*]}"
 
 CDEPEND="
 	>=app-eselect/eselect-rust-0.3_pre20150425
@@ -93,6 +93,7 @@ src_install() {
 	use doc && components="${components},rust-docs"
 	use source && components="${components},rust-src"
 	use clippy && components="${components},clippy-preview"
+	use miri && components="${components},miri-preview"
 	if use rls; then
 		local analysis=$(grep 'analysis' ./components)
 		components="${components},rls-preview,${analysis}"
@@ -140,6 +141,14 @@ src_install() {
 		dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}"
 		dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}"
 	fi
+	if use miri; then
+		local miri=miri-bin-${PV}
+		local cargo_miri=cargo-miri-bin-${PV}
+		mv "${D}/opt/${P}/bin/miri" "${D}/opt/${P}/bin/${miri}" || die
+		mv "${D}/opt/${P}/bin/cargo-miri" "${D}/opt/${P}/bin/${cargo_miri}" || die
+		dosym "../../opt/${P}/bin/${miri}" "/usr/bin/${miri}"
+		dosym "../../opt/${P}/bin/${cargo_miri}" "/usr/bin/${cargo_miri}"
+	fi
 	if use rls; then
 		local rls=rls-bin-${PV}
 		mv "${D}/opt/${P}/bin/rls" "${D}/opt/${P}/bin/${rls}" || die
@@ -177,6 +186,10 @@ src_install() {
 		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
 		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
 	fi
+	if use miri; then
+		echo /usr/bin/miri >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+	fi
 	if use rls; then
 		echo /usr/bin/rls >> "${T}/provider-${P}"
 	fi


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-08-03  6:26 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-03  6:26 [gentoo-commits] repo/proj/rust:master commit in: dev-lang/rust-bin/ Mikhail Pukhlikov
  -- strict thread matches above, loose matches on Subject: below --
2020-08-03  6:26 Mikhail Pukhlikov
2020-08-03  6:26 Mikhail Pukhlikov
2020-05-25  9:53 Mikhail Pukhlikov
2020-01-13  6:19 Mikhail Pukhlikov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox