commit:     6a3903d271f12f46c3bafcef4021fa1bfb16c7a6
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sat Jan 27 00:02:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 08:55:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3903d2

sys-devel/llvm: support llvm prefix on mac

Stop depending on sys-devel/binutils-apple which is required only when
building with gcc, but conflicts when using clang

Bug: https://bugs.gentoo.org/758167
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/llvm/llvm-16.0.6.ebuild             | 3 +--
 sys-devel/llvm/llvm-17.0.6.ebuild             | 3 +--
 sys-devel/llvm/llvm-18.0.0.9999.ebuild        | 1 -
 sys-devel/llvm/llvm-18.0.0_pre20240106.ebuild | 1 -
 sys-devel/llvm/llvm-18.0.0_pre20240113.ebuild | 1 -
 sys-devel/llvm/llvm-18.0.0_pre20240120.ebuild | 1 -
 sys-devel/llvm/llvm-19.0.0.9999.ebuild        | 1 -
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/sys-devel/llvm/llvm-16.0.6.ebuild 
b/sys-devel/llvm/llvm-16.0.6.ebuild
index 37a2e4d59cc3..b3a0f69644fb 100644
--- a/sys-devel/llvm/llvm-16.0.6.ebuild
+++ b/sys-devel/llvm/llvm-16.0.6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/";
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux 
~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux 
~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="
        +binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
        xml z3 zstd
@@ -47,7 +47,6 @@ BDEPEND="
        sys-devel/gnuconfig
        kernel_Darwin? (
                <sys-libs/libcxx-${LLVM_VERSION}.9999
-               >=sys-devel/binutils-apple-5.1
        )
        doc? ( $(python_gen_any_dep '
                dev-python/recommonmark[${PYTHON_USEDEP}]

diff --git a/sys-devel/llvm/llvm-17.0.6.ebuild 
b/sys-devel/llvm/llvm-17.0.6.ebuild
index 7444b297e002..7adb816d2e32 100644
--- a/sys-devel/llvm/llvm-17.0.6.ebuild
+++ b/sys-devel/llvm/llvm-17.0.6.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://llvm.org/";
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux 
~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux 
~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="
        +binutils-plugin debug debuginfod doc exegesis libedit +libffi
        ncurses test xar xml z3 zstd
@@ -51,7 +51,6 @@ BDEPEND="
        sys-devel/gnuconfig
        kernel_Darwin? (
                <sys-libs/libcxx-${LLVM_VERSION}.9999
-               >=sys-devel/binutils-apple-5.1
        )
        doc? ( $(python_gen_any_dep '
                dev-python/recommonmark[${PYTHON_USEDEP}]

diff --git a/sys-devel/llvm/llvm-18.0.0.9999.ebuild 
b/sys-devel/llvm/llvm-18.0.0.9999.ebuild
index 9c1e247877cc..80b458f57415 100644
--- a/sys-devel/llvm/llvm-18.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-18.0.0.9999.ebuild
@@ -49,7 +49,6 @@ BDEPEND="
        sys-devel/gnuconfig
        kernel_Darwin? (
                <sys-libs/libcxx-${LLVM_VERSION}.9999
-               >=sys-devel/binutils-apple-5.1
        )
        doc? ( $(python_gen_any_dep '
                dev-python/myst-parser[${PYTHON_USEDEP}]

diff --git a/sys-devel/llvm/llvm-18.0.0_pre20240106.ebuild 
b/sys-devel/llvm/llvm-18.0.0_pre20240106.ebuild
index 9c1e247877cc..80b458f57415 100644
--- a/sys-devel/llvm/llvm-18.0.0_pre20240106.ebuild
+++ b/sys-devel/llvm/llvm-18.0.0_pre20240106.ebuild
@@ -49,7 +49,6 @@ BDEPEND="
        sys-devel/gnuconfig
        kernel_Darwin? (
                <sys-libs/libcxx-${LLVM_VERSION}.9999
-               >=sys-devel/binutils-apple-5.1
        )
        doc? ( $(python_gen_any_dep '
                dev-python/myst-parser[${PYTHON_USEDEP}]

diff --git a/sys-devel/llvm/llvm-18.0.0_pre20240113.ebuild 
b/sys-devel/llvm/llvm-18.0.0_pre20240113.ebuild
index 9c1e247877cc..80b458f57415 100644
--- a/sys-devel/llvm/llvm-18.0.0_pre20240113.ebuild
+++ b/sys-devel/llvm/llvm-18.0.0_pre20240113.ebuild
@@ -49,7 +49,6 @@ BDEPEND="
        sys-devel/gnuconfig
        kernel_Darwin? (
                <sys-libs/libcxx-${LLVM_VERSION}.9999
-               >=sys-devel/binutils-apple-5.1
        )
        doc? ( $(python_gen_any_dep '
                dev-python/myst-parser[${PYTHON_USEDEP}]

diff --git a/sys-devel/llvm/llvm-18.0.0_pre20240120.ebuild 
b/sys-devel/llvm/llvm-18.0.0_pre20240120.ebuild
index 9c1e247877cc..80b458f57415 100644
--- a/sys-devel/llvm/llvm-18.0.0_pre20240120.ebuild
+++ b/sys-devel/llvm/llvm-18.0.0_pre20240120.ebuild
@@ -49,7 +49,6 @@ BDEPEND="
        sys-devel/gnuconfig
        kernel_Darwin? (
                <sys-libs/libcxx-${LLVM_VERSION}.9999
-               >=sys-devel/binutils-apple-5.1
        )
        doc? ( $(python_gen_any_dep '
                dev-python/myst-parser[${PYTHON_USEDEP}]

diff --git a/sys-devel/llvm/llvm-19.0.0.9999.ebuild 
b/sys-devel/llvm/llvm-19.0.0.9999.ebuild
index a0c0d6fa41d6..23646ea90d8a 100644
--- a/sys-devel/llvm/llvm-19.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-19.0.0.9999.ebuild
@@ -49,7 +49,6 @@ BDEPEND="
        sys-devel/gnuconfig
        kernel_Darwin? (
                <sys-libs/libcxx-${LLVM_VERSION}.9999
-               >=sys-devel/binutils-apple-5.1
        )
        doc? ( $(python_gen_any_dep '
                dev-python/myst-parser[${PYTHON_USEDEP}]

Reply via email to