diff --git a/dev-ml/camlimages/camlimages-4.2.2.ebuild b/dev-ml/camlimages/camlimages-4.2.2.ebuild
index 8f825c780a51d..9b589566854a9 100644
--- a/dev-ml/camlimages/camlimages-4.2.2.ebuild
+++ b/dev-ml/camlimages/camlimages-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ppc x86"
 IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm"
 
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt]
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[X(+)?,ocamlopt]
 	exif? ( media-libs/libexif )
 	gif? ( media-libs/giflib )
 	gtk? ( dev-ml/lablgtk )
diff --git a/dev-ml/camlimages/camlimages-4.2.3.ebuild b/dev-ml/camlimages/camlimages-4.2.3.ebuild
index 9be34cb0db7b8..ab0b210a36c7c 100644
--- a/dev-ml/camlimages/camlimages-4.2.3.ebuild
+++ b/dev-ml/camlimages/camlimages-4.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm"
 
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt]
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[X(+)?,ocamlopt]
 	exif? ( media-libs/libexif )
 	gif? ( media-libs/giflib )
 	gtk? ( dev-ml/lablgtk )
diff --git a/dev-ml/camlimages/camlimages-4.2.4.ebuild b/dev-ml/camlimages/camlimages-4.2.4.ebuild
index 9be34cb0db7b8..ab0b210a36c7c 100644
--- a/dev-ml/camlimages/camlimages-4.2.4.ebuild
+++ b/dev-ml/camlimages/camlimages-4.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm"
 
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt]
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[X(+)?,ocamlopt]
 	exif? ( media-libs/libexif )
 	gif? ( media-libs/giflib )
 	gtk? ( dev-ml/lablgtk )
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
index ebc669e81c2ac..c598fe1bdb416 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ SLOT="0/${PV}"
 IUSE="+ocamlopt doc +deriving +ppx +react +xml X"
 
 RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
+	>=dev-lang/ocaml-3.12:=[ocamlopt?,X(+)?]
 	>=dev-ml/lwt-2.4.4:=[camlp4(+)]
 	react? ( dev-ml/react:=  dev-ml/reactiveData:= )
 	xml? ( >=dev-ml/tyxml-4:= )
diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild
index cc5bfc3e1166b..9898bc5fa31af 100644
--- a/dev-ml/labltk/labltk-8.06.2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linu
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3:=
-	>=dev-lang/ocaml-4.04:=[ocamlopt?,X?]"
+	>=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]"
 DEPEND="${RDEPEND}
 	>=dev-ml/findlib-1.5.5-r1"
 
diff --git a/dev-ml/labltk/labltk-8.06.3.ebuild b/dev-ml/labltk/labltk-8.06.3.ebuild
index 3695e8495ff6b..4b18b50e9a4d9 100644
--- a/dev-ml/labltk/labltk-8.06.3.ebuild
+++ b/dev-ml/labltk/labltk-8.06.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3:=
-	>=dev-lang/ocaml-4.04:=[ocamlopt?,X?]"
+	>=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]"
 DEPEND="${RDEPEND}
 	>=dev-ml/findlib-1.5.5-r1"