9 files changed, 78 insertions, 7 deletions
diff --git a/dev-ml/lwt/lwt-5.9.0.ebuild b/dev-ml/lwt/lwt-5.9.0.ebuild
index dc7d0eebe0c7..887a2aa137c3 100644
--- a/dev-ml/lwt/lwt-5.9.0.ebuild
+++ b/dev-ml/lwt/lwt-5.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_import/Manifest b/dev-ml/ppx_import/Manifest
index 9d293629579c..1987cf2611f1 100644
--- a/dev-ml/ppx_import/Manifest
+++ b/dev-ml/ppx_import/Manifest
@@ -1,3 +1,4 @@
 DIST ppx_import-1.10.0.tar.gz 13927 BLAKE2B d036b730dd9c7b5be9fcbf175103ec6f1e2a14111575135a9cfaf935b936165418b34a4b0a37e0d112b7fbc1315526ce21a9db5bebbd99e1898c4a3c245dcf94 SHA512 7d4aeab6512014b5a16fdcc4d26ac29cc22223e18c7ab26e26f9fdd5bcd625c22aa9ff2e6c2106f45408316eaaf755437979961d97139da5973026038c210935
 DIST ppx_import-1.11.0.tar.gz 14018 BLAKE2B 4a1265d1364c51bc18351f964a0f6ffcaca4d866389479583353282f939f11001096b815a80c5d7f8b326a9987cd46cb7a897ca02b84458666bc54f2b350bffb SHA512 e8ba55fa89a1ca546107238c1141d4df1b371418fe901f1172458ba5b2b50160e9a9650f38639bc633e183494c4d728e9ccf3ec6ded5a7bd9cc923bd806a1156
+DIST ppx_import-1.12.0.tar.gz 14378 BLAKE2B 0163f1e08417511b050baaf1816388a8be089502356d808263062cfe2da3678ecd02bdbdb58ae37d6a95b07a157e7442c0bb4d992599ab3709a87c924fea530e SHA512 793f5f2571bb38d8353b572684c0bee8a00aca8edefbe2969018db485fb828828418ec4881772c6342486de50f55119d247c89abdb6058c844d3a982b6f2bfd2
 DIST ppx_import-1.9.1.tar.gz 13820 BLAKE2B 295796041ecad89c95bd6a6fe14a9d9bb969f7d984388cca5181c31b8358affeb92a4d200bb9e11449a0216995a8477b809acf251b049e8331eea9e6bb918cb7 SHA512 37bd54bc477b91a3aa4b2433a9817c6d939f1e4a1d950b83b05964d22540296582cec6513a0959fd036f738dbd6ef9df13430183b8bdaa9425c7640a5fddf4b3
diff --git a/dev-ml/ppx_import/ppx_import-1.10.0.ebuild b/dev-ml/ppx_import/ppx_import-1.10.0-r1.ebuild
index 76c36a3692e4..89420ed90291 100644
--- a/dev-ml/ppx_import/ppx_import-1.10.0.ebuild
+++ b/dev-ml/ppx_import/ppx_import-1.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,11 @@ KEYWORDS="amd64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-ml/ppxlib-0.26:="
+RDEPEND="
+	>=dev-ml/ppxlib-0.26:=
+	<dev-ml/ppxlib-0.32
+	<dev-lang/ocaml-5.2
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
diff --git a/dev-ml/ppx_import/ppx_import-1.11.0.ebuild b/dev-ml/ppx_import/ppx_import-1.11.0-r1.ebuild
index 51d2493ec85c..1707f58701ff 100644
--- a/dev-ml/ppx_import/ppx_import-1.11.0.ebuild
+++ b/dev-ml/ppx_import/ppx_import-1.11.0-r1.ebuild
@@ -16,7 +16,10 @@ KEYWORDS="amd64 arm64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-ml/ppxlib-0.26:="
+RDEPEND="
+	>=dev-ml/ppxlib-0.26:=
+	<dev-lang/ocaml-5.4
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
diff --git a/dev-ml/ppx_import/ppx_import-1.12.0.ebuild b/dev-ml/ppx_import/ppx_import-1.12.0.ebuild
new file mode 100644
index 000000000000..2349b1825a08
--- /dev/null
+++ b/dev-ml/ppx_import/ppx_import-1.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A syntax extension for importing declarations from interface files"
+HOMEPAGE="https://github.com/ocaml-ppx/ppx_import/"
+SRC_URI="https://github.com/ocaml-ppx/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/ppxlib-0.34:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-ml/ounit2
+		dev-ml/ppx_deriving
+		dev-ml/ppx_sexp_conv
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-dune-ounit2.patch )
diff --git a/dev-ml/ppx_import/ppx_import-1.9.1-r1.ebuild b/dev-ml/ppx_import/ppx_import-1.9.1-r2.ebuild
index c548ecf42c83..274c26600e2b 100644
--- a/dev-ml/ppx_import/ppx_import-1.9.1-r1.ebuild
+++ b/dev-ml/ppx_import/ppx_import-1.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-ml/ppxlib-0.24:=
 	<dev-ml/ppxlib-0.26
