12 files changed, 68 insertions, 190 deletions
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index f71ce1255c64..fe3cd87931e0 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -1,11 +1,8 @@
-DIST ppxlib-0.18.0.tar.gz 192929 BLAKE2B db14821aa77eac02038632ee8a9756ffd7a7b561c5852c4a5bb6882da531a6d2833737d4d1d372ff73251c168e2da57c7df0c724b1d9a6c4829632881aa4d2b3 SHA512 73b785eec34ca68451936c750ff68a4799b8c265cd973a587bd77b60cb933409eed4edfd4c9a4b0b1ada8d3a0bae5c5c719e4258d00cb0290a6842c67be1fd3d
 DIST ppxlib-0.20.0.tar.gz 193453 BLAKE2B baf5703737792f274654de489aee31c1d324011cbe7e4f5b73102ea352d10ca513ed1b04ec43324640a01c0e5d168945806f6fd4e3a60c9f70c28392a720ec61 SHA512 e19699cb09c441d0ecbda191df78e8227111f1880be4f2810228cbfbf93c9474ba6d04e0e3b4b14820ea7dbd1388fd4ac86f818a28819e7d8b0dd00200609a7d
 DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdda375371895072b857a44e8e7f437695f43990472dfad88261179ff07bd33f6e39881c2b28ff2650d7e2a53bdf SHA512 5760ecc8a5e0c0f49ad4f0d3ba2546185d36411f4292c4ebfbf0c9520438546a60d8fe0b265cec70793b03cc684e399401ff761cb1c369966add70118f1ecda5
 DIST ppxlib-0.22.0.tar.gz 202241 BLAKE2B 6b18ceb23e248eb2b4faed66ba0ea1cbee36df61cee9458fc0fd7057eff433340cb602a429c3f100ee054da06d9de20eca44e5ecc4ba98c888cfec2c83097151 SHA512 11442120c24bf60d9de90c9a325de9e5d87d87ba08d8e4cd216a3434f422c62427aa4214909b80646db638423ea35dff4280d5a70cf51bdfadc0a97745c32d41
 DIST ppxlib-0.22.2.tar.gz 202895 BLAKE2B 41d2c2e698846e5dfeb4158966b65dd29b253645b0286d0eab5a9dfb0e684b8b43f17a32b23023198d2c4e50e836705d2c965ea74ef337c5b0cf6aecd6fa4167 SHA512 3a83693551f11965b219a9caa4eaffbf358ea1311e05a38bfd531b8ad225d6571d86db7282e1d5bdc09775f2ba47791c03351402720cf5c2adefc52926d498e4
-DIST ppxlib-0.23.0.tar.gz 364308 BLAKE2B b1cc622eb5e01c455da437365053fd32a00d33007520cf28536e1f45c142aa0a9083da614110c1096fd3f8326453eb037a8c0054e00e17a813f99f3d8efde5d7 SHA512 9d6692ec4247031f26aed3bdc59808a5f929c34dbac3515a8b2a61c59ec118f0e90d12948d22aea40e9f01b1ed782e9dfa5b0263314b967217b2ac4006446c53
 DIST ppxlib-0.24.0.tar.gz 390297 BLAKE2B 7d8972b766cc8104a4d43aebc79e927e51cba114ad678837bfa1b8f009e2437df948c6cd3461db58ef247145e629d3bb11dff58dc5feadefce8152c77b056dfa SHA512 2f6a94c90fd17cea00f3294fde5742637d4758b9f43a021d667f2b09be326954efe22bb188ccf6a7205338ffc75fe096cbe2a075b125e3ced9f829a06ad2f496
-DIST ppxlib-0.28.0.tar.gz 422105 BLAKE2B a88f6c0cba93c880bd3f6e29fdc152e45240a5eb170454ed540c01dc5b88648f1ac71071316f0282bdd4c55cc6bc57e10ac5a7b08004354f50ed0cb2334646bf SHA512 31290cd34f4b306f289b6ef78fbc5907f007c722ffc2cb0682c1944af954f2c6732b236891d1872a22b856d0aee0f7e84d3262ee103aff15d0a4dcd1a20bbfe6
 DIST ppxlib-0.29.0.tar.gz 572842 BLAKE2B e772cfbbc5ff0390b1d256b7671e51aac0c86fe14e912e42fa6f428958d25af09920deae89ba080e37842f21361494237b697abe48dd563df9f69512a4a110ea SHA512 34babcea63b952ca610b5b9841a7d045e3973870014968d5abfff259de8d0f383e79f799fa3522830e0da5a7ff02fa52764b7cad64c8ac0da5a37f8897314c80
 DIST ppxlib-0.29.1.tar.gz 543819 BLAKE2B b0d3920b2aaef887b0120ae66dfa3a0f83d4a4edb237390bddd5206084f77bbd8483d99bc422ce6411a9a1aca7de4fcc5f1f85f9cf46532b7e06c476f2b76b72 SHA512 9bfd52709a63399ff35697b442de6818e2a61b9a2ccf33638f2da6295e3e034e2ae6108a2b8567402e80d928636cdee1572cc14d228a47fbda50625219e411f9
 DIST ppxlib-0.30.0.tar.gz 573753 BLAKE2B f16ba3b01288a535ebf7842d8b9379061cc86cb1bad7841540855508d7d9c10c27e63456d68a16a2408a6eee5cffe82c3c0202ad7894b9fabad8194136762e30 SHA512 a7310c5c0fe76c72984bc6a27648bf12ac83222c029b91a7abf8be13f1950f84de4b24e28f2bb50a6a65c16c9a6bb8c4d3d0596c4b5f7f5bedba87f8ca55a810
