12 files changed, 128 insertions, 47 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 276cd9eb5d70..9d187c154988 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index e3167f9c72f1..8c7998030ab3 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 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.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
+EBUILD llvm-ocaml-16.0.0.ebuild 2532 BLAKE2B 86820fc96e57f380dbddbe673423362925bbbd52f8fa98e3e8ce8f108c7999e520391db7a076c03351d83c80b662e1edb6a6e0f71a2d9b3aed8445d659eb8e16 SHA512 77e408a5f34d83abebef58df665767be4a059868f77a5e03f4edb29e20a317e4da057b7b6d473d55c9d398e24c389e911cd9153af9934f4b95d1a6b8bc6147ed
 EBUILD llvm-ocaml-16.0.0_rc3.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-16.0.0_rc4.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0.ebuild
new file mode 100644
index 000000000000..d5f0179fb951
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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="~amd64 ~arm ~x86"
+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
+}
diff --git a/dev-ml/ppxfind/Manifest b/dev-ml/ppxfind/Manifest
deleted file mode 100644
index 717a087b5435..000000000000
--- a/dev-ml/ppxfind/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ppxfind-1.4.tbz 4083 BLAKE2B 3661827c897a74af21f0d10c9435b74845fc4832cb1b50a510fdf7c33cd877faee5ddcb8307c65903a4692fcb58ca264e0c0b44433a34a59a12f8eb2917e12e9 SHA512 f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981
-EBUILD ppxfind-1.4.ebuild 463 BLAKE2B 9f1b416fd01c6621dd0b56642f6ad9713e34a1697472e01769cbcd2c5bcc11b5040ae34c819a1231750e2398c8cd2f6a9e0f9526556414f58d9ae88fdd32c3fc SHA512 4f87f4d8cb90357d95492386a05e2fe710426fafe0abfb304d53969333c863dd59fe204cde6a700bcbdb165b5be0e4d63be19c289729946a3ecf0c77a33d6436
-MISC metadata.xml 415 BLAKE2B 22236aa2a77c6b76037d8dda103ac7ad700e7d45f9b2251ddbe79e94e0d78ebe94f88ed2ac50a452584675eb2e2a424cbe0a2a251199498689d11c9b4f70a837 SHA512 cbf1dc85338df76b4341172fcded00ff727fb08590dbb05e5d53cb529f22290d2a4d07c385a6a0f2aaa34efdec63c638e8f3ca60332f1f7b2a51d5570aac7d96
diff --git a/dev-ml/ppxfind/metadata.xml b/dev-ml/ppxfind/metadata.xml
deleted file mode 100644
index 8eb95a3e7a89..000000000000
--- a/dev-ml/ppxfind/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">diml/ppxfind</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ppxfind/ppxfind-1.4.ebuild b/dev-ml/ppxfind/ppxfind-1.4.ebuild
deleted file mode 100644
index b964ae76cb11..000000000000
--- a/dev-ml/ppxfind/ppxfind-1.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="ocamlfind ppx tool"
-HOMEPAGE="https://github.com/diml/ppxfind"
-SRC_URI="https://github.com/diml/ppxfind/releases/download/${PV}/${P}.tbz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	<=dev-ml/ocaml-migrate-parsetree-1.80:=
-	dev-ml/findlib:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/stdune/Manifest b/dev-ml/stdune/Manifest
index 2a220ad1fd6d..2bce79f426cd 100644
--- a/dev-ml/stdune/Manifest
+++ b/dev-ml/stdune/Manifest
@@ -3,9 +3,9 @@ DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
 DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