+	<dev-lang/ocaml-5.4
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest
index 57d62795b3eb..2d656aee9114 100644
--- a/dev-ml/ppx_js_style/Manifest
+++ b/dev-ml/ppx_js_style/Manifest
@@ -1,2 +1,3 @@
 DIST ppx_js_style-0.16.0.tar.gz 10782 BLAKE2B f8d2cf691792240bb88094e3f3e09a82d2f947ac0fc2dafbf99351943e069cb237fcf17c45d1d097f3d78bafe4ef286acc931578180695cd7c237f4f45ddf7e8 SHA512 5a77fb8d8f7f4713a30d202d8edc16f11509cc9a6b4fb54609c774bb78f0dc1bb22d7064b5a2ea0c080aea32b626acae7a20af8e16913607c01e285134bead2d
 DIST ppx_js_style-0.17.0.tar.gz 10758 BLAKE2B db3710441f75cfa0e9af4589bd061896cdc384d5abcf255e46ea67846df0c18290257b5fb17e57790ad8bc8543832ca95be425e918aa8a5175440236ee0fecaa SHA512 e5abb24b5a445a1f8e30ade007f2b44e7f0dd0151b2a902943f056d338d8dbb9c17f614e270797f6fe52362a24b4fb56787ba891e5aadec673afde5c46dbd8a5
+DIST ppx_js_style-0.17.1.tar.gz 10758 BLAKE2B 4de7c22c5c85f0ec337ec62ee23b1e526471cb7bd1d53340c992a1fc784ce28db3c4fc5f31bdfaa569ba40e3d166a448176609546dee150e4aadd852b8bd35ec SHA512 7df4fb48935eaa505be37689cf01c2ae87ede67847e7574357d291a6d1a03fda4da589d9b6d2233992fbf8aaad5e2ad07e197b1e6aa6a92622347aa552fb7fcf
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.16.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.16.0-r1.ebuild
index 1797befead51..74ec32f1abd2 100644
--- a/dev-ml/ppx_js_style/ppx_js_style-0.16.0.ebuild
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,12 +14,16 @@ SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
+# Jane Street Minor
+JSM=$(ver_cut 1-2)*
+
 DEPEND="
 	>=dev-lang/ocaml-4.14
-	dev-ml/base:${SLOT}
+	=dev-ml/base-${JSM}:=[ocamlopt?]
 	dev-ml/findlib:=
 	dev-ml/octavius:=
 	>=dev-ml/ppxlib-0.28.0:=
+	<dev-ml/ppxlib-0.36
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.17.1.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.17.1.ebuild
new file mode 100644
index 000000000000..8d2b25f86823
--- /dev/null
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.17.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Code style checker for Jane Street Packages"
+HOMEPAGE="https://github.com/janestreet/ppx_js_style"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
+IUSE="+ocamlopt"
+
+# Jane Street Minor
+JSM=$(ver_cut 1-2)*
+
+RDEPEND="
+	>=dev-lang/ocaml-5.3.0
+	=dev-ml/base-${JSM}:=[ocamlopt?]
+	dev-ml/octavius:=[ocamlopt?]
+	>=dev-ml/ppxlib-0.36.0:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"