Rename dev-ml/{llvm-ocaml → llvm}

Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-08-06 12:58:16 -07:00 · 2024-12-11 12:32:26 +01:00
parent 1f9f1999cd
commit c2febb6f6f
38 changed files with 32 additions and 31 deletions
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
--- a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.7.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.7.ebuild
--- a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.6.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.6.ebuild
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.6.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.6.ebuild
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.8.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-18.1.8.ebuild
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.4.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.1.4.ebuild
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.5.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.1.5.ebuild
--- a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0.9999.ebuild
--- a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241207.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241207.ebuild
--- a/dev-ml/llvm-ocaml/metadata.xml
+++ b/dev-ml/llvm-ocaml/metadata.xml
--- 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
 	)

--- 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
 	)

--- 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
 	)

--- 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
 	)

--- 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
 	)

--- 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
 	)

--- 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
 	)

--- 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
 	)

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

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

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

--- 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 <mgorny@gentoo.org> (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
--- 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 <mgorny@gentoo.org> (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
--- a/profiles/arch/riscv/package.use
+++ b/profiles/arch/riscv/package.use
@@ -9,6 +9,6 @@ media-video/mpv soc

 # Yixun Lan <dlan@gentoo.org> (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
--- 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 <mgorny@gentoo.org> (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
--- a/profiles/arch/sparc/package.use
+++ b/profiles/arch/sparc/package.use
@@ -3,7 +3,7 @@

 # Michał Górny <mgorny@gentoo.org> (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

--- 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 <mgorny@gentoo.org> (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
--- a/profiles/arch/x86/package.use
+++ b/profiles/arch/x86/package.use
@@ -12,7 +12,7 @@ sys-apps/memtest86+ bios32

 # Michał Górny <mgorny@gentoo.org> (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

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

--- 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

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