From 107cec48583866aea34a98178763cabb7eb74606 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Thu, 15 Nov 2018 02:12:10 +0100 Subject: [PATCH] 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 --- ....29.1.ebuild => rust-bin-1.29.1-r1.ebuild} | 23 +++++++++---------- ....29.2.ebuild => rust-bin-1.29.2-r1.ebuild} | 23 +++++++++---------- ....30.1.ebuild => rust-bin-1.30.1-r1.ebuild} | 17 +++++++------- 3 files changed, 30 insertions(+), 33 deletions(-) rename dev-lang/rust-bin/{rust-bin-1.29.1.ebuild => rust-bin-1.29.1-r1.ebuild} (94%) rename dev-lang/rust-bin/{rust-bin-1.29.2.ebuild => rust-bin-1.29.2-r1.ebuild} (94%) rename dev-lang/rust-bin/{rust-bin-1.30.1.ebuild => rust-bin-1.30.1-r1.ebuild} (94%) 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 509e6014d003..a46314e53145 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 afca3183a7a0..83af1207dcbb 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 14b883f57815..570cc004968c 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=" -- 2.26.2