gentoo auto-resync : 12:12:2024 - 02:01:23

16 files changed, 31 insertions, 137 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 362d6d5769a9..6aa27725cb23 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index d42a54352bb7..dc17a882a8f2 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,3 +1,3 @@
 DIST cudf-v0.10.tar.bz2 47664 BLAKE2B 6ecdfc4243d80f12f6904b334f93ff47beb94535b6ba84992c6a31d244a7c2dcb6072e67828d96b31d4628bb244022fd962efcdcae5299f5a57694f3aa6c95a8 SHA512 b36ecad224070d2c07d4123fb7e39160390ddec4196505e66aad9fbd982bd7ca320ff5f0e771e7996da49bff22fb87fc057060277695b75cd68de19e57cb3855
-EBUILD cudf-0.10-r1.ebuild 2216 BLAKE2B afc71be9bafefb590bba4fedc82d0cbd958d1bd7be0fe7709265c27e451d942affdfc12fa4946e6c3616a152edbda8f5ff3e09a7d126fa0bccd12654592ebe73 SHA512 d23507b36faca065bf4a7c5759ae72ed289554e89d4673485b2e1bb1e8261c2b1cd8c99ab46c1cf80d104274a376e728a1f0aea2a65ca913eca42cfbc2f23b01
+EBUILD cudf-0.10-r1.ebuild 2216 BLAKE2B d093137e4b924e506f90dc3a8525b70e9f93c134cc5b8d145bcaa9b968a20d2c6c23ffd9f5f06974bcd841d677f61617ab66792b1f010338a4f47ca589fc5f9f SHA512 50c37238470f32e986184a190127dec5e90b80f8e7f9ecbfb093d22a5b7e54ddabddfbe96174df58b02dc01985247bd007328eba3554eb76d337b0fbd1273e72
 MISC metadata.xml 308 BLAKE2B 3ef59c1feb944f3cc9773629c5c4da487557829efb4764ce4b58f70c4a6c958bf675402ade39dde82b9f433c40d7933f4dcd372c529aec41a59a413287d43ee2 SHA512 4d7af5033b612da1fb1d2a80676c1e2a9818566c69c585c72554ac3fb827ea8bf216a59b9fb61ca0c2d74ea5745d6559d819e58512d100d482b9b53f5af3dd7d
diff --git a/dev-ml/cudf/cudf-0.10-r1.ebuild b/dev-ml/cudf/cudf-0.10-r1.ebuild
index 0bda6ee73dcd..4dcacb01d097 100644
--- a/dev-ml/cudf/cudf-0.10-r1.ebuild
+++ b/dev-ml/cudf/cudf-0.10-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-ml/extlib:=
 	dev-ml/findlib:=
 	dev-libs/glib:2
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	llvm-libunwind? ( llvm-runtimes/libunwind:= )
 	!llvm-libunwind? ( sys-libs/libunwind:= )
 	sys-libs/ncurses:=
 	app-arch/zstd
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0.9999.ebuild
deleted file mode 100644
index 36b3716c0372..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0.9999.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2024 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:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/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-ocaml/Manifest b/dev-ml/llvm/Manifest
index 5800ce26f652..916ceb1b85a9 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm/Manifest
@@ -11,14 +11,12 @@ DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e2
 DIST llvm-project-19.1.5.src.tar.xz 141243716 BLAKE2B 228fc66ab688abfc16f31b2cd83163b81ef61604ace21eab69a1776f0dc88cbe8fa831162205849e5be3975a214136399572b4ad1b908986e37b2d38a1a7fa5d SHA512 648854e9c91fdcc5c677ce3800e046f2060b998a45cf9f7eebe02898431b3924f9348b6fc366102cd4fdda72dcb8f32076f98aa69927e0e20b3f1007fba10b22
 DIST llvm-project-19.1.5.src.tar.xz.sig 438 BLAKE2B 1d40a5c5405f99ef86e3360f9ea153afd1ae4001697210fd799a988113e8a3cef39e2c4794edd9332f384d8490f4ce2ab6bee6d98f794f84775807f833b81c0a SHA512 a438c86ce882eb1ac3e50842937068794ed162bb1b7ded68a2fe3ec2ab4f57cc38aee667cfb46afe6da22eef7ed1cb65820a473f63bd5a0dc6aad41df7bfad54
 DIST llvm-project-32f7f0010bca99ee4bd917f57272733fb2bf3bd9.tar.gz 223983502 BLAKE2B fd3e6b0b795abc42568ef98fa774d927029c18838a5d0f34eaa66c37976444a63f2fc5d883f3bf3a98533f51e387936f1c659230f31c757d26153425696a16cd SHA512 65a345ad5b77c627008f759947e5e9f28a62c8992d7146113e0446e5849feaf9088c15c8b22ca0824af5b927d6a417f5326258b489fb8ccea78ec9e0e0fe8fba
