From 76fe2ea47021b48ac4fd9aa6429655a30d6336dd Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Fri, 15 Mar 2019 21:26:06 +0100 Subject: [PATCH] Revert "dev-lang/rust-bin: move app-eselect/eselect-rust to DEPEND" This reverts commit 4ed92c969842db8a4699644abe61c717dba5de3c. I was wrong, RDEPEND appropriate place to pull in app-eselect/eselect-rust. Bug: https://bugs.gentoo.org/678908 Signed-off-by: Thomas Deutschmann --- dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild | 5 +++-- dev-lang/rust-bin/rust-bin-1.31.1.ebuild | 5 +++-- dev-lang/rust-bin/rust-bin-1.32.0.ebuild | 5 +++-- dev-lang/rust-bin/rust-bin-1.33.0.ebuild | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild index 063ffde92379..c9cb9d5d92c6 100644 --- a/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.30.1-r1.ebuild @@ -16,8 +16,9 @@ SLOT="stable" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" -DEPEND=">=app-eselect/eselect-rust-20190311" -RDEPEND="sys-libs/zlib +DEPEND="" +RDEPEND=">=app-eselect/eselect-rust-20190311 + sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 diff --git a/dev-lang/rust-bin/rust-bin-1.31.1.ebuild b/dev-lang/rust-bin/rust-bin-1.31.1.ebuild index 89ba7839c393..9567b55a1c73 100644 --- a/dev-lang/rust-bin/rust-bin-1.31.1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.31.1.ebuild @@ -16,8 +16,9 @@ SLOT="stable" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" -DEPEND=">=app-eselect/eselect-rust-20190311" -RDEPEND="sys-libs/zlib +DEPEND="" +RDEPEND=">=app-eselect/eselect-rust-20190311 + sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 diff --git a/dev-lang/rust-bin/rust-bin-1.32.0.ebuild b/dev-lang/rust-bin/rust-bin-1.32.0.ebuild index ef0e3aee64f5..a4fb5e4c3094 100644 --- a/dev-lang/rust-bin/rust-bin-1.32.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.32.0.ebuild @@ -16,8 +16,9 @@ SLOT="stable" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" -DEPEND=">=app-eselect/eselect-rust-20190311" -RDEPEND="sys-libs/zlib +DEPEND="" +RDEPEND=">=app-eselect/eselect-rust-20190311 + sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 diff --git a/dev-lang/rust-bin/rust-bin-1.33.0.ebuild b/dev-lang/rust-bin/rust-bin-1.33.0.ebuild index ef0e3aee64f5..a4fb5e4c3094 100644 --- a/dev-lang/rust-bin/rust-bin-1.33.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.33.0.ebuild @@ -16,8 +16,9 @@ SLOT="stable" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" -DEPEND=">=app-eselect/eselect-rust-20190311" -RDEPEND="sys-libs/zlib +DEPEND="" +RDEPEND=">=app-eselect/eselect-rust-20190311 + sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 -- 2.26.2