-EBUILD stdune-3.0.3-r1.ebuild 845 BLAKE2B 4011992b54716bd47eb10da5a4e09bd9da930ea75be0f6b4073b7410c3aebcbd56d542e391337af936cec2b8e240f5f53cc5fbdf693fb072a78d0bec6685696f SHA512 30d5e3cfb21628f9fa2846302e8e69e18f1b0f72af47399fb9e1b16faabac03549f2ee550a052468512550acf59a729aa445a31773def2a2bc465f58735d5290
-EBUILD stdune-3.2.0.ebuild 763 BLAKE2B 4634b9d4888a26a8b29fe94b392151b01b74e4e00dc02c47a8a52326af7f358ec30c459441ad6ae2aff8a0572c8914c51c0726011a5c9ae349e92b1e14adc605 SHA512 6e0ae98827b3144cb6d922ee5aec046b1384fd4c49b5b8ab71a9f58585b1197652648380905a656c33accaceb99bd83b708ab7976996f853ceb1a1b3fcbec2a7
-EBUILD stdune-3.6.1.ebuild 765 BLAKE2B e5e85dee353dbf93d01520f2f202ee1aaadfc1f08cd347b5940950a0147be3f3a0d658ddcc329e4f67c39f2f43976ee07b234f697989d6d3812fa5b1dd538534 SHA512 e64fc40b0972527719ef420f7f33906c02f9a4c623cede9ac88c907675586202c14e7b54bd686440e8f702289e8a167cdfd10c2fc78bb9a523e1c1e2123979f0
-EBUILD stdune-3.6.2.ebuild 769 BLAKE2B 83c174cfe1e9e91d77d69b73e31a861119c6cce7f61331203eaa1e7a47973ac565c2416f56a9a2a90b23f9c67f04904d94d2926f7b9969a3ba2aecc5f6694ba5 SHA512 803597cd486931cf3dd716aa6d1fd796cce4ab0818435822d7316b12d75a477e4859a9cbf40f5970b3ccd0971927a18bd21d96ac98bdf951fc3fa35e721e08a7
-EBUILD stdune-3.7.0.ebuild 770 BLAKE2B b7ce0957db2dc97796e5d48bf286042d1bc7642b3704ea46e8e749efa567d54621ca72bae0d2937552dea290c96037ec32799b32ea8c0179e4ad0dee61f4211d SHA512 45c34d1eec5bd0a2976f4acab468826cb4ebfeae4ab856c08d8daeaa5a68a8c035edf828b940f203bd7a0461a66b4cf19028fe4a5e02791737171e37842a653e
+EBUILD stdune-3.0.3-r2.ebuild 880 BLAKE2B 2ead44e52c3f7a95b40f7cf1fb9ac4ce6e6ea1d0033b349db4fcec2a4d676c34449516fcb73101ced3f5e3e2abdc6d44a9901778dfd610fb65eb4d07f919195d SHA512 cbbb5c0cc62cd24f0ad4df2415cb33077527f2f6ba31af69d832d56733f2fa2c78b28c7ce30ce37668b74b02f4f1f4a6e418871a4a56b9422188ee74ec2a0546
+EBUILD stdune-3.2.0-r1.ebuild 798 BLAKE2B 34a506ce7f21df10539ddd5ce3459c62bc3141bec6a36f6d9a93077e3a8fa7ca10b58763fa6397538600c9e449661dc3acf9c761cad6bf0e156b4d0fff92663c SHA512 b70c6909e49e9e19cac20d9485f4dfee157fd5996d3142cee4d8e85e4a109b39cb5bb6e384ffacc7293da344e30d6b433c02238e6bf25710252e06a9167f50ee
+EBUILD stdune-3.6.1-r1.ebuild 800 BLAKE2B 91a0e8cb7157b6526b7833547d02822ad6a549d9046c246d6b45ef8157199e432f66d22d8c57e51347439c06527e5a0973243e5ec09208b4d09e4e5e356c0f1b SHA512 8923cea1f10501f78d9c508a3b8bb78edf6c852cb0750668f1ca0810c60d7f3099b29f48cfebe2512a4dda4f02b5d69e6106da7cfd54b53f9e31d6cb671ed652
+EBUILD stdune-3.6.2-r1.ebuild 799 BLAKE2B 15080bfc4ea1d21e5d478e469db27be133023573747fbd51e5d02d88ff4c0f77157fde8cc94a10c181facf0cf170774a0d9127ddea771fdbaffeba9aecc340ef SHA512 902fefbba7e7e552a76bfe93104a3d4afab63b087de5e22d55e65b0183045cfbf0cc85c70a141281ea6c8d82cfd467d1e47110934e301bf328f16ad79acaf5cc
+EBUILD stdune-3.7.0-r1.ebuild 800 BLAKE2B 91a0e8cb7157b6526b7833547d02822ad6a549d9046c246d6b45ef8157199e432f66d22d8c57e51347439c06527e5a0973243e5ec09208b4d09e4e5e356c0f1b SHA512 8923cea1f10501f78d9c508a3b8bb78edf6c852cb0750668f1ca0810c60d7f3099b29f48cfebe2512a4dda4f02b5d69e6106da7cfd54b53f9e31d6cb671ed652
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/stdune/stdune-3.0.3-r1.ebuild b/dev-ml/stdune/stdune-3.0.3-r2.ebuild
index 57914cc6d34c..6899e81ace5c 100644
--- a/dev-ml/stdune/stdune-3.0.3-r1.ebuild
+++ b/dev-ml/stdune/stdune-3.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,6 +22,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/stdune/stdune-3.2.0.ebuild b/dev-ml/stdune/stdune-3.2.0-r1.ebuild
index 42c85b7e9d79..6eb7a8ea3f95 100644
--- a/dev-ml/stdune/stdune-3.2.0.ebuild
+++ b/dev-ml/stdune/stdune-3.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/stdune/stdune-3.7.0.ebuild b/dev-ml/stdune/stdune-3.6.1-r1.ebuild
index 7ee771448037..8d82be573c81 100644
--- a/dev-ml/stdune/stdune-3.7.0.ebuild
+++ b/dev-ml/stdune/stdune-3.6.1-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/stdune/stdune-3.6.2.ebuild b/dev-ml/stdune/stdune-3.6.2-r1.ebuild
index 9ab1a59d2ae2..c31152e785e8 100644
--- a/dev-ml/stdune/stdune-3.6.2.ebuild
+++ b/dev-ml/stdune/stdune-3.6.2-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/stdune/stdune-3.6.1.ebuild b/dev-ml/stdune/stdune-3.7.0-r1.ebuild
index 8a902b92cec8..8d82be573c81 100644
--- a/dev-ml/stdune/stdune-3.6.1.ebuild
+++ b/dev-ml/stdune/stdune-3.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"