-DIST llvm-project-a348f223cab54b21a7b1c38dec7bc6aa2f81c949.tar.gz 223630067 BLAKE2B 3c2121a8d13e3a84a9ee98d17c58e5fd5a31d5870ac21c633c78c49b4af0c401310f7e91f64ff3b7cf7f6e8d205c730458b8b1101b1255f422659974d48e2ecb SHA512 33cc09a904e4fe0d529611a1d71d764e6d49f014cea903aadc0755d0420f65cfc763fdcfd4bb9a96adad79ce1c4475d8c005dcac37c4fe130a1fb3665172f1db
-EBUILD llvm-ocaml-15.0.7.ebuild 2576 BLAKE2B 19ad7bcc099299b50cee2551d0998ef748cf46081605459355a9d11b5882a3a26559892321f47d67f927a422ed1dc34332f9d9bee82da3e151dc9edec58f458a SHA512 3366ae720bb79421c253c28946c5281152d3573416fb9c7967327bd2d2b418f01887d63e00ccc1d5f5008d1f05280f270fe15be3e8d2b812c782d881778e8417
-EBUILD llvm-ocaml-16.0.6.ebuild 2510 BLAKE2B 129a25c76d02640a151bd2ba8b1542e34bc4b0adb5aac797f96f7f888b8939ae33dcda9eb1f2ec31eae81575ac3e32995b9e99de3540f3fdc8e085b0185200ec SHA512 250285a57be6d7cfbddd4a9ff4ab8bc25e2813441da263bfef1a7a4d11658b6ed9a3d280ada7b1e45c5cb472e6647eff260926672089e7e445a12be6a5344bdb
-EBUILD llvm-ocaml-17.0.6.ebuild 2510 BLAKE2B 129a25c76d02640a151bd2ba8b1542e34bc4b0adb5aac797f96f7f888b8939ae33dcda9eb1f2ec31eae81575ac3e32995b9e99de3540f3fdc8e085b0185200ec SHA512 250285a57be6d7cfbddd4a9ff4ab8bc25e2813441da263bfef1a7a4d11658b6ed9a3d280ada7b1e45c5cb472e6647eff260926672089e7e445a12be6a5344bdb
-EBUILD llvm-ocaml-18.1.8.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f9751bc34c3223b3f5be441e4d06d131f74aca0cb0115c71ebacb3909240e42d4608dddf98bb6f69e371d5e86e19141f5 SHA512 b7c05d3be29399eb9fb4267537a450daf00b7d8f6bd2be472e5802d4072e3a805db8d5f4fa2830ec46655170a7f2fc1119825327b2d4008af8364772fc215f65
-EBUILD llvm-ocaml-19.1.4.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f9751bc34c3223b3f5be441e4d06d131f74aca0cb0115c71ebacb3909240e42d4608dddf98bb6f69e371d5e86e19141f5 SHA512 b7c05d3be29399eb9fb4267537a450daf00b7d8f6bd2be472e5802d4072e3a805db8d5f4fa2830ec46655170a7f2fc1119825327b2d4008af8364772fc215f65
-EBUILD llvm-ocaml-19.1.5.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f9751bc34c3223b3f5be441e4d06d131f74aca0cb0115c71ebacb3909240e42d4608dddf98bb6f69e371d5e86e19141f5 SHA512 b7c05d3be29399eb9fb4267537a450daf00b7d8f6bd2be472e5802d4072e3a805db8d5f4fa2830ec46655170a7f2fc1119825327b2d4008af8364772fc215f65
-EBUILD llvm-ocaml-20.0.0.9999.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
-EBUILD llvm-ocaml-20.0.0_pre20241130.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
-EBUILD llvm-ocaml-20.0.0_pre20241207.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
+EBUILD llvm-15.0.7.ebuild 2576 BLAKE2B 077f5cee93e3f92e808856559add99b5fb94c03316493329fcc5067065c44d2216420fb411c9a52fb303fd33c9d4a4edb19d4b6f20ee10ac2e86d518f3ff500a SHA512 ca1d7158d86040261105d93632a2e0f23753990e8a0a268aef2b103c1c2cc81f0497bf243301839ab7c5b00051337bc20d7d9bb1f35c844a7a06d5b02603c72a
+EBUILD llvm-16.0.6.ebuild 2510 BLAKE2B a1877c6ac0e8e2063ab386eb063224b0059a1b8c956e26f5ac1b5daf4902a7bf221b1591be144df618a3598e5634ca80fa43ed3b734b8c096845f34649e9f125 SHA512 cfefe80cf361a5e98be33cdf75b1fc4c226496a68caf7ab19dc47bac3c2b91bbbb5c09c2447b0271e2149d2c5aded7a28e14e57f072ee8abc04cabef11a7fabc
+EBUILD llvm-17.0.6.ebuild 2510 BLAKE2B a1877c6ac0e8e2063ab386eb063224b0059a1b8c956e26f5ac1b5daf4902a7bf221b1591be144df618a3598e5634ca80fa43ed3b734b8c096845f34649e9f125 SHA512 cfefe80cf361a5e98be33cdf75b1fc4c226496a68caf7ab19dc47bac3c2b91bbbb5c09c2447b0271e2149d2c5aded7a28e14e57f072ee8abc04cabef11a7fabc
+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.5.ebuild 2466 BLAKE2B daa9646cc6b01f6de1ca0dfb13f8851b179985334b80cb5610fe11eb87be08129bc81ea6ab424e319c4eeca69bb9b29da19a36225eb79a1d6d9121e4c878b6b4 SHA512 30321d67dc080c88cc351959ec5b8ae63f1201559b0101c555420afada30ba21927f79907019ed6550242f613d2bc27668a4ff750e89f569fd200e1bb9c475ea
+EBUILD llvm-20.0.0.9999.ebuild 2439 BLAKE2B 19f4f49a8b1ab0a818a85877e6c3d2f876fcac59550644d8ec26434ea78da323f37ceb668bcffcbd8557f1c94a2e9d77e340e726862b56c6f55b3deca3b37520 SHA512 194c91d4c82e3083718040c3ebf8c0b25cfd7b0b89d3f7c84a3ae639ecd93b70e4f511e338da883631e2a24a1f1fd97610f97314a228d63a8dc82c79c24be7a5
+EBUILD llvm-20.0.0_pre20241207.ebuild 2439 BLAKE2B 19f4f49a8b1ab0a818a85877e6c3d2f876fcac59550644d8ec26434ea78da323f37ceb668bcffcbd8557f1c94a2e9d77e340e726862b56c6f55b3deca3b37520 SHA512 194c91d4c82e3083718040c3ebf8c0b25cfd7b0b89d3f7c84a3ae639ecd93b70e4f511e338da883631e2a24a1f1fd97610f97314a228d63a8dc82c79c24be7a5
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.7.ebuild b/dev-ml/llvm/llvm-15.0.7.ebuild
index 9bb647c198de..d6dd22e726d5 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.7.ebuild
+++ b/dev-ml/llvm/llvm-15.0.7.ebuild
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
 "
 
 DEPEND="
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.6.ebuild b/dev-ml/llvm/llvm-16.0.6.ebuild
index 045b66d0d543..286af8cce038 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.6.ebuild
+++ b/dev-ml/llvm/llvm-16.0.6.ebuild
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
 "
 
 DEPEND="
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.6.ebuild b/dev-ml/llvm/llvm-17.0.6.ebuild
index 045b66d0d543..286af8cce038 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.6.ebuild
+++ b/dev-ml/llvm/llvm-17.0.6.ebuild
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
 "
 
 DEPEND="
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.8.ebuild b/dev-ml/llvm/llvm-18.1.8.ebuild
index 84bd71875fac..197b3e46acd2 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-18.1.8.ebuild
+++ b/dev-ml/llvm/llvm-18.1.8.ebuild
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
 "
 
 DEPEND="
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.4.ebuild b/dev-ml/llvm/llvm-19.1.4.ebuild
index 84bd71875fac..197b3e46acd2 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.4.ebuild
+++ b/dev-ml/llvm/llvm-19.1.4.ebuild
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
 "
 
 DEPEND="
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.5.ebuild b/dev-ml/llvm/llvm-19.1.5.ebuild
index 84bd71875fac..197b3e46acd2 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.1.5.ebuild
+++ b/dev-ml/llvm/llvm-19.1.5.ebuild
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
 "
 
 DEPEND="
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241130.ebuild b/dev-ml/llvm/llvm-20.0.0.9999.ebuild
index 36b3716c0372..2b98b4b8952e 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241130.ebuild
+++ b/dev-ml/llvm/llvm-20.0.0.9999.ebuild
@@ -17,8 +17,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
 "
 
 DEPEND="
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241207.ebuild b/dev-ml/llvm/llvm-20.0.0_pre20241207.ebuild
index 36b3716c0372..2b98b4b8952e 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241207.ebuild
+++ b/dev-ml/llvm/llvm-20.0.0_pre20241207.ebuild
@@ -17,8 +17,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-lang/ocaml-4.00.0:0=
 	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
 "
 
 DEPEND="
