From 4ed92c969842db8a4699644abe61c717dba5de3c Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Fri, 15 Mar 2019 01:05:38 +0100 Subject: [PATCH] dev-lang/rust-bin: move app-eselect/eselect-rust to DEPEND We need to call eselect-rust in pkg_ phase but RDEPEND doesn't guarantee that eselect-rust will be available. Bug: https://bugs.gentoo.org/678908 Package-Manager: Portage-2.3.62, Repoman-2.3.12 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, 8 insertions(+), 12 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 c9cb9d5d92c6..063ffde92379 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,9 +16,8 @@ SLOT="stable" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" -DEPEND="" -RDEPEND=">=app-eselect/eselect-rust-20190311 - sys-libs/zlib +DEPEND=">=app-eselect/eselect-rust-20190311" +RDEPEND="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 9567b55a1c73..89ba7839c393 100644 --- a/dev-lang/rust-bin/rust-bin-1.31.1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.31.1.ebuild @@ -16,9 +16,8 @@ SLOT="stable" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" -DEPEND="" -RDEPEND=">=app-eselect/eselect-rust-20190311 - sys-libs/zlib +DEPEND=">=app-eselect/eselect-rust-20190311" +RDEPEND="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 a4fb5e4c3094..ef0e3aee64f5 100644 --- a/dev-lang/rust-bin/rust-bin-1.32.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.32.0.ebuild @@ -16,9 +16,8 @@ SLOT="stable" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" -DEPEND="" -RDEPEND=">=app-eselect/eselect-rust-20190311 - sys-libs/zlib +DEPEND=">=app-eselect/eselect-rust-20190311" +RDEPEND="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 a4fb5e4c3094..ef0e3aee64f5 100644 --- a/dev-lang/rust-bin/rust-bin-1.33.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.33.0.ebuild @@ -16,9 +16,8 @@ SLOT="stable" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" -DEPEND="" -RDEPEND=">=app-eselect/eselect-rust-20190311 - sys-libs/zlib +DEPEND=">=app-eselect/eselect-rust-20190311" +RDEPEND="sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 -- 2.26.2