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@gentoo.org>

diff --git a/sys-devel/llvm/llvm-7.0.9999.ebuild b/sys-devel/llvm/llvm-7.0.9999.ebuild
index 9e2be474c599b2b021e80624dc9c7b22c5b13b46..c361a226832d317c2dfc803f5c07a2e30c7bca89 100644 (file)
--- 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 167c83db857a2142695d46e07810d1657ed37609..250137f620f3cabb8877d19694deb5b2b1877a50 100644 (file)
--- 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 b31f34a91058da36e4983e8f98aa632b99f568aa..4d4395f2fdbb5084ad63812e5b07ef9973dde2c0 100644 (file)
--- 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 abc5f6f5ebda0fec93ce247e4a2de20a6846cd5f..0da81c25c4c6a89dacf0dad28116e096c0f4f253 100644 (file)
--- 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}] )