diff --git a/dev-ml/llvm-ocaml/metadata.xml b/dev-ml/llvm/metadata.xml
index 072910296ca3..072910296ca3 100644
--- a/dev-ml/llvm-ocaml/metadata.xml
+++ b/dev-ml/llvm/metadata.xml
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
index 2d040b70f8c9..50efd357bd6b 100644
--- a/dev-ml/re/Manifest
+++ b/dev-ml/re/Manifest
@@ -6,6 +6,6 @@ DIST ocaml-re-1.13.0.tar.gz 98675 BLAKE2B dd5a2dabdb73d5c5079cc36b7d82ea829b25fc
 DIST ocaml-re-1.13.3.gh.tar.gz 98392 BLAKE2B 931ed420b211f69411969ac920815390a5f8f6ed1a190cf33adff3a7c942af303b47ee0e8b82f80e175b3812c395aa85a585d0026e9341279adc9fe9640d35ab SHA512 868960c89d3ab9264c883b9e2dac911ad6c3625df0b18e240dd2467051a5477de40abce691a0c76af91c7cda39ecf1e6275e58f2271657092b039d3ad3d066e0
 EBUILD re-1.11.0.ebuild 859 BLAKE2B e5e01cd65ae5c1f59101b2e5add7f20a70b67a3e52626c0896b7d95ba9f06ff90f58d1b169fec37074d6a397f25c3fc689ca0dd9bc1a9ac2460527ce68342670 SHA512 641c5ac54fd0a964fe7b9b265dda8a2d773800c44d6386255399d7ea7a15117fb7dce73f301f2cf019a3877d1dcf4b8bdbfb8775873029a2bb15ba8289b3b39e
 EBUILD re-1.12.0.ebuild 806 BLAKE2B 9649dde022039e5fad8b9c75bd6b0d28830066ceb7da3d79b0d5b3c380015c536f8c875431cf7dd5d917d69257e035323d68052d9a7b92626575619da9fcd1e8 SHA512 12f76545a4e1795908fc22f3e8420d8d67b594730c9200f4245704efaf3483de0066b7b57006dc81c119884b0a137809af91ca11c49b6d7646e38b6c900ac461
