[gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-bin/

[Thomas Deutschmann]

commit:     107cec48583866aea34a98178763cabb7eb74606
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 15 01:12:10 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 15 01:19:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107cec48

dev-lang/rust-bin: move soft blockers to RDEPEND

Closes: https://bugs.gentoo.org/671150
Package-Manager: Portage-2.3.51, Repoman-2.3.12
RepoMan-Options: --force
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 ...bin-1.29.1.ebuild => rust-bin-1.29.1-r1.ebuild} | 23 +++++++++++-----------
 ...bin-1.29.2.ebuild => rust-bin-1.29.2-r1.ebuild} | 23 +++++++++++-----------
 ...bin-1.30.1.ebuild => rust-bin-1.30.1-r1.ebuild} | 17 ++++++++--------
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/dev-lang/rust-bin/rust-bin-1.29.1.ebuild b/dev-lang/rust-bin/rust-bin-1.29.1-r1.ebuild
similarity index 94%
rename from dev-lang/rust-bin/rust-bin-1.29.1.ebuild
rename to dev-lang/rust-bin/rust-bin-1.29.1-r1.ebuild
index 509e6014d00..a46314e5314 100644
--- a/dev-lang/rust-bin/rust-bin-1.29.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.29.1-r1.ebuild
@@ -25,19 +25,18 @@ IUSE="cargo clippy cpu_flags_x86_sse2 doc libressl rustfmt"
 
 CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
 
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+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
-	cargo? ( !dev-util/cargo )
-	rustfmt? ( !dev-util/rustfmt )
-"
-RDEPEND="${DEPEND}
-		cargo? (
-			sys-libs/zlib
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			net-libs/libssh2
-			net-misc/curl[ssl]
-		)"
+	rustfmt? ( !dev-util/rustfmt )"
 PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
 REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
 

diff --git a/dev-lang/rust-bin/rust-bin-1.29.2.ebuild b/dev-lang/rust-bin/rust-bin-1.29.2-r1.ebuild
similarity index 94%
rename from dev-lang/rust-bin/rust-bin-1.29.2.ebuild
rename to dev-lang/rust-bin/rust-bin-1.29.2-r1.ebuild
index afca3183a7a..83af1207dcb 100644
--- a/dev-lang/rust-bin/rust-bin-1.29.2.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.29.2-r1.ebuild
@@ -18,19 +18,18 @@ IUSE="cargo clippy cpu_flags_x86_sse2 doc libressl rustfmt"
 
 CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
 
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+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
-	cargo? ( !dev-util/cargo )
-	rustfmt? ( !dev-util/rustfmt )
-"
-RDEPEND="${DEPEND}
-		cargo? (
-			sys-libs/zlib
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-			net-libs/libssh2
-			net-misc/curl[ssl]
-		)"
+	rustfmt? ( !dev-util/rustfmt )"
 PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
 REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
 

diff --git a/dev-lang/rust-bin/rust-bin-1.30.1.ebuild b/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild
similarity index 94%
rename from dev-lang/rust-bin/rust-bin-1.30.1.ebuild
rename to dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild
index 14b883f5781..570cc004968 100644
--- a/dev-lang/rust-bin/rust-bin-1.30.1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild
@@ -16,17 +16,16 @@ SLOT="stable"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt"
 
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+DEPEND=""
+RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libssh2
+	net-misc/curl[ssl]
 	!dev-lang/rust:0
 	!dev-util/cargo
-	rustfmt? ( !dev-util/rustfmt )
-"
-RDEPEND="${DEPEND}
-		sys-libs/zlib
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-		net-libs/libssh2
-		net-misc/curl[ssl]"
+	rustfmt? ( !dev-util/rustfmt )"
 REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
 
 QA_PREBUILT="