gentoo auto-resync : 01:03:2025 - 19:28:40

6 files changed, 2 insertions, 330 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 4837b1393539..adbe43287ae6 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm/Manifest b/dev-ml/llvm/Manifest
index ce9e8b01ca9c..61b201627938 100644
--- a/dev-ml/llvm/Manifest
+++ b/dev-ml/llvm/Manifest
@@ -10,13 +10,9 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
-DIST llvm-project-20.1.0-rc2.src.tar.xz 147160684 BLAKE2B 6adc1226f022272d78fb0ed361c190d369a2afc53bf868409fe8f4e092d5ffb9894c71870f072bb68162610782f48088468b4a49cdb1bc731d6689c791a5b5e3 SHA512 f303deaec8f25e1b122a7e85df192b6ea10c51472b78a3d14ad9d0b976a533cfbb9164aff0bc99e447e30938cf43363552c5493b4693e1f23291ea7a9b824bbb
-DIST llvm-project-20.1.0-rc2.src.tar.xz.sig 566 BLAKE2B aa91f7be228e51b0f2234bb5e0df173e3ddc90b6db4350a9008c2f8ba53220da6eef0c69778aecac3caecf918a0c54a0d910177ffe7643ad7fc5624a97262b7f SHA512 e5563a8a79b5e9ef26d62dc6d4385c1c86d12a652b4b1e7fc9ce45a2ea66e5118112746a61b439823bf99d65aea82285eabf5e07714eec77e6e5cd02feab82ce
 DIST llvm-project-20.1.0-rc3.src.tar.xz 147194560 BLAKE2B 888764927782b01e968c9ec326315375c6b1050d3852c7ebe7fbd06b3b4052307162f77a76f1e8976879178116ea909c581b8d1ee99dc7a4c5368b01d5597d23 SHA512 9de97104681de9c8039f03e94adc25fe1765280f826342fb4f616266aa0e4afe63db09a8cc3458252d8b2834e4efb2d17ed0226c62c7bb06d948ba8172ee078c
 DIST llvm-project-20.1.0-rc3.src.tar.xz.sig 566 BLAKE2B 411ad085c3ab83c1599d110d93a9279206885a01e4748b8ac015a9a94b89fe25c35eab38b213cafb7f733be03826ffc4a01eb52788e2742d44d41a487aff2e26 SHA512 53c5aaa963e883ff06ac7ec9b821dcc4476b79f5be0169667843b18cd8836e8993856a045f2aab23bc77faefc2983fd822cfb1219d5644cec67132d647c877d8
-DIST llvm-project-2cd8207b26ea4269630feba661f68554d7ae3c15.tar.gz 227261597 BLAKE2B 51ce992b651fcf08b7fd520420040803b59f1260947953325400c50bec576c418b162d8ae2d2307e70b885b1185c302a97409bcfe48cdb14b8e1384f4e2dfa9e SHA512 a41749943508ea4a18b47c4e947917b5268544e64372c0c3347f9ab8172a2c229d8b1d813d1e842be1b98aedd624524857ed3bb23fe98ad5f36e7a71581abb4b
-DIST llvm-project-581599096e8a1a89ccd3e053a1209c69a9079083.tar.gz 227830555 BLAKE2B 28a04dd5ce96716d389fe049c4b877f55d6e5cad5c77d8867dd7e3a448213ef413e4f4d7d5f77b0702b26a8eb25f53e08d90e2a5a97eaa3f89245531d9f6626d SHA512 d775aea9bf71d60673e966a689ff6b933afecab2c133a1f64a158551ba9db049221148eab5087bab0ce0ff917456b85fb4ea4d7284886326f54617d167a385a5
-DIST llvm-project-c30a7f459452d5766da244564bc1d5888346c364.tar.gz 227560986 BLAKE2B c1c833aa6d488530826d96db81ca8be2fcf842ccf5b10a65ff18269fdfa32fa2742fb0a547eb315c2a9ee383e1b6b6cce4a78136e1740e04d322c79fb6a66a86 SHA512 0b68d3462e5eac89f50cff5e64603758ab74c701ff2de88c8569dd45b7e702b5d13b26c2745615c0c355d46d13765f47e4d43e61cde735240c6f386c0090becb
+DIST llvm-project-7e8a06cfa4a2951b8ee77e19e34926e6e535b4d1.tar.gz 228792296 BLAKE2B cd9357bdca9342770820f9fadfbd0b129a83324847f18e2ebac1fed8df4afb101aba2dc19d90264ae1e2d5692e34149ca24ef82a4973e7aeddb157268bb411b6 SHA512 9821a34a559e1db596940d76ce9388360baea43c1a9de814f567bfcf1428a0c6e3ced61b1e07537058454785d9c3aa3f443cbcf742a01fb40dd20b476a906442
 DIST llvm-project-d254fa877f419e61e54709f0a6f2e891da893a60.tar.gz 228028122 BLAKE2B 3321f3b205dfcd672d52122d7ba8e4e737916e01f5041a0dc140722f64359476632e036da0e0692cd366b080a073292cfdb4963e973bf800afabc20d06a2e86b SHA512 135c4864973b682cf41953d43d977eaa219a4a898fceb4b4a8cacbbc6a5dd271d26010b1db6c6c90e761bf3495036f3e7528ab259d48c9c4dc4a064332c0326f
 EBUILD llvm-15.0.7.ebuild 2576 BLAKE2B 077f5cee93e3f92e808856559add99b5fb94c03316493329fcc5067065c44d2216420fb411c9a52fb303fd33c9d4a4edb19d4b6f20ee10ac2e86d518f3ff500a SHA512 ca1d7158d86040261105d93632a2e0f23753990e8a0a268aef2b103c1c2cc81f0497bf243301839ab7c5b00051337bc20d7d9bb1f35c844a7a06d5b02603c72a
 EBUILD llvm-16.0.6.ebuild 2510 BLAKE2B a1877c6ac0e8e2063ab386eb063224b0059a1b8c956e26f5ac1b5daf4902a7bf221b1591be144df618a3598e5634ca80fa43ed3b734b8c096845f34649e9f125 SHA512 cfefe80cf361a5e98be33cdf75b1fc4c226496a68caf7ab19dc47bac3c2b91bbbb5c09c2447b0271e2149d2c5aded7a28e14e57f072ee8abc04cabef11a7fabc
