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

This reverts commit 2d4ac687fbf44588f764697c9dcb2b960a18d51b.

This commit is wrong in several aspects:
- Such changes should come with a revbump
- Removing := deps causes packages not to be rebuilt on upgrades, causing
  barely understandable build failures when upgrading, later on.
  Thanks to this commit, people that have installed those packages
  will likely experience those failures with the upcoming ocaml 4.03 unmask.
- This is a non maintainer commit where no discussion at all happened with the
  maintainers during the 3 days between bug report and mass commit.
  Such discussion could have prevented the above mentioned breakage.

Proper fix is to drop the backward compatibility part of the || () dep. This fix
was slowly moving forward whenever possible and noticed. Main blocker for this is
bug #463018 which requires taking extra care for not breaking the stable tree
nor needlessly preventing future stabilization of packages.

diff --git a/dev-ml/camomile/camomile-0.8.4.ebuild b/dev-ml/camomile/camomile-0.8.4.ebuild
index 23c7a7c986e6b425be1f0e6b1f7ebfa37a9eaf37..e8c05fe292e0d6d66552faca668b7bc6b2ba5667 100644 (file)
--- a/dev-ml/camomile/camomile-0.8.4.ebuild
+++ b/dev-ml/camomile/camomile-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 7c99453fab3bcdb098e53f3e3010d208fc011a87..c0cb67e32f00b54eec3d18bb0978a61f80ba83dd 100644 (file)
--- a/dev-ml/camomile/camomile-0.8.5.ebuild
+++ b/dev-ml/camomile/camomile-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 58ff5e0e06202b51027c26097a365ed2a4d10f1a..634a14960772b9c8cab6800a2f7a464fd9a34614 100644 (file)
--- a/dev-ml/comparelib/comparelib-109.60.00.ebuild
+++ b/dev-ml/comparelib/comparelib-109.60.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 3655d1faad9ff844783568742f10c46986bd9286..46b9a8e7a08602c0f5cfd5b8d14666325036d9a0 100644 (file)
--- a/dev-ml/comparelib/comparelib-113.00.00.ebuild
+++ b/dev-ml/comparelib/comparelib-113.00.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 a52ee9a02d16a54646aa261866e623b7c7e87a51..28677f2be0df8c81f17633c0d7a15f74caddf633 100644 (file)
--- 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-2016 Gentoo Foundation
+# Copyright 1999-2014 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 8cc9b8d1c01f6e16ba0f5975f2b101f6923a83c9..3e00a711625d21a32733c8b2eb22547cf5c6c971 100644 (file)
--- a/dev-ml/enumerate/enumerate-111.08.00.ebuild
+++ b/dev-ml/enumerate/enumerate-111.08.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 9ad7cde543453d97ec8b1c490be26c3350829b25..9ed1005c7ad6fea77af279474fe5cd95cd2b24a6 100644 (file)
--- a/dev-ml/extlib/extlib-1.6.1.ebuild
+++ b/dev-ml/extlib/extlib-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 56538221d2edf063044c3d985908dc5a35e99e53..7e642068fc60252162edaa80db3fd384072a5cba 100644 (file)
--- a/dev-ml/faillib/faillib-111.17.00.ebuild
+++ b/dev-ml/faillib/faillib-111.17.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 59fe57da1e02d3abaada92f985a0754d2001e645..2641d31973e0f68809b3c2a881fbc3811c6fcae9 100644 (file)
--- a/dev-ml/fieldslib/fieldslib-109.20.03.ebuild
+++ b/dev-ml/fieldslib/fieldslib-109.20.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 1e6438173a752987a7e4083510d9e14b40a1fa94..47d7758e69a3ec1bf42e17ee761c9af6bb6ee85c 100644 (file)
--- a/dev-ml/fieldslib/fieldslib-113.00.00.ebuild
+++ b/dev-ml/fieldslib/fieldslib-113.00.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 fd3d046441926abb3360240f39178164aa80476e..33ec4772a0b2d2d8b4f23c0e5552e37097b1c128 100644 (file)
--- a/dev-ml/lablgl/lablgl-1.05.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 5a82c4099430b76f53765c888e1a56b2f3a7b084..81b3d6abe490cea1224a8832be1b684dec5a1d3c 100644 (file)
--- a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 695cffe23f0b34d7cb9ecdf70235ad1f29599aba..4994848a0c2b9ea11532707c485a06100be17433 100644 (file)
--- a/dev-ml/lablgtk/lablgtk-2.18.4.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 9afd09ed892c48ee113d6731a6f6f995849b9997..ac787dd5582de4a8b384d460c73a790cbcd7ef3d 100644 (file)
--- a/dev-ml/lwt/lwt-2.5.1.ebuild
+++ b/dev-ml/lwt/lwt-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 9afd09ed892c48ee113d6731a6f6f995849b9997..ac787dd5582de4a8b384d460c73a790cbcd7ef3d 100644 (file)
--- a/dev-ml/lwt/lwt-2.5.2.ebuild
+++ b/dev-ml/lwt/lwt-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 25a79790f590aff5d6256ce09badb783d127cff9..9f245daae4969eeceb22e5c0810c89a885be571f 100644 (file)
--- a/dev-ml/macaque/macaque-0.7.2.ebuild
+++ b/dev-ml/macaque/macaque-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 04ac46d6c512d6679fbf9a438aa1dbaf832b785a..168330a2e762cada627faaed9e9c19c4eee55c94 100644 (file)
--- 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-2016 Gentoo Foundation
+# Copyright 1999-2014 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 7bfe24c73f83eb0eca4c08e60fc93fd5f593179d..788bd15dab27481bb24bd9700b89514eafde22bb 100644 (file)
--- 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-2016 Gentoo Foundation
+# Copyright 1999-2014 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 8ebd9765d6b102fec0bf0dba60e1ff63940568cb..b1462368049aea0d506a3da21457295726905179 100644 (file)
--- a/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild
+++ b/dev-ml/ocamldsort/ocamldsort-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 c789a74ebedde58dd6f5e38b977e4acc3fcb8dba..61ad3d6994b245c21949d4534ff7ddf05e61fd45 100644 (file)
--- a/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 59b6fb344934a554be1c05b28f3bace6bd612346..db254b69886db43c5bf3b182e61377536e663625 100644 (file)
--- a/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 307496b583a72759e89d2313f0a43db632b95b46..dc776089febee3210603d7e1bb2156ea0432013c 100644 (file)
--- a/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 4d3d445fdcb6c6bf4ed6de5e0f387aaf66a57c43..e4c4f2bd8a57d563c854996e364ac5636190827a 100644 (file)
--- a/dev-ml/optcomp/optcomp-1.6.ebuild
+++ b/dev-ml/optcomp/optcomp-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 4e6cfb0fc78dc0bcc9352be4d79c47a35ab9d4a1..417f5148dcaf61dd69ca8d095212b8a936193a2b 100644 (file)
--- 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-2016 Gentoo Foundation
+# Copyright 1999-2014 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 16cde0cc5b8a32df737edc497f203a4d4ef07d47..7aaa3fb315d22b794a7645000174aa3fa6f2a779 100644 (file)
--- a/dev-ml/pipebang/pipebang-110.01.00.ebuild
+++ b/dev-ml/pipebang/pipebang-110.01.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 cfbbd57790db2d79ca10c9c751d58020d57f6bff..47f352938aea0e25053cd376ecff9496bdf57afe 100644 (file)
--- a/dev-ml/pomap/pomap-3.0.3.ebuild
+++ b/dev-ml/pomap/pomap-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 aba9c46cffec4a4598c5cf22e893490f6cba316f..766dfe89ecb9ea86285a7d7996e479c6a4941f61 100644 (file)
--- a/dev-ml/pomap/pomap-3.0.5.ebuild
+++ b/dev-ml/pomap/pomap-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 f469f2d729bc02396d0d46494c9d6c600e28b76d..e1ce8a2400950506c11524d196fdee1a7171ef0b 100644 (file)
--- a/dev-ml/pxp/pxp-1.2.4.ebuild
+++ b/dev-ml/pxp/pxp-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 98cac6339ab52d5fe859e499b4487d4ace950674..1937ee73d8e993e641e73db1bab225a6690cae73 100644 (file)
--- a/dev-ml/pxp/pxp-1.2.7.ebuild
+++ b/dev-ml/pxp/pxp-1.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 6c0f1252be673adb05715618d07e105b83a4b66a..77edb0055c3acd2169c97e56aed16bb5a95db990 100644 (file)
--- a/dev-ml/pxp/pxp-1.2.8.ebuild
+++ b/dev-ml/pxp/pxp-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 a8b5c3d31a118dcbb934452bfebc82d83ba63c79..62cee40cf2a38c9ce242c9f77f0016196d8b6fa0 100644 (file)
--- a/dev-ml/typehashlib/typehashlib-109.15.02.ebuild
+++ b/dev-ml/typehashlib/typehashlib-109.15.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2014 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 e617706887fa15cc66471f770acc049caa2fe781..8da80ebddb9ad0c08a82eac17220b7e2717c38fb 100644 (file)
--- a/dev-ml/utop/utop-1.18.2.ebuild
+++ b/dev-ml/utop/utop-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 e617706887fa15cc66471f770acc049caa2fe781..8da80ebddb9ad0c08a82eac17220b7e2717c38fb 100644 (file)
--- a/dev-ml/utop/utop-1.19.1.ebuild
+++ b/dev-ml/utop/utop-1.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 e617706887fa15cc66471f770acc049caa2fe781..8da80ebddb9ad0c08a82eac17220b7e2717c38fb 100644 (file)
--- a/dev-ml/utop/utop-1.19.2.ebuild
+++ b/dev-ml/utop/utop-1.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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 e617706887fa15cc66471f770acc049caa2fe781..8da80ebddb9ad0c08a82eac17220b7e2717c38fb 100644 (file)
--- a/dev-ml/utop/utop-1.19.ebuild
+++ b/dev-ml/utop/utop-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 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" )