-EBUILD re-1.13.0.ebuild 832 BLAKE2B f3e7edb6a22cf80d0092dd3c6d109ea3718a57dfb7605d91b0eae56ce25ad596c01b62197d3852dcf4519a329087bc78e0941ebac4d25bcea0bbcc7437ec072f SHA512 31f29f0f13e18c7fa03c6621905f5d4fe926ab2b572792288a32a9da375b6ead62eccb1bb131bf8e59ba7c6391367052ba80c7a6d7fdbb17f8733d37b91067ed
+EBUILD re-1.13.0-r1.ebuild 855 BLAKE2B deea6704f5e5cb58e4d4245e52a1873692279eb7aa432517f38d46fc187dfe97bfea10c5d39a36c8b29f4178e801232b1926e5ddfd7a5c9cace7883d0846109a SHA512 e234febe9aabbca4606ed587308e3929dd4a3c8bd0ddd8263538e58085a085314b6ec3d6da50563bd047cd8c68eef565714aea6ac9847cf8a22c66fffe90e3fd
 EBUILD re-1.13.3.ebuild 922 BLAKE2B 6b3c957ab790901a2ce49a751eafb093ddfa6dac56e26bc0e986d28d4f42948e96316df8562cc2b9a21258c791ee03f729e1fb595dd6ee3c6594eeec3ae4aeb2 SHA512 bf0591fe45afe50b968f1835d3c32c223fef5f0091a5d707d3b180f939e0ea587323138ccb1e18f6bef0ffa4cb2c3670d50ae46fd3629ab576a8d9c3744353ee
 MISC metadata.xml 312 BLAKE2B 1bff09bbce8c58c0eea6b7831688673e74cecdfce1abe70df28d4d6f4c7bc12e200e9556a82a5246f2811ff6b91b96b9915feb7a4463f83f49fb306cbedf0cbb SHA512 009249da19f97167f6d60815915d746fe2a51ec8af1b1503fa4bd95979c0629843a96c31182ea8bc179a725fd68896c43aac0c78aa3e6ba8e91fc7d5206c8f43
diff --git a/dev-ml/re/re-1.13.0.ebuild b/dev-ml/re/re-1.13.0-r1.ebuild
index e135ea7f1a86..6f27afe7e5e6 100644
--- a/dev-ml/re/re-1.13.0.ebuild
+++ b/dev-ml/re/re-1.13.0-r1.ebuild
@@ -32,7 +32,10 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	test? ( dev-ml/ounit2 )
+	test? (
+		dev-ml/ounit2
+		dev-ml/ppx_expect
+	)
 "
 
 PATCHES=( "${FILESDIR}"/${P}-noSeq.patch )