From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 21 Jun 2016 20:32:35 +0000 (+0200)
Subject: dev-ml/*: Remove := slot ops from || deps, #586304
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2d4ac687fbf44588f764697c9dcb2b960a18d51b;p=gentoo.git

dev-ml/*: Remove := slot ops from || deps, #586304
---

diff --git a/dev-ml/camomile/camomile-0.8.4.ebuild b/dev-ml/camomile/camomile-0.8.4.ebuild
index e8c05fe292e0..23c7a7c986e6 100644
--- a/dev-ml/camomile/camomile-0.8.4.ebuild
+++ b/dev-ml/camomile/camomile-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ IUSE="debug +ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-ml/camomile/camomile-0.8.5.ebuild b/dev-ml/camomile/camomile-0.8.5.ebuild
index c0cb67e32f00..7c99453fab3b 100644
--- a/dev-ml/camomile/camomile-0.8.5.ebuild
+++ b/dev-ml/camomile/camomile-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ IUSE="debug +ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-ml/comparelib/comparelib-109.60.00.ebuild b/dev-ml/comparelib/comparelib-109.60.00.ebuild
index 634a14960772..58ff5e0e0620 100644
--- a/dev-ml/comparelib/comparelib-109.60.00.ebuild
+++ b/dev-ml/comparelib/comparelib-109.60.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=">=dev-ml/type-conv-109.20.00:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 DOCS=( "README.txt" )
diff --git a/dev-ml/comparelib/comparelib-113.00.00.ebuild b/dev-ml/comparelib/comparelib-113.00.00.ebuild
index 46b9a8e7a086..3655d1faad9f 100644
--- a/dev-ml/comparelib/comparelib-113.00.00.ebuild
+++ b/dev-ml/comparelib/comparelib-113.00.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=">=dev-ml/type-conv-109.20.00:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 DOCS=( "README.txt" )
diff --git a/dev-ml/deriving-ocsigen/deriving-ocsigen-0.3c.ebuild b/dev-ml/deriving-ocsigen/deriving-ocsigen-0.3c.ebuild
index 28677f2be0df..a52ee9a02d16 100644
--- a/dev-ml/deriving-ocsigen/deriving-ocsigen-0.3c.ebuild
+++ b/dev-ml/deriving-ocsigen/deriving-ocsigen-0.3c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 IUSE="+ocamlopt type-conv"
 
 DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
 	type-conv? ( >=dev-ml/type-conv-108:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/enumerate/enumerate-111.08.00.ebuild b/dev-ml/enumerate/enumerate-111.08.00.ebuild
index 3e00a711625d..8cc9b8d1c01f 100644
--- a/dev-ml/enumerate/enumerate-111.08.00.ebuild
+++ b/dev-ml/enumerate/enumerate-111.08.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND="
 	>=dev-ml/type-conv-111.13:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/extlib/extlib-1.6.1.ebuild b/dev-ml/extlib/extlib-1.6.1.ebuild
index 9ed1005c7ad6..9ad7cde54345 100644
--- a/dev-ml/extlib/extlib-1.6.1.ebuild
+++ b/dev-ml/extlib/extlib-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="https://ocaml-extlib.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 DEPEND="
 	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
 "
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
diff --git a/dev-ml/faillib/faillib-111.17.00.ebuild b/dev-ml/faillib/faillib-111.17.00.ebuild
index 7e642068fc60..56538221d2ed 100644
--- a/dev-ml/faillib/faillib-111.17.00.ebuild
+++ b/dev-ml/faillib/faillib-111.17.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ IUSE=""
 
 DEPEND="
 	dev-ml/herelib:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
 	"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/fieldslib/fieldslib-109.20.03.ebuild b/dev-ml/fieldslib/fieldslib-109.20.03.ebuild
index 2641d31973e0..59fe57da1e02 100644
--- a/dev-ml/fieldslib/fieldslib-109.20.03.ebuild
+++ b/dev-ml/fieldslib/fieldslib-109.20.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=">=dev-ml/type-conv-${PV}:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 DOCS=( "README.txt" )
diff --git a/dev-ml/fieldslib/fieldslib-113.00.00.ebuild b/dev-ml/fieldslib/fieldslib-113.00.00.ebuild
index 47d7758e69a3..1e6438173a75 100644
--- a/dev-ml/fieldslib/fieldslib-113.00.00.ebuild
+++ b/dev-ml/fieldslib/fieldslib-113.00.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=">=dev-ml/type-conv-${PV}:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 DOCS=( "README.txt" )
diff --git a/dev-ml/lablgl/lablgl-1.05.ebuild b/dev-ml/lablgl/lablgl-1.05.ebuild
index bb69c5d38aef..b8a7a5ee83f1 100644
--- a/dev-ml/lablgl/lablgl-1.05.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ RDEPEND="
 	x11-libs/libX11
 	virtual/opengl
 	virtual/glu
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
 	glut? ( media-libs/freeglut )
 	tk? (
 		>=dev-lang/tcl-8.3:0=
diff --git a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild b/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
index 81b3d6abe490..5a82c4099430 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
 		>=x11-libs/gtkglarea-1.9:2 )
 	spell? ( app-text/gtkspell:2 )
 	sourceview? ( x11-libs/gtksourceview:2.0 )
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
 	"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/dev-ml/lablgtk/lablgtk-2.18.4.ebuild b/dev-ml/lablgtk/lablgtk-2.18.4.ebuild
index 4994848a0c2b..695cffe23f0b 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.4.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ RDEPEND=">=x11-libs/gtk+-2.10:2
 		>=x11-libs/gtkglarea-1.9:2 )
 	spell? ( app-text/gtkspell:2 )
 	sourceview? ( x11-libs/gtksourceview:2.0 )
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
 	"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/dev-ml/lwt/lwt-2.5.1.ebuild b/dev-ml/lwt/lwt-2.5.1.ebuild
index ac787dd5582d..9afd09ed892c 100644
--- a/dev-ml/lwt/lwt-2.5.1.ebuild
+++ b/dev-ml/lwt/lwt-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ DEPEND="react? ( >=dev-ml/react-1.2:= )
 	ssl? ( >=dev-ml/ocaml-ssl-0.4.0:= )
 	gtk? ( dev-ml/lablgtk:= dev-libs/glib:2 )
 	ppx? ( dev-ml/ppx_tools:= )
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 
 RDEPEND="${DEPEND}
 	!<www-servers/ocsigen-1.1"
diff --git a/dev-ml/lwt/lwt-2.5.2.ebuild b/dev-ml/lwt/lwt-2.5.2.ebuild
index ac787dd5582d..9afd09ed892c 100644
--- a/dev-ml/lwt/lwt-2.5.2.ebuild
+++ b/dev-ml/lwt/lwt-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ DEPEND="react? ( >=dev-ml/react-1.2:= )
 	ssl? ( >=dev-ml/ocaml-ssl-0.4.0:= )
 	gtk? ( dev-ml/lablgtk:= dev-libs/glib:2 )
 	ppx? ( dev-ml/ppx_tools:= )
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 
 RDEPEND="${DEPEND}
 	!<www-servers/ocsigen-1.1"
diff --git a/dev-ml/macaque/macaque-0.7.2.ebuild b/dev-ml/macaque/macaque-0.7.2.ebuild
index 9f245daae496..25a79790f590 100644
--- a/dev-ml/macaque/macaque-0.7.2.ebuild
+++ b/dev-ml/macaque/macaque-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,6 +16,6 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=">=dev-ml/pgocaml-2.1:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 DOCS=( Changelog README.md )
diff --git a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11.ebuild b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11.ebuild
index 168330a2e762..04ac46d6c512 100644
--- a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11.ebuild
+++ b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND=">=dev-ml/type-conv-108.07.01:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 DEPEND="${RDEPEND}
 	test? ( >=dev-ml/ounit-2.0.0[ocamlopt?] dev-ml/ocaml-fileutils[ocamlopt?] )"
 
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild
index 788bd15dab27..7bfe24c73f83 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ RDEPEND=">=dev-lang/ocaml-3.12.1:=
 	>=dev-ml/ocaml-fileutils-0.4.0:=
 	>=dev-ml/camomile-0.8.3:=
 	sys-devel/gettext
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )
 	"
 DEPEND="${RDEPEND}
 	doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )
diff --git a/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild b/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild
index b1462368049a..8ebd9765d6b1 100644
--- a/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild
+++ b/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND=">=dev-lang/ocaml-3.12:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 src_compile() {
diff --git a/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild b/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
index 779f710c2fb5..422560139a61 100644
--- a/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild b/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
index 5fe2f7ad68f9..529dff5ee81b 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
index 5c042a395af2..2c174777fb1d 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/dev-ml/optcomp/optcomp-1.6.ebuild b/dev-ml/optcomp/optcomp-1.6.ebuild
index e4c4f2bd8a57..4d3d445fdcb6 100644
--- a/dev-ml/optcomp/optcomp-1.6.ebuild
+++ b/dev-ml/optcomp/optcomp-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+DEPEND="|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 DOCS=( CHANGES.md README.md )
diff --git a/dev-ml/pa_bench/pa_bench-111.28.00.ebuild b/dev-ml/pa_bench/pa_bench-111.28.00.ebuild
index 417f5148dcaf..4e6cfb0fc78d 100644
--- a/dev-ml/pa_bench/pa_bench-111.28.00.ebuild
+++ b/dev-ml/pa_bench/pa_bench-111.28.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND=">=dev-ml/type-conv-109:=
 	dev-ml/pa_ounit:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/pipebang/pipebang-110.01.00.ebuild b/dev-ml/pipebang/pipebang-110.01.00.ebuild
index 7aaa3fb315d2..16cde0cc5b8a 100644
--- a/dev-ml/pipebang/pipebang-110.01.00.ebuild
+++ b/dev-ml/pipebang/pipebang-110.01.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,5 +17,5 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=">=dev-ml/type-conv-109.60:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/pomap/pomap-3.0.3.ebuild b/dev-ml/pomap/pomap-3.0.3.ebuild
index 47f352938aea..cfbbd57790db 100644
--- a/dev-ml/pomap/pomap-3.0.3.ebuild
+++ b/dev-ml/pomap/pomap-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://bitbucket.org/mmottl/pomap"
 SRC_URI="https://bitbucket.org/mmottl/pomap/downloads/${P}.tar.gz"
 LICENSE="LGPL-2.1-with-linking-exception"
 
-DEPEND="|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+DEPEND="|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ppc x86"
diff --git a/dev-ml/pomap/pomap-3.0.5.ebuild b/dev-ml/pomap/pomap-3.0.5.ebuild
index 766dfe89ecb9..aba9c46cffec 100644
--- a/dev-ml/pomap/pomap-3.0.5.ebuild
+++ b/dev-ml/pomap/pomap-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://mmottl.github.io/pomap/"
 SRC_URI="https://github.com/mmottl/pomap/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1-with-linking-exception"
 
-DEPEND="|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+DEPEND="|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ppc x86"
diff --git a/dev-ml/pxp/pxp-1.2.4.ebuild b/dev-ml/pxp/pxp-1.2.4.ebuild
index e1ce8a240095..f469f2d729bc 100644
--- a/dev-ml/pxp/pxp-1.2.4.ebuild
+++ b/dev-ml/pxp/pxp-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ DEPEND=">=dev-ml/pcre-ocaml-4.31:=
 	>=dev-ml/ulex-0.5:=
 	>=dev-ml/ocamlnet-0.98:=
 	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 IUSE="examples +ocamlopt"
diff --git a/dev-ml/pxp/pxp-1.2.7.ebuild b/dev-ml/pxp/pxp-1.2.7.ebuild
index 1937ee73d8e9..98cac6339ab5 100644
--- a/dev-ml/pxp/pxp-1.2.7.ebuild
+++ b/dev-ml/pxp/pxp-1.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ DEPEND=">=dev-ml/pcre-ocaml-4.31:=
 	>=dev-ml/ulex-0.5:=
 	>=dev-ml/ocamlnet-0.98:=
 	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 IUSE="examples +ocamlopt"
diff --git a/dev-ml/pxp/pxp-1.2.8.ebuild b/dev-ml/pxp/pxp-1.2.8.ebuild
index 77edb0055c3a..6c0f1252be67 100644
--- a/dev-ml/pxp/pxp-1.2.8.ebuild
+++ b/dev-ml/pxp/pxp-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ DEPEND=">=dev-ml/pcre-ocaml-4.31:=
 	>=dev-ml/ulex-0.5:=
 	>=dev-ml/ocamlnet-4:=
 	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 IUSE="examples +ocamlopt"
diff --git a/dev-ml/typehashlib/typehashlib-109.15.02.ebuild b/dev-ml/typehashlib/typehashlib-109.15.02.ebuild
index 62cee40cf2a3..a8b5c3d31a11 100644
--- a/dev-ml/typehashlib/typehashlib-109.15.02.ebuild
+++ b/dev-ml/typehashlib/typehashlib-109.15.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND=">=dev-lang/ocaml-4.00.0:=
 	>=dev-ml/type-conv-${PV}:=
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+	|| ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/utop/utop-1.18.2.ebuild b/dev-ml/utop/utop-1.18.2.ebuild
index 8da80ebddb9a..e617706887fa 100644
--- a/dev-ml/utop/utop-1.18.2.ebuild
+++ b/dev-ml/utop/utop-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ DEPEND=">=dev-ml/lwt-2.4.0:=[react]
 	>=dev-ml/zed-1.2:=
 	>=dev-ml/cppo-1.0.1:=
 	emacs? ( virtual/emacs )
-	camlp4? ( || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) )"
+	camlp4? ( || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 ) )"
 RDEPEND="${DEPEND}"
 
 DOCS=( "CHANGES.md" "README.md" )
diff --git a/dev-ml/utop/utop-1.19.1.ebuild b/dev-ml/utop/utop-1.19.1.ebuild
index 8da80ebddb9a..e617706887fa 100644
--- a/dev-ml/utop/utop-1.19.1.ebuild
+++ b/dev-ml/utop/utop-1.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ DEPEND=">=dev-ml/lwt-2.4.0:=[react]
 	>=dev-ml/zed-1.2:=
 	>=dev-ml/cppo-1.0.1:=
 	emacs? ( virtual/emacs )
-	camlp4? ( || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) )"
+	camlp4? ( || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 ) )"
 RDEPEND="${DEPEND}"
 
 DOCS=( "CHANGES.md" "README.md" )
diff --git a/dev-ml/utop/utop-1.19.2.ebuild b/dev-ml/utop/utop-1.19.2.ebuild
index 8da80ebddb9a..e617706887fa 100644
--- a/dev-ml/utop/utop-1.19.2.ebuild
+++ b/dev-ml/utop/utop-1.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ DEPEND=">=dev-ml/lwt-2.4.0:=[react]
 	>=dev-ml/zed-1.2:=
 	>=dev-ml/cppo-1.0.1:=
 	emacs? ( virtual/emacs )
-	camlp4? ( || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) )"
+	camlp4? ( || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 ) )"
 RDEPEND="${DEPEND}"
 
 DOCS=( "CHANGES.md" "README.md" )
diff --git a/dev-ml/utop/utop-1.19.ebuild b/dev-ml/utop/utop-1.19.ebuild
index 8da80ebddb9a..e617706887fa 100644
--- a/dev-ml/utop/utop-1.19.ebuild
+++ b/dev-ml/utop/utop-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ DEPEND=">=dev-ml/lwt-2.4.0:=[react]
 	>=dev-ml/zed-1.2:=
 	>=dev-ml/cppo-1.0.1:=
 	emacs? ( virtual/emacs )
-	camlp4? ( || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) )"
+	camlp4? ( || ( dev-ml/camlp4 <dev-lang/ocaml-4.02.0 ) )"
 RDEPEND="${DEPEND}"
 
 DOCS=( "CHANGES.md" "README.md" )