6 files changed, 213 insertions, 4 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 1b5eda6be2f0..e0053b6c44a9 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index 584558351d82..e0c2de72754d 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,6 +1,7 @@
 AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
 DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
 DIST cudf-v0.10.tar.bz2 47664 BLAKE2B 6ecdfc4243d80f12f6904b334f93ff47beb94535b6ba84992c6a31d244a7c2dcb6072e67828d96b31d4628bb244022fd962efcdcae5299f5a57694f3aa6c95a8 SHA512 b36ecad224070d2c07d4123fb7e39160390ddec4196505e66aad9fbd982bd7ca320ff5f0e771e7996da49bff22fb87fc057060277695b75cd68de19e57cb3855
-EBUILD cudf-0.10.ebuild 1710 BLAKE2B 64530e269c54152473d3467428301c3bbc93d2aa705ea547fa8b00a6cf5a78039c6cfd781d235671fae8a5f081721001c9897ca87a1e2bc13d768b06ea344de9 SHA512 e421b96af33c2006ea56e3d601cee5187c5442e45e7c5a8b010bcab5cf390d28ad8d483f3c71c321b32c6d1c27f92614ac2f0ebe950db54959da34b36e500948
+EBUILD cudf-0.10-r1.ebuild 2221 BLAKE2B 2d1ee3a8ac3899a13d4cd0f31f30e45cda679b3c69dcc7208650807d535e2ae31eb6577f2eafae5e7f5fd3575899dc677bb3954c04af3e039a26848fe9614ea1 SHA512 95830ab4f649d99e12a49df5ec0dfe8fd3ec1675c5b494b5d30c4541a20b3c2cddbafdf6dd42bbc786e49f8c9bcedfa23471ba473f3b97b355476b5be86c1da9
+EBUILD cudf-0.10.ebuild 1710 BLAKE2B ab657db9f01691d6a82c2e71a58893c2563b1e67a0fd5e67d28b616bbebcf7a4d5e46bde7cb55a36264b907c7ef36fded130d81f8a0da7342b1c612aafe2028e SHA512 c30f9cfcc454093955762071fa56528b3c41ceee220c7e92a4cd887fb2f60298a814892b1be7c6628f9ff7d27ebc14f9ec15b6b6be539306f212b395415fc933
 EBUILD cudf-0.9-r2.ebuild 1842 BLAKE2B d8461a2af2d7e06d2f58ec11d87de3b1a4e24cbd7bb902b7d9ece589230313d1bb06b7ab7c729011b66188b14024ebb961f12c9689719c36b7a2f4dc396ee77d SHA512 b28fcb640bbb14d80c1dd45eb1a3c5c71a7412ae0eb6243095d1388d7e01d27e2a11ed00806a6562d82d192fdf05477ff5fcdfa6c467780ddc5ec1da6ddefebb
 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
new file mode 100644
index 000000000000..c77436962e30
--- /dev/null
+++ b/dev-ml/cudf/cudf-0.10-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune toolchain-funcs
+
+MYP=${PN}-v${PV}
+DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
+HOMEPAGE="http://www.mancoosi.org/cudf/"
+SRC_URI="https://gitlab.com/irill/${PN}/-/archive/v${PV}/${MYP}.tar.bz2"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="LGPL-3+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ml/extlib:=
+	dev-ml/findlib:=
+	dev-libs/glib:2
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+	sys-libs/ncurses:=
+	app-arch/zstd
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 )
+	dev-ml/ocamlbuild
+	dev-lang/perl
+"
+BDEPEND="virtual/pkgconfig"
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|make|$(MAKE)|g' \
+		Makefile || die
+
+	if has_version ">=dev-lang/ocaml-5" ; then
+		sed -i \
+			-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind -lzstd|g' \
+			-e "s|ar r|$(tc-getAR) r|g" \
+			c-lib/Makefile || die
+		sed -i \
+			-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind -lzstd|g' \
+			c-lib/Makefile.variants || die
+		if use ocamlopt ; then
+			sed -i \
+				-e 's|-lunix|-lunixnat|g' \
+				c-lib/Makefile || die
+		else
+			sed -i \
+				-e 's|-lunix|-lunixbyt|g' \
+				c-lib/Makefile || die
+		fi
+	else
+		sed -i \
+			-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
+			-e "s|ar r|$(tc-getAR) r|g" \
+			c-lib/Makefile || die
+		sed -i \
+			-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
+			c-lib/Makefile.variants || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	sed -i \
+		-e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \
+		c-lib/cudf.pc.in || die
+}
+
+src_compile() {
+	dune_src_compile
+	emake c-lib
+	if use ocamlopt ; then
+		emake c-lib-opt
+	fi
+}
+
+src_test() {
+	dune_src_test
+	emake c-lib-test
+}
+
+src_install() {
+	dune_src_install
+	mv "${ED}"/usr/share/doc/${PF}/{cudf/README,} || die
+	rmdir "${ED}"/usr/share/doc/${PF}/cudf || die
+	emake DESTDIR="${ED}" -C c-lib/ LIBDIR="/usr/$(get_libdir)" -e install
+	dodoc BUGS ChangeLog
+}
diff --git a/dev-ml/cudf/cudf-0.10.ebuild b/dev-ml/cudf/cudf-0.10.ebuild
index 00c999757bff..d4e45e0e014f 100644
--- a/dev-ml/cudf/cudf-0.10.ebuild
+++ b/dev-ml/cudf/cudf-0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,6 +10,8 @@ DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
 HOMEPAGE="http://www.mancoosi.org/cudf/"
 SRC_URI="https://gitlab.com/irill/${PN}/-/archive/v${PV}/${MYP}.tar.bz2"
 
+S="${WORKDIR}"/${MYP}
+
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
@@ -34,8 +36,6 @@ BDEPEND="virtual/pkgconfig"
 
 QA_FLAGS_IGNORED='.*'
 
-S="${WORKDIR}"/${MYP}
-
 src_prepare() {
 	default
 
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index bd0dda494dd1..3a8ebcba4abc 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,4 +1,5 @@
 DIST llvm-project-022d15c0039fc1cfaa3cc2eb1a45b71bbb21fadd.tar.gz 215902891 BLAKE2B ecd87b84a4e5f87c91b6df0a2d6849f385bdb7b26b14a2836f1e1fc5a69f9f5b441e47b9251174019f62eabe39a243092cd1a175b5da7d7576cdcfd63083cff0 SHA512 7726e253179bfd9e0b93236e3ce1133b421329b0b3496b10c0a0eecde372fb5e55cce737b6b78db13f2d0833bbc92023d95efa54cb2918b12ce9af166bd90ff4
+DIST llvm-project-0b9f2847da79298ed09c29493245113f02b32d9f.tar.gz 216399453 BLAKE2B ed13e6639d40bdda6dbd09eba0cc8e4f82f4f53ce3cff9742e902af1c306c60dcb6d5fb008057829d46bbbde391697726cba2096c52cf1592c00faf1e37430e4 SHA512 a5b0bf59fa228a41f0c904a42b4b96740fc5e5caa63248c546eb4a810e86d5d8d1d8df663051ed4444cc0389ffa6ec12ee5dbf7d94d6211a253319550d7fac1c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
@@ -15,4 +16,5 @@ EBUILD llvm-ocaml-18.1.8.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f975
 EBUILD llvm-ocaml-19.0.0.9999.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 EBUILD llvm-ocaml-19.0.0_pre20240623.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 EBUILD llvm-ocaml-19.0.0_pre20240630.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
+EBUILD llvm-ocaml-19.0.0_pre20240706.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240706.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240706.ebuild
new file mode 100644
index 000000000000..36b3716c0372
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240706.ebuild
@@ -0,0 +1,107 @@
+# 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
+}