dev-lang/rust: 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@gentoo.org>

diff --git a/dev-lang/rust/rust-1.29.1.ebuild b/dev-lang/rust/rust-1.29.1-r1.ebuild
similarity index 98%
rename from dev-lang/rust/rust-1.29.1.ebuild
rename to dev-lang/rust/rust-1.29.1-r1.ebuild
index 71a52599320e450a1531de05112be04f9f0cd1ff..7e2cf61022047eb52797df952b551a159a5bd6c1 100644 (file)
--- a/dev-lang/rust/rust-1.29.1.ebuild
+++ b/dev-lang/rust/rust-1.29.1-r1.ebuild
@@ -50,7 +50,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 
 IUSE="cargo clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
 
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
                jemalloc? ( dev-libs/jemalloc )
                cargo? (
                        sys-libs/zlib
@@ -60,16 +60,16 @@ RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
                        net-libs/http-parser:=
                        net-misc/curl[ssl]
                )"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
        ${PYTHON_DEPS}
        || (
                >=sys-devel/gcc-4.7
                >=sys-devel/clang-3.5
        )
+       dev-util/cmake"
+RDEPEND="${COMMON_DEPEND}
        cargo? ( !dev-util/cargo )
-       rustfmt? ( !dev-util/rustfmt )
-       dev-util/cmake
-"
+       rustfmt? ( !dev-util/rustfmt )"
 PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
 
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )

diff --git a/dev-lang/rust/rust-1.29.2.ebuild b/dev-lang/rust/rust-1.29.2-r1.ebuild
similarity index 97%
rename from dev-lang/rust/rust-1.29.2.ebuild
rename to dev-lang/rust/rust-1.29.2-r1.ebuild
index a78fda48444d6b77bf152a7c23ebcb23f3ff404d..724b161b99d4341a761f186d9afbedacf3cb192c 100644 (file)
--- a/dev-lang/rust/rust-1.29.2.ebuild
+++ b/dev-lang/rust/rust-1.29.2-r1.ebuild
@@ -40,7 +40,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 
 IUSE="cargo clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
 
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
                jemalloc? ( dev-libs/jemalloc )
                cargo? (
                        sys-libs/zlib
@@ -50,16 +50,16 @@ RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
                        net-libs/http-parser:=
                        net-misc/curl[ssl]
                )"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
        ${PYTHON_DEPS}
        || (
                >=sys-devel/gcc-4.7
                >=sys-devel/clang-3.5
        )
+       dev-util/cmake"
+RDEPEND="${COMMOND_DEPEND}
        cargo? ( !dev-util/cargo )
-       rustfmt? ( !dev-util/rustfmt )
-       dev-util/cmake
-"
+       rustfmt? ( !dev-util/rustfmt )"
 PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
 
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )

diff --git a/dev-lang/rust/rust-1.30.1.ebuild b/dev-lang/rust/rust-1.30.1-r1.ebuild
similarity index 97%
rename from dev-lang/rust/rust-1.30.1.ebuild
rename to dev-lang/rust/rust-1.30.1-r1.ebuild
index 1990ef1eaaa712724b0b34bdeb083feeaf8feb93..17118cfdb50f30714fa43e63d8bffd014ea5a7a1 100644 (file)
--- a/dev-lang/rust/rust-1.30.1.ebuild
+++ b/dev-lang/rust/rust-1.30.1-r1.ebuild
@@ -38,7 +38,7 @@ LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 
 IUSE="clippy cpu_flags_x86_sse2 debug doc +jemalloc libressl rls rustfmt wasm ${ALL_LLVM_TARGETS[*]}"
 
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
                jemalloc? ( dev-libs/jemalloc )
                sys-libs/zlib
                !libressl? ( dev-libs/openssl:0= )
@@ -46,16 +46,16 @@ RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
                net-libs/libssh2
                net-libs/http-parser:=
                net-misc/curl[ssl]"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
        ${PYTHON_DEPS}
        || (
                >=sys-devel/gcc-4.7
                >=sys-devel/clang-3.5
        )
+       dev-util/cmake"
+RDEPEND="${COMMON_DEPEND}
        !dev-util/cargo
-       rustfmt? ( !dev-util/rustfmt )
-       dev-util/cmake
-"
+       rustfmt? ( !dev-util/rustfmt )"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
                                x86? ( cpu_flags_x86_sse2 )"