diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
index 1dd2e0cac8b30..7e06d1ff65d3a 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
@@ -17,9 +17,9 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
index 8a3d59cf3d8bc..17c58e633847e 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
@@ -17,9 +17,9 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
index a8a42765fa982..9872ea859a4fa 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,8 +18,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
index b781e0525f037..e2e67518ea4c8 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,9 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
index 53d42345b5641..289317f1072ad 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
@@ -17,9 +17,9 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt=]
-	dev-ml/result:=[ocamlopt=]
+	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
+	dev-ml/csexp:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	test? (