diff --git a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
deleted file mode 100644
index 2358fdf46446..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/base-0.11.0:=
-	dev-ml/findlib:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-	dev-ml/cinaps:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-	>=dev-ml/stdio-0.11.0:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/cinaps
-	)"
diff --git a/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0-r2.ebuild
index 08b8d1a33c8f..15a01ecf7ce7 100644
--- a/dev-ml/ppxlib/ppxlib-0.20.0-r1.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.20.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,14 +21,14 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/base-0.11.0:=
-	dev-ml/findlib:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-	>=dev-ml/stdio-0.11.0:=
+	>=dev-ml/base-0.11.0:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
+	>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ml/cinaps:= )"
diff --git a/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0-r4.ebuild
index d6be89711e15..8957b814656c 100644
--- a/dev-ml/ppxlib/ppxlib-0.21.0-r3.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.21.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,14 +21,14 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/base-0.11.0:=
-	dev-ml/findlib:=
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-	>=dev-ml/stdio-0.11.0:=
+	>=dev-ml/base-0.11.0:=[ocamlopt?]
+	dev-ml/findlib:=[ocamlopt?]
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
+	>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild b/dev-ml/ppxlib/ppxlib-0.22.0-r4.ebuild
index bb3fbecbb17a..ac19e6280bab 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.0-r3.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.22.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild b/dev-ml/ppxlib/ppxlib-0.22.2-r3.ebuild
index 8457000dbf88..80bdccbf966e 100644
--- a/dev-ml/ppxlib/ppxlib-0.22.2-r2.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.22.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
deleted file mode 100644
index 5cb0b9a5899a..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
-		dev-ml/cinaps:=
-		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
-	)
-"
-BDEPEND=">=dev-ml/dune-2.8"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-ocaml-4.13.patch
-)
diff --git a/dev-ml/ppxlib/ppxlib-0.24.0.ebuild b/dev-ml/ppxlib/ppxlib-0.24.0-r1.ebuild
index dbf7db057beb..f15f96e90ae0 100644
--- a/dev-ml/ppxlib/ppxlib-0.24.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.24.0-r1.ebuild
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.28.0.ebuild b/dev-ml/ppxlib/ppxlib-0.28.0.ebuild
deleted file mode 100644
index 5dcf6f546bc2..000000000000
--- a/dev-ml/ppxlib/ppxlib-0.28.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-# Note that new "major" versions may change which OCaml version they support
-# See:
-# https://github.com/ocaml-ppx/ppxlib/issues/243
-# https://github.com/ocaml-ppx/ppxlib/issues/232
-
-DESCRIPTION="Base library and tools for ppx rewriters"
-HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
-SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
-		dev-ml/cinaps:=
-		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
-	)
-"
-BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.29.0.ebuild b/dev-ml/ppxlib/ppxlib-0.29.0-r1.ebuild
index e5e3edc8b4a1..7e0d07cf07ad 100644
--- a/dev-ml/ppxlib/ppxlib-0.29.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.29.0-r1.ebuild
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.29.1.ebuild b/dev-ml/ppxlib/ppxlib-0.29.1-r1.ebuild
index 9dee33ce54c6..ba772d5ce6a8 100644
--- a/dev-ml/ppxlib/ppxlib-0.29.1.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.29.1-r1.ebuild
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"
diff --git a/dev-ml/ppxlib/ppxlib-0.30.0.ebuild b/dev-ml/ppxlib/ppxlib-0.30.0-r1.ebuild
index e5e3edc8b4a1..7e0d07cf07ad 100644
--- a/dev-ml/ppxlib/ppxlib-0.30.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.30.0-r1.ebuild
@@ -21,19 +21,19 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/ocaml-compiler-libs-0.11.0:=
-	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=
-	dev-ml/sexplib0:=
-	dev-ml/stdlib-shims:=
-	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=[ocamlopt?]
+	>=dev-ml/ocaml-migrate-parsetree-2.2.0:=[ocamlopt?]
+	dev-ml/sexplib0:=[ocamlopt?]
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppx_derivers-1.2.1:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ml/findlib:=
-		>=dev-ml/base-0.11.0:=
+		dev-ml/findlib:=[ocamlopt?]
+		>=dev-ml/base-0.11.0:=[ocamlopt?]
 		dev-ml/cinaps:=
 		dev-ml/re:=
-		>=dev-ml/stdio-0.11.0:=
+		>=dev-ml/stdio-0.11.0:=[ocamlopt?]
 	)
 "
 BDEPEND=">=dev-ml/dune-2.8"