commit: c2febb6f6fa7ab82e7943d2c4f77749ccb5a61bd
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 11:32:26 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 11:53:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2febb6f
Rename dev-ml/{llvm-ocaml → llvm}
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-ml/{llvm-ocaml => llvm}/Manifest | 0
.../llvm-ocaml-15.0.7.ebuild => llvm/llvm-15.0.7.ebuild} | 0
.../llvm-ocaml-16.0.6.ebuild => llvm/llvm-16.0.6.ebuild} | 0
.../llvm-ocaml-17.0.6.ebuild => llvm/llvm-17.0.6.ebuild} | 0
.../llvm-ocaml-18.1.8.ebuild => llvm/llvm-18.1.8.ebuild} | 0
.../llvm-ocaml-19.1.4.ebuild => llvm/llvm-19.1.4.ebuild} | 0
.../llvm-ocaml-19.1.5.ebuild => llvm/llvm-19.1.5.ebuild} | 0
.../llvm-20.0.0.9999.ebuild} | 0
.../llvm-20.0.0_pre20241207.ebuild} | 0
dev-ml/{llvm-ocaml => llvm}/metadata.xml | 0
llvm-core/llvm/llvm-15.0.7-r7.ebuild | 2 +-
llvm-core/llvm/llvm-16.0.6-r5.ebuild | 2 +-
llvm-core/llvm/llvm-17.0.6-r3.ebuild | 2 +-
llvm-core/llvm/llvm-18.1.8-r6.ebuild | 2 +-
llvm-core/llvm/llvm-19.1.4.ebuild | 2 +-
llvm-core/llvm/llvm-19.1.5.ebuild | 2 +-
llvm-core/llvm/llvm-20.0.0.9999.ebuild | 2 +-
llvm-core/llvm/llvm-20.0.0_pre20241207.ebuild | 2 +-
metadata/stabilization-groups/llvm.group | 2 +-
profiles/arch/amd64/package.use | 2 +-
profiles/arch/amd64/package.use.force | 2 +-
profiles/arch/arm/package.use.force | 2 +-
profiles/arch/arm64/package.use.force | 2 +-
profiles/arch/loong/package.use.force | 2 +-
profiles/arch/mips/package.use.force | 2 +-
profiles/arch/powerpc/package.use.force | 2 +-
profiles/arch/riscv/package.use | 2 +-
profiles/arch/s390/s390x/package.use.force | 2 +-
profiles/arch/sparc/package.use | 2 +-
profiles/arch/sparc/package.use.force | 2 +-
profiles/arch/x86/package.use | 2 +-
profiles/arch/x86/package.use.force | 2 +-
profiles/base/package.use | 2 +-
profiles/base/package.use.mask | 10 +++++-----
profiles/prefix/darwin/macos/arch/arm64/package.use.force | 2 +-
profiles/prefix/darwin/macos/arch/ppc/package.use.force | 2 +-
profiles/prefix/darwin/macos/arch/x64/package.use.force | 2 +-
profiles/updates/4Q-2024 | 1 +
38 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm/Manifest
similarity index 100%
rename from dev-ml/llvm-ocaml/Manifest
rename to dev-ml/llvm/Manifest
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.7.ebuild
b/dev-ml/llvm/llvm-15.0.7.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-15.0.7.ebuild
rename to dev-ml/llvm/llvm-15.0.7.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.6.ebuild
b/dev-ml/llvm/llvm-16.0.6.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-16.0.6.ebuild
rename to dev-ml/llvm/llvm-16.0.6.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.6.ebuild
b/dev-ml/llvm/llvm-17.0.6.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-17.0.6.ebuild
rename to dev-ml/llvm/llvm-17.0.6.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.8.ebuild
b/dev-ml/llvm/llvm-18.1.8.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-18.1.8.ebuild
rename to dev-ml/llvm/llvm-18.1.8.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.4.ebuild
b/dev-ml/llvm/llvm-19.1.4.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-19.1.4.ebuild
rename to dev-ml/llvm/llvm-19.1.4.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.5.ebuild
b/dev-ml/llvm/llvm-19.1.5.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-19.1.5.ebuild
rename to dev-ml/llvm/llvm-19.1.5.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0.9999.ebuild
b/dev-ml/llvm/llvm-20.0.0.9999.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-20.0.0.9999.ebuild
rename to dev-ml/llvm/llvm-20.0.0.9999.ebuild
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241207.ebuild
b/dev-ml/llvm/llvm-20.0.0_pre20241207.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241207.ebuild
rename to dev-ml/llvm/llvm-20.0.0_pre20241207.ebuild
diff --git a/dev-ml/llvm-ocaml/metadata.xml b/dev-ml/llvm/metadata.xml
similarity index 100%
rename from dev-ml/llvm-ocaml/metadata.xml
rename to dev-ml/llvm/metadata.xml
diff --git a/llvm-core/llvm/llvm-15.0.7-r7.ebuild
b/llvm-core/llvm/llvm-15.0.7-r7.ebuild
index 6cc843dc5bad..e6f08b13f041 100644
--- a/llvm-core/llvm/llvm-15.0.7-r7.ebuild
+++ b/llvm-core/llvm/llvm-15.0.7-r7.ebuild
@@ -377,7 +377,7 @@ multilib_src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
- # disable OCaml bindings (now in dev-ml/llvm-ocaml)
+ # disable OCaml bindings (now in dev-ml/llvm)
-DOCAMLFIND=NO
)
diff --git a/llvm-core/llvm/llvm-16.0.6-r5.ebuild
b/llvm-core/llvm/llvm-16.0.6-r5.ebuild
index 7160e6e59701..9e393e15c202 100644
--- a/llvm-core/llvm/llvm-16.0.6-r5.ebuild
+++ b/llvm-core/llvm/llvm-16.0.6-r5.ebuild
@@ -382,7 +382,7 @@ multilib_src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
- # disable OCaml bindings (now in dev-ml/llvm-ocaml)
+ # disable OCaml bindings (now in dev-ml/llvm)
-DOCAMLFIND=NO
)
diff --git a/llvm-core/llvm/llvm-17.0.6-r3.ebuild
b/llvm-core/llvm/llvm-17.0.6-r3.ebuild
index cfcdcf7e9876..03c5535d257d 100644
--- a/llvm-core/llvm/llvm-17.0.6-r3.ebuild
+++ b/llvm-core/llvm/llvm-17.0.6-r3.ebuild
@@ -399,7 +399,7 @@ multilib_src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
- # disable OCaml bindings (now in dev-ml/llvm-ocaml)
+ # disable OCaml bindings (now in dev-ml/llvm)
-DOCAMLFIND=NO
)
diff --git a/llvm-core/llvm/llvm-18.1.8-r6.ebuild
b/llvm-core/llvm/llvm-18.1.8-r6.ebuild
index 3b5bb9e775a8..00ab7c11855d 100644
--- a/llvm-core/llvm/llvm-18.1.8-r6.ebuild
+++ b/llvm-core/llvm/llvm-18.1.8-r6.ebuild
@@ -406,7 +406,7 @@ multilib_src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
- # disable OCaml bindings (now in dev-ml/llvm-ocaml)
+ # disable OCaml bindings (now in dev-ml/llvm)
-DOCAMLFIND=NO
)
diff --git a/llvm-core/llvm/llvm-19.1.4.ebuild
b/llvm-core/llvm/llvm-19.1.4.ebuild
index f95d589ea5a3..83c7878116f8 100644
--- a/llvm-core/llvm/llvm-19.1.4.ebuild
+++ b/llvm-core/llvm/llvm-19.1.4.ebuild
@@ -409,7 +409,7 @@ multilib_src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
- # disable OCaml bindings (now in dev-ml/llvm-ocaml)
+ # disable OCaml bindings (now in dev-ml/llvm)
-DOCAMLFIND=NO
)
diff --git a/llvm-core/llvm/llvm-19.1.5.ebuild
b/llvm-core/llvm/llvm-19.1.5.ebuild
index 8892c50ed2e7..e134572c0a51 100644
--- a/llvm-core/llvm/llvm-19.1.5.ebuild
+++ b/llvm-core/llvm/llvm-19.1.5.ebuild
@@ -409,7 +409,7 @@ multilib_src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
- # disable OCaml bindings (now in dev-ml/llvm-ocaml)
+ # disable OCaml bindings (now in dev-ml/llvm)
-DOCAMLFIND=NO
)
diff --git a/llvm-core/llvm/llvm-20.0.0.9999.ebuild
b/llvm-core/llvm/llvm-20.0.0.9999.ebuild
index d364662559b9..9f0241e1ec26 100644
--- a/llvm-core/llvm/llvm-20.0.0.9999.ebuild
+++ b/llvm-core/llvm/llvm-20.0.0.9999.ebuild
@@ -415,7 +415,7 @@ multilib_src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
- # disable OCaml bindings (now in dev-ml/llvm-ocaml)
+ # disable OCaml bindings (now in dev-ml/llvm)
-DOCAMLFIND=NO
)
diff --git a/llvm-core/llvm/llvm-20.0.0_pre20241207.ebuild
b/llvm-core/llvm/llvm-20.0.0_pre20241207.ebuild
index d364662559b9..9f0241e1ec26 100644
--- a/llvm-core/llvm/llvm-20.0.0_pre20241207.ebuild
+++ b/llvm-core/llvm/llvm-20.0.0_pre20241207.ebuild
@@ -415,7 +415,7 @@ multilib_src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
- # disable OCaml bindings (now in dev-ml/llvm-ocaml)
+ # disable OCaml bindings (now in dev-ml/llvm)
-DOCAMLFIND=NO
)
diff --git a/metadata/stabilization-groups/llvm.group
b/metadata/stabilization-groups/llvm.group
index 98bb0f87d455..7fa36bd98fcf 100644
--- a/metadata/stabilization-groups/llvm.group
+++ b/metadata/stabilization-groups/llvm.group
@@ -1,4 +1,4 @@
-dev-ml/llvm-ocaml
+dev-ml/llvm
dev-python/clang-python
dev-python/lit
llvm-core/clang
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index 2108df51e585..eb73ee985cec 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -37,7 +37,7 @@ sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc
# Michał Górny <[email protected]> (2016-09-24)
# Enable the GPU targets matching the default VIDEO_CARDS
-dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
+dev-ml/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
llvm-core/clang llvm_targets_AMDGPU llvm_targets_NVPTX
llvm-core/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/profiles/arch/amd64/package.use.force
b/profiles/arch/amd64/package.use.force
index adcb7251ce13..da5032b5b2ec 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -40,7 +40,7 @@ sys-apps/sandbox abi_x86_32
# Michał Górny <[email protected]> (2016-09-24)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_X86
+dev-ml/llvm llvm_targets_X86
llvm-core/clang llvm_targets_X86
llvm-core/llvm llvm_targets_X86
diff --git a/profiles/arch/arm/package.use.force
b/profiles/arch/arm/package.use.force
index 6078ea244a85..e895ba22c4ad 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -16,6 +16,6 @@ dev-lang/rust llvm_targets_ARM
# Michał Górny <[email protected]> (2016-09-24)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_ARM
+dev-ml/llvm llvm_targets_ARM
llvm-core/clang llvm_targets_ARM
llvm-core/llvm llvm_targets_ARM
diff --git a/profiles/arch/arm64/package.use.force
b/profiles/arch/arm64/package.use.force
index 27fa09ae9bf7..bd26d13e42e5 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -40,6 +40,6 @@ dev-lang/rust llvm_targets_AArch64
# Michał Górny <[email protected]> (2016-09-24)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_AArch64
+dev-ml/llvm llvm_targets_AArch64
llvm-core/clang llvm_targets_AArch64
llvm-core/llvm llvm_targets_AArch64
diff --git a/profiles/arch/loong/package.use.force
b/profiles/arch/loong/package.use.force
index 16eca7f362da..f1f01cb659f3 100644
--- a/profiles/arch/loong/package.use.force
+++ b/profiles/arch/loong/package.use.force
@@ -28,7 +28,7 @@ media-video/mpv lua_single_target_lua5-1
-lua_single_target_luajit
# Some packages are not fully ported yet, but preemptively added so we won't
# have to revisit later.
dev-lang/rust llvm_targets_LoongArch
-dev-ml/llvm-ocaml llvm_targets_LoongArch
+dev-ml/llvm llvm_targets_LoongArch
llvm-core/clang llvm_targets_LoongArch
llvm-core/llvm llvm_targets_LoongArch
diff --git a/profiles/arch/mips/package.use.force
b/profiles/arch/mips/package.use.force
index 2f291f62f765..3d5be7f071c4 100644
--- a/profiles/arch/mips/package.use.force
+++ b/profiles/arch/mips/package.use.force
@@ -7,6 +7,6 @@ dev-lang/rust llvm_targets_Mips
# Michał Górny <[email protected]> (2016-09-24)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_Mips
+dev-ml/llvm llvm_targets_Mips
llvm-core/clang llvm_targets_Mips
llvm-core/llvm llvm_targets_Mips
diff --git a/profiles/arch/powerpc/package.use.force
b/profiles/arch/powerpc/package.use.force
index 534364aace37..d9e962820714 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -20,6 +20,6 @@ dev-lang/rust llvm_targets_PowerPC
# Michał Górny <[email protected]> (2016-09-24)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_PowerPC
+dev-ml/llvm llvm_targets_PowerPC
llvm-core/clang llvm_targets_PowerPC
llvm-core/llvm llvm_targets_PowerPC
diff --git a/profiles/arch/riscv/package.use b/profiles/arch/riscv/package.use
index bfd8e56f9b7c..dd7d9ebd37e6 100644
--- a/profiles/arch/riscv/package.use
+++ b/profiles/arch/riscv/package.use
@@ -9,6 +9,6 @@ media-video/mpv soc
# Yixun Lan <[email protected]> (2021-07-20)
# Enable the GPU targets matching the default VIDEO_CARDS
-dev-ml/llvm-ocaml llvm_targets_AMDGPU
+dev-ml/llvm llvm_targets_AMDGPU
llvm-core/clang llvm_targets_AMDGPU
llvm-core/llvm llvm_targets_AMDGPU
diff --git a/profiles/arch/s390/s390x/package.use.force
b/profiles/arch/s390/s390x/package.use.force
index 9ffd60862e32..2f5d02582336 100644
--- a/profiles/arch/s390/s390x/package.use.force
+++ b/profiles/arch/s390/s390x/package.use.force
@@ -7,7 +7,7 @@ sys-auth/polkit duktape
# Michał Górny <[email protected]> (2016-11-11)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_SystemZ
+dev-ml/llvm llvm_targets_SystemZ
dev-lang/rust llvm_targets_SystemZ
llvm-core/clang llvm_targets_SystemZ
llvm-core/llvm llvm_targets_SystemZ
diff --git a/profiles/arch/sparc/package.use b/profiles/arch/sparc/package.use
index f88e6966abff..5b7f49cabf04 100644
--- a/profiles/arch/sparc/package.use
+++ b/profiles/arch/sparc/package.use
@@ -3,7 +3,7 @@
# Michał Górny <[email protected]> (2016-09-24)
# Enable the GPU targets matching the default VIDEO_CARDS
-dev-ml/llvm-ocaml llvm_targets_AMDGPU
+dev-ml/llvm llvm_targets_AMDGPU
llvm-core/clang llvm_targets_AMDGPU
llvm-core/llvm llvm_targets_AMDGPU
diff --git a/profiles/arch/sparc/package.use.force
b/profiles/arch/sparc/package.use.force
index 71ab3a85d27e..8468ce0df82b 100644
--- a/profiles/arch/sparc/package.use.force
+++ b/profiles/arch/sparc/package.use.force
@@ -13,7 +13,7 @@ sys-auth/polkit duktape
# Michał Górny <[email protected]> (2016-09-24)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_Sparc
+dev-ml/llvm llvm_targets_Sparc
llvm-core/clang llvm_targets_Sparc
llvm-core/llvm llvm_targets_Sparc
dev-lang/rust llvm_targets_Sparc
diff --git a/profiles/arch/x86/package.use b/profiles/arch/x86/package.use
index c4b27fb3ac42..0bbf0a8cbe80 100644
--- a/profiles/arch/x86/package.use
+++ b/profiles/arch/x86/package.use
@@ -12,7 +12,7 @@ sys-apps/memtest86+ bios32
# Michał Górny <[email protected]> (2016-09-24)
# Enable the GPU targets matching the default VIDEO_CARDS
-dev-ml/llvm-ocaml llvm_targets_AMDGPU llvm_targets_NVPTX
+dev-ml/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
llvm-core/clang llvm_targets_AMDGPU llvm_targets_NVPTX
llvm-core/llvm llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/profiles/arch/x86/package.use.force
b/profiles/arch/x86/package.use.force
index 700ae620d828..7e0f7b0c3508 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -35,6 +35,6 @@ dev-lang/rust llvm_targets_X86
# Michał Górny <[email protected]> (2016-09-24)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_X86
+dev-ml/llvm llvm_targets_X86
llvm-core/clang llvm_targets_X86
llvm-core/llvm llvm_targets_X86
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 1960babb2192..92b4c57ef598 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -52,7 +52,7 @@ media-video/wireplumber lua_single_target_lua5-4
# Michał Górny <[email protected]> (2016-09-24)
# Enable the BPF target by default
-dev-ml/llvm-ocaml llvm_targets_BPF
+dev-ml/llvm llvm_targets_BPF
llvm-core/clang llvm_targets_BPF
llvm-core/llvm llvm_targets_BPF
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 9652be31ad0d..d6fe0a8e1bc9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -629,19 +629,19 @@ app-office/abiword ots
# Mask the experimental targets in release ebuilds.
# Note to self: remember to move still-applicable masks to the newer
# version when master is bumped.
-<dev-ml/llvm-ocaml-16 llvm_targets_LoongArch
+<dev-ml/llvm-16 llvm_targets_LoongArch
<llvm-core/clang-16 llvm_targets_LoongArch
<llvm-core/llvm-16 llvm_targets_LoongArch
-<dev-ml/llvm-ocaml-17 llvm_targets_ARC llvm_targets_CSKY
+<dev-ml/llvm-17 llvm_targets_ARC llvm_targets_CSKY
<llvm-core/clang-17 llvm_targets_ARC llvm_targets_CSKY
<llvm-core/llvm-17 llvm_targets_ARC llvm_targets_CSKY
-<dev-ml/llvm-ocaml-17 llvm_targets_DirectX
+<dev-ml/llvm-17 llvm_targets_DirectX
<llvm-core/clang-17 llvm_targets_DirectX
<llvm-core/llvm-17 llvm_targets_DirectX
-<dev-ml/llvm-ocaml-17 llvm_targets_M68k llvm_targets_SPIRV
+<dev-ml/llvm-17 llvm_targets_M68k llvm_targets_SPIRV
<llvm-core/clang-17 llvm_targets_M68k llvm_targets_SPIRV
<llvm-core/llvm-17 llvm_targets_M68k llvm_targets_SPIRV
-<dev-ml/llvm-ocaml-17 llvm_targets_Xtensa
+<dev-ml/llvm-17 llvm_targets_Xtensa
<llvm-core/clang-17 llvm_targets_Xtensa
<llvm-core/llvm-17 llvm_targets_Xtensa
diff --git a/profiles/prefix/darwin/macos/arch/arm64/package.use.force
b/profiles/prefix/darwin/macos/arch/arm64/package.use.force
index 7dfc8c26129c..aad5e2426c8c 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/arm64/package.use.force
@@ -3,6 +3,6 @@
# Fabian Groffen <[email protected]> (2020-12-31)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_AArch64
+dev-ml/llvm llvm_targets_AArch64
llvm-core/clang llvm_targets_AArch64
llvm-core/llvm llvm_targets_AArch64
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.force
b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
index 0e5c1e628ffc..316fe8fb4022 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
@@ -7,6 +7,6 @@ sys-devel/gcc -pie
# Fabian Groffen <[email protected]> (2016-12-20)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_PowerPC
+dev-ml/llvm llvm_targets_PowerPC
llvm-core/clang llvm_targets_PowerPC
llvm-core/llvm llvm_targets_PowerPC
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.force
b/profiles/prefix/darwin/macos/arch/x64/package.use.force
index 27d8966fd9f8..34bc46c08bb3 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.force
@@ -3,6 +3,6 @@
# Fabian Groffen <[email protected]> (2016-12-20)
# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_X86
+dev-ml/llvm llvm_targets_X86
llvm-core/clang llvm_targets_X86
llvm-core/llvm llvm_targets_X86
diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024
index 26a199ba3409..4151dc191c38 100644
--- a/profiles/updates/4Q-2024
+++ b/profiles/updates/4Q-2024
@@ -80,3 +80,4 @@ move sys-devel/llvmgold llvm-core/llvmgold
move sys-devel/llvm-toolchain-symlinks llvm-core/llvm-toolchain-symlinks
move sys-devel/llvm-common llvm-core/llvm-common
move sys-devel/llvm llvm-core/llvm
+move dev-ml/llvm-ocaml dev-ml/llvm