@@ -24,11 +20,8 @@ EBUILD llvm-17.0.6.ebuild 2510 BLAKE2B a1877c6ac0e8e2063ab386eb063224b0059a1b8c9
 EBUILD llvm-18.1.8.ebuild 2466 BLAKE2B daa9646cc6b01f6de1ca0dfb13f8851b179985334b80cb5610fe11eb87be08129bc81ea6ab424e319c4eeca69bb9b29da19a36225eb79a1d6d9121e4c878b6b4 SHA512 30321d67dc080c88cc351959ec5b8ae63f1201559b0101c555420afada30ba21927f79907019ed6550242f613d2bc27668a4ff750e89f569fd200e1bb9c475ea
 EBUILD llvm-19.1.4.ebuild 2466 BLAKE2B daa9646cc6b01f6de1ca0dfb13f8851b179985334b80cb5610fe11eb87be08129bc81ea6ab424e319c4eeca69bb9b29da19a36225eb79a1d6d9121e4c878b6b4 SHA512 30321d67dc080c88cc351959ec5b8ae63f1201559b0101c555420afada30ba21927f79907019ed6550242f613d2bc27668a4ff750e89f569fd200e1bb9c475ea
 EBUILD llvm-19.1.7.ebuild 2466 BLAKE2B 095155ffec474c2b2c6d7a241f7e8026f316d5e7e194920221480530493e72808f5d43907ef9a520e5c4501e8f8b744712a407d106739de7ff313bce774ab4f9 SHA512 5faba05a88385260585b1e41a69d329efba70bfc836e5e3ba1dac89ed52e48567891cc8c399485b9322a8f8fc038a908ea09bac0fb8e3db6275d4c91434fad80
-EBUILD llvm-20.1.0_rc2.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
 EBUILD llvm-20.1.0_rc3.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
 EBUILD llvm-21.0.0.9999.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
-EBUILD llvm-21.0.0_pre20250211.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
-EBUILD llvm-21.0.0_pre20250215.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
-EBUILD llvm-21.0.0_pre20250221.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
 EBUILD llvm-21.0.0_pre20250225.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
+EBUILD llvm-21.0.0_pre20250301.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm/llvm-21.0.0_pre20250211.ebuild b/dev-ml/llvm/llvm-21.0.0_pre20250211.ebuild
deleted file mode 100644
index bacc5c89fa79..000000000000
--- a/dev-ml/llvm/llvm-21.0.0_pre20250211.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~llvm-core/llvm-${PV}:=[debug?]
-	!llvm-core/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm/llvm-21.0.0_pre20250215.ebuild b/dev-ml/llvm/llvm-21.0.0_pre20250215.ebuild
deleted file mode 100644
index bacc5c89fa79..000000000000
--- a/dev-ml/llvm/llvm-21.0.0_pre20250215.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~llvm-core/llvm-${PV}:=[debug?]
-	!llvm-core/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm/llvm-21.0.0_pre20250221.ebuild b/dev-ml/llvm/llvm-21.0.0_pre20250221.ebuild
deleted file mode 100644
index bacc5c89fa79..000000000000
--- a/dev-ml/llvm/llvm-21.0.0_pre20250221.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~llvm-core/llvm-${PV}:=[debug?]
-	!llvm-core/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm/llvm-20.1.0_rc2.ebuild b/dev-ml/llvm/llvm-21.0.0_pre20250301.ebuild
index bacc5c89fa79..bacc5c89fa79 100644
--- a/dev-ml/llvm/llvm-20.1.0_rc2.ebuild
+++ b/dev-ml/llvm/llvm-21.0.0_pre20250301.ebuild