sys-devel/llvm: Update binutils dep in remaining versions

Closes: https://bugs.gentoo.org/677888
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/sys-devel/llvm/llvm-4.0.1-r1.ebuild b/sys-devel/llvm/llvm-4.0.1-r1.ebuild
index 410573dc10b33658368e6b6bfa65101e09683204..83f6f64dba2f94b338c95eb6040a023a8ed5d600 100644 (file)
--- a/sys-devel/llvm/llvm-4.0.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-4.0.1-r1.ebuild
@@ -38,7 +38,12 @@ IUSE="debug doc gold libedit +libffi ncurses test
 
 RDEPEND="
        sys-libs/zlib:0=
-       gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+       gold? (
+               || (
+                       >=sys-devel/binutils-2.31.1-r4:*[plugins]
+                       <sys-devel/binutils-2.31.1-r4:*[cxx]
+               )
+       )
        libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
        libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
        ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"

diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild
index dbda3db29a26a12b1f9921835de2641f7fdb9643..80b1b7799ed26a502446ffcb1c7cae7ba9b72828 100644 (file)
--- a/sys-devel/llvm/llvm-5.0.2.ebuild
+++ b/sys-devel/llvm/llvm-5.0.2.ebuild
@@ -39,7 +39,12 @@ IUSE="debug doc gold libedit +libffi ncurses test
 
 RDEPEND="
        sys-libs/zlib:0=
-       gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+       gold? (
+               || (
+                       >=sys-devel/binutils-2.31.1-r4:*[plugins]
+                       <sys-devel/binutils-2.31.1-r4:*[cxx]
+               )
+       )
        libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
        libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
        ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"

diff --git a/sys-devel/llvm/llvm-6.0.1-r2.ebuild b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
index 7a983e01f194460a5cdf2c0ef19d7fb5afa46e7c..14a3816982e9499fed0f3806771371c401861985 100644 (file)
--- a/sys-devel/llvm/llvm-6.0.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
@@ -39,7 +39,12 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
        sys-libs/zlib:0=
-       gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+       gold? (
+               || (
+                       >=sys-devel/binutils-2.31.1-r4:*[plugins]
+                       <sys-devel/binutils-2.31.1-r4:*[cxx]
+               )
+       )
        libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
        libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
        ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )

diff --git a/sys-devel/llvm/llvm-6.0.1.ebuild b/sys-devel/llvm/llvm-6.0.1.ebuild
index fde2a075f4df87b470a1dd1d332253e2fb7d9990..a326996a19016c3f7928a1faea26a83ed90e919b 100644 (file)
--- a/sys-devel/llvm/llvm-6.0.1.ebuild
+++ b/sys-devel/llvm/llvm-6.0.1.ebuild
@@ -39,7 +39,12 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
        sys-libs/zlib:0=
-       gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+       gold? (
+               || (
+                       >=sys-devel/binutils-2.31.1-r4:*[plugins]
+                       <sys-devel/binutils-2.31.1-r4:*[cxx]
+               )
+       )
        libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
        libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
        ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )