5 files changed, 118 insertions, 5 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index cf4df5c36e92..a2b892bdebed 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 2ef1b24c26a3..a42cc547b33a 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -6,5 +6,5 @@ DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32
 EBUILD dune-2.8.4.ebuild 925 BLAKE2B aaf039c23fdec35db8eafa1362e05e0a0007b4d5a59483726cffdd4c3f2738ab53cae26451001fa051fe46444f29d08ffd3e22233acaa3280db2c761822c1295 SHA512 175a4b03a248ade24a4a0fc232d13364f5332f9cd686056710dd1fce04b27ac59d81b3844ef1476867f3c5f646167dc40ada4609afc5594ac721ca5f216670a7
 EBUILD dune-2.9.1.ebuild 904 BLAKE2B f98314d3cd1daa6fd08610daee2695a30b4c751bc1d060aad8b99b8e3e138fbe9751a92b5df3e1d1f62a8235b509ed884c75f2e11673d8a8a3cb50ddc414bdd2 SHA512 10a59aa34098669ca0d6d6a568cc63d124fd174850bb66591e9798b452629cc7647d6204050a4fbda2db394782c17590155467d798783018ff1205cde4b92e0e
 EBUILD dune-2.9.3-r3.ebuild 1268 BLAKE2B b1a9b83a1a02159c5c48c2025c0819bbb725529b78d26fbc34953e75762edf1c0dd95954fd9046d1d76fdd8a65430ac90909c2d6994ee608db304bdd27da1ad7 SHA512 fbae16298c1bfd19ab66722cf122745065817a08839deaf408bdd734b4870f0934bf5c977a844f5dc123a4173e51fec769d59cc3c857757d8857746ce5bea3ad
-EBUILD dune-3.0.3-r1.ebuild 1520 BLAKE2B 103f150281a6bef999259459f312c0c0c51e49322637c0bf30eb5447ab0a656143988dca456836b3d5a4e5b67ca098c5c1dd58273709432ff5a97980f3bbdec9 SHA512 0db1f7974e20798db29ca56448d5f51132787135e8073e3abccb8421dc870d77f6b6b07b150cc9647e257d8b8c943e81b25637380a26b31a936160b65d2bfc9c
+EBUILD dune-3.0.3-r1.ebuild 1519 BLAKE2B 73794b43fe622a63df00e38fb732d391ac8f8f062dc065e8df859b2f403d3beb65fd0c1ec2e99ba9cda22600f8120c846b3551dad6af33ea1ce462fd02a15d35 SHA512 ad686f9a6af18fa26bd49c1e3b7e03c48cbadb07ec45fba560b713677b6101dfd76003575911a7ec0c7585b284ca9e53127399367e010b9ad811d0c5e928d28c
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune/dune-3.0.3-r1.ebuild b/dev-ml/dune/dune-3.0.3-r1.ebuild
index 34a23dd6020a..4021856b5e95 100644
--- a/dev-ml/dune/dune-3.0.3-r1.ebuild
+++ b/dev-ml/dune/dune-3.0.3-r1.ebuild
@@ -43,8 +43,7 @@ src_configure() {
 
 src_compile() {
 	ocaml bootstrap.ml -j $(makeopts_jobs) || die
-	./dune.exe build -p "${PN}" --profile dune-bootstrap \
-		-j $(makeopts_jobs) \
+	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) \
 		--display short || die
 
 	use emacs && elisp-compile editor-integration/emacs/*.el
@@ -56,8 +55,8 @@ src_install() {
 		|| die
 
 	dodir /usr/share/doc
-	mv "${D}"/usr/doc/dune "${D}"/usr/share/doc/${PF} || die
-	rmdir "${D}"/usr/doc || die
+	mv "${ED}"/usr/doc/dune "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/doc || die
 
 	if use emacs ; then
 		elisp-install ${PN} editor-integration/emacs/*.el{,c}
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index da8e09e3b169..9a1fbafecf4b 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baff
 DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
 DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6cc574a31c4abe038331b86206348ac3ce93a243add2be3a0bbfc2ec5ec3f3562a5b5efea745cb1943c9c9153bc7b0fcf4de22e SHA512 cf2a89ebb6bc9d7e3f1fd09531c84ac9927cdbe5ee13a6fcb8ce4d08e5a9d6d480ad982f62126b9c757beafa283b34f2ba1fbc56223c641e70da2be4627f59a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
+DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAKE2B 1ab79554a05f8d7a74c0b4bab319c30375475d3fd089764733744fde55c65eb38967cdb19e5b0211a1543549c2bfc3c0f3d43facb7e041f51988e8a65e4448f3 SHA512 4c4d3a748b967cbc75372d0db87ac48d32271a54047ddeeb028d565fa6b7004b2ab3abd82d8ff4621e50c9410fce28c3044550cc94aaf0f6e4f672498f47aba8
 DIST llvm-project-f6f1fd443f48f417de9dfe23353055f1b20d87ef.tar.gz 170625743 BLAKE2B 3add45d7e2f26659f9602b5ccc034033610921ebeb2d6d69d6f5a3d1e3af224d3f5fd42e411d1fe0d5f8249c2ad995d41a236a87eba5a72ea9b20c112faa4c2f SHA512 2b57132d156f3d6d96802f617fff3eec0df6a3b5077ddcc4f31c87829e617f3065074d80e9d26c8c1c64322e76a09321fdfc8ae1d7a84f5da9f8606125e3b635
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B 4125904f29738c9d1df5dda7737d2edb1e68512f66b561d4ab4b24ebaa457da1a13ab830ab911b5016e05cb48696aff0f6cd1753615e33e8b06f5b086deb020f SHA512 7b80a864207d4c0ef50725a5e9e64c6ff0956b4dfd3f6c55f4363f44703a7113205a39a53624e288562b08ca3191bd11cd7615ecb53395e07777ae7161a173c4
@@ -16,4 +17,5 @@ EBUILD llvm-ocaml-15.0.5.9999.ebuild 2582 BLAKE2B 941dc173e32fcd3333cd3b8bc0424b
 EBUILD llvm-ocaml-15.0.5.ebuild 2598 BLAKE2B d04e4d0567e251d2499de4e696d6f0d93083cf821662a6f38e17ac3e34d43062acc3599ed5d36a4fbd301c8de95a8d9a6e59506baec477806b92ec88204fc8c2 SHA512 bde4b047ac38ca30c616f2ced8da379e43c770aa6d6985435e444da0602f7f73f03adefe06a58f140e16f5b436ca4ba895601dc9936ff5f21866a5b95c65db8a
 EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
 EBUILD llvm-ocaml-16.0.0_pre20221113.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
+EBUILD llvm-ocaml-16.0.0_pre20221120.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20221120.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20221120.ebuild
new file mode 100644
index 000000000000..3f12e090b092
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20221120.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+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
+	>=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	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
+}