commit:     1f7a7694538ef2e256e1d3cb94da1cb391df9c31
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 07:47:09 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 07:47:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7a7694

sys-devel/llvm: Update binutils dep in live ebuilds & RC

Update binutils dependency to account for USE flag rename in live
ebuilds and the masked RC.  ~arch ebuilds are going to be updated
as new releases are added to avoid spurious rebuilds.

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

 sys-devel/llvm/llvm-7.0.9999.ebuild  | 7 ++++++-
 sys-devel/llvm/llvm-8.0.0_rc5.ebuild | 7 ++++++-
 sys-devel/llvm/llvm-8.0.9999.ebuild  | 7 ++++++-
 sys-devel/llvm/llvm-9999.ebuild      | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/sys-devel/llvm/llvm-7.0.9999.ebuild 
b/sys-devel/llvm/llvm-7.0.9999.ebuild
index 9e2be474c59..c361a226832 100644
--- a/sys-devel/llvm/llvm-7.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-7.0.9999.ebuild
@@ -42,7 +42,12 @@ RESTRICT="!test? ( test )"
 RDEPEND="
        sys-libs/zlib:0=
        exegesis? ( dev-libs/libpfm:= )
-       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-8.0.0_rc5.ebuild 
b/sys-devel/llvm/llvm-8.0.0_rc5.ebuild
index 167c83db857..250137f620f 100644
--- a/sys-devel/llvm/llvm-8.0.0_rc5.ebuild
+++ b/sys-devel/llvm/llvm-8.0.0_rc5.ebuild
@@ -40,7 +40,12 @@ RESTRICT="!test? ( test )"
 RDEPEND="
        sys-libs/zlib:0=
        exegesis? ( dev-libs/libpfm:= )
-       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-8.0.9999.ebuild 
b/sys-devel/llvm/llvm-8.0.9999.ebuild
index b31f34a9105..4d4395f2fdb 100644
--- a/sys-devel/llvm/llvm-8.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-8.0.9999.ebuild
@@ -42,7 +42,12 @@ RESTRICT="!test? ( test )"
 RDEPEND="
        sys-libs/zlib:0=
        exegesis? ( dev-libs/libpfm:= )
-       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-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index abc5f6f5ebd..0da81c25c4c 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -44,7 +44,12 @@ RESTRICT="!test? ( test )"
 RDEPEND="
        sys-libs/zlib:0=
        exegesis? ( dev-libs/libpfm:= )
-       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}] )

Reply via email to